Skip to content

Commit f85382a

Browse files
ReimousTHReimousTH
ReimousTH
authored and
ReimousTH
committed
More Posture & More Graphics
PostureCommon(Recreation), 100.0% *Testing *Cleanup 1 *Attempt to fix Shadow KDV Glider Bug *Vehicle Enter on Spawn Fixed (Adjusted m_radius for Zock a little, depends on fps) *Deque class (not tested) *Entity & EntityRef & EntityWrapper (all of them fixed) *Config::DisableEdgeGrabLeftover -> Edge Oscallation experimental fix *BodyHavok Experimental Delta Fix *Silver Psycho Fix(Removed due BodyHavok Fix) *Aqa Mercury API *Cleanup 2 closes issue #96 closes issue #33 *New Code Config::AlwaysResetSpringState *classes have been updated : Object2, CommonObject, *Fixed SoX::AI::StateMachine, new class SoX::AI::State,Player::State::CommonSprintTemplate closes issue #26 *New Codes : AllowSpinDashJump, DisableMachStateLockInput(Blue Gem), AlwaysBlueGem(allow to using blue for states like spindash, kick ...) RTTI API Graphics API
1 parent 3e2ad7c commit f85382a

File tree

156 files changed

+8563
-354
lines changed

Some content is hidden

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

156 files changed

+8563
-354
lines changed

‎MarathonRecomp/api/Marathon.h‎

Lines changed: 71 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"
@@ -36,6 +37,7 @@
3637
#include "Sonicteam/Enemy/EnemyShot.h"
3738
#include "Sonicteam/Enemy/EnemyShotNormal.h"
3839
#include "Sonicteam/Enemy/EnemyShotPoint.h"
40+
#include "Sonicteam/EnemyPsiCommon.h"
3941
#include "Sonicteam/Fixture.h"
4042
#include "Sonicteam/Game.h"
4143
#include "Sonicteam/GameImp.h"
@@ -55,9 +57,11 @@
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"
@@ -76,28 +80,46 @@
7680
#include "Sonicteam/MyCueAdx.h"
7781
#include "Sonicteam/MyCueAttenuate.h"
7882
#include "Sonicteam/MyGraphicsDevice.h"
83+
#include "Sonicteam/MyMaterialCommon.h"
84+
#include "Sonicteam/MyModel.h"
85+
#include "Sonicteam/MyModelStrategy.h"
86+
#include "Sonicteam/MyModelStrategyNN.h"
7987
#include "Sonicteam/MyPhantom.h"
8088
#include "Sonicteam/MyRenderProcess.h"
8189
#include "Sonicteam/MyTexture.h"
8290
#include "Sonicteam/MyTransforms.h"
8391
#include "Sonicteam/NamedActor.h"
8492
#include "Sonicteam/NamedTask.h"
8593
#include "Sonicteam/NoSyncThread.h"
94+
#include "Sonicteam/ObjectAqaMercurySmall.h"
95+
#include "Sonicteam/ObjectPsi.h"
96+
#include "Sonicteam/ObjectPsiContext.h"
8697
#include "Sonicteam/ObjectVehicle.h"
8798
#include "Sonicteam/ObjectVehicleBike.h"
99+
#include "Sonicteam/PathAnimation/Animation.h"
100+
#include "Sonicteam/PathAnimation/Controller.h"
101+
#include "Sonicteam/PathAnimation/Entity.h"
88102
#include "Sonicteam/PauseAdapter.h"
89103
#include "Sonicteam/PauseTask.h"
104+
#include "Sonicteam/Player/AllListener.h"
105+
#include "Sonicteam/Player/Gravity.h"
106+
#include "Sonicteam/Player/GroundListener.h"
90107
#include "Sonicteam/Player/GroundRayListener.h"
91108
#include "Sonicteam/Player/ICollisionListener.h"
92109
#include "Sonicteam/Player/ICollisionListenerTemplate.h"
93110
#include "Sonicteam/Player/IDynamicLink.h"
94111
#include "Sonicteam/Player/IEventerListener.h"
95112
#include "Sonicteam/Player/IExportExternalFlag.h"
96113
#include "Sonicteam/Player/IExportPostureRequestFlag.h"
114+
#include "Sonicteam/Player/IExportVehicleFlag.h"
97115
#include "Sonicteam/Player/IExportWeaponRequestFlag.h"
98116
#include "Sonicteam/Player/IFlagCommunicator.h"
117+
#include "Sonicteam/Player/IForce.h"
99118
#include "Sonicteam/Player/IGauge.h"
119+
#include "Sonicteam/Player/IImportAnimation.h"
120+
#include "Sonicteam/Player/IModel.h"
100121
#include "Sonicteam/Player/INotification.h"
122+
#include "Sonicteam/Player/IPath.h"
101123
#include "Sonicteam/Player/IPlugIn.h"
102124
#include "Sonicteam/Player/IPostureControl.h"
103125
#include "Sonicteam/Player/IPosturePlugIn.h"
@@ -113,14 +135,23 @@
113135
#include "Sonicteam/Player/Input/IListener.h"
114136
#include "Sonicteam/Player/Input/ListenerNormal.h"
115137
#include "Sonicteam/Player/Input/TimedAction.h"
138+
#include "Sonicteam/Player/ModelStandard.h"
139+
#include "Sonicteam/Player/MovableBody.h"
116140
#include "Sonicteam/Player/Object.h"
141+
#include "Sonicteam/Player/PhysicsBodyList.h"
117142
#include "Sonicteam/Player/PostureControl.h"
143+
#include "Sonicteam/Player/PostureEdge.h"
144+
#include "Sonicteam/Player/PostureVehicle.h"
145+
#include "Sonicteam/Player/RealGroundRayListener.h"
118146
#include "Sonicteam/Player/RootFrame.h"
147+
#include "Sonicteam/Player/RotationGravityAxis.h"
119148
#include "Sonicteam/Player/Score.h"
120149
#include "Sonicteam/Player/SonicGauge.h"
121150
#include "Sonicteam/Player/State/CommonContext.h"
122151
#include "Sonicteam/Player/State/CommonFall.h"
152+
#include "Sonicteam/Player/State/CommonGrind.h"
123153
#include "Sonicteam/Player/State/CommonObject.h"
154+
#include "Sonicteam/Player/State/CommonSpringTemplate.h"
124155
#include "Sonicteam/Player/State/ContextSpeedAndJump.h"
125156
#include "Sonicteam/Player/State/ICommonContext.h"
126157
#include "Sonicteam/Player/State/ICommonContextIF.h"
@@ -130,9 +161,12 @@
130161
#include "Sonicteam/Player/State/Object2.h"
131162
#include "Sonicteam/Player/State/SonicContext.h"
132163
#include "Sonicteam/Player/State/SonicObject.h"
164+
#include "Sonicteam/Player/State/SonicState.h"
133165
#include "Sonicteam/Player/State/TailsContext.h"
134166
#include "Sonicteam/Player/State/TailsFlight.h"
135167
#include "Sonicteam/Player/Unit/ITestCase.h"
168+
#include "Sonicteam/Player/WallListener.h"
169+
#include "Sonicteam/Player/WallRayListener.h"
136170
#include "Sonicteam/Player/Weapon/SonicWeapons.h"
137171
#include "Sonicteam/Player/Zock.h"
138172
#include "Sonicteam/PropFixture.h"
@@ -187,12 +221,16 @@
187221
#include "Sonicteam/SaveDataTask.h"
188222
#include "Sonicteam/SaveDataTaskXENON.h"
189223
#include "Sonicteam/SelectWindowTask.h"
224+
#include "Sonicteam/ShotPsiCommon.h"
225+
#include "Sonicteam/SoX/AI/State.h"
190226
#include "Sonicteam/SoX/AI/StateMachine.h"
191227
#include "Sonicteam/SoX/ApplicationXenon.h"
228+
#include "Sonicteam/SoX/Array.h"
192229
#include "Sonicteam/SoX/Audio/Cue.h"
193230
#include "Sonicteam/SoX/Audio/IAudioEngine.h"
194231
#include "Sonicteam/SoX/Audio/Player.h"
195232
#include "Sonicteam/SoX/Audio/PlayerImpl.h"
233+
#include "Sonicteam/SoX/Component — копия.h"
196234
#include "Sonicteam/SoX/Component.h"
197235
#include "Sonicteam/SoX/Engine/Application.h"
198236
#include "Sonicteam/SoX/Engine/Doc.h"
@@ -203,33 +241,57 @@
203241
#include "Sonicteam/SoX/Graphics/Frame.h"
204242
#include "Sonicteam/SoX/Graphics/FrameGP.h"
205243
#include "Sonicteam/SoX/Graphics/FrameObserver.h"
244+
#include "Sonicteam/SoX/Graphics/IndexBuffer.h"
245+
#include "Sonicteam/SoX/Graphics/MaterialCommon.h"
246+
#include "Sonicteam/SoX/Graphics/Model.h"
247+
#include "Sonicteam/SoX/Graphics/ModelCommon.h"
248+
#include "Sonicteam/SoX/Graphics/ModelMgr.h"
249+
#include "Sonicteam/SoX/Graphics/SamplerCommon.h"
250+
#include "Sonicteam/SoX/Graphics/Shader.h"
251+
#include "Sonicteam/SoX/Graphics/ShaderFXL.h"
252+
#include "Sonicteam/SoX/Graphics/ShaderMgr.h"
253+
#include "Sonicteam/SoX/Graphics/ShaderPassFXL.h"
254+
#include "Sonicteam/SoX/Graphics/SyncronizeShaderPass.h"
206255
#include "Sonicteam/SoX/Graphics/Technique.h"
207256
#include "Sonicteam/SoX/Graphics/TechniqueFXL.h"
257+
#include "Sonicteam/SoX/Graphics/Texture.h"
208258
#include "Sonicteam/SoX/Graphics/Transforms.h"
209259
#include "Sonicteam/SoX/Graphics/Vertex.h"
260+
#include "Sonicteam/SoX/Graphics/VertexBuffer.h"
210261
#include "Sonicteam/SoX/Graphics/Xenon/DeviceXenon.h"
262+
#include "Sonicteam/SoX/Graphics/Xenon/IndexBufferXenon.h"
211263
#include "Sonicteam/SoX/Graphics/Xenon/TextureXenon.h"
264+
#include "Sonicteam/SoX/Graphics/Xenon/VertexBufferXenon.h"
212265
#include "Sonicteam/SoX/IResource.h"
213266
#include "Sonicteam/SoX/IResource2.h"
214267
#include "Sonicteam/SoX/IResourceMgr.h"
268+
#include "Sonicteam/SoX/Input/Listener.h"
215269
#include "Sonicteam/SoX/Input/Manager.h"
216270
#include "Sonicteam/SoX/LinkNode.h"
271+
#include "Sonicteam/SoX/Math/Math.h"
217272
#include "Sonicteam/SoX/Math/Matrix.h"
218273
#include "Sonicteam/SoX/Math/Quaternion.h"
219274
#include "Sonicteam/SoX/Math/Vector.h"
275+
#include "Sonicteam/SoX/Math/__vector.h"
220276
#include "Sonicteam/SoX/Message.h"
221277
#include "Sonicteam/SoX/MessageReceiver.h"
222278
#include "Sonicteam/SoX/Object.h"
279+
#include "Sonicteam/SoX/Physics/Body.h"
223280
#include "Sonicteam/SoX/Physics/Entity.h"
281+
#include "Sonicteam/SoX/Physics/EntityRef.h"
224282
#include "Sonicteam/SoX/Physics/Havok/EntityHavok.h"
225283
#include "Sonicteam/SoX/Physics/Havok/EntityHavokImp.h"
226284
#include "Sonicteam/SoX/Physics/Havok/PhantomHavok.h"
285+
#include "Sonicteam/SoX/Physics/Havok/RayCastHavok.h"
286+
#include "Sonicteam/SoX/Physics/Havok/ShapeCastHavok.h"
227287
#include "Sonicteam/SoX/Physics/Havok/WorldHavok.h"
228288
#include "Sonicteam/SoX/Physics/IntersectEvent.h"
229289
#include "Sonicteam/SoX/Physics/IntersectListener.h"
230290
#include "Sonicteam/SoX/Physics/Phantom.h"
231291
#include "Sonicteam/SoX/Physics/PhantomListener.h"
292+
#include "Sonicteam/SoX/Physics/RayCast.h"
232293
#include "Sonicteam/SoX/Physics/Shape.h"
294+
#include "Sonicteam/SoX/Physics/ShapeCast.h"
233295
#include "Sonicteam/SoX/Physics/ShapeCastEvent.h"
234296
#include "Sonicteam/SoX/Physics/ShapeCastListener.h"
235297
#include "Sonicteam/SoX/Physics/World.h"
@@ -263,22 +325,31 @@
263325
#include "hk330/hkArray.h"
264326
#include "hk330/hkReferencedObject.h"
265327
#include "hk330/hkpBroadPhaseHandle.h"
328+
#include "hk330/hkpBvShape.h"
266329
#include "hk330/hkpCdBody.h"
267330
#include "hk330/hkpCollidable.h"
268331
#include "hk330/hkpCollidableCollidableFilter.h"
269332
#include "hk330/hkpCollisionFilter.h"
270333
#include "hk330/hkpEntity.h"
271334
#include "hk330/hkpLinkedCollidable.h"
335+
#include "hk330/hkpMotion.h"
272336
#include "hk330/hkpPhantom.h"
273337
#include "hk330/hkpProperty.h"
274338
#include "hk330/hkpRayCollidableFilter.h"
275339
#include "hk330/hkpRayShapeCollectionFilter.h"
276340
#include "hk330/hkpRigidBody.h"
277341
#include "hk330/hkpShape.h"
278342
#include "hk330/hkpShapeCollectionFilter.h"
343+
#include "hk330/hkpShapeContainer.h"
344+
#include "hk330/hkpShapeSphere.h"
345+
#include "hk330/hkpSingleShapeContainer.h"
279346
#include "hk330/hkpTypedBroadPhaseHandle.h"
280347
#include "hk330/hkpWorld.h"
281348
#include "hk330/hkpWorldObject.h"
349+
#include "stdx/RTTI.h"
350+
#include "stdx/deque.h"
351+
#include "stdx/map.h"
282352
#include "stdx/string.h"
353+
#include "stdx/type_info.h"
283354
#include "stdx/vector.h"
284355
#include "stdx/wstring.h"

‎MarathonRecomp/api/Marathon.inl‎

Lines changed: 11 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;
@@ -138,3 +139,13 @@ inline void printU16(const uint16_t* str, bool endianSwap = false)
138139

139140
printf("\n");
140141
}
142+
143+
struct MARATHON_NULL_CTOR {};
144+
145+
struct MARATHON_STD_MAP_CONST_CHAR_COMPARE
146+
{
147+
bool operator()(xpointer<const char> lhs, xpointer<const char> rhs) const
148+
{
149+
return std::strcmp(lhs.get(), rhs.get()) < 0;
150+
}
151+
};

‎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: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,46 @@
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
{
1115
class DocMarathonImp : public SoX::Engine::Doc
1216
{
1317
public:
14-
MARATHON_INSERT_PADDING(0x40);
15-
stdx::vector<boost::shared_ptr<SoX::Input::Manager>> m_vspInputManager;
18+
MARATHON_INSERT_PADDING(4);
19+
xpointer<MyGraphicsDevice> m_pMyGraphicsDevice;
20+
MARATHON_INSERT_PADDING(0x38);
21+
stdx::vector<boost::shared_ptr<SoX::Input::Manager>> m_vspInputManagers;
1622
MARATHON_INSERT_PADDING(0x24);
1723
bool m_VFrame;
18-
MARATHON_INSERT_PADDING(0x55B58);
24+
MARATHON_INSERT_PADDING(4);
25+
xpointer<void> m_pRenderTargetContainer;
26+
xpointer<void> m_pSFXAgent;
27+
MARATHON_INSERT_PADDING(0x8);
28+
be<float> m_DocSpeed;
29+
be<uint32_t> m_PauseFlags;
30+
MARATHON_INSERT_PADDING(0x8);
31+
xpointer<SoX::LinkedList<SoX::Thread>> m_lnThread;
32+
MARATHON_INSERT_PADDING(0x288);
33+
xpointer<void> m_pParticleManager;
34+
MARATHON_INSERT_PADDING(0x15D0);
35+
xpointer<RaderMapManager> m_pRaderMapManager;
36+
MARATHON_INSERT_PADDING(0x542D0);
1937
be<uint32_t> m_aPadIDs[4];
2038
MARATHON_INSERT_PADDING(0x2C);
2139
};
2240

23-
MARATHON_ASSERT_OFFSETOF(DocMarathonImp, m_vspInputManager, 0x9C);
41+
MARATHON_ASSERT_OFFSETOF(DocMarathonImp, m_DocSpeed, 0xE8);
42+
MARATHON_ASSERT_OFFSETOF(DocMarathonImp, m_PauseFlags, 0xEC);
43+
MARATHON_ASSERT_OFFSETOF(DocMarathonImp, m_vspInputManagers, 0x9C);
2444
MARATHON_ASSERT_OFFSETOF(DocMarathonImp, m_VFrame, 0xD0);
2545
MARATHON_ASSERT_OFFSETOF(DocMarathonImp, m_aPadIDs, 0x55C2C);
2646
MARATHON_ASSERT_SIZEOF(DocMarathonImp, 0x55C68);

‎MarathonRecomp/api/Sonicteam/EnemyPsiCommon.h‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#pragma once
2+
3+
#include <Marathon.inl>
4+
#include <Sonicteam/ObjectPsi.h>
5+
#include <Sonicteam/SoX/Math/Vector.h>
6+
7+
namespace Sonicteam
8+
{
9+
class EnemyPsiCommon : public ObjectPsi
10+
{
11+
public:
12+
xpointer<void> m_pFigure;
13+
be<float> m_Field2C;
14+
SoX::Math::Vector m_Velocity;
15+
SoX::Math::Vector m_Rotation;
16+
};
17+
18+
MARATHON_ASSERT_SIZEOF(EnemyPsiCommon, 0x50);
19+
MARATHON_ASSERT_OFFSETOF(EnemyPsiCommon, m_pFigure, 0x28);
20+
MARATHON_ASSERT_OFFSETOF(EnemyPsiCommon, m_Field2C, 0x2C);
21+
MARATHON_ASSERT_OFFSETOF(EnemyPsiCommon, m_Velocity, 0x30);
22+
MARATHON_ASSERT_OFFSETOF(EnemyPsiCommon, m_Rotation, 0x40);
23+
}

‎MarathonRecomp/api/Sonicteam/KeyframedPath.h‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#pragma once
2+
3+
#include <Marathon.inl>
4+
#include <Sonicteam/PathAnimation/Animation.h>
5+
6+
namespace Sonicteam
7+
{
8+
class KeyframedPath : public PathAnimation::Animation
9+
{
10+
MARATHON_INSERT_PADDING(0x14);
11+
};
12+
13+
MARATHON_ASSERT_SIZEOF(KeyframedPath, 0x1C);
14+
}

0 commit comments

Comments
 (0)