Implemented camera X/Y inversion

MarathonRecomp/CMakeLists.txt

@@ -136,7 +136,8 @@ set(MARATHON_RECOMP_HID_CXX_SOURCES
 
 set(MARATHON_RECOMP_PATCHES_CXX_SOURCES
     "patches/aspect_ratio_patches.cpp"
-    "patches/audio_patches.cpp"
+    "patches/audio_patches.cpp"
+    "patches/camera_patches.cpp"
     "patches/frontend_listener.cpp"
     "patches/misc_patches.cpp"
     "patches/TitleTask_patches.cpp"

MarathonRecomp/api/CSD/Manager/csdmResourceBase.h

@@ -15,7 +15,7 @@ namespace Chao::CSD
         };
 
         xpointer<Vftable> m_pVftable;
-        RCPtr<uint8_t> m_rcResourceHolder;
+        MARATHON_INSERT_PADDING(4);
         xpointer<T> m_pResource;
 
         ~CResourceBase();

MarathonRecomp/api/Marathon.h

@@ -15,7 +15,11 @@
 #include "CSD/Manager/csdmSceneObserver.h"
 #include "CSD/Manager/csdmSubjectBase.h"
 #include "CSD/Platform/csdTexList.h"
+#include "Sonicteam/Actor.h"
 #include "Sonicteam/AppMarathon.h"
+#include "Sonicteam/Camera/CameraMode.h"
+#include "Sonicteam/Camera/Cameraman.h"
+#include "Sonicteam/Camera/SonicCamera.h"
 #include "Sonicteam/DocMarathonImp.h"
 #include "Sonicteam/DocMarathonState.h"
 #include "Sonicteam/SoX/Component.h"

MarathonRecomp/api/Sonicteam/Actor.h

@@ -0,0 +1,9 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Sonicteam/SoX/Engine/Task.h>
+
+namespace Sonicteam
+{
+    class Actor : public SoX::Engine::Task {};
+}

MarathonRecomp/api/Sonicteam/Camera/CameraMode.h

@@ -0,0 +1,13 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Sonicteam/SoX/MessageReceiver.h>
+
+namespace Sonicteam::Camera
+{
+    class CameraMode : public SoX::MessageReceiver
+    {
+    public:
+        MARATHON_INSERT_PADDING(0x24);
+    };
+}

MarathonRecomp/api/Sonicteam/Camera/Cameraman.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <boost/smart_ptr/shared_ptr.h>
+
+namespace Sonicteam::Camera
+{
+    class Cameraman : Actor
+    {
+    public:
+        MARATHON_INSERT_PADDING(0x28);
+        boost::anonymous_shared_ptr m_spMyInputObj;
+        MARATHON_INSERT_PADDING(0x34);
+        be<float> m_FOV;
+        MARATHON_INSERT_PADDING(0x04);
+        boost::anonymous_shared_ptr m_spKynapseControl;
+    };
+}

MarathonRecomp/api/Sonicteam/Camera/SonicCamera.h

@@ -0,0 +1,19 @@
+#pragma once
+
+namespace Sonicteam::Camera
+{
+    class SonicCamera : public CameraMode
+    {
+    public:
+        MARATHON_INSERT_PADDING(0x1C);
+        be<float> m_SpringK;
+        be<float> m_DampingK;
+        MARATHON_INSERT_PADDING(0x08);
+        be<float> m_AzDriveK;
+        be<float> m_AzDampingK;
+        be<float> m_AltDriveK;
+        be<float> m_AltDampingK;
+        MARATHON_INSERT_PADDING(0x3C);
+        be<float> m_FovY;
+    };
+}

MarathonRecomp/api/Sonicteam/SoX/Component.h

@@ -8,6 +8,6 @@ namespace Sonicteam::SoX
     class Component : public Object
     {
     public:
-        MARATHON_INSERT_PADDING(0x20);
+        MARATHON_INSERT_PADDING(0x1C);
     };
 }

MarathonRecomp/api/Sonicteam/SoX/Engine/Doc.h

@@ -7,6 +7,7 @@ namespace Sonicteam::SoX::Engine
     class Doc
     {
     public:
-        MARATHON_INSERT_PADDING(0x5C);
+        xpointer<void> m_pVftable;
+        MARATHON_INSERT_PADDING(0x58);
     };
 }

MarathonRecomp/api/Sonicteam/SoX/Engine/Task.h

@@ -9,6 +9,6 @@ namespace Sonicteam::SoX::Engine
     class Task : public Component, public MessageReceiver
     {
     public:
-        MARATHON_INSERT_PADDING(0x4C);
+        MARATHON_INSERT_PADDING(0x28);
     };
 }

MarathonRecomp/api/Sonicteam/SoX/MessageReceiver.h

@@ -2,5 +2,9 @@
 
 namespace Sonicteam::SoX
 {
-    class MessageReceiver {};
+    class MessageReceiver
+    {
+    public:
+        xpointer<void> m_pVftable;
+    };
 }

MarathonRecomp/api/Sonicteam/SoX/Object.h

@@ -2,5 +2,9 @@
 
 namespace Sonicteam::SoX
 {
-    class Object {};
+    class Object
+    {
+    public:
+        xpointer<void> m_pVftable;
+    };
 }

MarathonRecomp/api/Sonicteam/TitleTask.h

@@ -5,10 +5,10 @@
 
 namespace Sonicteam
 {
-    class TitleTask : public Sonicteam::SoX::Engine::Task
+    class TitleTask : public SoX::Engine::Task
     {
     public:
-        MARATHON_INSERT_PADDING(0x10);
+        MARATHON_INSERT_PADDING(0x30);
         be<uint32_t> m_SelectedIndex;
     };
 }

MarathonRecomp/api/boost/smart_ptr/shared_ptr.h

@@ -2,6 +2,7 @@
 
 #include <cstddef>
 #include <utility>
+#include <Marathon.inl>
 
 namespace boost
 {

MarathonRecomp/app.cpp

@@ -112,7 +112,7 @@ PPC_FUNC(sub_82582648)
 }
 
 #if _DEBUG
-// Sonicteam::SoX::Thread
+// Sonicteam::SoX::Thread::Thread
 PPC_FUNC_IMPL(__imp__sub_825867A8);
 PPC_FUNC(sub_825867A8)
 {

MarathonRecomp/patches/camera_patches.cpp

@@ -0,0 +1,18 @@
+#include <api/Marathon.h>
+#include <user/config.h>
+
+// Load Sonicteam::Camera::SonicCamera parameters
+PPC_FUNC_IMPL(__imp__sub_82192218);
+PPC_FUNC(sub_82192218)
+{
+    auto pSonicCamera = (Sonicteam::Camera::SonicCamera*)g_memory.Translate(ctx.r3.u32);
+
+    __imp__sub_82192218(ctx, base);
+
+    // X axis is inverted by default.
+    if (Config::HorizontalCamera == ECameraRotationMode::Normal)
+        pSonicCamera->m_AzDriveK = -pSonicCamera->m_AzDriveK;
+
+    if (Config::VerticalCamera == ECameraRotationMode::Reverse)
+        pSonicCamera->m_AltDriveK = -pSonicCamera->m_AltDriveK;
+}

MarathonRecomp/user/config_def.h

@@ -10,7 +10,7 @@ CONFIG_DEFINE_LOCALISED("System", bool, AchievementNotifications, true);
 CONFIG_DEFINE_ENUM_LOCALISED("System", ETimeOfDayTransition, TimeOfDayTransition, ETimeOfDayTransition::Xbox);
 CONFIG_DEFINE("System", bool, ShowConsole, false);
 
-CONFIG_DEFINE_ENUM_LOCALISED("Input", ECameraRotationMode, HorizontalCamera, ECameraRotationMode::Normal);
+CONFIG_DEFINE_ENUM_LOCALISED("Input", ECameraRotationMode, HorizontalCamera, ECameraRotationMode::Reverse);
 CONFIG_DEFINE_ENUM_LOCALISED("Input", ECameraRotationMode, VerticalCamera, ECameraRotationMode::Normal);
 CONFIG_DEFINE_LOCALISED("Input", bool, Vibration, true);
 CONFIG_DEFINE_LOCALISED("Input", bool, AllowBackgroundInput, false);