Fix camera jumps during cutscenes and events

Haven't got all camera cutscenes patched yet. But I think its still better then the previous behavior.

Author: Crementif

resources/BreathOfTheWild_BetterVR/patch_FirstPersonMode_Events.asm

@@ -3,6 +3,60 @@ moduleMatches = 0x6267BFD0
 
 .origin = codecave
 
+
+0x02C036E4 = act__getCamera:
+0x030EA2CC = ksys__act__ai__ActionBase__setFinished:
+
+hook_calcCameraDuringEvent_trampoline:
+; at entry r3 = this+0x10 (arg for getCamera), LR = return addr in caller
+mflr r0
+stwu r1, -0x10(r1)
+stw r0, 0x14(r1)
+stw r3, 0x0C(r1)
+
+; c++ hook decides whether to skip the event camera updates based on the current event's settings
+bla import.coreinit.hook_ShouldSkipEventCamera
+
+cmpwi r3, 0
+bne skipEventCamera
+
+; run regular camera update
+lwz r3, 0x0C(r1)
+lis r4, act__getCamera@ha
+addi r4, r4, act__getCamera@l
+mtctr r4
+bctrl
+b done_calcCameraDuringEvent_trampoline
+
+skipEventCamera:
+; mark the action as finished so the game doesn't get stuck waiting for it, and return 0 to skip the camera update
+lwz r3, 0x0C(r1)
+addi r3, r3, -0x10 ; r3 = ActionBase this (getCamera arg was this+0x10)
+lis r4, ksys__act__ai__ActionBase__setFinished@ha
+addi r4, r4, ksys__act__ai__ActionBase__setFinished@l
+mtctr r4
+bctrl
+li r3, 0
+
+done_calcCameraDuringEvent_trampoline:
+lwz r0, 0x14(r1)
+addi r1, r1, 0x10
+mtlr r0
+blr
+
+; patch CameraEventAnim::m_43_calcCameraDuringEvent
+0x02BA3214 = bla hook_calcCameraDuringEvent_trampoline
+; patch CameraEventMovePos::m_43_calcCameraDuringEvent
+0x02BB9D30 = bla hook_calcCameraDuringEvent_trampoline
+; patch CameraEventMovePos::m_42_calcCameraDuringEvent
+0x02BB7034 = bla hook_calcCameraDuringEvent_trampoline
+; patch CameraEventMove::m_43_calcCameraDuringEvent
+0x02BB1F68 = bla hook_calcCameraDuringEvent_trampoline
+
+
+; --------------------------------------------------------------------------------------
+; run a function every frame to check the current event and update settings accordingly
+
 0x1046D3AC = EventMgr__sInstance:
 0x031CA1C0 = EventMgr__getActiveEventName:
 

resources/BreathOfTheWild_BetterVR/patch_Misc.asm

@@ -3,6 +3,9 @@ moduleMatches = 0x6267BFD0
 
 .origin = codecave
 
+; disable sideOffsetBowCus
+;0x02C01A5C = bla import.coreinit.hook_OverwriteCameraParam
+
 ; disable agl::fx::Cloud::drawSunOcc which uses texture readback
 ;0x0340425C = cmpwi r1, 0
 

src/hooking/camera.cpp

@@ -181,14 +181,6 @@ void CemuHooks::hook_UpdateCameraForGameplay(PPCInterpreter_t* hCPU) {
         }
 
 
-        if (auto eventSettings = GetFirstPersonSettingsForActiveEvent()) {
-            if (eventSettings->ignoreCameraRotation) {
-                glm::fquat playerRot = mtx.getRotLE();
-                auto [swing, baseYaw] = swingTwistY(playerRot);
-                s_wsCameraRotation = baseYaw * glm::angleAxis(glm::radians(180.0f), glm::fvec3(0.0f, 1.0f, 0.0f));
-            }
-        }
-
         if (s_isLadderClimbing > 0) {
             s_isLadderClimbing--;
         }
@@ -320,15 +312,6 @@ void CemuHooks::hook_GetRenderCamera(PPCInterpreter_t* hCPU) {
         }
 
         basePos = playerPos;
-        if (auto eventSettings = GetFirstPersonSettingsForActiveEvent()) {
-
-            if (eventSettings->ignoreCameraRotation) {
-                glm::fquat playerRot = playerMtx.getRotLE();
-                auto [swing, yaw] = swingTwistY(playerRot);
-                baseYaw = yaw * glm::angleAxis(glm::radians(180.0f), glm::fvec3(0.0f, 1.0f, 0.0f));
-                baseYawWithoutClimbingFix = yaw * glm::angleAxis(glm::radians(180.0f), glm::fvec3(0.0f, 1.0f, 0.0f));
-            }
-        }
     }
 
     s_lastCameraMtx = glm::fmat4x3(glm::translate(glm::identity<glm::fmat4>(), basePos) * glm::mat4(baseYawWithoutClimbingFix));
@@ -556,15 +539,6 @@ void CemuHooks::hook_ModifyProjectionUsingCamera(PPCInterpreter_t* hCPU) {
             // take link's direction, then rotate the headset position
             BEMatrix34 playerMtx = {};
             readMemory(s_playerMtxAddress, &playerMtx);
-
-            if (auto eventSettings = GetFirstPersonSettingsForActiveEvent()) {
-
-                if (eventSettings->ignoreCameraRotation) {
-                    glm::fquat playerRot = playerMtx.getRotLE();
-                    auto [swing, yaw] = swingTwistY(playerRot);
-                    baseYaw = yaw * glm::angleAxis(glm::radians(180.0f), glm::fvec3(0.0f, 1.0f, 0.0f));
-                }
-            }
         }
 
         // vr camera
@@ -667,13 +641,6 @@ std::pair<glm::vec3, glm::fquat> CemuHooks::CalculateVRWorldPose(const BESeadLoo
         }
 
         basePos = playerPos;
-        if (auto eventSettings = GetFirstPersonSettingsForActiveEvent()) {
-            if (eventSettings->ignoreCameraRotation) {
-                glm::fquat playerRot = playerMtx.getRotLE();
-                auto [swing, yaw] = swingTwistY(playerRot);
-                baseYaw = yaw * glm::angleAxis(glm::radians(180.0f), glm::fvec3(0.0f, 1.0f, 0.0f));
-            }
-        }
     }
 
     // vr camera
@@ -943,6 +910,23 @@ void CemuHooks::hook_GetEventName(PPCInterpreter_t* hCPU) {
     }
 }
 
+void CemuHooks::hook_ShouldSkipEventCamera(PPCInterpreter_t* hCPU) {
+    hCPU->instructionPointer = hCPU->sprNew.LR;
+
+    if (IsFirstPerson()) {
+        // disable camera rotation for first-person events, according to the event settings
+        if (auto eventSettings = GetFirstPersonSettingsForActiveEvent()) {
+            if (eventSettings->ignoreCameraRotation) {
+                hCPU->gpr[3] = 1;
+                return;
+            }
+        }
+    }
+
+    // return 0 to just follow regular camera rotation
+    hCPU->gpr[3] = 0;
+}
+
 struct CameraParamValueOffset {
     std::string name;
     uint32_t offsetInsideCamera;
@@ -996,6 +980,8 @@ void CemuHooks::hook_ReplaceCameraMode(PPCInterpreter_t* hCPU) {
     constexpr uint32_t kCameraAiming2Vtbl = 0X101B2EB4;
     constexpr uint32_t kCameraMagneCatchVtbl = 0x101BAB4C;
 
+    //hCPU->gpr[3] = cameraChaseInstance;
+
     if (hCPU->gpr[5] == kCameraMagneCatchVtbl) {
         if (IsFirstPerson()) {
             //hCPU->gpr[3] = cameraChaseMode;

src/hooking/cemu_hooks.h

@@ -48,6 +48,7 @@ class CemuHooks {
         osLib_registerHLEFunction("coreinit", "hook_UseCameraDistance", &hook_UseCameraDistance);
         osLib_registerHLEFunction("coreinit", "hook_ReplaceCameraMode", &hook_ReplaceCameraMode);
         osLib_registerHLEFunction("coreinit", "hook_GetEventName", &hook_GetEventName);
+        osLib_registerHLEFunction("coreinit", "hook_ShouldSkipEventCamera", &hook_ShouldSkipEventCamera);
         osLib_registerHLEFunction("coreinit", "hook_OverwriteCameraParam", &hook_OverwriteCameraParam);
         osLib_registerHLEFunction("coreinit", "hook_PlayerLadderFix", &hook_PlayerLadderFix);
         osLib_registerHLEFunction("coreinit", "hook_PlayerIsRiding", &hook_PlayerIsRiding);
@@ -253,6 +254,7 @@ class CemuHooks {
     static void hook_UseCameraDistance(PPCInterpreter_t* hCPU);
     static void hook_ReplaceCameraMode(PPCInterpreter_t* hCPU);
     static void hook_GetEventName(PPCInterpreter_t* hCPU);
+    static void hook_ShouldSkipEventCamera(PPCInterpreter_t* hCPU);
     static void hook_OverwriteCameraParam(PPCInterpreter_t* hCPU);
     static void hook_PlayerLadderFix(PPCInterpreter_t* hCPU);
     static void hook_VisualizeRayCastHits(PPCInterpreter_t* hCPU);