More…

IsaacMarovitz · IsaacMarovitz · commit 2f9e1fc0067b · 2025-11-07T01:04:23.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
@@ -259,6 +259,7 @@
 #include "Sonicteam/sonicXmaPlayer.h"
 #include "boost/smart_ptr/make_shared_object.h"
 #include "boost/smart_ptr/shared_ptr.h"
+#include "d3dxb.h"
 #include "hk330/hkArray.h"
 #include "hk330/hkReferencedObject.h"
 #include "hk330/hkpBroadPhaseHandle.h"
diff --git a/MarathonRecomp/api/Sonicteam/RenderAction/SetCSMTextures.h b/MarathonRecomp/api/Sonicteam/RenderAction/SetCSMTextures.h
@@ -8,8 +8,12 @@ namespace Sonicteam::RenderAction
     class SetCSMTextures : public MyRenderProcess
     {
     public:
-        MARATHON_INSERT_PADDING(0xC);
+        bool m_Flag;
+        xpointer<void> m_pCSMTexture;
+        MARATHON_INSERT_PADDING(0x4);
     };
 
     MARATHON_ASSERT_SIZEOF(SetCSMTextures, 0x44);
+    MARATHON_ASSERT_OFFSETOF(SetCSMTextures, m_Flag, 0x38);
+    MARATHON_ASSERT_OFFSETOF(SetCSMTextures, m_pCSMTexture, 0x3C);
 }
diff --git a/MarathonRecomp/api/Sonicteam/RenderAction/SetConstantShader.h b/MarathonRecomp/api/Sonicteam/RenderAction/SetConstantShader.h
@@ -8,8 +8,26 @@ namespace Sonicteam::RenderAction
     class SetConstantShader : public MyRenderProcess
     {
     public:
-        MARATHON_INSERT_PADDING(0x8);
+        enum PassIndex
+        {
+            Main,
+            Transparent,
+            Sky,
+            Shadowmap,
+            Psi,
+            Oc,
+            Glare,
+            AfterPp,
+            Radermap,
+            User0,
+            User1
+        };
+
+        be<PassIndex> m_PassIndex;
+        xpointer<void> m_pShader;
     };
 
     MARATHON_ASSERT_SIZEOF(SetConstantShader, 0x40);
+    MARATHON_ASSERT_OFFSETOF(SetConstantShader, m_PassIndex, 0x38);
+    MARATHON_ASSERT_OFFSETOF(SetConstantShader, m_pShader, 0x3C);
 }
diff --git a/MarathonRecomp/api/Sonicteam/RenderAction/SetCullMode.h b/MarathonRecomp/api/Sonicteam/RenderAction/SetCullMode.h
@@ -8,8 +8,16 @@ namespace Sonicteam::RenderAction
     class SetCullMode : public MyRenderProcess
     {
     public:
-        MARATHON_INSERT_PADDING(0x4);
+        enum CullMode
+        {
+            None,
+            CW,
+            CCW
+        };
+
+        be<CullMode> m_CullMode;
     };
 
     MARATHON_ASSERT_SIZEOF(SetCullMode, 0x3C);
+    MARATHON_ASSERT_OFFSETOF(SetCullMode, m_CullMode, 0x38);
 }
diff --git a/MarathonRecomp/api/Sonicteam/RenderAction/SetCurrentScreen.h b/MarathonRecomp/api/Sonicteam/RenderAction/SetCurrentScreen.h
@@ -8,8 +8,9 @@ namespace Sonicteam::RenderAction
     class SetCurrentScreen : public MyRenderProcess
     {
     public:
-        MARATHON_INSERT_PADDING(0x4);
+        be<uint32_t> m_ScreenIndex;
     };
 
     MARATHON_ASSERT_SIZEOF(SetCurrentScreen, 0x3C);
+    MARATHON_ASSERT_OFFSETOF(SetCurrentScreen, m_ScreenIndex, 0x38);
 }
diff --git a/MarathonRecomp/api/Sonicteam/RenderAction/SetDepthTextures.h b/MarathonRecomp/api/Sonicteam/RenderAction/SetDepthTextures.h
@@ -8,8 +8,11 @@ namespace Sonicteam::RenderAction
     class SetDepthTextures : public MyRenderProcess
     {
     public:
-        MARATHON_INSERT_PADDING(0x8);
+        bool m_Flag;
+        xpointer<void> m_pDepthTexture;
     };
 
     MARATHON_ASSERT_SIZEOF(SetDepthTextures, 0x40);
+    MARATHON_ASSERT_OFFSETOF(SetDepthTextures, m_Flag, 0x38);
+    MARATHON_ASSERT_OFFSETOF(SetDepthTextures, m_pDepthTexture, 0x3C);
 }
diff --git a/MarathonRecomp/api/Sonicteam/RenderAction/SetFovY.h b/MarathonRecomp/api/Sonicteam/RenderAction/SetFovY.h
@@ -9,9 +9,10 @@ namespace Sonicteam::RenderAction
     {
     public:
         be<uint32_t> m_CameraIndex;
-        MARATHON_INSERT_PADDING(0x4);
+        be<float> m_FovY;
     };
 
     MARATHON_ASSERT_SIZEOF(SetFovY, 0x40);
     MARATHON_ASSERT_OFFSETOF(SetFovY, m_CameraIndex, 0x38);
+    MARATHON_ASSERT_OFFSETOF(SetFovY, m_FovY, 0x3C);
 }
diff --git a/MarathonRecomp/api/Sonicteam/RenderAction/SetFrameBufferObject.h b/MarathonRecomp/api/Sonicteam/RenderAction/SetFrameBufferObject.h
@@ -9,9 +9,13 @@ namespace Sonicteam::RenderAction
     {
     public:
         xpointer<void> m_pFrameBufferObject;
-        MARATHON_INSERT_PADDING(0x8);
+        MARATHON_INSERT_PADDING(0x4);
+        bool m_Once;
+        bool m_PostProcess;
     };
 
     MARATHON_ASSERT_SIZEOF(SetFrameBufferObject, 0x44);
-    MARATHON_ASSERT_OFFSETOF(SetFrameBufferObject, m_pParentProcess, 0x30);
+    MARATHON_ASSERT_OFFSETOF(SetFrameBufferObject, m_pFrameBufferObject, 0x38);
+    MARATHON_ASSERT_OFFSETOF(SetFrameBufferObject, m_Once, 0x40);
+    MARATHON_ASSERT_OFFSETOF(SetFrameBufferObject, m_PostProcess, 0x41);
 }
diff --git a/MarathonRecomp/api/Sonicteam/RenderAction/SetReflectionTextures.h b/MarathonRecomp/api/Sonicteam/RenderAction/SetReflectionTextures.h
@@ -5,11 +5,14 @@
 
 namespace Sonicteam::RenderAction
 {
-    class SetReflectionTexture : public MyRenderProcess
+    class SetReflectionTextures : public MyRenderProcess
     {
     public:
-        MARATHON_INSERT_PADDING(0x8);
+        bool m_Flag;
+        xpointer<void> m_pReflectionTexture;
     };
 
-    MARATHON_ASSERT_SIZEOF(SetReflectionTexture, 0x40);
+    MARATHON_ASSERT_SIZEOF(SetReflectionTextures, 0x40);
+    MARATHON_ASSERT_OFFSETOF(SetReflectionTextures, m_Flag, 0x38);
+    MARATHON_ASSERT_OFFSETOF(SetReflectionTextures, m_pReflectionTexture, 0x3C);
 }
diff --git a/MarathonRecomp/api/Sonicteam/RenderAction/SetScissorRect.h b/MarathonRecomp/api/Sonicteam/RenderAction/SetScissorRect.h
@@ -8,8 +8,15 @@ namespace Sonicteam::RenderAction
     class SetScissorRect : public MyRenderProcess
     {
     public:
-        MARATHON_INSERT_PADDING(0x10);
+        be<float> m_X;
+        be<float> m_Y;
+        be<float> m_Width;
+        be<float> m_Height;
     };
 
     MARATHON_ASSERT_SIZEOF(SetScissorRect, 0x48);
+    MARATHON_ASSERT_OFFSETOF(SetScissorRect, m_X, 0x38);
+    MARATHON_ASSERT_OFFSETOF(SetScissorRect, m_Y, 0x3C);
+    MARATHON_ASSERT_OFFSETOF(SetScissorRect, m_Width, 0x40);
+    MARATHON_ASSERT_OFFSETOF(SetScissorRect, m_Height, 0x44);
 }
diff --git a/MarathonRecomp/api/Sonicteam/RenderAction/SetScissorTest.h b/MarathonRecomp/api/Sonicteam/RenderAction/SetScissorTest.h
@@ -8,8 +8,9 @@ namespace Sonicteam::RenderAction
     class SetScissorTest : public MyRenderProcess
     {
     public:
-        MARATHON_INSERT_PADDING(0x4);
+        bool m_Enabled;
     };
 
     MARATHON_ASSERT_SIZEOF(SetScissorTest, 0x3C);
+    MARATHON_ASSERT_OFFSETOF(SetScissorTest, m_Enabled, 0x38);
 }
diff --git a/MarathonRecomp/api/Sonicteam/RenderAction/SetScreen.h b/MarathonRecomp/api/Sonicteam/RenderAction/SetScreen.h
@@ -9,9 +9,12 @@ namespace Sonicteam::RenderAction
     {
     public:
         be<uint32_t> m_CameraIndex;
-        MARATHON_INSERT_PADDING(0x8);
+        be<float> m_Width;
+        be<float> m_Height;
     };
 
     MARATHON_ASSERT_SIZEOF(SetScreen, 0x44);
     MARATHON_ASSERT_OFFSETOF(SetScreen, m_CameraIndex, 0x38);
+    MARATHON_ASSERT_OFFSETOF(SetScreen, m_Width, 0x3C);
+    MARATHON_ASSERT_OFFSETOF(SetScreen, m_Height, 0x40);
 }
diff --git a/MarathonRecomp/api/Sonicteam/RenderAction/SetShaderGPRAllocation.h b/MarathonRecomp/api/Sonicteam/RenderAction/SetShaderGPRAllocation.h
@@ -8,8 +8,11 @@ namespace Sonicteam::RenderAction
     class SetShaderGPRAllocation : public MyRenderProcess
     {
     public:
-        MARATHON_INSERT_PADDING(0x8);
+        be<uint32_t> m_Field0;
+        be<uint32_t> m_Field1;
     };
 
     MARATHON_ASSERT_SIZEOF(SetShaderGPRAllocation, 0x40);
+    MARATHON_ASSERT_OFFSETOF(SetShaderGPRAllocation, m_Field0, 0x38);
+    MARATHON_ASSERT_OFFSETOF(SetShaderGPRAllocation, m_Field1, 0x3C);
 }
diff --git a/MarathonRecomp/api/Sonicteam/RenderAction/SetStencilEnable.h b/MarathonRecomp/api/Sonicteam/RenderAction/SetStencilEnable.h
@@ -8,8 +8,11 @@ namespace Sonicteam::RenderAction
     class SetStencilEnable : public MyRenderProcess
     {
     public:
-        MARATHON_INSERT_PADDING(0x4);
+        bool m_FrontEnable;
+        bool m_BackEnable;
     };
 
     MARATHON_ASSERT_SIZEOF(SetStencilEnable, 0x3C);
+    MARATHON_ASSERT_OFFSETOF(SetStencilEnable, m_FrontEnable, 0x38);
+    MARATHON_ASSERT_OFFSETOF(SetStencilEnable, m_BackEnable, 0x39);
 }
diff --git a/MarathonRecomp/api/Sonicteam/RenderAction/SetStencilFunc.h b/MarathonRecomp/api/Sonicteam/RenderAction/SetStencilFunc.h
@@ -1,15 +1,21 @@
 #pragma once
 
 #include <Marathon.inl>
+#include <d3dxb.h>
 #include <Sonicteam/MyRenderProcess.h>
 
 namespace Sonicteam::RenderAction
 {
     class SetStencilFunc : public MyRenderProcess
     {
     public:
-        MARATHON_INSERT_PADDING(0xC);
+        be<D3DXBSTENCILOP> m_StencilMode;
+        be<uint32_t> m_FrontReference;
+        be<uint32_t> m_BackReference;
     };
 
     MARATHON_ASSERT_SIZEOF(SetStencilFunc, 0x44);
+    MARATHON_ASSERT_OFFSETOF(SetStencilFunc, m_StencilMode, 0x38);
+    MARATHON_ASSERT_OFFSETOF(SetStencilFunc, m_FrontReference, 0x3C);
+    MARATHON_ASSERT_OFFSETOF(SetStencilFunc, m_BackReference, 0x40);
 }
diff --git a/MarathonRecomp/api/Sonicteam/RenderAction/SetStencilOp.h b/MarathonRecomp/api/Sonicteam/RenderAction/SetStencilOp.h
@@ -1,15 +1,19 @@
 #pragma once
 
 #include <Marathon.inl>
+#include <d3dxb.h>
 #include <Sonicteam/MyRenderProcess.h>
 
 namespace Sonicteam::RenderAction
 {
     class SetStencilOp : public MyRenderProcess
     {
     public:
-        MARATHON_INSERT_PADDING(0x8);
+        be<D3DXBSTENCILOP> m_FrontStencilOp;
+        be<D3DXBSTENCILOP> m_BackStencilOp;
     };
 
     MARATHON_INSERT_PADDING(0x44);
+    MARATHON_ASSERT_OFFSETOF(SetStencilOp, m_FrontStencilOp, 0x38);
+    MARATHON_ASSERT_OFFSETOF(SetStencilOp, m_BackStencilOp, 0x3C);
 }
diff --git a/MarathonRecomp/api/Sonicteam/RenderAction/SetStencilWriteMask.h b/MarathonRecomp/api/Sonicteam/RenderAction/SetStencilWriteMask.h
@@ -8,8 +8,9 @@ namespace Sonicteam::RenderAction
     class SetStencilWriteMask : public MyRenderProcess
     {
     public:
-        MARATHON_INSERT_PADDING(0x4);
+        be<uint32_t> m_WriteMask;
     };
 
     MARATHON_ASSERT_SIZEOF(SetStencilWriteMask, 0x3C);
+    MARATHON_ASSERT_OFFSETOF(SetStencilWriteMask, m_WriteMask, 0x38);
 }
diff --git a/MarathonRecomp/api/d3dxb.h b/MarathonRecomp/api/d3dxb.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include <Marathon.inl>
+
+enum D3DXBSTENCILOP
+{
+    D3DXBSTENCILOP_KEEP = 0,
+    D3DXBSTENCILOP_ZERO = 1,
+    D3DXBSTENCILOP_REPLACE = 2,
+    D3DXBSTENCILOP_INCRSAT = 3,
+    D3DXBSTENCILOP_DECRSAT = 4,
+    D3DXBSTENCILOP_INVERT = 5,
+    D3DXBSTENCILOP_INCR = 6,
+    D3DXBSTENCILOP_DECR = 7
+};

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,12 @@ namespace Sonicteam::RenderAction`
`8`	`8`	`class SetCSMTextures : public MyRenderProcess`
`9`	`9`	`{`
`10`	`10`	`public:`
`11`		`- MARATHON_INSERT_PADDING(0xC);`
	`11`	`+ bool m_Flag;`
	`12`	`+ xpointer<void> m_pCSMTexture;`
	`13`	`+ MARATHON_INSERT_PADDING(0x4);`
`12`	`14`	`};`
`13`	`15`
`14`	`16`	`MARATHON_ASSERT_SIZEOF(SetCSMTextures, 0x44);`
	`17`	`+ MARATHON_ASSERT_OFFSETOF(SetCSMTextures, m_Flag, 0x38);`
	`18`	`+ MARATHON_ASSERT_OFFSETOF(SetCSMTextures, m_pCSMTexture, 0x3C);`
`15`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,9 @@ namespace Sonicteam::RenderAction`
`8`	`8`	`class SetCurrentScreen : public MyRenderProcess`
`9`	`9`	`{`
`10`	`10`	`public:`
`11`		`- MARATHON_INSERT_PADDING(0x4);`
	`11`	`+ be<uint32_t> m_ScreenIndex;`
`12`	`12`	`};`
`13`	`13`
`14`	`14`	`MARATHON_ASSERT_SIZEOF(SetCurrentScreen, 0x3C);`
	`15`	`+ MARATHON_ASSERT_OFFSETOF(SetCurrentScreen, m_ScreenIndex, 0x38);`
`15`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,11 @@ namespace Sonicteam::RenderAction`
`8`	`8`	`class SetDepthTextures : public MyRenderProcess`
`9`	`9`	`{`
`10`	`10`	`public:`
`11`		`- MARATHON_INSERT_PADDING(0x8);`
	`11`	`+ bool m_Flag;`
	`12`	`+ xpointer<void> m_pDepthTexture;`
`12`	`13`	`};`
`13`	`14`
`14`	`15`	`MARATHON_ASSERT_SIZEOF(SetDepthTextures, 0x40);`
	`16`	`+ MARATHON_ASSERT_OFFSETOF(SetDepthTextures, m_Flag, 0x38);`
	`17`	`+ MARATHON_ASSERT_OFFSETOF(SetDepthTextures, m_pDepthTexture, 0x3C);`
`15`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,10 @@ namespace Sonicteam::RenderAction`
`9`	`9`	`{`
`10`	`10`	`public:`
`11`	`11`	`be<uint32_t> m_CameraIndex;`
`12`		`- MARATHON_INSERT_PADDING(0x4);`
	`12`	`+ be<float> m_FovY;`
`13`	`13`	`};`
`14`	`14`
`15`	`15`	`MARATHON_ASSERT_SIZEOF(SetFovY, 0x40);`
`16`	`16`	`MARATHON_ASSERT_OFFSETOF(SetFovY, m_CameraIndex, 0x38);`
	`17`	`+ MARATHON_ASSERT_OFFSETOF(SetFovY, m_FovY, 0x3C);`
`17`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,14 @@`
`5`	`5`
`6`	`6`	`namespace Sonicteam::RenderAction`
`7`	`7`	`{`
`8`		`- class SetReflectionTexture : public MyRenderProcess`
	`8`	`+ class SetReflectionTextures : public MyRenderProcess`
`9`	`9`	`{`
`10`	`10`	`public:`
`11`		`- MARATHON_INSERT_PADDING(0x8);`
	`11`	`+ bool m_Flag;`
	`12`	`+ xpointer<void> m_pReflectionTexture;`
`12`	`13`	`};`
`13`	`14`
`14`		`- MARATHON_ASSERT_SIZEOF(SetReflectionTexture, 0x40);`
	`15`	`+ MARATHON_ASSERT_SIZEOF(SetReflectionTextures, 0x40);`
	`16`	`+ MARATHON_ASSERT_OFFSETOF(SetReflectionTextures, m_Flag, 0x38);`
	`17`	`+ MARATHON_ASSERT_OFFSETOF(SetReflectionTextures, m_pReflectionTexture, 0x3C);`
`15`	`18`	`}`