More SoX::Graphics and SoX::Scenery

IsaacMarovitz · IsaacMarovitz · commit 445c1023ae8c · 2025-11-04T22:12:16.000-05:00
Signed-off-by: Isaac Marovitz &lt;isaacryu@icloud.com&gt;
diff --git a/MarathonRecomp/api/Marathon.h b/MarathonRecomp/api/Marathon.h
@@ -221,7 +221,12 @@
 #include "Sonicteam/SoX/Graphics/FrameGP.h"
 #include "Sonicteam/SoX/Graphics/FrameObserver.h"
 #include "Sonicteam/SoX/Graphics/IndexBuffer.h"
+#include "Sonicteam/SoX/Graphics/InstanceModel.h"
+#include "Sonicteam/SoX/Graphics/InstanceModelCommon.h"
 #include "Sonicteam/SoX/Graphics/Lights.h"
+#include "Sonicteam/SoX/Graphics/Model.h"
+#include "Sonicteam/SoX/Graphics/ModelCommon.h"
+#include "Sonicteam/SoX/Graphics/ModelMgr.h"
 #include "Sonicteam/SoX/Graphics/PointLight.h"
 #include "Sonicteam/SoX/Graphics/RenderStates.h"
 #include "Sonicteam/SoX/Graphics/Shader.h"
@@ -277,6 +282,12 @@
 #include "Sonicteam/SoX/Scenery/CameraImp.h"
 #include "Sonicteam/SoX/Scenery/Drawable.h"
 #include "Sonicteam/SoX/Scenery/DrawableCallback.h"
+#include "Sonicteam/SoX/Scenery/Sector.h"
+#include "Sonicteam/SoX/Scenery/TerrainMgr.h"
+#include "Sonicteam/SoX/Scenery/WorldBuildPipeline.h"
+#include "Sonicteam/SoX/Scenery/WorldIntersection.h"
+#include "Sonicteam/SoX/Scenery/WorldSector.h"
+#include "Sonicteam/SoX/Scenery/WorldSectorCommon.h"
 #include "Sonicteam/SoX/Thread.h"
 #include "Sonicteam/StdImageFilters/BurnoutBlurFilter.h"
 #include "Sonicteam/StdImageFilters/SingleTechniqueFilter.h"
@@ -295,6 +306,9 @@
 #include "Sonicteam/VehicleMissileCtrl.h"
 #include "Sonicteam/VehicleMissileCtrlAutomatic.h"
 #include "Sonicteam/VehicleMissileCtrlSingle.h"
+#include "Sonicteam/WorldIntersectionCSM.h"
+#include "Sonicteam/WorldIntersectionParticle.h"
+#include "Sonicteam/WorldIntersectionSky.h"
 #include "Sonicteam/WorldRenderProcess.h"
 #include "Sonicteam/WorldRenderTask.h"
 #include "Sonicteam/sonicXmaPlayer.h"
diff --git a/MarathonRecomp/api/Sonicteam/SoX/Graphics/InstanceModel.h b/MarathonRecomp/api/Sonicteam/SoX/Graphics/InstanceModel.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Sonicteam/SoX/RefCountObject.h>
+#include <Sonicteam/SoX/Scenery/CameraEventCallback.h>
+
+namespace Sonicteam::SoX::Graphics
+{
+    class InstanceModel : public RefCountObject, public Scenery::CameraEventCallback
+    {
+
+    };
+}
diff --git a/MarathonRecomp/api/Sonicteam/SoX/Graphics/InstanceModelCommon.h b/MarathonRecomp/api/Sonicteam/SoX/Graphics/InstanceModelCommon.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Sonicteam/SoX/Graphics/InstanceModel.h>
+
+namespace Sonicteam::SoX::Graphics
+{
+    class InstanceModelCommon : public InstanceModel
+    {
+
+    };
+}
diff --git a/MarathonRecomp/api/Sonicteam/SoX/Graphics/Model.h b/MarathonRecomp/api/Sonicteam/SoX/Graphics/Model.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Sonicteam/SoX/Graphics/ModelMgr.h>
+#include <Sonicteam/SoX/IResource2.h>
+
+namespace Sonicteam::SoX::Graphics
+{
+    class Model : public IResource2<Model, ModelMgr>
+    {
+
+    };
+}
diff --git a/MarathonRecomp/api/Sonicteam/SoX/Graphics/ModelCommon.h b/MarathonRecomp/api/Sonicteam/SoX/Graphics/ModelCommon.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Sonicteam/SoX/Graphics/Model.h>
+
+namespace Sonicteam::SoX::Graphics
+{
+    class ModelCommon : public Model
+    {
+
+    };
+}
diff --git a/MarathonRecomp/api/Sonicteam/SoX/Graphics/ModelMgr.h b/MarathonRecomp/api/Sonicteam/SoX/Graphics/ModelMgr.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Sonicteam/SoX/IResourceMgr.h>
+#include <Sonicteam/System/CreateStatic.h>
+#include <Sonicteam/System/Singleton.h>
+
+namespace Sonicteam::SoX::Graphics
+{
+    class ModelMgr : public IResourceMgr, System::Singleton<ModelMgr, 0x82D36EF4, System::CreateStatic<ModelMgr, 0x822DE058>>
+    {
+
+    };
+}
diff --git a/MarathonRecomp/api/Sonicteam/SoX/Graphics/Xenon/SurfaceXenon.h b/MarathonRecomp/api/Sonicteam/SoX/Graphics/Xenon/SurfaceXenon.h
@@ -9,7 +9,6 @@ namespace Sonicteam::SoX::Graphics::Xenon
     class SurfaceXenon : public Surface
     {
     public:
-        MARATHON_INSERT_PADDING(0x8);
         be<uint32_t> m_Width;
         be<uint32_t> m_Height;
         xpointer<void> m_pD3DDevice;
diff --git a/MarathonRecomp/api/Sonicteam/SoX/Scenery/Sector.h b/MarathonRecomp/api/Sonicteam/SoX/Scenery/Sector.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "Sonicteam/SoX/RefCountObject.h"
+
+#include <Marathon.inl>
+
+namespace Sonicteam::SoX::Scenery
+{
+    class Sector : public RefCountObject
+    {
+
+    };
+}
diff --git a/MarathonRecomp/api/Sonicteam/SoX/Scenery/TerrainMgr.h b/MarathonRecomp/api/Sonicteam/SoX/Scenery/TerrainMgr.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Sonicteam/SoX/IResourceMgr.h>
+#include <Sonicteam/System/CreateStatic.h>
+#include <Sonicteam/System/Singleton.h>
+
+namespace Sonicteam::SoX::Scenery
+{
+    class TerrainMgr : public IResourceMgr, public System::Singleton<TerrainMgr, 0x82D3C0E0, System::CreateStatic<TerrainMgr, 0x8261AED8>>
+    {
+
+    };
+}
diff --git a/MarathonRecomp/api/Sonicteam/SoX/Scenery/WorldBuildPipeline.h b/MarathonRecomp/api/Sonicteam/SoX/Scenery/WorldBuildPipeline.h
@@ -0,0 +1,11 @@
+#pragma once
+
+#include <Marathon.inl>
+
+namespace Sonicteam::SoX::Scenery
+{
+    class WorldBuildPipeline
+    {
+
+    };
+}
diff --git a/MarathonRecomp/api/Sonicteam/SoX/Scenery/WorldIntersection.h b/MarathonRecomp/api/Sonicteam/SoX/Scenery/WorldIntersection.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Sonicteam/SoX/RefCountObject.h>
+
+namespace Sonicteam::SoX::Scenery
+{
+    class WorldIntersection : public RefCountObject
+    {
+
+    };
+}
diff --git a/MarathonRecomp/api/Sonicteam/SoX/Scenery/WorldSector.h b/MarathonRecomp/api/Sonicteam/SoX/Scenery/WorldSector.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Sonicteam/SoX/Scenery/CameraEventCallback.h>
+#include <Sonicteam/SoX/Scenery/Sector.h>
+
+namespace Sonicteam::SoX::Scenery
+{
+    class WorldSector : public Sector, public CameraEventCallback
+    {
+
+    };
+}
diff --git a/MarathonRecomp/api/Sonicteam/SoX/Scenery/WorldSectorCommon.h b/MarathonRecomp/api/Sonicteam/SoX/Scenery/WorldSectorCommon.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Sonicteam/SoX/Scenery/WorldSector.h>
+
+namespace Sonicteam::SoX::Scenery
+{
+    class WorldSectorCommon : public WorldSector
+    {
+
+    };
+}
diff --git a/MarathonRecomp/api/Sonicteam/WorldIntersectionCSM.h b/MarathonRecomp/api/Sonicteam/WorldIntersectionCSM.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Sonicteam/SoX/Scenery/WorldIntersection.h>
+
+namespace Sonicteam
+{
+    class WorldIntersectionCSM : public SoX::Scenery::WorldIntersection
+    {
+
+    };
+}
diff --git a/MarathonRecomp/api/Sonicteam/WorldIntersectionParticle.h b/MarathonRecomp/api/Sonicteam/WorldIntersectionParticle.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Sonicteam/SoX/Scenery/WorldIntersection.h>
+
+namespace Sonicteam
+{
+    class WorldIntersectionParticle : public SoX::Scenery::WorldIntersection
+    {
+
+    };
+}
diff --git a/MarathonRecomp/api/Sonicteam/WorldIntersectionSky.h b/MarathonRecomp/api/Sonicteam/WorldIntersectionSky.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Sonicteam/SoX/Scenery/WorldIntersection.h>
+
+namespace Sonicteam
+{
+    class WorldIntersectionParticle : public SoX::Scenery::WorldIntersection
+    {
+
+    };
+}

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ namespace Sonicteam::SoX::Graphics::Xenon`
`9`	`9`	`class SurfaceXenon : public Surface`
`10`	`10`	`{`
`11`	`11`	`public:`
`12`		`- MARATHON_INSERT_PADDING(0x8);`
`13`	`12`	`be<uint32_t> m_Width;`
`14`	`13`	`be<uint32_t> m_Height;`
`15`	`14`	`xpointer<void> m_pD3DDevice;`