Skip to content

Commit a257463

Browse files
committed
About halfway through
Signed-off-by: Isaac Marovitz <isaacryu@icloud.com>
1 parent aeb0d78 commit a257463

File tree

11 files changed

+49
-12
lines changed

11 files changed

+49
-12
lines changed

MarathonRecomp/api/Marathon.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
#include "Sonicteam/MyCueAttenuate.h"
7878
#include "Sonicteam/MyGraphicsDevice.h"
7979
#include "Sonicteam/MyPhantom.h"
80+
#include "Sonicteam/MyRenderProcess.h"
8081
#include "Sonicteam/MyTexture.h"
8182
#include "Sonicteam/MyTransforms.h"
8283
#include "Sonicteam/NamedActor.h"
@@ -160,10 +161,10 @@
160161
#include "Sonicteam/RenderAction/SetAutoZPass.h"
161162
#include "Sonicteam/RenderAction/SetBackStencilOp.h"
162163
#include "Sonicteam/RenderAction/SetBlendMode.h"
164+
#include "Sonicteam/RenderAction/SetCSMTextures.h"
163165
#include "Sonicteam/RenderAction/SetClip.h"
164166
#include "Sonicteam/RenderAction/SetColorWriteEnable.h"
165167
#include "Sonicteam/RenderAction/SetConstantShader.h"
166-
#include "Sonicteam/RenderAction/SetCSMTextures.h"
167168
#include "Sonicteam/RenderAction/SetCullMode.h"
168169
#include "Sonicteam/RenderAction/SetCurrentScreen.h"
169170
#include "Sonicteam/RenderAction/SetDepthTextures.h"
@@ -196,7 +197,7 @@
196197
#include "Sonicteam/SoX/Engine/Application.h"
197198
#include "Sonicteam/SoX/Engine/Doc.h"
198199
#include "Sonicteam/SoX/Engine/DocMode.h"
199-
#include "Sonicteam/SoX/Engine//RenderProcess.h"
200+
#include "Sonicteam/SoX/Engine/RenderProcess.h"
200201
#include "Sonicteam/SoX/Engine/Task.h"
201202
#include "Sonicteam/SoX/Graphics/Device.h"
202203
#include "Sonicteam/SoX/Graphics/Frame.h"

MarathonRecomp/api/Sonicteam/RenderAction/LockBlendMode.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ namespace Sonicteam::RenderAction
88
class LockBlendMode : public MyRenderProcess
99
{
1010
public:
11-
MARATHON_INSERT_PADDING(0x4);
11+
bool m_Lock;
1212
};
1313

1414
MARATHON_ASSERT_SIZEOF(LockBlendMode, 0x3C);
15+
MARATHON_ASSERT_OFFSETOF(LockBlendMode, m_Lock, 0x38);
1516
}

MarathonRecomp/api/Sonicteam/RenderAction/LockCullMode.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ namespace Sonicteam::RenderAction
88
class LockCullMode : public MyRenderProcess
99
{
1010
public:
11-
MARATHON_INSERT_PADDING(0x4);
11+
bool m_Lock;
1212
};
1313

1414
MARATHON_ASSERT_SIZEOF(LockCullMode, 0x3C);
15+
MARATHON_ASSERT_OFFSETOF(LockCullMode, m_Lock, 0x38);
1516
}

MarathonRecomp/api/Sonicteam/RenderAction/LockZMode.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ namespace Sonicteam::RenderAction
88
class LockZMode : public MyRenderProcess
99
{
1010
public:
11-
MARATHON_INSERT_PADDING(0x4);
11+
bool m_Lock;
1212
};
1313

1414
MARATHON_ASSERT_SIZEOF(LockZMode, 0x3C);
15+
MARATHON_ASSERT_OFFSETOF(LockZMode, m_Lock, 0x38);
1516
}

MarathonRecomp/api/Sonicteam/RenderAction/Movie.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ namespace Sonicteam::RenderAction
88
class Movie : public MyRenderProcess
99
{
1010
public:
11-
MARATHON_INSERT_PADDING(0x4);
11+
xpointer<MovieObject> m_pMovieObject;
1212
};
1313

1414
MARATHON_ASSERT_SIZEOF(Movie, 0x3C);
15+
MARATHON_ASSERT_OFFSETOF(Movie, m_pMovieObject, 0x38);
1516
}

MarathonRecomp/api/Sonicteam/RenderAction/Rasterize.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,12 @@ namespace Sonicteam::RenderAction
88
class Rasterize : public MyRenderProcess
99
{
1010
public:
11-
MARATHON_INSERT_PADDING(0xC);
11+
MARATHON_INSERT_PADDING(0x4);
12+
xpointer<SoX::Graphics::Xenon::TextureXenon> m_pTexture;
13+
bool m_Flag;
1214
};
1315

1416
MARATHON_ASSERT_SIZEOF(Rasterize, 0x44);
17+
MARATHON_ASSERT_OFFSETOF(Rasterize, m_pTexture, 0x3C);
18+
MARATHON_ASSERT_OFFSETOF(Rasterize, m_Flag, 0x40);
1519
}

MarathonRecomp/api/Sonicteam/RenderAction/SetAutoZPass.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ namespace Sonicteam::RenderAction
88
class SetAutoZPass : public MyRenderProcess
99
{
1010
public:
11-
MARATHON_INSERT_PADDING(0x4);
11+
bool m_Enabled;
1212
};
1313

1414
MARATHON_ASSERT_SIZEOF(SetAutoZPass, 0x3C);
15+
MARATHON_ASSERT_OFFSETOF(SetAutoZPass, m_Enabled, 0x38);
1516
}

MarathonRecomp/api/Sonicteam/RenderAction/SetBackStencilOp.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,13 @@ namespace Sonicteam::RenderAction
88
class SetBackStencilOp : public MyRenderProcess
99
{
1010
public:
11-
MARATHON_INSERT_PADDING(0xC);
11+
be<uint32_t> m_StencilOp1;
12+
be<uint32_t> m_StencilOp2;
13+
be<uint32_t> m_StencilOp3;
1214
};
1315

1416
MARATHON_ASSERT_SIZEOF(SetBackStencilOp, 0x44);
17+
MARATHON_ASSERT_OFFSETOF(SetBackStencilOp, m_StencilOp1, 0x38);
18+
MARATHON_ASSERT_OFFSETOF(SetBackStencilOp, m_StencilOp2, 0x3C);
19+
MARATHON_ASSERT_OFFSETOF(SetBackStencilOp, m_StencilOp3, 0x40);
1520
}

MarathonRecomp/api/Sonicteam/RenderAction/SetBlendMode.h

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,17 @@ namespace Sonicteam::RenderAction
77
{
88
class SetBlendMode : public MyRenderProcess
99
{
10-
MARATHON_INSERT_PADDING(0x4);
10+
public:
11+
enum BlendMode
12+
{
13+
Opaque = 0,
14+
Blend = 1,
15+
Add = 2
16+
};
17+
18+
be<BlendMode> m_BlendMode;
1119
};
1220

1321
MARATHON_ASSERT_SIZEOF(SetBlendMode, 0x3C);
22+
MARATHON_ASSERT_OFFSETOF(SetBlendMode, m_BlendMode, 0x38);
1423
}

MarathonRecomp/api/Sonicteam/RenderAction/SetClip.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,12 @@ namespace Sonicteam::RenderAction
99
{
1010
public:
1111
be<uint32_t> m_CameraIndex;
12-
MARATHON_INSERT_PADDING(0x8);
12+
be<float> m_Clip1;
13+
be<float> m_Clip2;
1314
};
1415

1516
MARATHON_ASSERT_SIZEOF(SetClip, 0x44);
1617
MARATHON_ASSERT_OFFSETOF(SetClip, m_CameraIndex, 0x38);
18+
MARATHON_ASSERT_OFFSETOF(SetClip, m_Clip1, 0x3C);
19+
MARATHON_ASSERT_OFFSETOF(SetClip, m_Clip2, 0x40);
1720
}

0 commit comments

Comments
 (0)