Bad level link fixes

CMakeLists.txt

@@ -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)
 

Editor/CMakeLists.txt

@@ -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}

Editor/ProjectManager.cpp

@@ -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();
+}
+
 }

Editor/ProjectManager.hpp

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

Runtime/Audio/CMakeLists.txt

@@ -1,7 +1,9 @@
-add_library(RuntimeCommonAudio
+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)

Runtime/AutoMapper/CMakeLists.txt

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

Runtime/CMakeLists.txt

@@ -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)

Runtime/Camera/CCameraFilter.hpp

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

Runtime/Camera/CCinematicCamera.cpp

@@ -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)
+{
+}
+
+}

Runtime/Camera/CGameCamera.cpp

@@ -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)
+{
+}
+
+}

Runtime/Camera/CGameCamera.hpp

@@ -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;}
 };
 

Runtime/Camera/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_library(RuntimeCommonCamera
+set(CAMERA_SOURCES
     CCameraManager.hpp CCameraManager.cpp
     CGameCamera.hpp CGameCamera.cpp
     CFirstPersonCamera.hpp CFirstPersonCamera.cpp
@@ -7,3 +7,5 @@ add_library(RuntimeCommonCamera
     CCinematicCamera.hpp CCinematicCamera.cpp
     CCameraShakeData.hpp CCameraShakeData.cpp
     CCameraFilter.hpp CCameraFilter.cpp)
+
+runtime_add_list(Camera CAMERA_SOURCES)

Runtime/Character/CActorLights.hpp

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

Runtime/Character/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_library(RuntimeCommonCharacter
+set(CHARACTER_SOURCES
     CAssetFactory.hpp CAssetFactory.cpp
     CCharacterFactory.hpp CCharacterFactory.cpp
     CModelData.hpp CModelData.cpp
@@ -78,3 +78,5 @@ add_library(RuntimeCommonCharacter
     CActorLights.hpp CActorLights.cpp
     CAnimSysContext.hpp
     CBodyState.hpp)
+
+runtime_add_list(Character CHARACTER_SOURCES)

Runtime/Collision/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_library(RuntimeCommonCollision
+set(COLLISION_SOURCES
     CGameCollision.hpp CGameCollision.cpp
     CCollisionInfo.hpp CCollisionInfo.cpp
     CCollidableOBBTree.hpp CCollidableOBBTree.cpp
@@ -6,3 +6,5 @@ add_library(RuntimeCommonCollision
     CMaterialList.hpp
     CMaterialFilter.hpp
     CRayCastResult.hpp CRayCastResult.cpp)
+
+runtime_add_list(Collision COLLISION_SOURCES)

Runtime/Graphics/CMakeLists.txt

@@ -6,7 +6,7 @@ endif()
 
 include_directories(${LIBJPEG_INCLUDE_DIR})
 
-add_library(RuntimeCommonGraphics
+set(GRAPHICS_SOURCES
     IRenderer.hpp
     CBooRenderer.hpp CBooRenderer.cpp
     CLineRenderer.hpp CLineRenderer.cpp
@@ -23,3 +23,5 @@ add_library(RuntimeCommonGraphics
     CGraphicsPalette.hpp CGraphicsPalette.cpp
     CGraphics.hpp CGraphics.cpp
     ${PLAT_SRCS})
+
+runtime_add_list(Graphics GRAPHICS_SOURCES)

Runtime/Graphics/CSkinnedModel.hpp

@@ -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

Runtime/GuiSys/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_library(RuntimeCommonGuiSys
+set(GUISYS_SOURCES
     CSplashScreen.cpp
     CSplashScreen.hpp
     CGuiObject.cpp
@@ -93,3 +93,5 @@ add_library(RuntimeCommonGuiSys
     CWordBreakTables.hpp
     CFontImageDef.cpp
     CFontImageDef.hpp)
+
+runtime_add_list(GuiSys GUISYS_SOURCES)

Runtime/Input/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_library(RuntimeCommonInput
+set(INPUT_SOURCES
     IController.hpp
     CKeyboardMouseController.hpp
     ControlMapper.hpp ControlMapper.cpp
@@ -7,3 +7,5 @@ add_library(RuntimeCommonInput
     CRumbleManager.hpp CRumbleManager.cpp
     CRumbleGenerator.hpp CRumbleGenerator.cpp
     CRumbleVoice.hpp CRumbleVoice.cpp)
+
+runtime_add_list(Input INPUT_SOURCES)

Runtime/Input/CRumbleManager.hpp

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

Runtime/MP1/CMakeLists.txt

@@ -1,5 +1,5 @@
 include_directories(. ..)
-add_library(RuntimeMP1
+set(MP1_SOURCES
     CTweaks.hpp CTweaks.cpp
     CInGameTweakManager.hpp CInGameTweakManager.cpp
     CMainFlow.hpp CMainFlow.cpp
@@ -7,3 +7,5 @@ add_library(RuntimeMP1
     CPlayMovie.hpp CPlayMovie.cpp
     CFrontEndUI.hpp CFrontEndUI.cpp
     MP1.hpp MP1.cpp)
+
+runtime_add_list(MP1 MP1_SOURCES)

Runtime/Particle/CMakeLists.txt

@@ -4,7 +4,7 @@ elseif(APPLE)
   set(PLAT_SRCS CElementGenShadersMetal.cpp)
 endif()
 
-add_library(RuntimeCommonParticle
+set(PARTICLE_SOURCES
     IElement.hpp
     CGenDescription.hpp
     CRealElement.hpp CRealElement.cpp
@@ -36,3 +36,5 @@ add_library(RuntimeCommonParticle
     CElementGenShaders.hpp
     CElementGenShadersGLSL.cpp
     ${PLAT_SRCS})
+
+runtime_add_list(Particle PARTICLE_SOURCES)

Runtime/World/CGameArea.hpp

@@ -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 SetFogExplicit(ERglFogMode, const zeus::CColor& color, const zeus::CVector2f& vec) {}
-        void DisableFog();
+        void DisableFog() {}
-        void Update(float dt);
+        void Update(float dt) {}
     };
 
     CGameArea(CInputStream& in, int mlvlVersion);

Runtime/World/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_library(RuntimeCommonWorld
+set(WORLD_SOURCES
     CWorld.hpp CWorld.cpp
     IGameArea.hpp IGameArea.cpp
     CGameArea.hpp CGameArea.cpp
@@ -40,3 +40,5 @@ add_library(RuntimeCommonWorld
     CDamageVulnerability.hpp
     CFluidUVMotion.hpp CFluidUVMotion.cpp
     CFluidPlane.hpp)
+
+runtime_add_list(World WORLD_SOURCES)

Runtime/World/CScriptCounter.cpp

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

Runtime/World/CScriptGenerator.cpp

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

Runtime/World/CScriptTimer.cpp

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