Skip to content

Commit 2de64ab

Browse files
ReimousTHReimousTH
committed
PostureAPI
1 parent 3e2ad7c commit 2de64ab

144 files changed

Lines changed: 8083 additions & 379 deletions

File tree

Some content is hidden

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

‎MarathonRecomp/api/Marathon.h‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "Sonicteam/AlertWindowTask.h"
2121
#include "Sonicteam/AppMarathon.h"
2222
#include "Sonicteam/AudioEngineXenon.h"
23+
#include "Sonicteam/BasicIScriptParamsDesc.h"
2324
#include "Sonicteam/ButtonWindowTask.h"
2425
#include "Sonicteam/CObjBalloonIconDrawable.h"
2526
#include "Sonicteam/Camera/CameraMode.h"
@@ -52,12 +53,15 @@
5253
#include "Sonicteam/HUDPopupScreen.h"
5354
#include "Sonicteam/HUDRaderMap.h"
5455
#include "Sonicteam/HUDStageTitle.h"
56+
#include "Sonicteam/Heap.h"
5557
#include "Sonicteam/HintWindowTask.h"
5658
#include "Sonicteam/HudTextParts.h"
5759
#include "Sonicteam/ImageFilter.h"
60+
#include "Sonicteam/KeyframedPath.h"
5861
#include "Sonicteam/MainDisplayTask.h"
5962
#include "Sonicteam/MainMenuTask.h"
6063
#include "Sonicteam/MainMode.h"
64+
#include "Sonicteam/MercuryDrawable.h"
6165
#include "Sonicteam/Message/MsgCameramanChangeMode.h"
6266
#include "Sonicteam/Message/MsgHUDButtonWindowChangeButtons.h"
6367
#include "Sonicteam/Message/MsgHUDMainMenuChangeState.h"
@@ -85,19 +89,34 @@
8589
#include "Sonicteam/NoSyncThread.h"
8690
#include "Sonicteam/ObjectVehicle.h"
8791
#include "Sonicteam/ObjectVehicleBike.h"
92+
#include "Sonicteam/Package.h"
93+
#include "Sonicteam/PackageBinary.h"
94+
#include "Sonicteam/PathAnimation/Animation.h"
95+
#include "Sonicteam/PathAnimation/Controller.h"
96+
#include "Sonicteam/PathAnimation/Entity.h"
8897
#include "Sonicteam/PauseAdapter.h"
8998
#include "Sonicteam/PauseTask.h"
99+
#include "Sonicteam/Player/AllListener.h"
100+
#include "Sonicteam/Player/Gravity.h"
101+
#include "Sonicteam/Player/GroundListener.h"
90102
#include "Sonicteam/Player/GroundRayListener.h"
103+
#include "Sonicteam/Player/HairSimulator.h"
91104
#include "Sonicteam/Player/ICollisionListener.h"
92105
#include "Sonicteam/Player/ICollisionListenerTemplate.h"
93106
#include "Sonicteam/Player/IDynamicLink.h"
94107
#include "Sonicteam/Player/IEventerListener.h"
95108
#include "Sonicteam/Player/IExportExternalFlag.h"
96109
#include "Sonicteam/Player/IExportPostureRequestFlag.h"
110+
#include "Sonicteam/Player/IExportVehicleFlag.h"
97111
#include "Sonicteam/Player/IExportWeaponRequestFlag.h"
98112
#include "Sonicteam/Player/IFlagCommunicator.h"
113+
#include "Sonicteam/Player/IForce.h"
99114
#include "Sonicteam/Player/IGauge.h"
115+
#include "Sonicteam/Player/IImportAnimation.h"
116+
#include "Sonicteam/Player/ILoad.h"
117+
#include "Sonicteam/Player/IModel.h"
100118
#include "Sonicteam/Player/INotification.h"
119+
#include "Sonicteam/Player/IPath.h"
101120
#include "Sonicteam/Player/IPlugIn.h"
102121
#include "Sonicteam/Player/IPostureControl.h"
103122
#include "Sonicteam/Player/IPosturePlugIn.h"
@@ -113,14 +132,23 @@
113132
#include "Sonicteam/Player/Input/IListener.h"
114133
#include "Sonicteam/Player/Input/ListenerNormal.h"
115134
#include "Sonicteam/Player/Input/TimedAction.h"
135+
#include "Sonicteam/Player/Load.h"
136+
#include "Sonicteam/Player/MovableBody.h"
116137
#include "Sonicteam/Player/Object.h"
138+
#include "Sonicteam/Player/PhysicsBodyList.h"
117139
#include "Sonicteam/Player/PostureControl.h"
140+
#include "Sonicteam/Player/PostureEdge.h"
141+
#include "Sonicteam/Player/PostureVehicle.h"
142+
#include "Sonicteam/Player/RealGroundRayListener.h"
118143
#include "Sonicteam/Player/RootFrame.h"
144+
#include "Sonicteam/Player/RotationGravityAxis.h"
119145
#include "Sonicteam/Player/Score.h"
120146
#include "Sonicteam/Player/SonicGauge.h"
121147
#include "Sonicteam/Player/State/CommonContext.h"
122148
#include "Sonicteam/Player/State/CommonFall.h"
149+
#include "Sonicteam/Player/State/CommonGrind.h"
123150
#include "Sonicteam/Player/State/CommonObject.h"
151+
#include "Sonicteam/Player/State/CommonSpringTemplate.h"
124152
#include "Sonicteam/Player/State/ContextSpeedAndJump.h"
125153
#include "Sonicteam/Player/State/ICommonContext.h"
126154
#include "Sonicteam/Player/State/ICommonContextIF.h"
@@ -130,9 +158,12 @@
130158
#include "Sonicteam/Player/State/Object2.h"
131159
#include "Sonicteam/Player/State/SonicContext.h"
132160
#include "Sonicteam/Player/State/SonicObject.h"
161+
#include "Sonicteam/Player/State/SonicState.h"
133162
#include "Sonicteam/Player/State/TailsContext.h"
134163
#include "Sonicteam/Player/State/TailsFlight.h"
135164
#include "Sonicteam/Player/Unit/ITestCase.h"
165+
#include "Sonicteam/Player/WallListener.h"
166+
#include "Sonicteam/Player/WallRayListener.h"
136167
#include "Sonicteam/Player/Weapon/SonicWeapons.h"
137168
#include "Sonicteam/Player/Zock.h"
138169
#include "Sonicteam/PropFixture.h"
@@ -184,11 +215,14 @@
184215
#include "Sonicteam/RenderAction/SetViewport.h"
185216
#include "Sonicteam/RenderAction/SetZMode.h"
186217
#include "Sonicteam/RenderPostprocess.h"
218+
#include "Sonicteam/SFXAgent.h"
187219
#include "Sonicteam/SaveDataTask.h"
188220
#include "Sonicteam/SaveDataTaskXENON.h"
189221
#include "Sonicteam/SelectWindowTask.h"
222+
#include "Sonicteam/SoX/AI/State.h"
190223
#include "Sonicteam/SoX/AI/StateMachine.h"
191224
#include "Sonicteam/SoX/ApplicationXenon.h"
225+
#include "Sonicteam/SoX/Array.h"
192226
#include "Sonicteam/SoX/Audio/Cue.h"
193227
#include "Sonicteam/SoX/Audio/IAudioEngine.h"
194228
#include "Sonicteam/SoX/Audio/Player.h"
@@ -199,45 +233,58 @@
199233
#include "Sonicteam/SoX/Engine/DocMode.h"
200234
#include "Sonicteam/SoX/Engine/RenderProcess.h"
201235
#include "Sonicteam/SoX/Engine/Task.h"
236+
#include "Sonicteam/SoX/Graphics/AnimationUserDataListener.h"
202237
#include "Sonicteam/SoX/Graphics/Device.h"
203238
#include "Sonicteam/SoX/Graphics/Frame.h"
204239
#include "Sonicteam/SoX/Graphics/FrameGP.h"
205240
#include "Sonicteam/SoX/Graphics/FrameObserver.h"
206241
#include "Sonicteam/SoX/Graphics/Technique.h"
207242
#include "Sonicteam/SoX/Graphics/TechniqueFXL.h"
243+
#include "Sonicteam/SoX/Graphics/Texture.h"
208244
#include "Sonicteam/SoX/Graphics/Transforms.h"
209245
#include "Sonicteam/SoX/Graphics/Vertex.h"
210246
#include "Sonicteam/SoX/Graphics/Xenon/DeviceXenon.h"
211247
#include "Sonicteam/SoX/Graphics/Xenon/TextureXenon.h"
212248
#include "Sonicteam/SoX/IResource.h"
213249
#include "Sonicteam/SoX/IResource2.h"
214250
#include "Sonicteam/SoX/IResourceMgr.h"
251+
#include "Sonicteam/SoX/Input/Listener.h"
215252
#include "Sonicteam/SoX/Input/Manager.h"
216253
#include "Sonicteam/SoX/LinkNode.h"
254+
#include "Sonicteam/SoX/Math/Math.h"
217255
#include "Sonicteam/SoX/Math/Matrix.h"
218256
#include "Sonicteam/SoX/Math/Quaternion.h"
219257
#include "Sonicteam/SoX/Math/Vector.h"
258+
#include "Sonicteam/SoX/Math/__vector.h"
220259
#include "Sonicteam/SoX/Message.h"
221260
#include "Sonicteam/SoX/MessageReceiver.h"
222261
#include "Sonicteam/SoX/Object.h"
262+
#include "Sonicteam/SoX/Physics/Body.h"
223263
#include "Sonicteam/SoX/Physics/Entity.h"
264+
#include "Sonicteam/SoX/Physics/EntityRef.h"
224265
#include "Sonicteam/SoX/Physics/Havok/EntityHavok.h"
225266
#include "Sonicteam/SoX/Physics/Havok/EntityHavokImp.h"
226267
#include "Sonicteam/SoX/Physics/Havok/PhantomHavok.h"
268+
#include "Sonicteam/SoX/Physics/Havok/RayCastHavok.h"
269+
#include "Sonicteam/SoX/Physics/Havok/ShapeCastHavok.h"
227270
#include "Sonicteam/SoX/Physics/Havok/WorldHavok.h"
228271
#include "Sonicteam/SoX/Physics/IntersectEvent.h"
229272
#include "Sonicteam/SoX/Physics/IntersectListener.h"
230273
#include "Sonicteam/SoX/Physics/Phantom.h"
231274
#include "Sonicteam/SoX/Physics/PhantomListener.h"
275+
#include "Sonicteam/SoX/Physics/RayCast.h"
232276
#include "Sonicteam/SoX/Physics/Shape.h"
277+
#include "Sonicteam/SoX/Physics/ShapeCast.h"
233278
#include "Sonicteam/SoX/Physics/ShapeCastEvent.h"
234279
#include "Sonicteam/SoX/Physics/ShapeCastListener.h"
235280
#include "Sonicteam/SoX/Physics/World.h"
236281
#include "Sonicteam/SoX/RefCountObject.h"
237282
#include "Sonicteam/SoX/RefSharedPointer.h"
283+
#include "Sonicteam/SoX/ResourceManager.h"
238284
#include "Sonicteam/SoX/Scenery/Camera.h"
239285
#include "Sonicteam/SoX/Scenery/CameraEventCallback.h"
240286
#include "Sonicteam/SoX/Scenery/CameraImp.h"
287+
#include "Sonicteam/SoX/Scenery/Clump.h"
241288
#include "Sonicteam/SoX/Scenery/Drawable.h"
242289
#include "Sonicteam/SoX/Thread.h"
243290
#include "Sonicteam/StdImageFilters/BurnoutBlurFilter.h"
@@ -263,22 +310,32 @@
263310
#include "hk330/hkArray.h"
264311
#include "hk330/hkReferencedObject.h"
265312
#include "hk330/hkpBroadPhaseHandle.h"
313+
#include "hk330/hkpBvShape.h"
266314
#include "hk330/hkpCdBody.h"
267315
#include "hk330/hkpCollidable.h"
268316
#include "hk330/hkpCollidableCollidableFilter.h"
269317
#include "hk330/hkpCollisionFilter.h"
270318
#include "hk330/hkpEntity.h"
271319
#include "hk330/hkpLinkedCollidable.h"
320+
#include "hk330/hkpMotion.h"
272321
#include "hk330/hkpPhantom.h"
273322
#include "hk330/hkpProperty.h"
274323
#include "hk330/hkpRayCollidableFilter.h"
275324
#include "hk330/hkpRayShapeCollectionFilter.h"
276325
#include "hk330/hkpRigidBody.h"
277326
#include "hk330/hkpShape.h"
278327
#include "hk330/hkpShapeCollectionFilter.h"
328+
#include "hk330/hkpShapeContainer.h"
329+
#include "hk330/hkpShapeSphere.h"
330+
#include "hk330/hkpSingleShapeContainer.h"
279331
#include "hk330/hkpTypedBroadPhaseHandle.h"
280332
#include "hk330/hkpWorld.h"
281333
#include "hk330/hkpWorldObject.h"
334+
#include "stdx/RTTI.h"
335+
#include "stdx/deque.h"
336+
#include "stdx/list.h"
337+
#include "stdx/map.h"
282338
#include "stdx/string.h"
339+
#include "stdx/type_info.h"
283340
#include "stdx/vector.h"
284341
#include "stdx/wstring.h"

‎MarathonRecomp/api/Marathon.inl‎

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

33
#include <cpu/guest_stack_var.h>
4+
#include <cpu/guest_heap_var.h>
45
#include <kernel/function.h>
56

67
constexpr float RAD2DEGf = 57.2958f;
@@ -24,6 +25,9 @@ constexpr double DEG2RAD = 0.01745329238474369;
2425
#define MARATHON_VIRTUAL_FUNCTION(returnType, virtualIndex, ...) \
2526
GuestToHostFunction<returnType>(*(be<uint32_t>*)(g_memory.Translate(*(be<uint32_t>*)(this) + (4 * virtualIndex))), __VA_ARGS__)
2627

28+
#define MARATHON_CALL_VIRTUAL_FUNCTION(base, returnType, func, ...) \
29+
GuestToHostFunction<returnType>((Vftable*)(static_cast<base*>(this)->m_pVftable.get())->*func, ##__VA_ARGS__)
30+
2731
struct marathon_null_ctor {};
2832

2933
inline std::vector<std::string_view> ParseTextVariables(const char* pVariables)
@@ -138,3 +142,13 @@ inline void printU16(const uint16_t* str, bool endianSwap = false)
138142

139143
printf("\n");
140144
}
145+
146+
struct MARATHON_NULL_CTOR {};
147+
148+
struct MARATHON_STD_MAP_CONST_CHAR_COMPARE
149+
{
150+
bool operator()(xpointer<const char> lhs, xpointer<const char> rhs) const
151+
{
152+
return std::strcmp(lhs.get(), rhs.get()) < 0;
153+
}
154+
};

‎MarathonRecomp/api/Sonicteam/ActorManager.h‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,13 @@ namespace Sonicteam
88
class ActorManager
99
{
1010
public:
11-
be<uint32_t> m_aActorIDs[0xFFFF];
12-
xpointer<Actor> m_aActors[0xFFFF];
13-
be<uint32_t> m_LastActorID;
14-
be<uint32_t> m_LastActorIndex;
15-
MARATHON_INSERT_PADDING(4);
16-
};
11+
be<uint32_t> m_ActorID[0xFFFF];
12+
xpointer<Actor> m_Actor[0xFFFF];
13+
be<uint32_t> m_LastActorID;
14+
be<uint32_t> m_LastActorIndex;
1715

18-
MARATHON_ASSERT_OFFSETOF(ActorManager, m_aActorIDs, 0x00);
19-
MARATHON_ASSERT_OFFSETOF(ActorManager, m_aActors, 0x3FFFC);
20-
MARATHON_ASSERT_OFFSETOF(ActorManager, m_LastActorID, 0x7FFF8);
21-
MARATHON_ASSERT_OFFSETOF(ActorManager, m_LastActorIndex, 0x7FFFC);
22-
MARATHON_ASSERT_SIZEOF(ActorManager, 0x80004);
16+
Sonicteam::Actor* FindActor(uint32_t ActorID);
17+
};
2318
}
19+
20+
#include "ActorManager.inl"

‎MarathonRecomp/api/Sonicteam/ActorManager.inl‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#pragma once
2+
3+
namespace Sonicteam
4+
{
5+
inline Actor* ActorManager::FindActor(uint32_t ActorID)
6+
{
7+
unsigned int left = 0;
8+
unsigned int right = this->m_LastActorIndex - 1;
9+
int Index = 0;
10+
11+
while (left <= right) {
12+
unsigned int mid = left + (right - left) / 2;
13+
if (this->m_ActorID[mid] == ActorID) {
14+
Index = mid;
15+
break;
16+
}
17+
if (this->m_ActorID[mid] < ActorID) {
18+
left = mid + 1;
19+
}
20+
else {
21+
right = mid - 1;
22+
}
23+
}
24+
if (!this->m_Actor[Index]) return 0;
25+
return this->m_Actor[Index];
26+
}
27+
}

‎MarathonRecomp/api/Sonicteam/BasicIScriptParamsDesc.h‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#pragma once
2+
3+
#include <Marathon.inl>
4+
#include <Sonicteam/SoX/Engine/Task.h>
5+
6+
namespace Sonicteam
7+
{
8+
class BasicIScriptParamsDesc
9+
{
10+
xpointer<void> m_pDefaultDesc; //points to static, (0x82..., NOT VFT )
11+
};
12+
//static 0x8202AC38 (??????)
13+
}

‎MarathonRecomp/api/Sonicteam/DocMarathonImp.h‎

Lines changed: 29 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,49 @@
11
#pragma once
22

33
#include <Marathon.inl>
4+
#include <boost/smart_ptr/shared_ptr.h>
45
#include <Sonicteam/SoX/Engine/Doc.h>
56
#include <Sonicteam/SoX/Input/Manager.h>
6-
#include <boost/smart_ptr/shared_ptr.h>
7-
#include <api/stdx/vector.h>
7+
#include <Sonicteam/SoX/LinkNode.h>
8+
#include <Sonicteam/SoX/Thread.h>
9+
#include <Sonicteam/MyGraphicsDevice.h>
10+
#include <Sonicteam/RaderMapManager.h>
11+
#include <stdx/vector.h>
812

913
namespace Sonicteam
1014
{
15+
class RenderTargetContainer;
16+
class SFXAgent;
17+
1118
class DocMarathonImp : public SoX::Engine::Doc
1219
{
1320
public:
14-
MARATHON_INSERT_PADDING(0x40);
15-
stdx::vector<boost::shared_ptr<SoX::Input::Manager>> m_vspInputManager;
21+
MARATHON_INSERT_PADDING(4);
22+
xpointer<MyGraphicsDevice> m_pMyGraphicsDevice;
23+
MARATHON_INSERT_PADDING(0x38);
24+
stdx::vector<boost::shared_ptr<SoX::Input::Manager>> m_vspInputManagers;
1625
MARATHON_INSERT_PADDING(0x24);
1726
bool m_VFrame;
18-
MARATHON_INSERT_PADDING(0x55B58);
27+
MARATHON_INSERT_PADDING(4);
28+
xpointer<RenderTargetContainer> m_pRenderTargetContainer;
29+
xpointer<SFXAgent> m_pSFXAgent;
30+
MARATHON_INSERT_PADDING(0x8);
31+
be<float> m_DocSpeed;
32+
be<uint32_t> m_PauseFlags;
33+
MARATHON_INSERT_PADDING(0x8);
34+
xpointer<SoX::LinkedList<SoX::Thread>> m_lnThread;
35+
MARATHON_INSERT_PADDING(0x288);
36+
xpointer<void> m_pParticleManager;
37+
MARATHON_INSERT_PADDING(0x15D0);
38+
xpointer<RaderMapManager> m_pRaderMapManager;
39+
MARATHON_INSERT_PADDING(0x542D0);
1940
be<uint32_t> m_aPadIDs[4];
2041
MARATHON_INSERT_PADDING(0x2C);
2142
};
2243

23-
MARATHON_ASSERT_OFFSETOF(DocMarathonImp, m_vspInputManager, 0x9C);
44+
MARATHON_ASSERT_OFFSETOF(DocMarathonImp, m_DocSpeed, 0xE8);
45+
MARATHON_ASSERT_OFFSETOF(DocMarathonImp, m_PauseFlags, 0xEC);
46+
MARATHON_ASSERT_OFFSETOF(DocMarathonImp, m_vspInputManagers, 0x9C);
2447
MARATHON_ASSERT_OFFSETOF(DocMarathonImp, m_VFrame, 0xD0);
2548
MARATHON_ASSERT_OFFSETOF(DocMarathonImp, m_aPadIDs, 0x55C2C);
2649
MARATHON_ASSERT_SIZEOF(DocMarathonImp, 0x55C68);

‎MarathonRecomp/api/Sonicteam/GameImp.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ namespace Sonicteam
109109
{
110110
auto pCameraImp = (SoX::Scenery::CameraImp*)spCamera.get();
111111

112-
if (pCameraImp->m_Name == pName)
112+
if (pCameraImp->m_AttachPoint == pName)
113113
return pCameraImp;
114114
}
115115

0 commit comments

Comments
 (0)