Skip to content

Commit 701d63a

Browse files
hyperbxhyperbx
committed
Clean-up
1 parent 48e8113 commit 701d63a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+457
-533
lines changed

‎MarathonRecomp/api/Marathon.h‎

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,16 @@
3737
#include "Sonicteam/Enemy/EnemyShotNormal.h"
3838
#include "Sonicteam/Enemy/EnemyShotPoint.h"
3939
#include "Sonicteam/Fixture.h"
40+
#include "Sonicteam/GE1PE/EffectBank.h"
41+
#include "Sonicteam/GE1PE/EmitterListener.h"
42+
#include "Sonicteam/GE1PE/Manager.h"
43+
#include "Sonicteam/GE1PE/ParticleEngine.h"
44+
#include "Sonicteam/GE1PE/Plugin.h"
45+
#include "Sonicteam/GE1PE/RefCountObject.h"
4046
#include "Sonicteam/Game.h"
4147
#include "Sonicteam/GameImp.h"
4248
#include "Sonicteam/GameMode.h"
4349
#include "Sonicteam/Globals.h"
44-
#include "Sonicteam/MyPE/CManageParticle.h"
4550
#include "Sonicteam/HUDButtonWindow.h"
4651
#include "Sonicteam/HUDCALLBACK.h"
4752
#include "Sonicteam/HUDLimitTime.h"
@@ -56,8 +61,12 @@
5661
#include "Sonicteam/HintWindowTask.h"
5762
#include "Sonicteam/HudTextParts.h"
5863
#include "Sonicteam/ImageFilter.h"
64+
#include "Sonicteam/LuaNode.h"
65+
#include "Sonicteam/LuaNodeImp.h"
66+
#include "Sonicteam/LuaSystem.h"
5967
#include "Sonicteam/LuaSystemManager.h"
6068
#include "Sonicteam/MainDisplayTask.h"
69+
#include "Sonicteam/MainMenuExpositionTask.h"
6170
#include "Sonicteam/MainMenuTask.h"
6271
#include "Sonicteam/MainMode.h"
6372
#include "Sonicteam/Message/MsgCameramanChangeMode.h"
@@ -78,7 +87,13 @@
7887
#include "Sonicteam/MyCueAdx.h"
7988
#include "Sonicteam/MyCueAttenuate.h"
8089
#include "Sonicteam/MyGraphicsDevice.h"
90+
#include "Sonicteam/MyPE/CManageParticle.h"
91+
#include "Sonicteam/MyPE/EffectBankLoad.h"
92+
#include "Sonicteam/MyPE/EffectBankLoadManager.h"
93+
#include "Sonicteam/MyPE/MyEffectBank.h"
94+
#include "Sonicteam/MyPE/MyEmitterListener.h"
8195
#include "Sonicteam/MyPhantom.h"
96+
#include "Sonicteam/MyRenderProcess.h"
8297
#include "Sonicteam/MyTexture.h"
8398
#include "Sonicteam/MyTransforms.h"
8499
#include "Sonicteam/NamedActor.h"
@@ -87,11 +102,15 @@
87102
#include "Sonicteam/ObjectVehicle.h"
88103
#include "Sonicteam/ObjectVehicleBike.h"
89104
#include "Sonicteam/Particles/Particle.h"
105+
#include "Sonicteam/Particles/ParticleContainer.h"
106+
#include "Sonicteam/Particles/ParticleContainerMgr.h"
90107
#include "Sonicteam/Particles/ParticleManager.h"
108+
#include "Sonicteam/Particles/ParticleManagerUnit.h"
91109
#include "Sonicteam/Particles/ParticleRef.h"
92110
#include "Sonicteam/PauseAdapter.h"
93111
#include "Sonicteam/PauseTask.h"
94112
#include "Sonicteam/Player/Effect/ParticleJoint.h"
113+
#include "Sonicteam/Player/Effect/ParticleLuaTable.h"
95114
#include "Sonicteam/Player/GroundRayListener.h"
96115
#include "Sonicteam/Player/ICollisionListener.h"
97116
#include "Sonicteam/Player/ICollisionListenerTemplate.h"
@@ -144,6 +163,8 @@
144163
#include "Sonicteam/PropFixture.h"
145164
#include "Sonicteam/RaderMapManager.h"
146165
#include "Sonicteam/RenderTargetContainer.h"
166+
#include "Sonicteam/RootGTask.h"
167+
#include "Sonicteam/SFXAgent.h"
147168
#include "Sonicteam/SaveDataTask.h"
148169
#include "Sonicteam/SaveDataTaskXENON.h"
149170
#include "Sonicteam/SelectWindowTask.h"
@@ -158,8 +179,10 @@
158179
#include "Sonicteam/SoX/Engine/Application.h"
159180
#include "Sonicteam/SoX/Engine/Doc.h"
160181
#include "Sonicteam/SoX/Engine/DocMode.h"
161-
#include "Sonicteam/SoX/Engine/Task.h"
182+
#include "Sonicteam/SoX/Engine/GTask.h"
162183
#include "Sonicteam/SoX/Engine/RenderProcess.h"
184+
#include "Sonicteam/SoX/Engine/RenderScheduler.h"
185+
#include "Sonicteam/SoX/Engine/Task.h"
163186
#include "Sonicteam/SoX/Graphics/Device.h"
164187
#include "Sonicteam/SoX/Graphics/Frame.h"
165188
#include "Sonicteam/SoX/Graphics/FrameGP.h"
@@ -207,6 +230,11 @@
207230
#include "Sonicteam/SoX/Scenery/CameraImp.h"
208231
#include "Sonicteam/SoX/Scenery/Drawable.h"
209232
#include "Sonicteam/SoX/Thread.h"
233+
#include "Sonicteam/Spanverse/AckResource.h"
234+
#include "Sonicteam/Spanverse/AckResourceMgr.h"
235+
#include "Sonicteam/Spanverse/SpanABDT.h"
236+
#include "Sonicteam/Spanverse/SpanACBS.h"
237+
#include "Sonicteam/Spanverse/SpanBASE.h"
210238
#include "Sonicteam/StdImageFilters/BurnoutBlurFilter.h"
211239
#include "Sonicteam/StdImageFilters/SingleTechniqueFilter.h"
212240
#include "Sonicteam/System/CreateStatic.h"
@@ -216,7 +244,6 @@
216244
#include "Sonicteam/TextBookMgr.h"
217245
#include "Sonicteam/TextCard.h"
218246
#include "Sonicteam/TextEntity.h"
219-
#include "Sonicteam/LuaSystem.h"
220247
#include "Sonicteam/TextFontPicture.h"
221248
#include "Sonicteam/TextFontPictureMgr.h"
222249
#include "Sonicteam/TitleTask.h"
@@ -226,6 +253,7 @@
226253
#include "Sonicteam/sonicXmaPlayer.h"
227254
#include "boost/smart_ptr/make_shared_object.h"
228255
#include "boost/smart_ptr/shared_ptr.h"
256+
#include "d3dxb.h"
229257
#include "hk330/hkArray.h"
230258
#include "hk330/hkReferencedObject.h"
231259
#include "hk330/hkpBroadPhaseHandle.h"
@@ -245,8 +273,9 @@
245273
#include "hk330/hkpTypedBroadPhaseHandle.h"
246274
#include "hk330/hkpWorld.h"
247275
#include "hk330/hkpWorldObject.h"
276+
#include "lua50/lua.h"
277+
#include "stdx/list.h"
248278
#include "stdx/map.h"
249279
#include "stdx/string.h"
250280
#include "stdx/vector.h"
251281
#include "stdx/wstring.h"
252-

‎MarathonRecomp/api/Sonicteam/AppMarathon.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ namespace Sonicteam
1212
public:
1313
xpointer<DocMarathonState> m_pDoc;
1414

15-
static AppMarathon* GetInstance();
15+
AppMarathon* GetInstance()
16+
{
17+
return *(xpointer<AppMarathon>*)MmGetHostAddress(0x82D3B348);
18+
}
1619

1720
GameImp* GetGame() const
1821
{
@@ -25,5 +28,3 @@ namespace Sonicteam
2528

2629
MARATHON_ASSERT_OFFSETOF(AppMarathon, m_pDoc, 0x180);
2730
}
28-
29-
#include <Sonicteam/AppMarathon.inl>

‎MarathonRecomp/api/Sonicteam/AppMarathon.inl‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎MarathonRecomp/api/Sonicteam/DocMarathonImp.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
#include <Marathon.inl>
44
#include <boost/smart_ptr/shared_ptr.h>
5+
#include <Sonicteam/Particles/ParticleManager.h>
56
#include <Sonicteam/SoX/Engine/Doc.h>
67
#include <Sonicteam/SoX/Input/Manager.h>
8+
#include <Sonicteam/SoX/LinkNode.h>
9+
#include <Sonicteam/SoX/Thread.h>
710
#include <Sonicteam/MyGraphicsDevice.h>
8-
#include <Sonicteam/SFXAgent.h>
911
#include <Sonicteam/RaderMapManager.h>
1012
#include <Sonicteam/RenderTargetContainer.h>
11-
#include <Sonicteam/Particles/ParticleManager.h>
12-
#include <Sonicteam/SoX/LinkNode.h>
13-
#include <Sonicteam/SoX/Thread.h>
13+
#include <Sonicteam/SFXAgent.h>
1414
#include <stdx/vector.h>
1515

1616
namespace Sonicteam
@@ -21,7 +21,7 @@ namespace Sonicteam
2121
MARATHON_INSERT_PADDING(4);
2222
xpointer<MyGraphicsDevice> m_pMyGraphicsDevice;
2323
MARATHON_INSERT_PADDING(0x38);
24-
stdx::vector<boost::shared_ptr<SoX::Input::Manager>> m_vspInputManager;
24+
stdx::vector<boost::shared_ptr<SoX::Input::Manager>> m_vspInputManagers;
2525
MARATHON_INSERT_PADDING(0x24);
2626
bool m_VFrame;
2727
MARATHON_INSERT_PADDING(4);
@@ -37,12 +37,12 @@ namespace Sonicteam
3737
xpointer<RaderMapManager> m_pRaderMapManager;
3838
MARATHON_INSERT_PADDING(0x542D0);
3939
be<uint32_t> m_aPadIDs[4];
40+
MARATHON_INSERT_PADDING(0x2C);
4041
};
4142

4243
MARATHON_ASSERT_OFFSETOF(DocMarathonImp, m_PauseFlags, 0xEC);
43-
MARATHON_ASSERT_OFFSETOF(DocMarathonImp, m_vspInputManager, 0x9C);
44+
MARATHON_ASSERT_OFFSETOF(DocMarathonImp, m_vspInputManagers, 0x9C);
4445
MARATHON_ASSERT_OFFSETOF(DocMarathonImp, m_VFrame, 0xD0);
4546
MARATHON_ASSERT_OFFSETOF(DocMarathonImp, m_aPadIDs, 0x55C2C);
46-
MARATHON_ASSERT_SIZEOF(DocMarathonImp, 0x55C3C);
47-
47+
MARATHON_ASSERT_SIZEOF(DocMarathonImp, 0x55C68);
4848
}

‎MarathonRecomp/api/Sonicteam/DocMarathonState.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ namespace Sonicteam
77
{
88
class DocMarathonState : public DocMarathonImp {};
99

10-
MARATHON_ASSERT_SIZEOF(DocMarathonState, 0x55C3C);
10+
MARATHON_ASSERT_SIZEOF(DocMarathonState, 0x55C68);
1111
}

‎MarathonRecomp/api/Sonicteam/GE1PE/EffectBank.h‎

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,40 +7,36 @@
77

88
namespace Sonicteam::GE1PE
99
{
10-
//.peb
11-
1210
class ParticleEngine;
1311

14-
//no name left for type
15-
class EffectBankData
12+
struct EffectBankData
1613
{
17-
public:
18-
be<uint32_t> m_Field0; // 0x3E - no idea
19-
stdx::string m_DataName; // player_sonic
20-
//from .peb (raw converted since they released after)
21-
xpointer<void> m_Data1;
22-
xpointer<void> m_Data2;
23-
xpointer<void> m_Data3;
24-
stdx::map<stdx::string, be<uint32_t>> m_EffectDataIndices; //barrier_g = 0x23
14+
be<uint32_t> Field00;
15+
stdx::string Name;
16+
xpointer<void> pData1;
17+
xpointer<void> pData2;
18+
xpointer<void> pData3;
19+
stdx::map<stdx::string, be<uint32_t>> mEffectDataIndices;
2520
};
26-
MARATHON_ASSERT_OFFSETOF(EffectBankData, m_Field0, 0);
27-
MARATHON_ASSERT_OFFSETOF(EffectBankData, m_DataName, 4);
28-
MARATHON_ASSERT_OFFSETOF(EffectBankData, m_Data1, 0x20);
29-
MARATHON_ASSERT_OFFSETOF(EffectBankData, m_Data2, 0x24);
30-
MARATHON_ASSERT_OFFSETOF(EffectBankData, m_Data3, 0x28);
31-
MARATHON_ASSERT_OFFSETOF(EffectBankData, m_EffectDataIndices, 0x2C);
32-
MARATHON_ASSERT_SIZEOF(EffectBankData, 0x38);
3321

3422
class EffectBank : public RefCountObject
3523
{
3624
public:
3725
xpointer<ParticleEngine> m_pParticleEngine;
38-
be<uint32_t> m_FieldC; //index ?
26+
be<uint32_t> m_Field0C; // Index?
3927
xpointer<EffectBankData> m_pEffectBankA;
4028
};
4129

42-
MARATHON_ASSERT_OFFSETOF(EffectBank,m_pParticleEngine, 8);
43-
MARATHON_ASSERT_OFFSETOF(EffectBank,m_FieldC, 0xC);
30+
MARATHON_ASSERT_OFFSETOF(EffectBankData, Field00, 0x00);
31+
MARATHON_ASSERT_OFFSETOF(EffectBankData, Name, 0x04);
32+
MARATHON_ASSERT_OFFSETOF(EffectBankData, pData1, 0x20);
33+
MARATHON_ASSERT_OFFSETOF(EffectBankData, pData2, 0x24);
34+
MARATHON_ASSERT_OFFSETOF(EffectBankData, pData3, 0x28);
35+
MARATHON_ASSERT_OFFSETOF(EffectBankData, mEffectDataIndices, 0x2C);
36+
MARATHON_ASSERT_SIZEOF(EffectBankData, 0x38);
37+
38+
MARATHON_ASSERT_OFFSETOF(EffectBank, m_pParticleEngine, 0x08);
39+
MARATHON_ASSERT_OFFSETOF(EffectBank, m_Field0C, 0x0C);
4440
MARATHON_ASSERT_OFFSETOF(EffectBank, m_pEffectBankA, 0x10);
4541
MARATHON_ASSERT_SIZEOF(EffectBank, 0x14);
4642
}

‎MarathonRecomp/api/Sonicteam/GE1PE/EmitterListener.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ namespace Sonicteam::GE1PE
66
{
77
class EmitterListener
88
{
9+
public:
910
xpointer<void> m_pVftable;
1011
};
1112
}

‎MarathonRecomp/api/Sonicteam/GE1PE/Manager.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
namespace Sonicteam::GE1PE
77
{
8-
class ParticleEngine;
9-
class Particle;
10-
class Emitter;
118
class Effect;
9+
class Emitter;
10+
class Particle;
11+
class ParticleEngine;
1212

1313
class Manager
1414
{
@@ -30,14 +30,14 @@ namespace Sonicteam::GE1PE
3030
SoX::LinkNode<Effect> m_lnField5C;
3131
MARATHON_INSERT_PADDING(0x24);
3232
};
33-
MARATHON_ASSERT_OFFSETOF(Manager, m_pParticleEngine, 4);
34-
MARATHON_ASSERT_OFFSETOF(Manager, m_lnManager, 8);
33+
34+
MARATHON_ASSERT_OFFSETOF(Manager, m_pParticleEngine, 0x04);
35+
MARATHON_ASSERT_OFFSETOF(Manager, m_lnManager, 0x08);
3536
MARATHON_ASSERT_OFFSETOF(Manager, m_lnField14, 0x14);
3637
MARATHON_ASSERT_OFFSETOF(Manager, m_lnParticle, 0x20);
3738
MARATHON_ASSERT_OFFSETOF(Manager, m_lnField2C, 0x2C);
3839
MARATHON_ASSERT_OFFSETOF(Manager, m_lnField38, 0x38);
3940
MARATHON_ASSERT_OFFSETOF(Manager, m_lnEmitter, 0x44);
4041
MARATHON_ASSERT_OFFSETOF(Manager, m_lnEffect, 0x50);
4142
MARATHON_ASSERT_OFFSETOF(Manager, m_lnField5C, 0x5C);
42-
4343
}

‎MarathonRecomp/api/Sonicteam/GE1PE/ParticleEngine.h‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
11
#pragma once
22

33
#include <Marathon.inl>
4+
#include <boost/smart_ptr/shared_ptr.h>
5+
#include <Sonicteam/GE1PE/Plugin.h>
6+
#include <Sonicteam/SoX/LinkNode.h>
47
#include <Sonicteam/System/Singleton.h>
58
#include <Sonicteam/System/CreateStatic.h>
6-
#include <Sonicteam/GE1PE/Plugin.h>
7-
#include <boost/smart_ptr/shared_ptr.h>
89
#include <stdx/map.h>
910
#include <stdx/string.h>
1011
#include <stdx/vector.h>
11-
#include <Sonicteam/SoX/LinkNode.h>
1212

1313
namespace Sonicteam::GE1PE
1414
{
1515
class EffectBank;
16-
class TextureBank;
17-
class Material;
1816
class Manager;
17+
class Material;
18+
class TextureBank;
1919

20-
class ParticleEngine : public System::Singleton<ParticleEngine,0x82D3C4F4, System::CreateStatic<ParticleEngine,0x82642090>>
20+
class ParticleEngine : public System::Singleton<ParticleEngine, 0x82D3C4F4, System::CreateStatic<ParticleEngine, 0x82642090>>
2121
{
2222
public:
2323
xpointer<void> m_pVftable;
2424
boost::shared_ptr<Plugin> m_spPlugin;
25-
stdx::map<stdx::string, be<uint32_t>> m_mEffectIndicies; // ev001 = index
26-
stdx::map<stdx::string, be<uint32_t>> m_mTextureIndicies; //vehicle_jet_grid = 0x9F;
27-
stdx::map<stdx::string, be<uint32_t>> m_MaterialIndicies; //addBN = 3; MeshTestShader ...
25+
stdx::map<stdx::string, be<uint32_t>> m_mEffectIndices;
26+
stdx::map<stdx::string, be<uint32_t>> m_mTextureIndices;
27+
stdx::map<stdx::string, be<uint32_t>> m_mMaterialIndices;
2828
stdx::vector<xpointer<EffectBank>> m_vpEffectBank;
2929
stdx::vector<xpointer<TextureBank>> m_vpTextureBank;
3030
stdx::vector<xpointer<TextureBank>> m_vpMaterialBank;
3131
SoX::LinkNode<Manager> m_lnManager;
32-
stdx::vector<void> m_vField6C;
32+
stdx::vector<be<uint32_t>> m_vField6C;
3333
};
3434

35-
MARATHON_ASSERT_OFFSETOF(ParticleEngine, m_spPlugin, 4);
36-
MARATHON_ASSERT_OFFSETOF(ParticleEngine, m_mEffectIndicies, 0xC);
37-
MARATHON_ASSERT_OFFSETOF(ParticleEngine, m_mTextureIndicies, 0x18);
38-
MARATHON_ASSERT_OFFSETOF(ParticleEngine, m_MaterialIndicies, 0x24);
35+
MARATHON_ASSERT_OFFSETOF(ParticleEngine, m_spPlugin, 0x04);
36+
MARATHON_ASSERT_OFFSETOF(ParticleEngine, m_mEffectIndices, 0x0C);
37+
MARATHON_ASSERT_OFFSETOF(ParticleEngine, m_mTextureIndices, 0x18);
38+
MARATHON_ASSERT_OFFSETOF(ParticleEngine, m_mMaterialIndices, 0x24);
3939
MARATHON_ASSERT_OFFSETOF(ParticleEngine, m_vpEffectBank, 0x30);
4040
MARATHON_ASSERT_OFFSETOF(ParticleEngine, m_vpTextureBank, 0x40);
4141
MARATHON_ASSERT_OFFSETOF(ParticleEngine, m_vpMaterialBank, 0x50);

‎MarathonRecomp/api/Sonicteam/GE1PE/Plugin.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,9 @@ namespace Sonicteam::GE1PE
1111
struct Vftable
1212
{
1313
be<uint32_t> fpDestroy;
14-
//....
1514
};
1615

1716
xpointer<Vftable> m_pVftable;
1817
xpointer<SoX::Engine::Doc> m_pDoc;
1918
};
20-
2119
}

0 commit comments

Comments
 (0)