mirror of https://github.com/AxioDL/metaforce.git
Adjust runtime directory layout
This commit is contained in:
parent
042030934b
commit
7afdc556fd
|
@ -39,6 +39,9 @@ target_link_libraries(urde
|
|||
UrdeLocales
|
||||
UrdeIcons
|
||||
RuntimeMP1
|
||||
RuntimeCommonWorld
|
||||
RuntimeCommonAutoMapper
|
||||
RuntimeCommonCamera
|
||||
RuntimeCommonCharacter
|
||||
RuntimeCommonInput
|
||||
RuntimeCommonParticle
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
add_library(RuntimeCommonAutoMapper
|
||||
CMapWorldInfo.hpp CMapWorldInfo.cpp)
|
|
@ -5,7 +5,7 @@
|
|||
#include "CBasics.hpp"
|
||||
#include "CPlayerState.hpp"
|
||||
#include "CGameOptions.hpp"
|
||||
#include "CWorldTransManager.hpp"
|
||||
#include "World/CWorldTransManager.hpp"
|
||||
|
||||
namespace urde
|
||||
{
|
||||
|
|
|
@ -5,6 +5,8 @@ add_subdirectory(Audio)
|
|||
add_subdirectory(Character)
|
||||
add_subdirectory(Graphics)
|
||||
add_subdirectory(Camera)
|
||||
add_subdirectory(World)
|
||||
add_subdirectory(AutoMapper)
|
||||
add_subdirectory(GuiSys)
|
||||
add_subdirectory(Input)
|
||||
add_subdirectory(Particle)
|
||||
|
@ -22,7 +24,6 @@ add_library(RuntimeCommon
|
|||
CMemoryCardSys.hpp
|
||||
IAllocator.hpp IAllocator.cpp
|
||||
CGameAllocator.hpp CGameAllocator.cpp
|
||||
CPathFindArea.hpp CPathFindArea.cpp
|
||||
CDependencyGroup.hpp CDependencyGroup.cpp
|
||||
CBasics.hpp CBasicsPC.cpp
|
||||
CIOWin.hpp
|
||||
|
@ -30,9 +31,7 @@ add_library(RuntimeCommon
|
|||
CStateManager.hpp CStateManager.cpp
|
||||
CGameState.hpp CGameState.cpp
|
||||
CScriptMailbox.hpp CScriptMailbox.cpp
|
||||
CMapWorldInfo.hpp CMapWorldInfo.cpp
|
||||
CPlayerState.hpp CPlayerState.cpp
|
||||
CWorldTransManager.hpp CWorldTransManager.cpp
|
||||
CRandom16.hpp CRandom16.cpp
|
||||
CResFactory.hpp CResFactory.cpp
|
||||
CResLoader.hpp CResLoader.cpp
|
||||
|
@ -41,11 +40,9 @@ add_library(RuntimeCommon
|
|||
CVirtualDvdFile.hpp CVirtualDvdFile.cpp
|
||||
IObjectStore.hpp
|
||||
CSimplePool.hpp CSimplePool.cpp
|
||||
CAi.hpp CAi.cpp
|
||||
CGameOptions.hpp CGameOptions.cpp
|
||||
CStaticInterference.hpp
|
||||
CCRC32.hpp CCRC32.cpp
|
||||
CEntity.hpp CEntity.cpp
|
||||
IFactory.hpp
|
||||
IObjFactory.hpp
|
||||
ScriptObjectSupport.hpp ScriptObjectSupport.cpp
|
||||
|
@ -58,9 +55,6 @@ add_library(RuntimeCommon
|
|||
IVParamObj.hpp
|
||||
CTimeProvider.hpp CTimeProvider.cpp
|
||||
CToken.hpp
|
||||
CAreaOctTree.hpp CAreaOctTree.cpp
|
||||
CActor.hpp CActor.cpp
|
||||
CPhysicsActor.hpp CPhysicsActor.cpp
|
||||
CFactoryMgr.hpp CFactoryMgr.cpp
|
||||
CPakFile.hpp CPakFile.cpp
|
||||
CStringExtras.hpp
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef __URDE_COBJECTLIST_HPP__
|
||||
#define __URDE_COBJECTLIST_HPP__
|
||||
|
||||
#include "CEntity.hpp"
|
||||
#include "World/CEntity.hpp"
|
||||
#include "RetroTypes.hpp"
|
||||
|
||||
namespace urde
|
||||
|
|
|
@ -1,9 +1,11 @@
|
|||
#include "CCameraManager.hpp"
|
||||
#include "CCameraShakeData.hpp"
|
||||
|
||||
namespace urde
|
||||
{
|
||||
|
||||
CCameraManager::CCameraManager(TUniqueId id)
|
||||
CCameraManager::CCameraManager(TUniqueId curCameraId)
|
||||
: x0_curCameraId(curCameraId)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
@ -3,21 +3,26 @@
|
|||
|
||||
#include "RetroTypes.hpp"
|
||||
#include "zeus/CVector3f.hpp"
|
||||
#include "World/CGameArea.hpp"
|
||||
|
||||
namespace urde
|
||||
{
|
||||
class CFirstPersonCamera;
|
||||
class CBallCamera;
|
||||
class CStateManager;
|
||||
class CGameCamera;
|
||||
class CCameraShakeData;
|
||||
|
||||
class CCameraManager
|
||||
{
|
||||
TUniqueId x0_id;
|
||||
TUniqueId x0_curCameraId;
|
||||
std::vector<TUniqueId> x4_cineCameras;
|
||||
std::list<CCameraShakeData> x18_shakers;
|
||||
zeus::CVector3f x30_;
|
||||
CFirstPersonCamera* x7c_fpCamera;
|
||||
CBallCamera* x80_ballCamera;
|
||||
public:
|
||||
CCameraManager(TUniqueId id);
|
||||
CCameraManager(TUniqueId curCameraId);
|
||||
|
||||
void SetSpecialCameras(CFirstPersonCamera& fp, CBallCamera& ball)
|
||||
{
|
||||
|
@ -31,7 +36,15 @@ public:
|
|||
void AddCinemaCamera(TUniqueId, CStateManager& stateMgr);
|
||||
void SetInsideFluid(bool, TUniqueId);
|
||||
void Update(float dt, CStateManager& stateMgr);
|
||||
|
||||
CGameCamera* GetCurrentCamera(CStateManager& stateMgr) const;
|
||||
const CGameCamera* GetCurrentCamera(const CStateManager& stateMgr) const;
|
||||
void SetCurrentCameraId(TUniqueId id, CStateManager& stateMgr);
|
||||
TUniqueId GetCurrentCameraId() const
|
||||
{
|
||||
if (x4_cineCameras.size())
|
||||
return x4_cineCameras.back();
|
||||
return x0_curCameraId;
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -0,0 +1,15 @@
|
|||
#ifndef __URDE_CCAMERASHAKEDATA_HPP__
|
||||
#define __URDE_CCAMERASHAKEDATA_HPP__
|
||||
|
||||
namespace urde
|
||||
{
|
||||
|
||||
class CCameraShakeData
|
||||
{
|
||||
public:
|
||||
CCameraShakeData(float, float, float, float, float, float, float, bool);
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif // __URDE_CCAMERASHAKEDATA_HPP__
|
|
@ -4,4 +4,5 @@ add_library(RuntimeCommonCamera
|
|||
CFirstPersonCamera.hpp CFirstPersonCamera.cpp
|
||||
CBallCamera.hpp CBallCamera.cpp
|
||||
CPathCamera.hpp CPathCamera.cpp
|
||||
CCinematicCamera.hpp CCinematicCamera.cpp)
|
||||
CCinematicCamera.hpp CCinematicCamera.cpp
|
||||
CCameraShakeData.hpp CCameraShakeData.cpp)
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
#include "CResFactory.hpp"
|
||||
#include "CSimplePool.hpp"
|
||||
#include "Character/CAssetFactory.hpp"
|
||||
#include "CAi.hpp"
|
||||
#include "World/CAi.hpp"
|
||||
#include "CGameState.hpp"
|
||||
#include "CInGameTweakManager.hpp"
|
||||
#include "Particle/CElementGen.hpp"
|
||||
|
|
|
@ -0,0 +1,13 @@
|
|||
#ifndef __URDE_CGAMEAREA_HPP__
|
||||
#define __URDE_CGAMEAREA_HPP__
|
||||
|
||||
namespace urde
|
||||
{
|
||||
|
||||
class CGameArea
|
||||
{
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif // __URDE_CGAMEAREA_HPP__
|
|
@ -0,0 +1,9 @@
|
|||
add_library(RuntimeCommonWorld
|
||||
CGameArea.hpp CGameArea.cpp
|
||||
CPathFindArea.hpp CPathFindArea.cpp
|
||||
CAreaOctTree.hpp CAreaOctTree.cpp
|
||||
CActor.hpp CActor.cpp
|
||||
CAi.hpp CAi.cpp
|
||||
CEntity.hpp CEntity.cpp
|
||||
CPhysicsActor.hpp CPhysicsActor.cpp
|
||||
CWorldTransManager.hpp CWorldTransManager.cpp)
|
Loading…
Reference in New Issue