mirror of https://github.com/AxioDL/metaforce.git
Re-add accidentally removed CRSM types
This commit is contained in:
parent
14a76ce955
commit
40cd1226fa
|
@ -65,7 +65,7 @@ static const std::vector<FourCC> DecalTypes =
|
|||
SBIG('NCDL'),SBIG('DDCL'),SBIG('CODL'),SBIG('MEDL'),
|
||||
SBIG('GRDL'),SBIG('ICDL'),SBIG('GODL'),SBIG('WODL'),
|
||||
SBIG('WTDL'),SBIG('3MUD'),SBIG('3LAV'),SBIG('3SAN'),
|
||||
SBIG('CHDL')
|
||||
SBIG('CHDL'),SBIG('ENDL')
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@ class CGameState
|
|||
{
|
||||
int m_stateFlag = -1;
|
||||
CPlayerState m_playerState;
|
||||
CWorldTransManager m_transManager;
|
||||
CWorldTransManager x9c_transManager;
|
||||
float m_gameTime = 0.0;
|
||||
CGameOptions m_gameOpts;
|
||||
double xa0_playTime;
|
||||
|
@ -22,7 +22,7 @@ public:
|
|||
CGameState() {}
|
||||
CGameState(CBitStreamReader& stream);
|
||||
void SetCurrentWorldId(unsigned int id, const std::string& name);
|
||||
CWorldTransManager& WorldTransitionManager() {return m_transManager;}
|
||||
CWorldTransManager& WorldTransitionManager() {return x9c_transManager;}
|
||||
void SetTotalPlayTime(float time);
|
||||
};
|
||||
|
||||
|
|
|
@ -47,6 +47,7 @@ add_library(RuntimeCommon
|
|||
${WORLD_SOURCES}
|
||||
#CMemory.hpp CMemory.cpp
|
||||
CMemoryCardSys.hpp
|
||||
CSaveWorld.hpp CSaveWorld.cpp
|
||||
IAllocator.hpp IAllocator.cpp
|
||||
CGameAllocator.hpp CGameAllocator.cpp
|
||||
CDependencyGroup.hpp CDependencyGroup.cpp
|
||||
|
|
|
@ -0,0 +1,12 @@
|
|||
#ifndef __URDE_CSAVEWORLD_HPP__
|
||||
#define __URDE_CSAVEWORLD_HPP__
|
||||
|
||||
namespace urde
|
||||
{
|
||||
class CSaveWorld
|
||||
{
|
||||
CSaveWorld(CInputStream& in);
|
||||
};
|
||||
}
|
||||
|
||||
#endif // __URDE_CSAVEWORLD_HPP__
|
|
@ -38,7 +38,7 @@ zeus::CVector3f CGuiCamera::ConvertToScreenSpace(const zeus::CVector3f& vec) con
|
|||
|
||||
void CGuiCamera::Draw(const CGuiWidgetDrawParms& parms) const
|
||||
{
|
||||
if (xf8_proj == Projection::Perspective)
|
||||
if (xf8_proj == EProjection::Perspective)
|
||||
CGraphics::SetPerspective(xfc_fov, x100_aspect, x104_znear, x108_zfar);
|
||||
else
|
||||
CGraphics::SetOrtho(xfc_left, x100_right, x104_top, x108_bottom, x10c_znear, x110_zfar);
|
||||
|
@ -49,11 +49,11 @@ void CGuiCamera::Draw(const CGuiWidgetDrawParms& parms) const
|
|||
CGuiCamera* CGuiCamera::Create(CGuiFrame* frame, CInputStream& in, bool flag)
|
||||
{
|
||||
CGuiWidgetParms parms = ReadWidgetHeader(frame, in, flag);
|
||||
Projection proj = Projection(in.readUint32Big());
|
||||
EProjection proj = EProjection(in.readUint32Big());
|
||||
CGuiCamera* ret = nullptr;
|
||||
switch (proj)
|
||||
{
|
||||
case Projection::Perspective:
|
||||
case EProjection::Perspective:
|
||||
{
|
||||
float fov = in.readFloatBig();
|
||||
float aspect = in.readFloatBig();
|
||||
|
@ -62,7 +62,7 @@ CGuiCamera* CGuiCamera::Create(CGuiFrame* frame, CInputStream& in, bool flag)
|
|||
ret = new CGuiCamera(parms, fov, aspect, znear, zfar);
|
||||
break;
|
||||
}
|
||||
case Projection::Orthographic:
|
||||
case EProjection::Orthographic:
|
||||
{
|
||||
float left = in.readFloatBig();
|
||||
float right = in.readFloatBig();
|
||||
|
|
|
@ -9,13 +9,13 @@ namespace urde
|
|||
class CGuiCamera : public CGuiWidget
|
||||
{
|
||||
public:
|
||||
enum class Projection
|
||||
enum class EProjection
|
||||
{
|
||||
Perspective,
|
||||
Orthographic
|
||||
};
|
||||
private:
|
||||
Projection xf8_proj;
|
||||
EProjection xf8_proj;
|
||||
union
|
||||
{
|
||||
struct
|
||||
|
|
|
@ -69,7 +69,7 @@ static const std::vector<FourCC> DecalTypes =
|
|||
SBIG('NCDL'),SBIG('DDCL'),SBIG('CODL'),SBIG('MEDL'),
|
||||
SBIG('GRDL'),SBIG('ICDL'),SBIG('GODL'),SBIG('WODL'),
|
||||
SBIG('WTDL'),SBIG('3MUD'),SBIG('3LAV'),SBIG('3SAN'),
|
||||
SBIG('CHDL')
|
||||
SBIG('CHDL'),SBIG('ENDL')
|
||||
};
|
||||
|
||||
using CPF = CParticleDataFactory;
|
||||
|
|
Loading…
Reference in New Issue