AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bad level link fixes

This commit is contained in:
Jack Andersen 2016-04-23 18:03:30 -10:00
parent 38c9ece8ec
commit b60d55d784
27 changed files with 425 additions and 353 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -95,6 +95,11 @@ include_directories(${ATHENA_INCLUDE_DIR} ${LOGVISOR_INCLUDE_DIR} ${HECL_INCLUDE
${SPECTER_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
add_subdirectory(DataSpec)
add_subdirectory(Editor)
set(CLIENT_SOURCES
${CMAKE_SOURCE_DIR}/Editor/ProjectResourceFactoryBase.hpp
${CMAKE_SOURCE_DIR}/Editor/ProjectResourceFactoryBase.cpp
${CMAKE_SOURCE_DIR}/Editor/ProjectResourceFactoryMP1.hpp
${CMAKE_SOURCE_DIR}/Editor/ProjectResourceFactoryMP1.cpp)
add_subdirectory(Runtime)
add_subdirectory(mpcksum)

13
Editor/CMakeLists.txt
View File

@ -29,8 +29,6 @@ add_executable(urde WIN32 MACOSX_BUNDLE
ParticleEditor.hpp ParticleEditor.cpp atdna_ParticleEditor.cpp
InformationCenter.hpp InformationCenter.hpp atdna_InformationCenter.cpp
ProjectManager.hpp ProjectManager.cpp
ProjectResourceFactoryBase.hpp ProjectResourceFactoryBase.cpp
ProjectResourceFactoryMP1.hpp ProjectResourceFactoryMP1.cpp
ViewManager.hpp ViewManager.cpp
Resource.hpp Resource.cpp
Camera.hpp Camera.cpp)
@ -38,17 +36,6 @@ add_executable(urde WIN32 MACOSX_BUNDLE
target_link_libraries(urde
UrdeLocales
UrdeIcons
RuntimeMP1
RuntimeCommonWorld
RuntimeCommonAutoMapper
RuntimeCommonCamera
RuntimeCommonCharacter
RuntimeCommonInput
RuntimeCommonParticle
RuntimeCommonCollision
RuntimeCommonGuiSys
RuntimeCommonGraphics
RuntimeCommonAudio
RuntimeCommon
DNAMP3 DNAMP2 DNAMP1
DNACommon specter specter-fonts freetype ${DATA_SPEC_LIBS}

19
Editor/ProjectManager.cpp
View File

@ -188,4 +188,23 @@ bool ProjectManager::saveProject()
return true;
}
void ProjectManager::mainUpdate()
{
if (m_mainMP1)
m_mainMP1->Proc();
}
void ProjectManager::asyncIdle()
{
m_factoryMP1.AsyncIdle();
}
void ProjectManager::shutdown()
{
if (m_mainMP1)
m_mainMP1->Shutdown();
m_clientProc.shutdown();
m_factoryMP1.Shutdown();
}
}

21
Editor/ProjectManager.hpp
View File

@ -49,24 +49,9 @@ public:
bool extractGame(const hecl::SystemString& path);
bool saveProject();
void mainUpdate()
{
if (m_mainMP1)
m_mainMP1->Proc();
}
void asyncIdle()
{
m_factoryMP1.AsyncIdle();
}
void shutdown()
{
if (m_mainMP1)
m_mainMP1->Shutdown();
m_clientProc.shutdown();
m_factoryMP1.Shutdown();
}
void mainUpdate();
void asyncIdle();
void shutdown();
};
}

16
Runtime/Audio/CMakeLists.txt
View File

@ -1,7 +1,9 @@
add_library(RuntimeCommonAudio
CAudioSys.hpp CAudioSys.cpp
CAudioStateWin.hpp CAudioStateWin.cpp
CSfxManager.hpp CSfxManager.cpp
CSfxHandle.hpp CSfxHandle.cpp
dsp.c dsp.h
g721.c g721.h)
set(AUDIO_SOURCES
CAudioSys.hpp CAudioSys.cpp
CAudioStateWin.hpp CAudioStateWin.cpp
CSfxManager.hpp CSfxManager.cpp
CSfxHandle.hpp CSfxHandle.cpp
dsp.c dsp.h
g721.c g721.h)
runtime_add_list(Audio AUDIO_SOURCES)

6
Runtime/AutoMapper/CMakeLists.txt
View File

@ -1,2 +1,4 @@
add_library(RuntimeCommonAutoMapper
CMapWorldInfo.hpp CMapWorldInfo.cpp)
set(AUTOMAPPER_SOURCES
CMapWorldInfo.hpp CMapWorldInfo.cpp)
runtime_add_list(AutoMapper AUTOMAPPER_SOURCES)

28
Runtime/CMakeLists.txt
View File

@ -1,6 +1,14 @@
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${BOO_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/DataSpec)
macro(runtime_add_list rel_path a_list)
unset(tmp_list)
foreach(path IN LISTS ${a_list})
list(APPEND tmp_list "${rel_path}/${path}")
endforeach(path)
set(${a_list} "${tmp_list}" PARENT_SCOPE)
endmacro(runtime_add_list)
add_subdirectory(Audio)
add_subdirectory(Character)
add_subdirectory(Graphics)
@ -20,7 +28,23 @@ else()
list(APPEND PLAT_SRCS CMemoryCardSysNix.cpp CCallStackNix.cpp)
endif()
add_subdirectory(MP1)
add_subdirectory(MP2)
add_subdirectory(MP3)
add_library(RuntimeCommon
${CLIENT_SOURCES}
${MP1_SOURCES}
${AUDIO_SOURCES}
${AUTOMAPPER_SOURCES}
${CAMERA_SOURCES}
${CHARACTER_SOURCES}
${COLLISION_SOURCES}
${GRAPHICS_SOURCES}
${GUISYS_SOURCES}
${INPUT_SOURCES}
${PARTICLE_SOURCES}
${WORLD_SOURCES}
#CMemory.hpp CMemory.cpp
CMemoryCardSys.hpp
IAllocator.hpp IAllocator.cpp
@ -72,7 +96,3 @@ add_library(RuntimeCommon
RetroTypes.hpp
GCNTypes.hpp
${PLAT_SRCS})
add_subdirectory(MP1)
add_subdirectory(MP2)
add_subdirectory(MP3)

4
Runtime/Camera/CCameraFilter.hpp
View File

@ -22,8 +22,8 @@ public:
};
private:
public:
void SetFilter(EFilterType type, EFilterShape shape, float, const zeus::CColor& color, u32);
void DisableFilter(float);
void SetFilter(EFilterType type, EFilterShape shape, float, const zeus::CColor& color, u32) {}
void DisableFilter(float) {}
};
class CCameraBlurPass

12
Runtime/Camera/CCinematicCamera.cpp
View File

@ -0,0 +1,12 @@
#include "CCinematicCamera.hpp"
namespace urde
{
CCinematicCamera::CCinematicCamera(TUniqueId uid, const std::string& name, const CEntityInfo& info,
const zeus::CTransform& xf, bool active, float, float a, float b, float c, float d, u32 e)
: CGameCamera(uid, active, name, info, xf, a, b, c, d, kInvalidUniqueId, e & 0x20, 0)
{
}
}

14
Runtime/Camera/CGameCamera.cpp
View File

@ -0,0 +1,14 @@
#include "CGameCamera.hpp"
#include "World/CActorParameters.hpp"
namespace urde
{
CGameCamera::CGameCamera(TUniqueId uid, bool active, const std::string& name, const CEntityInfo& info,
const zeus::CTransform& xf, float, float, float, float, TUniqueId, bool, u32)
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(),
CMaterialList(EMaterialTypes::Zero), CActorParameters::None(), kInvalidUniqueId)
{
}
}

2
Runtime/Camera/CGameCamera.hpp
View File

@ -10,6 +10,8 @@ namespace urde
class CGameCamera : public CActor
{
public:
CGameCamera(TUniqueId, bool active, const std::string& name, const CEntityInfo& info,
const zeus::CTransform& xf, float, float, float, float, TUniqueId, bool, u32);
const zeus::CTransform& GetTransform() const {return x34_transform;}
};

20
Runtime/Camera/CMakeLists.txt
View File

@ -1,9 +1,11 @@
add_library(RuntimeCommonCamera
CCameraManager.hpp CCameraManager.cpp
CGameCamera.hpp CGameCamera.cpp
CFirstPersonCamera.hpp CFirstPersonCamera.cpp
CBallCamera.hpp CBallCamera.cpp
CPathCamera.hpp CPathCamera.cpp
CCinematicCamera.hpp CCinematicCamera.cpp
CCameraShakeData.hpp CCameraShakeData.cpp
CCameraFilter.hpp CCameraFilter.cpp)
set(CAMERA_SOURCES
CCameraManager.hpp CCameraManager.cpp
CGameCamera.hpp CGameCamera.cpp
CFirstPersonCamera.hpp CFirstPersonCamera.cpp
CBallCamera.hpp CBallCamera.cpp
CPathCamera.hpp CPathCamera.cpp
CCinematicCamera.hpp CCinematicCamera.cpp
CCameraShakeData.hpp CCameraShakeData.cpp
CCameraFilter.hpp CCameraFilter.cpp)
runtime_add_list(Camera CAMERA_SOURCES)

2
Runtime/Character/CActorLights.hpp
View File

@ -7,7 +7,7 @@ namespace urde
class CActorLights
{
public:
void ActivateLights() const;
void ActivateLights() const {}
};
}

162
Runtime/Character/CMakeLists.txt
View File

@ -1,80 +1,82 @@
add_library(RuntimeCommonCharacter
CAssetFactory.hpp CAssetFactory.cpp
CCharacterFactory.hpp CCharacterFactory.cpp
CModelData.hpp CModelData.cpp
CAnimData.hpp CAnimData.cpp
CCharAnimTime.hpp CCharAnimTime.cpp
IMetaAnim.hpp IMetaAnim.cpp
IMetaTrans.hpp
CAnimationDatabase.hpp
CAnimationDatabaseGame.hpp CAnimationDatabaseGame.cpp
CTransitionDatabase.hpp
CTransitionDatabaseGame.hpp CTransitionDatabaseGame.cpp
CHierarchyPoseBuilder.hpp CHierarchyPoseBuilder.cpp
CPoseAsTransforms.hpp CPoseAsTransforms.cpp
CSkinBank.hpp CSkinBank.cpp
CCharLayoutInfo.hpp CCharLayoutInfo.cpp
CLayoutDescription.hpp
CSegIdList.hpp CSegIdList.cpp
CSegId.hpp CSegId.cpp
TSegIdMap.hpp
CSkinRules.hpp CSkinRules.cpp
CAnimCharacterSet.hpp CAnimCharacterSet.cpp
CAnimationSet.hpp CAnimationSet.cpp
CCharacterSet.hpp CCharacterSet.cpp
CCharacterInfo.hpp CCharacterInfo.cpp
CPASDatabase.hpp CPASDatabase.cpp
CPASAnimState.hpp CPASAnimState.cpp
CPASParmInfo.hpp CPASParmInfo.cpp
CPASAnimInfo.hpp CPASAnimInfo.cpp
CPASAnimParm.hpp CPASAnimParm.cpp
CEffectComponent.hpp CEffectComponent.cpp
CAnimation.hpp CAnimation.cpp
CAnimationManager.hpp CAnimationManager.cpp
CTransition.hpp CTransition.cpp
CTransitionManager.hpp CTransitionManager.cpp
CMetaAnimFactory.hpp CMetaAnimFactory.cpp
CMetaAnimPlay.hpp CMetaAnimPlay.cpp
CMetaAnimBlend.hpp CMetaAnimBlend.cpp
CMetaAnimPhaseBlend.hpp CMetaAnimPhaseBlend.cpp
CMetaAnimRandom.hpp CMetaAnimRandom.cpp
CMetaAnimSequence.hpp CMetaAnimSequence.cpp
CMetaTransFactory.hpp CMetaTransFactory.cpp
CMetaTransMetaAnim.hpp CMetaTransMetaAnim.cpp
CMetaTransTrans.hpp CMetaTransTrans.cpp
CMetaTransPhaseTrans.hpp CMetaTransPhaseTrans.cpp
CMetaTransSnap.hpp CMetaTransSnap.cpp
CAnimTreeLoopIn.hpp CAnimTreeLoopIn.cpp
CAnimTreeSequence.hpp CAnimTreeSequence.cpp
CAnimTreeAnimReaderContainer.hpp CAnimTreeAnimReaderContainer.cpp
CAnimTreeBlend.hpp CAnimTreeBlend.cpp
CAnimTreeNode.hpp CAnimTreeNode.cpp
CAnimTreeScale.hpp CAnimTreeScale.cpp
CAnimTreeTimeScale.hpp CAnimTreeTimeScale.cpp
CAnimTreeTransition.hpp CAnimTreeTransition.cpp
CAnimTreeTweenBase.hpp CAnimTreeTweenBase.cpp
CAnimTreeSingleChild.hpp CAnimTreeSingleChild.cpp
CAnimTreeDoubleChild.hpp CAnimTreeDoubleChild.cpp
CAnimPlaybackParms.hpp
IAnimReader.hpp IAnimReader.cpp
CPrimitive.hpp CPrimitive.cpp
CHalfTransition.hpp CHalfTransition.cpp
CTimeScaleFunctions.hpp CTimeScaleFunctions.cpp
CParticleData.hpp CParticleData.cpp
CParticleDatabase.hpp CParticleDatabase.cpp
CParticleGenInfo.hpp CParticleGenInfo.cpp
CAnimPOIData.hpp CAnimPOIData.cpp
CPOINode.hpp CPOINode.cpp
CBoolPOINode.hpp CBoolPOINode.cpp
CInt32POINode.hpp CInt32POINode.cpp
CSoundPOINode.hpp CSoundPOINode.cpp
CParticlePOINode.hpp CParticlePOINode.cpp
CAnimSourceReader.hpp CAnimSourceReader.cpp
CAnimSource.hpp CAnimSource.cpp
CAllFormatsAnimSource.hpp CAllFormatsAnimSource.cpp
CSegStatementSet.hpp CSegStatementSet.cpp
CAnimPerSegmentData.hpp
CAdditiveAnimPlayback.hpp CAdditiveAnimPlayback.cpp
CActorLights.hpp CActorLights.cpp
CAnimSysContext.hpp
CBodyState.hpp)
set(CHARACTER_SOURCES
CAssetFactory.hpp CAssetFactory.cpp
CCharacterFactory.hpp CCharacterFactory.cpp
CModelData.hpp CModelData.cpp
CAnimData.hpp CAnimData.cpp
CCharAnimTime.hpp CCharAnimTime.cpp
IMetaAnim.hpp IMetaAnim.cpp
IMetaTrans.hpp
CAnimationDatabase.hpp
CAnimationDatabaseGame.hpp CAnimationDatabaseGame.cpp
CTransitionDatabase.hpp
CTransitionDatabaseGame.hpp CTransitionDatabaseGame.cpp
CHierarchyPoseBuilder.hpp CHierarchyPoseBuilder.cpp
CPoseAsTransforms.hpp CPoseAsTransforms.cpp
CSkinBank.hpp CSkinBank.cpp
CCharLayoutInfo.hpp CCharLayoutInfo.cpp
CLayoutDescription.hpp
CSegIdList.hpp CSegIdList.cpp
CSegId.hpp CSegId.cpp
TSegIdMap.hpp
CSkinRules.hpp CSkinRules.cpp
CAnimCharacterSet.hpp CAnimCharacterSet.cpp
CAnimationSet.hpp CAnimationSet.cpp
CCharacterSet.hpp CCharacterSet.cpp
CCharacterInfo.hpp CCharacterInfo.cpp
CPASDatabase.hpp CPASDatabase.cpp
CPASAnimState.hpp CPASAnimState.cpp
CPASParmInfo.hpp CPASParmInfo.cpp
CPASAnimInfo.hpp CPASAnimInfo.cpp
CPASAnimParm.hpp CPASAnimParm.cpp
CEffectComponent.hpp CEffectComponent.cpp
CAnimation.hpp CAnimation.cpp
CAnimationManager.hpp CAnimationManager.cpp
CTransition.hpp CTransition.cpp
CTransitionManager.hpp CTransitionManager.cpp
CMetaAnimFactory.hpp CMetaAnimFactory.cpp
CMetaAnimPlay.hpp CMetaAnimPlay.cpp
CMetaAnimBlend.hpp CMetaAnimBlend.cpp
CMetaAnimPhaseBlend.hpp CMetaAnimPhaseBlend.cpp
CMetaAnimRandom.hpp CMetaAnimRandom.cpp
CMetaAnimSequence.hpp CMetaAnimSequence.cpp
CMetaTransFactory.hpp CMetaTransFactory.cpp
CMetaTransMetaAnim.hpp CMetaTransMetaAnim.cpp
CMetaTransTrans.hpp CMetaTransTrans.cpp
CMetaTransPhaseTrans.hpp CMetaTransPhaseTrans.cpp
CMetaTransSnap.hpp CMetaTransSnap.cpp
CAnimTreeLoopIn.hpp CAnimTreeLoopIn.cpp
CAnimTreeSequence.hpp CAnimTreeSequence.cpp
CAnimTreeAnimReaderContainer.hpp CAnimTreeAnimReaderContainer.cpp
CAnimTreeBlend.hpp CAnimTreeBlend.cpp
CAnimTreeNode.hpp CAnimTreeNode.cpp
CAnimTreeScale.hpp CAnimTreeScale.cpp
CAnimTreeTimeScale.hpp CAnimTreeTimeScale.cpp
CAnimTreeTransition.hpp CAnimTreeTransition.cpp
CAnimTreeTweenBase.hpp CAnimTreeTweenBase.cpp
CAnimTreeSingleChild.hpp CAnimTreeSingleChild.cpp
CAnimTreeDoubleChild.hpp CAnimTreeDoubleChild.cpp
CAnimPlaybackParms.hpp
IAnimReader.hpp IAnimReader.cpp
CPrimitive.hpp CPrimitive.cpp
CHalfTransition.hpp CHalfTransition.cpp
CTimeScaleFunctions.hpp CTimeScaleFunctions.cpp
CParticleData.hpp CParticleData.cpp
CParticleDatabase.hpp CParticleDatabase.cpp
CParticleGenInfo.hpp CParticleGenInfo.cpp
CAnimPOIData.hpp CAnimPOIData.cpp
CPOINode.hpp CPOINode.cpp
CBoolPOINode.hpp CBoolPOINode.cpp
CInt32POINode.hpp CInt32POINode.cpp
CSoundPOINode.hpp CSoundPOINode.cpp
CParticlePOINode.hpp CParticlePOINode.cpp
CAnimSourceReader.hpp CAnimSourceReader.cpp
CAnimSource.hpp CAnimSource.cpp
CAllFormatsAnimSource.hpp CAllFormatsAnimSource.cpp
CSegStatementSet.hpp CSegStatementSet.cpp
CAnimPerSegmentData.hpp
CAdditiveAnimPlayback.hpp CAdditiveAnimPlayback.cpp
CActorLights.hpp CActorLights.cpp
CAnimSysContext.hpp
CBodyState.hpp)
runtime_add_list(Character CHARACTER_SOURCES)

18
Runtime/Collision/CMakeLists.txt
View File

@ -1,8 +1,10 @@
add_library(RuntimeCommonCollision
CGameCollision.hpp CGameCollision.cpp
CCollisionInfo.hpp CCollisionInfo.cpp
CCollidableOBBTree.hpp CCollidableOBBTree.cpp
CCollidableOBBTreeGroup.hpp CCollidableOBBTreeGroup.cpp
CMaterialList.hpp
CMaterialFilter.hpp
CRayCastResult.hpp CRayCastResult.cpp)
set(COLLISION_SOURCES
CGameCollision.hpp CGameCollision.cpp
CCollisionInfo.hpp CCollisionInfo.cpp
CCollidableOBBTree.hpp CCollidableOBBTree.cpp
CCollidableOBBTreeGroup.hpp CCollidableOBBTreeGroup.cpp
CMaterialList.hpp
CMaterialFilter.hpp
CRayCastResult.hpp CRayCastResult.cpp)
runtime_add_list(Collision COLLISION_SOURCES)

36
Runtime/Graphics/CMakeLists.txt
View File

@ -6,20 +6,22 @@ endif()
include_directories(${LIBJPEG_INCLUDE_DIR})
add_library(RuntimeCommonGraphics
IRenderer.hpp
CBooRenderer.hpp CBooRenderer.cpp
CLineRenderer.hpp CLineRenderer.cpp
CLineRendererShaders.hpp CLineRendererShadersGLSL.cpp
CMetroidModelInstance.hpp
CLight.hpp CLight.cpp
CTexture.hpp CTextureBoo.cpp
CModel.hpp CModelBoo.cpp
CSkinnedModel.hpp CSkinnedModel.cpp
CModelShaders.hpp CModelShadersGLSL.cpp
CVertexMorphEffect.hpp CVertexMorphEffect.cpp
CMoviePlayer.hpp CMoviePlayer.cpp
CFrustumPlanes.hpp CFrustumPlanes.cpp
CGraphicsPalette.hpp CGraphicsPalette.cpp
CGraphics.hpp CGraphics.cpp
${PLAT_SRCS})
set(GRAPHICS_SOURCES
IRenderer.hpp
CBooRenderer.hpp CBooRenderer.cpp
CLineRenderer.hpp CLineRenderer.cpp
CLineRendererShaders.hpp CLineRendererShadersGLSL.cpp
CMetroidModelInstance.hpp
CLight.hpp CLight.cpp
CTexture.hpp CTextureBoo.cpp
CModel.hpp CModelBoo.cpp
CSkinnedModel.hpp CSkinnedModel.cpp
CModelShaders.hpp CModelShadersGLSL.cpp
CVertexMorphEffect.hpp CVertexMorphEffect.cpp
CMoviePlayer.hpp CMoviePlayer.cpp
CFrustumPlanes.hpp CFrustumPlanes.cpp
CGraphicsPalette.hpp CGraphicsPalette.cpp
CGraphics.hpp CGraphics.cpp
${PLAT_SRCS})
runtime_add_list(Graphics GRAPHICS_SOURCES)

2
Runtime/Graphics/CSkinnedModel.hpp
View File

@ -37,7 +37,7 @@ public:
const TLockedToken<CCharLayoutInfo>& GetLayoutInfo() const {return x1c_layoutInfo;}
void Calculate(const CPoseAsTransforms& pose, const std::experimental::optional<CVertexMorphEffect>&);
void Draw(const CModelFlags& drawFlags) const;
void Draw(const CModelFlags& drawFlags) const {}
};
class CMorphableSkinnedModel : public CSkinnedModel

192
Runtime/GuiSys/CMakeLists.txt
View File

@ -1,95 +1,97 @@
add_library(RuntimeCommonGuiSys
CSplashScreen.cpp
CSplashScreen.hpp
CGuiObject.cpp
CGuiObject.hpp
CConsoleOutputWindow.cpp
CConsoleOutputWindow.hpp
CAuiEnergyBarT01.cpp
CAuiEnergyBarT01.hpp
CAuiImagePane.cpp
CAuiImagePane.hpp
CAuiMeter.cpp
CAuiMeter.hpp
CConsoleOutputWindow.cpp
CConsoleOutputWindow.hpp
CGuiAnimBase.cpp
CGuiAnimBase.hpp
CGuiAnimController.cpp
CGuiAnimController.hpp
CGuiAutoRepeatData.cpp
CGuiAutoRepeatData.hpp
CGuiCamera.cpp
CGuiCamera.hpp
CGuiFactories.cpp
CGuiFactories.hpp
CGuiFrame.cpp
CGuiFrame.hpp
CGuiLight.cpp
CGuiLight.hpp
CGuiModel.cpp
CGuiModel.hpp
CGuiRandomVar.cpp
CGuiRandomVar.hpp
CGuiSliderGroup.cpp
CGuiSliderGroup.hpp
CGuiStaticImage.cpp
CGuiStaticImage.hpp
CGuiSys.cpp
CGuiSys.hpp
CGuiTableGroup.cpp
CGuiTableGroup.hpp
CGuiTextPane.cpp
CGuiTextPane.hpp
CGuiTextSupport.cpp
CGuiTextSupport.hpp
CGuiWidget.cpp
CGuiWidgetDrawParms.cpp
CGuiWidgetDrawParms.hpp
CGuiWidget.hpp
CMakeLists.txt
CSplashScreen.cpp
CSplashScreen.hpp
CGuiCompoundWidget.cpp
CGuiCompoundWidget.hpp
CSaveableState.cpp
CSaveableState.hpp
CDrawStringOptions.cpp
CDrawStringOptions.hpp
CRasterFont.cpp
CRasterFont.hpp
CGuiGroup.cpp
CGuiGroup.hpp
CGuiFunctionDef.cpp
CGuiFunctionDef.hpp
CGuiFuncParm.cpp
CGuiFuncParm.hpp
CGuiPhysicalMsg.cpp
CGuiPhysicalMsg.hpp
CGuiControllerInfo.hpp
CGuiLogicalEventTrigger.cpp
CGuiLogicalEventTrigger.hpp
CGuiWidgetIdDB.cpp
CGuiWidgetIdDB.hpp
CGuiHeadWidget.cpp
CGuiHeadWidget.hpp
CGuiBackground.cpp
CGuiBackground.hpp
CGuiPane.cpp
CGuiPane.hpp
CGuiMessage.cpp
CGuiMessage.hpp
CFontRenderState.cpp
CFontRenderState.hpp
CTextExecuteBuffer.cpp
CTextExecuteBuffer.hpp
CTextRenderBuffer.cpp
CTextRenderBuffer.hpp
CInstruction.cpp
CInstruction.hpp
CTextParser.cpp
CTextParser.hpp
CWordBreakTables.cpp
CWordBreakTables.hpp
CFontImageDef.cpp
CFontImageDef.hpp)
set(GUISYS_SOURCES
CSplashScreen.cpp
CSplashScreen.hpp
CGuiObject.cpp
CGuiObject.hpp
CConsoleOutputWindow.cpp
CConsoleOutputWindow.hpp
CAuiEnergyBarT01.cpp
CAuiEnergyBarT01.hpp
CAuiImagePane.cpp
CAuiImagePane.hpp
CAuiMeter.cpp
CAuiMeter.hpp
CConsoleOutputWindow.cpp
CConsoleOutputWindow.hpp
CGuiAnimBase.cpp
CGuiAnimBase.hpp
CGuiAnimController.cpp
CGuiAnimController.hpp
CGuiAutoRepeatData.cpp
CGuiAutoRepeatData.hpp
CGuiCamera.cpp
CGuiCamera.hpp
CGuiFactories.cpp
CGuiFactories.hpp
CGuiFrame.cpp
CGuiFrame.hpp
CGuiLight.cpp
CGuiLight.hpp
CGuiModel.cpp
CGuiModel.hpp
CGuiRandomVar.cpp
CGuiRandomVar.hpp
CGuiSliderGroup.cpp
CGuiSliderGroup.hpp
CGuiStaticImage.cpp
CGuiStaticImage.hpp
CGuiSys.cpp
CGuiSys.hpp
CGuiTableGroup.cpp
CGuiTableGroup.hpp
CGuiTextPane.cpp
CGuiTextPane.hpp
CGuiTextSupport.cpp
CGuiTextSupport.hpp
CGuiWidget.cpp
CGuiWidgetDrawParms.cpp
CGuiWidgetDrawParms.hpp
CGuiWidget.hpp
CMakeLists.txt
CSplashScreen.cpp
CSplashScreen.hpp
CGuiCompoundWidget.cpp
CGuiCompoundWidget.hpp
CSaveableState.cpp
CSaveableState.hpp
CDrawStringOptions.cpp
CDrawStringOptions.hpp
CRasterFont.cpp
CRasterFont.hpp
CGuiGroup.cpp
CGuiGroup.hpp
CGuiFunctionDef.cpp
CGuiFunctionDef.hpp
CGuiFuncParm.cpp
CGuiFuncParm.hpp
CGuiPhysicalMsg.cpp
CGuiPhysicalMsg.hpp
CGuiControllerInfo.hpp
CGuiLogicalEventTrigger.cpp
CGuiLogicalEventTrigger.hpp
CGuiWidgetIdDB.cpp
CGuiWidgetIdDB.hpp
CGuiHeadWidget.cpp
CGuiHeadWidget.hpp
CGuiBackground.cpp
CGuiBackground.hpp
CGuiPane.cpp
CGuiPane.hpp
CGuiMessage.cpp
CGuiMessage.hpp
CFontRenderState.cpp
CFontRenderState.hpp
CTextExecuteBuffer.cpp
CTextExecuteBuffer.hpp
CTextRenderBuffer.cpp
CTextRenderBuffer.hpp
CInstruction.cpp
CInstruction.hpp
CTextParser.cpp
CTextParser.hpp
CWordBreakTables.cpp
CWordBreakTables.hpp
CFontImageDef.cpp
CFontImageDef.hpp)
runtime_add_list(GuiSys GUISYS_SOURCES)

20
Runtime/Input/CMakeLists.txt
View File

@ -1,9 +1,11 @@
add_library(RuntimeCommonInput
IController.hpp
CKeyboardMouseController.hpp
ControlMapper.hpp ControlMapper.cpp
CInputGenerator.hpp CInputGenerator.cpp
CFinalInput.hpp CFinalInput.cpp
CRumbleManager.hpp CRumbleManager.cpp
CRumbleGenerator.hpp CRumbleGenerator.cpp
CRumbleVoice.hpp CRumbleVoice.cpp)
set(INPUT_SOURCES
IController.hpp
CKeyboardMouseController.hpp
ControlMapper.hpp ControlMapper.cpp
CInputGenerator.hpp CInputGenerator.cpp
CFinalInput.hpp CFinalInput.cpp
CRumbleManager.hpp CRumbleManager.cpp
CRumbleGenerator.hpp CRumbleGenerator.cpp
CRumbleVoice.hpp CRumbleVoice.cpp)
runtime_add_list(Input INPUT_SOURCES)

4
Runtime/Input/CRumbleManager.hpp
View File

@ -13,8 +13,8 @@ public:
CRumbleManager() = default;
void Update(float);
void StopRumble(u16) {}
void Rumble(ERumbleFxId, CStateManager&, ERumblePriority priority);
void Rumble(ERumbleFxId, float, CStateManager&, ERumblePriority priority);
void Rumble(ERumbleFxId, CStateManager&, ERumblePriority priority) {}
void Rumble(ERumbleFxId, float, CStateManager&, ERumblePriority priority) {}
};
}

18
Runtime/MP1/CMakeLists.txt
View File

@ -1,9 +1,11 @@
include_directories(. ..)
add_library(RuntimeMP1
CTweaks.hpp CTweaks.cpp
CInGameTweakManager.hpp CInGameTweakManager.cpp
CMainFlow.hpp CMainFlow.cpp
CMFGame.hpp CMFGame.cpp
CPlayMovie.hpp CPlayMovie.cpp
CFrontEndUI.hpp CFrontEndUI.cpp
MP1.hpp MP1.cpp)
set(MP1_SOURCES
CTweaks.hpp CTweaks.cpp
CInGameTweakManager.hpp CInGameTweakManager.cpp
CMainFlow.hpp CMainFlow.cpp
CMFGame.hpp CMFGame.cpp
CPlayMovie.hpp CPlayMovie.cpp
CFrontEndUI.hpp CFrontEndUI.cpp
MP1.hpp MP1.cpp)
runtime_add_list(MP1 MP1_SOURCES)

66
Runtime/Particle/CMakeLists.txt
View File

@ -4,35 +4,37 @@ elseif(APPLE)
set(PLAT_SRCS CElementGenShadersMetal.cpp)
endif()
add_library(RuntimeCommonParticle
IElement.hpp
CGenDescription.hpp
CRealElement.hpp CRealElement.cpp
CIntElement.hpp CIntElement.cpp
CVectorElement.hpp CVectorElement.cpp
CModVectorElement.hpp CModVectorElement.cpp
CColorElement.hpp CColorElement.cpp
CUVElement.hpp CUVElement.cpp
CEmitterElement.hpp CEmitterElement.cpp
CParticleDataFactory.hpp CParticleDataFactory.cpp
CSwooshDescription.hpp CSwooshDescription.cpp
CElectricDescription.hpp CElectricDescription.cpp
CDecalDescription.hpp CDecalDescription.cpp
CWeaponDescription.hpp CWeaponDescription.cpp
CDecalDataFactory.hpp CDecalDataFactory.cpp
CElementGen.hpp CElementGen.cpp
CParticleSwooshDataFactory.hpp CParticleSwooshDataFactory.cpp
CParticleSwoosh.hpp CParticleSwoosh.cpp
CParticleElectricDataFactory.hpp CParticleElectricDataFactory.cpp
CParticleElectric.hpp CParticleElectric.cpp
CParticleGen.hpp CParticleGen.cpp
CProjectileWeaponDataFactory.hpp CProjectileWeaponDataFactory.cpp
CCollisionResponseData.hpp CCollisionResponseData.cpp
CDecalManager.hpp CDecalManager.cpp
CSpawnSystemKeyframeData.hpp CSpawnSystemKeyframeData.cpp
CWarp.hpp CWarp.cpp
CFlameWarp.hpp CFlameWarp.cpp
CParticleGlobals.hpp CParticleGlobals.cpp
CElementGenShaders.hpp
CElementGenShadersGLSL.cpp
${PLAT_SRCS})
set(PARTICLE_SOURCES
IElement.hpp
CGenDescription.hpp
CRealElement.hpp CRealElement.cpp
CIntElement.hpp CIntElement.cpp
CVectorElement.hpp CVectorElement.cpp
CModVectorElement.hpp CModVectorElement.cpp
CColorElement.hpp CColorElement.cpp
CUVElement.hpp CUVElement.cpp
CEmitterElement.hpp CEmitterElement.cpp
CParticleDataFactory.hpp CParticleDataFactory.cpp
CSwooshDescription.hpp CSwooshDescription.cpp
CElectricDescription.hpp CElectricDescription.cpp
CDecalDescription.hpp CDecalDescription.cpp
CWeaponDescription.hpp CWeaponDescription.cpp
CDecalDataFactory.hpp CDecalDataFactory.cpp
CElementGen.hpp CElementGen.cpp
CParticleSwooshDataFactory.hpp CParticleSwooshDataFactory.cpp
CParticleSwoosh.hpp CParticleSwoosh.cpp
CParticleElectricDataFactory.hpp CParticleElectricDataFactory.cpp
CParticleElectric.hpp CParticleElectric.cpp
CParticleGen.hpp CParticleGen.cpp
CProjectileWeaponDataFactory.hpp CProjectileWeaponDataFactory.cpp
CCollisionResponseData.hpp CCollisionResponseData.cpp
CDecalManager.hpp CDecalManager.cpp
CSpawnSystemKeyframeData.hpp CSpawnSystemKeyframeData.cpp
CWarp.hpp CWarp.cpp
CFlameWarp.hpp CFlameWarp.cpp
CParticleGlobals.hpp CParticleGlobals.cpp
CElementGenShaders.hpp
CElementGenShadersGLSL.cpp
${PLAT_SRCS})
runtime_add_list(Particle PARTICLE_SOURCES)

6
Runtime/World/CGameArea.hpp
View File

@ -61,9 +61,9 @@ public:
zeus::CVector3f x28_ = {0.5f};
float x34_ = 0.f;
public:
void SetFogExplicit(ERglFogMode, const zeus::CColor& color, const zeus::CVector2f& vec);
void DisableFog();
void Update(float dt);
void SetFogExplicit(ERglFogMode, const zeus::CColor& color, const zeus::CVector2f& vec) {}
void DisableFog() {}
void Update(float dt) {}
};
CGameArea(CInputStream& in, int mlvlVersion);

86
Runtime/World/CMakeLists.txt
View File

@ -1,42 +1,44 @@
add_library(RuntimeCommonWorld
CWorld.hpp CWorld.cpp
IGameArea.hpp IGameArea.cpp
CGameArea.hpp CGameArea.cpp
CAi.hpp CAi.cpp
CPathFindArea.hpp CPathFindArea.cpp
CAreaOctTree.hpp CAreaOctTree.cpp
CActor.hpp CActor.cpp
CPhysicsActor.hpp CPhysicsActor.cpp
CEntity.hpp CEntity.cpp
CPhysicsActor.hpp CPhysicsActor.cpp
CWorldTransManager.hpp CWorldTransManager.cpp
CEnvFxManager.hpp CEnvFxManager.cpp
CActorModelParticles.hpp CActorModelParticles.cpp
CTeamAiTypes.hpp CTeamAiTypes.cpp
ScriptObjectSupport.hpp ScriptObjectSupport.cpp
ScriptLoader.hpp ScriptLoader.cpp
CScriptActor.hpp CScriptActor.cpp
CScriptWaypoint.hpp CScriptWaypoint.cpp
CScriptDoor.hpp CScriptDoor.cpp
CScriptTrigger.hpp CScriptTrigger.cpp
CScriptTimer.hpp CScriptTimer.cpp
CScriptCounter.hpp CScriptCounter.cpp
CScriptEffect.hpp CScriptEffect.cpp
CScriptPlatform.hpp CScriptPlatform.cpp
CScriptSound.hpp CScriptSound.cpp
CScriptGenerator.hpp CScriptGenerator.cpp
CScriptDock.hpp CScriptDock.cpp
CScriptWater.hpp CScriptWater.cpp
CScriptGrapplePoint.hpp CScriptGrapplePoint.cpp
CScriptAreaAttributes.hpp CScriptAreaAttributes.cpp
CScriptCameraWaypoint.hpp CScriptCameraWaypoint.cpp
CGrappleParameters.hpp
CActorParameters.hpp
CLightParameters.hpp
CScannableParameters.hpp
CVisorParameters.hpp
CAnimationParameters.hpp
CDamageInfo.hpp
CDamageVulnerability.hpp
CFluidUVMotion.hpp CFluidUVMotion.cpp
CFluidPlane.hpp)
set(WORLD_SOURCES
CWorld.hpp CWorld.cpp
IGameArea.hpp IGameArea.cpp
CGameArea.hpp CGameArea.cpp
CAi.hpp CAi.cpp
CPathFindArea.hpp CPathFindArea.cpp
CAreaOctTree.hpp CAreaOctTree.cpp
CActor.hpp CActor.cpp
CPhysicsActor.hpp CPhysicsActor.cpp
CEntity.hpp CEntity.cpp
CPhysicsActor.hpp CPhysicsActor.cpp
CWorldTransManager.hpp CWorldTransManager.cpp
CEnvFxManager.hpp CEnvFxManager.cpp
CActorModelParticles.hpp CActorModelParticles.cpp
CTeamAiTypes.hpp CTeamAiTypes.cpp
ScriptObjectSupport.hpp ScriptObjectSupport.cpp
ScriptLoader.hpp ScriptLoader.cpp
CScriptActor.hpp CScriptActor.cpp
CScriptWaypoint.hpp CScriptWaypoint.cpp
CScriptDoor.hpp CScriptDoor.cpp
CScriptTrigger.hpp CScriptTrigger.cpp
CScriptTimer.hpp CScriptTimer.cpp
CScriptCounter.hpp CScriptCounter.cpp
CScriptEffect.hpp CScriptEffect.cpp
CScriptPlatform.hpp CScriptPlatform.cpp
CScriptSound.hpp CScriptSound.cpp
CScriptGenerator.hpp CScriptGenerator.cpp
CScriptDock.hpp CScriptDock.cpp
CScriptWater.hpp CScriptWater.cpp
CScriptGrapplePoint.hpp CScriptGrapplePoint.cpp
CScriptAreaAttributes.hpp CScriptAreaAttributes.cpp
CScriptCameraWaypoint.hpp CScriptCameraWaypoint.cpp
CGrappleParameters.hpp
CActorParameters.hpp
CLightParameters.hpp
CScannableParameters.hpp
CVisorParameters.hpp
CAnimationParameters.hpp
CDamageInfo.hpp
CDamageVulnerability.hpp
CFluidUVMotion.hpp CFluidUVMotion.cpp
CFluidPlane.hpp)
runtime_add_list(World WORLD_SOURCES)

2
Runtime/World/CScriptCounter.cpp
View File

@ -9,4 +9,6 @@ CScriptCounter::CScriptCounter(TUniqueId uid, const std::string& name, const CEn
{
}
void CScriptCounter::Accept(IVisitor&) {}
}

2
Runtime/World/CScriptGenerator.cpp
View File

@ -9,4 +9,6 @@ CScriptGenerator::CScriptGenerator(TUniqueId uid, const std::string& name, const
{
}
void CScriptGenerator::Accept(IVisitor&) {}
}

2
Runtime/World/CScriptTimer.cpp
View File

@ -9,4 +9,6 @@ CScriptTimer::CScriptTimer(TUniqueId uid, const std::string& name, const CEntity
{
}
void CScriptTimer::Accept(IVisitor&) {}
}