Fix aim for magnesis, stasis, cryonis runes

Author: Crementif

resources/BreathOfTheWild_BetterVR/patch_CTRL_FixScreenChecks.asm

@@ -0,0 +1,46 @@
+[BetterVR_StereoRendering_ScreenChecks_V208]
+moduleMatches = 0x6267BFD0
+
+.origin = codecave
+
+; disable agl::fx::Cloud::drawSunOcc which uses texture readback
+;0x0340425C = cmpwi r1, 0
+
+; disable peekTexture_checksQueuedRegions to narrow down interesting readback function
+;0x030F1B78 = nop
+
+; hook GX2SetPixelUniformBlock to hook the right pixels
+hook_GX2SetPixelUniformBlock:
+mflr r0
+stwu r1, -0x20(r1)
+stw r0, 0x24(r1)
+stw r3, 0x1C(r1)
+stw r4, 0x18(r1)
+stw r5, 0x14(r1)
+stw r6, 0x10(r1)
+stw r7, 0x0C(r1)
+
+; check size of uniform block being set
+; r3 is uniform block handle
+; r4 is the size of the uniform block data in bytes
+; r5 is the pointer to the uniform block data to be set
+cmpwi r4, 0x20
+bne skipHook_GX2SetPixelUniformBlock
+
+; modify values in the uniform block data to be set
+bla import.coreinit.hook_ModifyPixelUniformBlockData
+
+skipHook_GX2SetPixelUniformBlock:
+bla import.gx2.GX2SetPixelUniformBlock
+
+lwz r7, 0x0C(r1)
+lwz r6, 0x10(r1)
+lwz r5, 0x14(r1)
+lwz r4, 0x18(r1)
+;lwz r3, 0x1C(r1) ; r3 should be the return value of GX2SetPixelUniformBlock
+lwz r0, 0x24(r1)
+addi r1, r1, 0x20
+mtlr r0
+blr
+
+0x038B2B2C = bla hook_GX2SetPixelUniformBlock

src/hooking/camera.cpp

@@ -741,6 +741,28 @@ void CemuHooks::hook_CheckIfCameraCanSeePos(PPCInterpreter_t* hCPU) {
     hCPU->gpr[3] = visible ? 1 : 0;
 }
 
+
+
+void CemuHooks::hook_ModifyPixelUniformBlockData(PPCInterpreter_t* hCPU) {
+    hCPU->instructionPointer = hCPU->sprNew.LR;
+
+    auto currFovOpt = VRManager::instance().XR->GetRenderer()->GetFOV(EyeSide::RIGHT);
+    if (!currFovOpt.has_value()) {
+        return;
+    }
+
+    glm::fvec4 ubData = {};
+    readMemory(hCPU->gpr[5], &ubData);
+    
+    XrFovf currFOV = currFovOpt.value();
+    auto newProjection = calculateFOVAndOffset(currFOV);
+
+    ubData.x = 0.5f+newProjection.offsetX.getLE();
+    ubData.y = 0.5f+newProjection.offsetY.getLE();
+
+    writeMemory(hCPU->gpr[5], &ubData);
+}
+
 void CemuHooks::hook_EndCameraSide(PPCInterpreter_t* hCPU) {
     hCPU->instructionPointer = hCPU->sprNew.LR;
 

src/hooking/cemu_hooks.h

@@ -2,7 +2,6 @@
 #include "entity_debugger.h"
 #include "utils/mod_settings.h"
 
-
 class CemuHooks {
 public:
     CemuHooks() {
@@ -49,6 +48,7 @@ class CemuHooks {
         osLib_registerHLEFunction("coreinit", "hook_PlayerIsRidingSandSeal", &hook_PlayerIsRidingSandSeal);
         osLib_registerHLEFunction("coreinit", "hook_FixStaminaGaugeScreenPosition", &hook_FixStaminaGaugeScreenPosition);
         osLib_registerHLEFunction("coreinit", "hook_FixExtraStaminaGaugeIconPositions", &hook_FixExtraStaminaGaugeIconPositions);
+        osLib_registerHLEFunction("coreinit", "hook_ModifyPixelUniformBlockData", &hook_ModifyPixelUniformBlockData);
 
         // First-Person Model Hooks
         osLib_registerHLEFunction("coreinit", "hook_SetActorOpacity", &hook_SetActorOpacity);
@@ -245,6 +245,7 @@ class CemuHooks {
     static void hook_FixLadder(PPCInterpreter_t* hCPU);
     static void hook_PlayerIsRiding(PPCInterpreter_t* hCPU);
     static void hook_PlayerIsRidingSandSeal(PPCInterpreter_t* hCPU);
+    static void hook_ModifyPixelUniformBlockData(PPCInterpreter_t* hCPU);
 
     // First-Person Model Hooks
     static void hook_SetActorOpacity(PPCInterpreter_t* hCPU);

src/utils/logger.h

@@ -100,6 +100,13 @@ struct std::formatter<glm::fvec3> : std::formatter<string> {
     }
 };
 
+template <>
+struct std::formatter<glm::fvec4> : std::formatter<string> {
+    auto format(const glm::fvec4& vec, std::format_context& ctx) const {
+        return std::format_to(ctx.out(), "{}", glm::to_string(vec));
+    }
+};
+
 template <>
 struct std::formatter<glm::fquat> : std::formatter<string> {
     auto format(const glm::fquat& quat, std::format_context& ctx) const {