Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions MarathonRecomp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ set(MARATHON_RECOMP_PATCHES_CXX_SOURCES
"patches/aspect_ratio_patches.cpp"
"patches/audio_patches.cpp"
"patches/camera_patches.cpp"
"patches/fps_patches.cpp"
"patches/frontend_listener.cpp"
"patches/misc_patches.cpp"
"patches/player_patches.cpp"
Expand Down
3 changes: 3 additions & 0 deletions MarathonRecomp/api/Marathon.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@
#include "Sonicteam/SoX/Engine/Task.h"
#include "Sonicteam/SoX/MessageReceiver.h"
#include "Sonicteam/SoX/Object.h"
#include "Sonicteam/SoX/Physics/Havok/WorldHavok.h"
#include "Sonicteam/SoX/Physics/World.h"
#include "Sonicteam/SoX/RefCountObject.h"
#include "Sonicteam/System/CreateStatic.h"
#include "Sonicteam/System/Singleton.h"
#include "Sonicteam/TitleTask.h"
Expand Down
9 changes: 9 additions & 0 deletions MarathonRecomp/api/Sonicteam/GameImp.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

#include <Marathon.inl>
#include <Sonicteam/SoX/Physics/World.h>

namespace Sonicteam
{
Expand Down Expand Up @@ -29,5 +30,13 @@ namespace Sonicteam

MARATHON_INSERT_PADDING(0xE3C);
PlayerData m_PlayerData[4];
MARATHON_INSERT_PADDING(0xA4C);
xpointer<SoX::Physics::World> m_pPhysicsWorld;
xpointer<void> m_pMyCollisionFilter;

template <typename T>
inline T* GetPhysicsWorld();
};
}

#include <Sonicteam/GameImp.inl>
8 changes: 8 additions & 0 deletions MarathonRecomp/api/Sonicteam/GameImp.inl
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
namespace Sonicteam
{
template <typename T>
inline T* GameImp::GetPhysicsWorld()
{
return (T*)m_pPhysicsWorld.get();
}
}
14 changes: 14 additions & 0 deletions MarathonRecomp/api/Sonicteam/SoX/Physics/Havok/WorldHavok.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#pragma once

#include <Marathon.inl>
#include <Sonicteam/SoX/Physics/World.h>

namespace Sonicteam::SoX::Physics::Havok
{
class WorldHavok : public World
{
public:
MARATHON_INSERT_PADDING(0x18);
bool m_IsDynamicUpdateRate;
};
}
9 changes: 9 additions & 0 deletions MarathonRecomp/api/Sonicteam/SoX/Physics/World.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#pragma once

#include <Marathon.inl>
#include <Sonicteam/SoX/RefCountObject.h>

namespace Sonicteam::SoX::Physics
{
class World : public RefCountObject {};
}
11 changes: 11 additions & 0 deletions MarathonRecomp/api/Sonicteam/SoX/RefCountObject.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#pragma once

namespace Sonicteam::SoX
{
class RefCountObject
{
public:
xpointer<void> m_pVftable;
be<uint32_t> m_ReferenceCount;
};
}
14 changes: 14 additions & 0 deletions MarathonRecomp/patches/fps_patches.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#include <api/Marathon.h>
#include <user/config.h>

// Sonicteam::SoX::Physics::Havok::WorldHavok::Update
PPC_FUNC_IMPL(__imp__sub_82587AA8);
PPC_FUNC(sub_82587AA8)
{
auto pPhysicsWorld = (Sonicteam::SoX::Physics::Havok::WorldHavok*)(base + ctx.r3.u32);

// Use dynamic update rate if the FPS exceeds the fixed rate.
pPhysicsWorld->m_IsDynamicUpdateRate = Config::FPS > 120;

__imp__sub_82587AA8(ctx, base);
}
Loading