Skip to content

Commit c2d35a8

Browse files
ReimousTHReimousTH
committed
More
1 parent 558d777 commit c2d35a8

42 files changed

Lines changed: 539 additions & 106 deletions

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: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,29 +27,30 @@
2727
#include "Sonicteam/DocMarathonState.h"
2828
#include "Sonicteam/GameImp.h"
2929
#include "Sonicteam/GameMode.h"
30-
#include "Sonicteam/MyPhantom.h"
3130
#include "Sonicteam/HUDCALLBACK.h"
3231
#include "Sonicteam/HUDLoading.h"
3332
#include "Sonicteam/ImageFilter.h"
3433
#include "Sonicteam/MovieObject.h"
3534
#include "Sonicteam/MovieObjectWmv.h"
3635
#include "Sonicteam/MovieTask.h"
3736
#include "Sonicteam/MyGraphicsDevice.h"
37+
#include "Sonicteam/MyPhantom.h"
3838
#include "Sonicteam/MyTexture.h"
3939
#include "Sonicteam/Player/IDynamicLink.h"
4040
#include "Sonicteam/Player/IExportPostureRequestFlag.h"
4141
#include "Sonicteam/Player/IExportWeaponRequestFlag.h"
42+
#include "Sonicteam/Player/IExportExternalFlag.h"
4243
#include "Sonicteam/Player/IFlagCommunicator.h"
4344
#include "Sonicteam/Player/IGauge.h"
4445
#include "Sonicteam/Player/IPlugIn.h"
4546
#include "Sonicteam/Player/IScore.h"
4647
#include "Sonicteam/Player/IStepable.h"
4748
#include "Sonicteam/Player/IVariable.h"
4849
#include "Sonicteam/Player/IZock.h"
49-
#include "Sonicteam/Player/Zock.h"
5050
#include "Sonicteam/Player/Object.h"
5151
#include "Sonicteam/Player/Score.h"
5252
#include "Sonicteam/Player/SonicGauge.h"
53+
#include "Sonicteam/Player/RootFrame.h"
5354
#include "Sonicteam/Player/State/CommonContext.h"
5455
#include "Sonicteam/Player/State/CommonFall.h"
5556
#include "Sonicteam/Player/State/CommonObject.h"
@@ -61,6 +62,7 @@
6162
#include "Sonicteam/Player/State/Machine2.h"
6263
#include "Sonicteam/Player/State/Object2.h"
6364
#include "Sonicteam/Player/State/TailsContext.h"
65+
#include "Sonicteam/Player/Zock.h"
6466
#include "Sonicteam/SaveDataTask.h"
6567
#include "Sonicteam/SaveDataTaskXENON.h"
6668
#include "Sonicteam/SelectWindowTask.h"
@@ -70,34 +72,48 @@
7072
#include "Sonicteam/SoX/Engine/Doc.h"
7173
#include "Sonicteam/SoX/Engine/DocMode.h"
7274
#include "Sonicteam/SoX/Engine/Task.h"
73-
#include "Sonicteam/SoX/Input/Manager.h"
75+
#include "Sonicteam/SoX/Graphics/Device.h"
7476
#include "Sonicteam/SoX/Graphics/Technique.h"
7577
#include "Sonicteam/SoX/Graphics/TechniqueFXL.h"
76-
#include "Sonicteam/SoX/Graphics/Device.h"
78+
#include "Sonicteam/SoX/Graphics/Frame.h"
7779
#include "Sonicteam/SoX/Graphics/Xenon/DeviceXenon.h"
7880
#include "Sonicteam/SoX/Graphics/Xenon/TextureXenon.h"
7981
#include "Sonicteam/SoX/IResource.h"
82+
#include "Sonicteam/SoX/Input/Manager.h"
8083
#include "Sonicteam/SoX/Math/Matrix.h"
8184
#include "Sonicteam/SoX/Math/Vector.h"
8285
#include "Sonicteam/SoX/MessageReceiver.h"
8386
#include "Sonicteam/SoX/Object.h"
84-
#include "Sonicteam/SoX/Math/Vector.h"
87+
#include "Sonicteam/SoX/Physics/Entity.h"
8588
#include "Sonicteam/SoX/Physics/Havok/EntityHavok.h"
8689
#include "Sonicteam/SoX/Physics/Havok/EntityHavokImp.h"
8790
#include "Sonicteam/SoX/Physics/Havok/PhantomHavok.h"
88-
#include "Sonicteam/SoX/Physics/World.h"
89-
#include "Sonicteam/SoX/Physics/Entity.h"
91+
#include "Sonicteam/SoX/Physics/Havok/WorldHavok.h"
9092
#include "Sonicteam/SoX/Physics/Phantom.h"
93+
#include "Sonicteam/SoX/Physics/PhantomListener.h"
94+
#include "Sonicteam/SoX/Physics/Shape.h"
95+
#include "Sonicteam/SoX/Physics/World.h"
9196
#include "Sonicteam/SoX/RefCountObject.h"
97+
#include "Sonicteam/SoX/RefSharedPointer.h"
9298
#include "Sonicteam/StdImageFilters/BurnoutBlurFilter.h"
9399
#include "Sonicteam/StdImageFilters/SingleTechniqueFilter.h"
94100
#include "Sonicteam/System/CreateStatic.h"
95101
#include "Sonicteam/System/Singleton.h"
96102
#include "Sonicteam/TitleTask.h"
97103
#include "boost/smart_ptr/make_shared_object.h"
98104
#include "boost/smart_ptr/shared_ptr.h"
99-
#include "Physics/RigidBody.h"
100-
#include "Physics/Entity.h"
101-
#include "Physics/Shape.h"
105+
#include "hk330/hkArray.h"
106+
#include "hk330/hkReferencedObject.h"
107+
#include "hk330/hkpBroadPhaseHandle.h"
108+
#include "hk330/hkpCdBody.h"
109+
#include "hk330/hkpCollidable.h"
110+
#include "hk330/hkpEntity.h"
111+
#include "hk330/hkpLinkedCollidable.h"
112+
#include "hk330/hkpProperty.h"
113+
#include "hk330/hkpRigidBody.h"
114+
#include "hk330/hkpShape.h"
115+
#include "hk330/hkpTypedBroadPhaseHandle.h"
116+
#include "hk330/hkpWorld.h"
117+
#include "hk330/hkpWorldObject.h"
102118
#include "stdx/string.h"
103119
#include "stdx/vector.h"

‎MarathonRecomp/api/Marathon.inl‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,14 @@
1818
#define MARATHON_VIRTUAL_FUNCTION(returnType, virtualIndex, ...) \
1919
GuestToHostFunction<returnType>(*(be<uint32_t>*)(g_memory.Translate(*(be<uint32_t>*)(this) + (4 * virtualIndex))), __VA_ARGS__)
2020

21+
#define MARATHON_DEFINE_VIRTUAL_FUNCTION(returnType, virtualFunc, ...) \
22+
returnType virtualFunc(__VA_ARGS__) \
23+
{ \
24+
return GuestToHostFunction<returnType>(m_pVftable->virtualFunc, this, __VA_ARGS__); \
25+
}
26+
27+
28+
29+
#define MARATHON_VIRTUAL_FUNCTION_ATTRITUBE __attribute__((annotate("__virtual_function__")))
30+
2131
struct marathon_null_ctor {};

‎MarathonRecomp/api/Physics/Entity.h‎

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

‎MarathonRecomp/api/Physics/RigidBody.h‎

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

‎MarathonRecomp/api/Physics/Shape.h‎

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

‎MarathonRecomp/api/Sonicteam/GameImp.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
#include <Marathon.inl>
44
#include <Sonicteam/SoX/Physics/World.h>
5+
#include <Sonicteam/SoX/RefSharedPointer.h>
6+
#include <Sonicteam/SoX/RefCountObject.h>
57

68
namespace Sonicteam
79
{
@@ -52,7 +54,7 @@ namespace Sonicteam
5254
MARATHON_INSERT_PADDING(0x0C);
5355
be<uint32_t> m_Field1180;
5456
MARATHON_INSERT_PADDING(0x838);
55-
xpointer<SoX::Physics::World> m_pPhysicsWorld;
57+
SoX::RefSharedPointer<SoX::Physics::World> m_spPhysicsWorld;
5658
xpointer<void> m_pMyCollisionFilter;
5759

5860
template <typename T>

‎MarathonRecomp/api/Sonicteam/GameImp.inl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ namespace Sonicteam
33
template <typename T>
44
inline T* GameImp::GetPhysicsWorld()
55
{
6-
return (T*)m_pPhysicsWorld.get();
6+
return (T*)m_spPhysicsWorld.get();
77
}
88
}

‎MarathonRecomp/api/Sonicteam/Player/IExportExternalFlag.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 IExportExternalFlag
8+
{
9+
public:
10+
xpointer<void> m_pVftable;
11+
};
12+
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#include <Marathon.inl>
44
#include <Sonicteam/Player/IPlugIn.h>
55

6-
76
namespace Sonicteam::Player
87
{
98
class IZock : public IPlugIn {};

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
#include <boost/smart_ptr/shared_ptr.h>
66
#include <Sonicteam/Player/IPlugIn.h>
77
#include <stdx/vector.h>
8+
#include <Sonicteam/SoX/RefCountObject.h>
9+
#include <Sonicteam/SoX/RefSharedPointer.h>
10+
#include <Sonicteam/Player/RootFrame.h>
811

912
namespace Sonicteam::Player
1013
{
@@ -20,22 +23,22 @@ namespace Sonicteam::Player
2023
bool m_IsPosture;
2124
bool m_IsAmigo;
2225
MARATHON_INSERT_PADDING(0x1);
23-
xpointer<Sonicteam::SoX::RefCountObject> m_RootFrame;
26+
SoX::RefSharedPointer<Sonicteam::Player::RootFrame> m_spRootFrame;
2427
MARATHON_INSERT_PADDING(0x14);
2528
boost::shared_ptr<State::Machine2> m_spStateMachine;
2629
MARATHON_INSERT_PADDING(0x10);
2730
be<uint32_t> m_SetupModuleIndexPrefix;
2831
be<uint32_t> m_SetupModuleIndexPostfix;
2932
boost::shared_ptr<IGauge> m_spGauge;
3033
MARATHON_INSERT_PADDING(0x8);
31-
stdx::vector<boost::shared_ptr<Sonicteam::Player::IPlugIn>> m_PlayerPlugins;
34+
stdx::vector<boost::shared_ptr<Sonicteam::Player::IPlugIn>> m_vspPlayerPlugins;
3235
MARATHON_INSERT_PADDING(0x1F4);
3336

3437
template <typename T>
3538
inline T* GetGauge();
3639

3740
template <typename T = Sonicteam::Player::IPlugIn>
38-
inline T* GetPlugin(const char* PluginName);
41+
inline T* GetPlugin(const char* pluginName);
3942
};
4043
}
4144

0 commit comments

Comments
 (0)