Skip to content

Commit f9b8eb1

Browse files
hyperbxhyperbx
committed
Clean-up
1 parent 246a528 commit f9b8eb1

38 files changed

Lines changed: 211 additions & 212 deletions

‎MarathonRecomp/api/Marathon.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
#include "Sonicteam/MyPhantom.h"
3838
#include "Sonicteam/MyTexture.h"
3939
#include "Sonicteam/Player/IDynamicLink.h"
40+
#include "Sonicteam/Player/IExportExternalFlag.h"
4041
#include "Sonicteam/Player/IExportPostureRequestFlag.h"
4142
#include "Sonicteam/Player/IExportWeaponRequestFlag.h"
42-
#include "Sonicteam/Player/IExportExternalFlag.h"
4343
#include "Sonicteam/Player/IFlagCommunicator.h"
4444
#include "Sonicteam/Player/IGauge.h"
4545
#include "Sonicteam/Player/IPlugIn.h"
@@ -48,9 +48,9 @@
4848
#include "Sonicteam/Player/IVariable.h"
4949
#include "Sonicteam/Player/IZock.h"
5050
#include "Sonicteam/Player/Object.h"
51+
#include "Sonicteam/Player/RootFrame.h"
5152
#include "Sonicteam/Player/Score.h"
5253
#include "Sonicteam/Player/SonicGauge.h"
53-
#include "Sonicteam/Player/RootFrame.h"
5454
#include "Sonicteam/Player/State/CommonContext.h"
5555
#include "Sonicteam/Player/State/CommonFall.h"
5656
#include "Sonicteam/Player/State/CommonObject.h"
@@ -73,14 +73,15 @@
7373
#include "Sonicteam/SoX/Engine/DocMode.h"
7474
#include "Sonicteam/SoX/Engine/Task.h"
7575
#include "Sonicteam/SoX/Graphics/Device.h"
76+
#include "Sonicteam/SoX/Graphics/Frame.h"
7677
#include "Sonicteam/SoX/Graphics/Technique.h"
7778
#include "Sonicteam/SoX/Graphics/TechniqueFXL.h"
78-
#include "Sonicteam/SoX/Graphics/Frame.h"
7979
#include "Sonicteam/SoX/Graphics/Xenon/DeviceXenon.h"
8080
#include "Sonicteam/SoX/Graphics/Xenon/TextureXenon.h"
8181
#include "Sonicteam/SoX/IResource.h"
8282
#include "Sonicteam/SoX/Input/Manager.h"
8383
#include "Sonicteam/SoX/Math/Matrix.h"
84+
#include "Sonicteam/SoX/Math/Quaternion.h"
8485
#include "Sonicteam/SoX/Math/Vector.h"
8586
#include "Sonicteam/SoX/MessageReceiver.h"
8687
#include "Sonicteam/SoX/Object.h"

‎MarathonRecomp/api/Sonicteam/DocMarathonImp.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace Sonicteam
1212
{
1313
public:
1414
MARATHON_INSERT_PADDING(0x40);
15-
stdx::vector<boost::shared_ptr<Sonicteam::SoX::Input::Manager>> m_vspInputManager;
15+
stdx::vector<boost::shared_ptr<SoX::Input::Manager>> m_vspInputManager;
1616
MARATHON_INSERT_PADDING(0x24);
1717
bool m_VFrame;
1818
MARATHON_INSERT_PADDING(0x55B58);

‎MarathonRecomp/api/Sonicteam/MyPhantom.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,5 @@
55

66
namespace Sonicteam
77
{
8-
class MyPhantom : public SoX::Physics::Havok::PhantomHavok
9-
{
10-
};
8+
class MyPhantom : public SoX::Physics::Havok::PhantomHavok {};
119
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,28 +16,28 @@ namespace Sonicteam::Player
1616
public:
1717
stdx::string m_PlayerLua;
1818
stdx::string m_PlayerPackage;
19-
MARATHON_INSERT_PADDING(0x8);
19+
MARATHON_INSERT_PADDING(8);
2020
be<uint32_t> m_PlayerIndex;
2121
MARATHON_INSERT_PADDING(0x2C);
2222
bool m_IsPlayer;
2323
bool m_IsPosture;
2424
bool m_IsAmigo;
25-
MARATHON_INSERT_PADDING(0x1);
26-
SoX::RefSharedPointer<Sonicteam::Player::RootFrame> m_spRootFrame;
25+
MARATHON_INSERT_PADDING(1);
26+
SoX::RefSharedPointer<RootFrame> m_spRootFrame;
2727
MARATHON_INSERT_PADDING(0x14);
2828
boost::shared_ptr<State::Machine2> m_spStateMachine;
2929
MARATHON_INSERT_PADDING(0x10);
3030
be<uint32_t> m_SetupModuleIndexPrefix;
3131
be<uint32_t> m_SetupModuleIndexPostfix;
3232
boost::shared_ptr<IGauge> m_spGauge;
33-
MARATHON_INSERT_PADDING(0x8);
34-
stdx::vector<boost::shared_ptr<Sonicteam::Player::IPlugIn>> m_vspPlayerPlugins;
33+
MARATHON_INSERT_PADDING(8);
34+
stdx::vector<boost::shared_ptr<IPlugIn>> m_vspPlayerPlugins;
3535
MARATHON_INSERT_PADDING(0x1F4);
3636

3737
template <typename T>
3838
inline T* GetGauge();
3939

40-
template <typename T = Sonicteam::Player::IPlugIn>
40+
template <typename T = IPlugIn>
4141
inline T* GetPlugin(const char* pluginName);
4242
};
4343
}

‎MarathonRecomp/api/Sonicteam/Player/Object.inl‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@ namespace Sonicteam::Player
77
}
88

99
template<typename T>
10-
inline T* Sonicteam::Player::Object::GetPlugin(const char* pluginName)
10+
inline T* Object::GetPlugin(const char* pluginName)
1111
{
12-
for (stdx::vector<boost::shared_ptr<Sonicteam::Player::IPlugIn>>::iterator it = m_vspPlayerPlugins.begin(); it != m_vspPlayerPlugins.end(); it = it + 1)
12+
for (auto it = m_vspPlayerPlugins.begin(); it != m_vspPlayerPlugins.end(); it = it + 1)
1313
{
1414
if (it->get()->m_Name == pluginName)
15-
{
1615
return static_cast<T*>(it->get());
17-
}
1816
}
17+
1918
return nullptr;
2019
}
2120
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ namespace Sonicteam::Player
1111
class RootFrame : public SoX::Graphics::Frame, public IPlugIn
1212
{
1313
public:
14-
SoX::Math::Matrix4x4 m_TransformMatrix0x70; //set/get
15-
SoX::Math::Matrix4x4 m_TransformMatrix0xB0; //get
16-
SoX::Math::Vector m_Position0xF0;
17-
SoX::Math::Vector m_Position0x100;
14+
SoX::Math::Matrix4x4 m_Transform70;
15+
SoX::Math::Matrix4x4 m_TransformB0;
16+
SoX::Math::Vector m_PositionF0;
17+
SoX::Math::Vector m_Position100;
1818
SoX::Math::Vector m_Impulse;
1919
MARATHON_INSERT_PADDING(0x30);
2020
be<uint64_t> m_ExternalFlag;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ namespace Sonicteam::Player
2020
public:
2121
SoX::RefSharedPointer<Sonicteam::SoX::Physics::World> m_spWorld;
2222
SoX::RefSharedPointer<Sonicteam::SoX::Physics::World> m_spRootFrame;
23-
SoX::RefSharedPointer<Sonicteam::MyPhantom> m_pPhantom;
23+
SoX::RefSharedPointer<Sonicteam::MyPhantom> m_spPhantomA;
2424
MARATHON_INSERT_PADDING(0x20);
25-
SoX::RefSharedPointer<Sonicteam::MyPhantom> m_pPhantomB;
25+
SoX::RefSharedPointer<Sonicteam::MyPhantom> m_spPhantomB;
2626
MARATHON_INSERT_PADDING(0x40);
2727
SoX::RefSharedPointer<Sonicteam::SoX::Physics::PhantomListener> m_spPhantomListener;
2828
MARATHON_INSERT_PADDING(0x3C);

‎MarathonRecomp/api/Sonicteam/SoX/Graphics/Frame.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66

77
namespace Sonicteam::SoX::Graphics
88
{
9-
class Frame:SoX::RefCountObject
9+
class Frame : public SoX::RefCountObject
1010
{
1111
public:
12-
MARATHON_INSERT_PADDING(0x18); //SimpleNode
12+
MARATHON_INSERT_PADDING(0x18); // SimpleNode
1313
MARATHON_INSERT_PADDING(0x2C);
14-
1514
};
1615
}

‎MarathonRecomp/api/Sonicteam/SoX/Math/Quaternion.h‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#pragma once
2+
3+
#include <Marathon.inl>
4+
5+
namespace Sonicteam::SoX::Math
6+
{
7+
class alignas(16) Quaternion
8+
{
9+
public:
10+
be<float> X;
11+
be<float> Y;
12+
be<float> Z;
13+
be<float> W;
14+
};
15+
}

‎MarathonRecomp/api/Sonicteam/SoX/Math/Vector.h‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#include "Marathon.inl"
3+
#include <Marathon.inl>
44

55
namespace Sonicteam::SoX::Math
66
{
@@ -27,13 +27,4 @@ namespace Sonicteam::SoX::Math
2727
be<float> Z;
2828
be<float> W;
2929
};
30-
31-
class alignas(16) Vector4
32-
{
33-
public:
34-
be<float> X;
35-
be<float> Y;
36-
be<float> Z;
37-
be<float> W;
38-
};
3930
}

0 commit comments

Comments
 (0)