ChainFlips

Author: ReimousTH

MarathonRecomp/api/Marathon.h

@@ -16,6 +16,7 @@
 #include "CSD/Manager/csdmSubjectBase.h"
 #include "CSD/Platform/csdTexList.h"
 #include "Sonicteam/Actor.h"
+#include "Sonicteam/Fixture.h"
 #include "Sonicteam/AlertWindowTask.h"
 #include "Sonicteam/AppMarathon.h"
 #include "Sonicteam/AudioEngineXenon.h"

MarathonRecomp/api/Sonicteam/Fixture.h

@@ -0,0 +1,17 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Sonicteam/Actor.h>
+#include <Sonicteam/SoX/Math/Quaternion.h>
+#include <Sonicteam/SoX/Math/Vector.h>
+
+namespace Sonicteam
+{
+    class Fixture : public Actor
+    {
+    public:
+        Sonicteam::SoX::Math::Quaternion m_Rotation;
+        Sonicteam::SoX::Math::Vector m_Position;
+        MARATHON_INSERT_PADDING(0xF0);
+    };
+}

MarathonRecomp/api/Sonicteam/GameImp.h

@@ -7,6 +7,8 @@
 
 namespace Sonicteam
 {
+    class ActorManager; //gauge patch
+    class GameScript;
     class GameImp : public SoX::MessageReceiver
     {
     public:
@@ -53,7 +55,10 @@ namespace Sonicteam
         bool m_IsStage;
         MARATHON_INSERT_PADDING(0x0C);
         be<uint32_t> m_Field1180;
-        MARATHON_INSERT_PADDING(0x838);
+        xpointer<GameScript> m_pGameScript;
+        be<uint32_t> m_aObjPlayerActorID[0xF];
+        boost::shared_ptr<ActorManager> m_spActorManager;
+        MARATHON_INSERT_PADDING(0x7F0);
         SoX::RefSharedPointer<SoX::Physics::World> m_spPhysicsWorld;
         xpointer<void> m_pMyCollisionFilter;
 

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

@@ -26,5 +26,20 @@ namespace Sonicteam::SoX::Math
         be<float> Y;
         be<float> Z;
         be<float> W;
+        std::string tostring()
+        {
+            return std::format("Vector({}, {}, {}, {})",
+                static_cast<float>(X),
+                static_cast<float>(Y),
+                static_cast<float>(Z),
+                static_cast<float>(W));
+        }
+        float distanceTo(const Vector& other) const
+        {
+            float dx = static_cast<float>(X) - static_cast<float>(other.X);
+            float dy = static_cast<float>(Y) - static_cast<float>(other.Y);
+            float dz = static_cast<float>(Z) - static_cast<float>(other.Z);
+            return std::sqrt(dx * dx + dy * dy + dz * dz);
+        }
     };
 }

MarathonRecomp/api/Sonicteam/SoX/MessageReceiver.h

@@ -2,13 +2,16 @@
 
 namespace Sonicteam::SoX
 {
-    struct Message;
+    struct Message
+    {
+    };
 
     class MessageReceiver
     {
     public:
         struct Vftable
         {
+            be<uint32_t> Destroy;
             be<uint32_t> OnMessageRecieved;
         };
 

MarathonRecomp/patches/player_patches.cpp

@@ -198,66 +198,66 @@ void RestoreChaosBoostJump(PPCRegister& r10, PPCRegister& r11)
     r11.u32 = 2;
 }
 
-bool RestoreChainJumpFlips1(PPCRegister& f3, PPCRegister& r1)
-{
-    if (Config::RestoreChainJumpFlips)
-    {
-        auto base = g_memory.base;
-
-        PPCRegister temp{};
-        temp.u32 = PPC_LOAD_U32(r1.u32 + 0x7C);
-        f3.f64 = double(temp.f32);
-
-        return true;
-    }
-
-    return false;
-}
 
-bool RestoreChainJumpFlips2(PPCRegister& r10, PPCRegister& r11)
+void RestoreChainJumpFlips1(PPCRegister& r_ObjectPlayer, PPCRegister& r_Message,PPCRegister& r_ObjectContext,PPCRegister& f1, PPCRegister& f2, PPCRegister& f3)
 {
-    if (Config::RestoreChainJumpFlips)
+    struct Message0x11047
     {
-        auto base = g_memory.base;
-
-        PPC_STORE_U32(r10.u32 + 0x44, r11.u32);
-
-        return true;
+        be<uint32_t> m_id;
+        Sonicteam::SoX::Math::Quaternion m_rotation;
+        Sonicteam::SoX::Math::Vector m_position;
+        be<uint32_t> m_ActorID;
+    };
+
+    auto pObjectPlayer = ((Sonicteam::Player::Object*)g_memory.Translate(r_ObjectPlayer.u32));
+    auto pMessage = ((Message0x11047*)g_memory.Translate(r_Message.u32));
+    auto pObjectContext = ((Sonicteam::Player::State::ICommonContext*)g_memory.Translate(r_ObjectContext.u32));
+    auto speed_horizontal = f1.f64;
+    auto speed_forward = f2.f64;
+
+    auto Point = pObjectPlayer->m_spRootFrame->m_PositionF0;
+    auto Target = pMessage->m_position;
+    if (pMessage->m_ActorID.get() != -1)
+    {
+        auto pFixture = GuestToHostFunction<Sonicteam::Fixture*>(sub_821609D0,App::s_pApp->m_pDoc->GetDocMode<Sonicteam::GameMode>()->m_pGameImp->m_spActorManager.get(), &pMessage->m_ActorID);
+        struct Message10007:Sonicteam::SoX::Message
+        {
+            be<uint32_t> m_id;
+            Sonicteam::SoX::Math::Quaternion m_Rotation;
+            Sonicteam::SoX::Math::Vector m_Position;
+        };
+        auto sMessage = guest_stack_var<Message10007>();
+        sMessage->m_id = 0x10007; 
+        sMessage->m_Rotation = { 0,0,0,1 };
+        sMessage->m_Position = { 0,0,0,1 };
+        if (pFixture->OnMessageRecieved(sMessage))
+        {
+            Target = sMessage->m_Position;
+        }
     }
-
-    return false;
-}
-
-bool RestoreChainJumpFlips3(PPCRegister& f31, PPCRegister& r11)
-{
-    if (Config::RestoreChainJumpFlips)
+    auto Distance = Point.distanceTo(Target);
+    double combined_speed = std::sqrt(speed_horizontal * speed_horizontal + speed_forward * speed_forward);
+    double time_value = 1.0; // default fallback
+    if (Distance > 0.0 && combined_speed > 0.0)
     {
-        auto base = g_memory.base;
-
-        PPCRegister temp{};
-        temp.f32 = float(f31.f64);
-        PPC_STORE_U32(r11.u32 + 0x44, temp.u32);
-
-        return true;
+        time_value = Distance / combined_speed;
+        /*
+        printf("PlayerPoint : (%s)\n", Point.tostring().c_str());
+        printf("TargetPoint : (%s)\n", Target.tostring().c_str());
+        printf("time_value : %f\n", time_value);
+        printf("distance : %f\n", Distance);
+        printf("c_speed_horizontal : %f\n", speed_horizontal);
+        printf("c_speed_forward : %f\n", speed_forward);
+        */
     }
 
-    return false;
-}
-
-bool RestoreChainJumpFlips4(PPCRegister& f0, PPCRegister& r11)
-{
-    if (Config::RestoreChainJumpFlips)
+    //optional (non fast context)
+    //CommonContext has a slightly different algorithm to process chain flips
+    if (reinterpret_cast<Sonicteam::Player::IPlugIn*>(pObjectContext)->m_pVftable.get() != g_memory.Translate(0x8200A728))
     {
-        auto base = g_memory.base;
-
-        PPCRegister temp{};
-        temp.f32 = float(f0.f64);
-        PPC_STORE_U32(r11.u32 + 0x44, temp.u32);
-
-        return true;
+        time_value *= 0.35;
     }
-
-    return false;
+    f3.f64 = time_value;
 }
 
 bool DisablePushState()

MarathonRecompLib/config/Marathon.toml

@@ -372,27 +372,13 @@ registers = ["r10", "r11"]
 
 [[midasm_hook]]
 name = "RestoreChainJumpFlips1"
-address = 0x82199650
-registers = ["f3", "r1"]
-jump_address_on_true = 0x82199654
+address = 0x82199654
+registers = ["r31","r30","r11","f1", "f2", "f3"]
 
 [[midasm_hook]]
 name = "RestoreChainJumpFlips2"
-address = 0x82209B74
-registers = ["r10", "r11"]
-jump_address_on_true = 0x82209B78
-
-[[midasm_hook]]
-name = "RestoreChainJumpFlips3"
-address = 0x8220C0BC
-registers = ["f31", "r11"]
-jump_address_on_true = 0x8220C0C0
-
-[[midasm_hook]]
-name = "RestoreChainJumpFlips4"
-address = 0x822106BC
-registers = ["f0", "r11"]
-jump_address_on_true = 0x822106C0
+address = 0x82199654
+registers = ["r10","r11","r3"]
 
 [[midasm_hook]]
 name = "DisablePushState"