Skip to content

Commit dc022b5

Browse files
committed
More scenery crap
Signed-off-by: Isaac Marovitz <isaacryu@icloud.com>
1 parent 445c102 commit dc022b5

6 files changed

Lines changed: 87 additions & 7 deletions

File tree

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#pragma once
2+
3+
#include <Marathon.inl>
4+
#include <Sonicteam/System/CreateStatic.h>
5+
#include <Sonicteam/System/Singleton.h>
6+
7+
namespace Sonicteam
8+
{
9+
class SceneryFactoryXenon : public System::Singleton<SceneryFactoryXenon, 0x82D3BC5C, System::CreateStatic<SceneryFactoryXenon, 0x825EB070>>
10+
{
11+
public:
12+
struct Vftable
13+
{
14+
MARATHON_INSERT_PADDING(0x14);
15+
};
16+
17+
xpointer<Vftable> m_pVftable;
18+
};
19+
}

MarathonRecomp/api/Sonicteam/SoX/Scenery/CameraImp.h

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ namespace Sonicteam::SoX::Scenery
1919
xpointer<CameraImp> m_pCameraImp;
2020
be<uint32_t> m_Field18;
2121
MARATHON_INSERT_PADDING(0x14);
22-
SoX::Math::Matrix4x4 m_Field30;
23-
SoX::Math::Matrix4x4 m_Field70;
24-
SoX::Math::Quaternion m_FieldB0;
25-
SoX::Math::Vector m_FieldC0;
22+
Math::Matrix4x4 m_Field30;
23+
Math::Matrix4x4 m_Field70;
24+
Math::Quaternion m_FieldB0;
25+
Math::Vector m_FieldC0;
2626
MARATHON_INSERT_PADDING(0x20);
2727
xpointer<void> m_pWorldIntersectionStandard;
2828
MARATHON_INSERT_PADDING(0x10);
@@ -38,9 +38,11 @@ namespace Sonicteam::SoX::Scenery
3838
be<float> m_Far;
3939
xpointer<void> m_pWorldImp;
4040
MARATHON_INSERT_PADDING(0x18);
41-
SoX::Math::Matrix4x4 m_ViewMatrix;
42-
SoX::Math::Matrix4x4 m_Field90;
43-
SoX::Math::Matrix4x4 m_FieldD0;
41+
Math::Matrix4x4 m_ViewMatrix;
42+
Math::Matrix4x4 m_Field90;
43+
Math::Matrix4x4 m_FieldD0;
4444
frameObserver m_FrameObserver;
4545
};
46+
47+
MARATHON_ASSERT_SIZEOF(CameraImp, 0x220);
4648
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#pragma once
2+
3+
#include <Marathon.inl>
4+
#include <Sonicteam/SoX/Scenery/Drawable.h>
5+
6+
namespace Sonicteam::SoX::Scenery
7+
{
8+
class Clump : public Drawable
9+
{
10+
public:
11+
MARATHON_INSERT_PADDING(0x10);
12+
};
13+
14+
MARATHON_ASSERT_SIZEOF(Clump, 0x80);
15+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#pragma once
2+
3+
#include <Marathon.inl>
4+
5+
namespace Sonicteam::SoX::Scenery
6+
{
7+
class World
8+
{
9+
10+
};
11+
}
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#pragma once
2+
3+
#include <Marathon.inl>
4+
#include <Sonicteam/SoX/Scenery/World.h>
5+
6+
namespace Sonicteam::SoX::Scenery
7+
{
8+
class WorldImp : public World
9+
{
10+
public:
11+
struct Vftable
12+
{
13+
MARATHON_INSERT_PADDING(0x78);
14+
};
15+
16+
xpointer<Vftable> m_pVftable;
17+
MARATHON_INSERT_PADDING(0x16C);
18+
};
19+
20+
MARATHON_ASSERT_SIZEOF(WorldImp, 0x170);
21+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#pragma once
2+
3+
#include <Marathon.inl>
4+
5+
namespace Sonicteam::SoX::Scenery
6+
{
7+
template <typename T>
8+
class WorldPipeLine
9+
{
10+
11+
};
12+
}

0 commit comments

Comments
 (0)