Skip to content

Commit 8b0af47

Browse files
ReimousTHReimousTH
committed
Rebase #1 
1 parent 4c9a90e commit 8b0af47

17 files changed

Lines changed: 257 additions & 45 deletions

‎MarathonRecomp/api/Marathon.h‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include "CSD/Manager/csdmSubjectBase.h"
1717
#include "CSD/Platform/csdTexList.h"
1818
#include "Sonicteam/Actor.h"
19+
#include "Sonicteam/ActorManager.h"
1920
#include "Sonicteam/AlertWindowTask.h"
2021
#include "Sonicteam/AppMarathon.h"
2122
#include "Sonicteam/AudioEngineXenon.h"
@@ -36,6 +37,7 @@
3637
#include "Sonicteam/MyGraphicsDevice.h"
3738
#include "Sonicteam/MyPhantom.h"
3839
#include "Sonicteam/MyTexture.h"
40+
#include "Sonicteam/Player/GroundRayListener.h"
3941
#include "Sonicteam/Player/IDynamicLink.h"
4042
#include "Sonicteam/Player/IExportExternalFlag.h"
4143
#include "Sonicteam/Player/IExportPostureRequestFlag.h"
@@ -44,11 +46,19 @@
4446
#include "Sonicteam/Player/IGauge.h"
4547
#include "Sonicteam/Player/INotification.h"
4648
#include "Sonicteam/Player/IPlugIn.h"
49+
#include "Sonicteam/Player/IPostureControl.h"
50+
#include "Sonicteam/Player/IPosturePlugIn.h"
51+
#include "Sonicteam/Player/IPostureSupportEdge.h"
52+
#include "Sonicteam/Player/IPostureSupportInput.h"
53+
#include "Sonicteam/Player/IPostureSupportOttoto.h"
54+
#include "Sonicteam/Player/IPostureSupportRayTemplate.h"
55+
#include "Sonicteam/Player/IPostureSupportSphere.h"
4756
#include "Sonicteam/Player/IScore.h"
4857
#include "Sonicteam/Player/IStepable.h"
4958
#include "Sonicteam/Player/IVariable.h"
5059
#include "Sonicteam/Player/IZock.h"
5160
#include "Sonicteam/Player/Object.h"
61+
#include "Sonicteam/Player/PostureControl.h"
5262
#include "Sonicteam/Player/RootFrame.h"
5363
#include "Sonicteam/Player/Score.h"
5464
#include "Sonicteam/Player/SonicGauge.h"
@@ -66,6 +76,7 @@
6676
#include "Sonicteam/Player/State/SonicObject.h"
6777
#include "Sonicteam/Player/State/SonicSpinDash.h"
6878
#include "Sonicteam/Player/State/TailsContext.h"
79+
#include "Sonicteam/Player/Unit/ITestCase.h"
6980
#include "Sonicteam/Player/Weapon/SonicWeapons.h"
7081
#include "Sonicteam/Player/Zock.h"
7182
#include "Sonicteam/SaveDataTask.h"

‎MarathonRecomp/api/Sonicteam/ActorManager.h‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#pragma once
2+
3+
#include <Marathon.inl>
4+
#include <Sonicteam/Actor.h>
5+
6+
namespace Sonicteam
7+
{
8+
class ActorManager
9+
{
10+
public:
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;
15+
};
16+
}

‎MarathonRecomp/api/Sonicteam/Player/GroundRayListener.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+
5+
namespace Sonicteam::Player
6+
{
7+
//Sonicteam::Player::ICollisionListener, Sonicteam::Player::ICollisionListenerTemplate<Sonicteam::SoX::Physics::IntersectListener,Sonicteam::SoX::Physics::IntersectEvent>
8+
class GroundRayListener
9+
{
10+
public:
11+
xpointer<void> m_pVftable;
12+
MARATHON_INSERT_PADDING(0x7C);
13+
};
14+
}

‎MarathonRecomp/api/Sonicteam/Player/IPostureControl.h‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
#pragma once
2+
3+
#include <Marathon.inl>
4+
#include <Sonicteam/Player/IFlagCommunicator.h>
5+
#include <Sonicteam/Player/State/ICommonContextIF.h>
6+
#include <Sonicteam/Player/IDynamicLink.h>
7+
#include <Sonicteam/Player/IVariable.h>
8+
#include <Sonicteam/Player/IPosturePlugIn.h>
9+
#include <Sonicteam/Player/Unit/ITestCase.h>
10+
#include <Sonicteam/SoX/RefCountObject.h>
11+
#include <Sonicteam/SoX/RefSharedPointer.h>
12+
#include <Sonicteam/SoX/Math/Vector.h>
13+
#include <Sonicteam/SoX/Engine/Task.h>
14+
#include <Sonicteam/SoX/Math/Quaternion.h>
15+
#include <Sonicteam/SoX/Physics/World.h>
16+
#include <boost/smart_ptr/shared_ptr.h>
17+
#include <Sonicteam/ActorManager.h>
18+
19+
20+
namespace Sonicteam::Player
21+
{
22+
class IPostureControl : public IVariable, public IDynamicLink, public Unit::ITestCase, public IFlagCommunicator
23+
{
24+
public:
25+
SoX::RefSharedPointer<SoX::RefCountObject> m_spRootFrame;
26+
SoX::Math::Quaternion m_RotationFixed;
27+
SoX::Math::Vector m_PositionFixed;
28+
SoX::RefSharedPointer<SoX::Physics::World> m_spWorld;
29+
boost::shared_ptr<void> m_spGravity;
30+
boost::shared_ptr<void> m_spInputListener;
31+
boost::shared_ptr<void> m_spAmigoListener;
32+
boost::shared_ptr<State::ICommonContextIF> m_ContextIF;
33+
boost::shared_ptr<ActorManager> m_spActorManager;
34+
xpointer<SoX::Engine::Task> m_pTask;
35+
boost::shared_ptr<IPosturePlugIn> m_spPosturePlugIn;
36+
SoX::Math::Vector m_GravityDirection;
37+
be<float> m_GravityForce;
38+
SoX::Math::Vector m_NormalizedSurface; //ground normal?
39+
SoX::Math::Vector m_Position;
40+
SoX::Math::Quaternion m_Rotation;
41+
MARATHON_INSERT_PADDING(0x20);
42+
be<uint32_t> m_PostureFlag;
43+
be<float> m_ImpulseForward;
44+
be<float> m_ImpulseVertical;
45+
SoX::Math::Vector m_ImpulseUP;
46+
be<uint32_t> m_ContextIFFlag;
47+
be<uint32_t> m_PostureRequestFlag;
48+
be<uint32_t> m_PostureFlag118;
49+
be<uint32_t> m_PostureFlag11C;
50+
};
51+
}

‎MarathonRecomp/api/Sonicteam/Player/IPosturePlugIn.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#pragma once
2+
3+
#include <Marathon.inl>
4+
5+
namespace Sonicteam::Player
6+
{
7+
class IPosturePlugIn
8+
{
9+
public:
10+
xpointer<void> m_pVftable;
11+
};
12+
}

‎MarathonRecomp/api/Sonicteam/Player/IPostureSupportEdge.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+
5+
namespace Sonicteam::Player
6+
{
7+
class IPostureSupportEdge
8+
{
9+
public:
10+
xpointer<void> m_pVftable;
11+
MARATHON_INSERT_PADDING(0x70 - 4);
12+
};
13+
}

‎MarathonRecomp/api/Sonicteam/Player/IPostureSupportInput.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+
5+
namespace Sonicteam::Player
6+
{
7+
class IPostureSupportInput
8+
{
9+
public:
10+
xpointer<void> m_pVftable;
11+
MARATHON_INSERT_PADDING(0x30 - 4);
12+
};
13+
}

‎MarathonRecomp/api/Sonicteam/Player/IPostureSupportOttoto.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+
5+
namespace Sonicteam::Player
6+
{
7+
class IPostureSupportOttoto
8+
{
9+
public:
10+
xpointer<void> m_pVftable;
11+
MARATHON_INSERT_PADDING(0x70 - 4);
12+
};
13+
}

‎MarathonRecomp/api/Sonicteam/Player/IPostureSupportRayTemplate.h‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#pragma once
2+
3+
#include <Marathon.inl>
4+
#include <Sonicteam/SoX/Physics/World.h>
5+
#include <Sonicteam/SoX/RefCountObject.h>
6+
#include <Sonicteam/SoX/RefSharedPointer.h>
7+
#include <Sonicteam/Player/RootFrame.h>
8+
9+
10+
namespace Sonicteam::Player
11+
{
12+
template <typename TCollisionListener>
13+
class IPostureSupportRayTemplate
14+
{
15+
public:
16+
xpointer<void> m_pVftable;
17+
SoX::RefSharedPointer<SoX::Physics::World> m_spWorld;
18+
boost::shared_ptr<TCollisionListener> m_spCollisionListener;
19+
xpointer<Player::RootFrame> m_pRootFrame;
20+
};
21+
}

‎MarathonRecomp/api/Sonicteam/Player/IPostureSupportSphere.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+
5+
namespace Sonicteam::Player
6+
{
7+
class IPostureSupportSphere
8+
{
9+
public:
10+
xpointer<void> m_pVftable;
11+
MARATHON_INSERT_PADDING(0xD0 - 4);
12+
};
13+
}

0 commit comments

Comments
 (0)