Fix stamina wheel being invisible in first-person

Author: Crementif

README.md

@@ -34,14 +34,13 @@ While more integrated solutions are being found out, there's probably ways to se
 
 ### Current Limitations & Known Issues
 
-- Stamina wheel is difficult to see after any sorts of camera rotation.
 - There's a very small chance that the screen stays black after exiting any menus, which requires restarting the game to continue.
 - Bow Aiming is done via a crosshair on the VR headset. Bow support might be added at some point.
-- No roomscale support. You can freely move around your room, but enemies and physics will use your center point. 
+- No roomscale support. You can freely move around your room, but enemies and physics will use your center point.
 - Magnesis & Stasis aim is off-center at far distances. Point your gaze to the **right** of the object to highlight it.
 - Climbing ladders require jumping up the ladder to go up and you have to look at the ladder.
 - You can get stuck behind ladders sometimes, especially when you stop moving at the very top of the ladder while climbing down. So keep moving at the start!
-- Bombs, barrels etc. are thrown at a weird angle. 
+- Bombs, barrels etc. are thrown at a weird angle.
 - It'll lack some comfort options for now, like a left-handed mode or snap turning. These will be added later.
 
 ### Mod Installation

include/game_structs.h

@@ -534,6 +534,25 @@ struct BESeadLookAtCamera : BESeadCamera {
 static_assert(sizeof(BESeadCamera) == 0x34, "BESeadCamera size mismatch");
 static_assert(sizeof(BESeadLookAtCamera) == 0x58, "BESeadLookAtCamera size mismatch");
 
+
+struct UIManagerInnerArray {
+    PADDED_BYTES(0x00, 0x34);
+    BEVec3 uiPos1;
+    BEVec3 uiPos2;
+    PADDED_BYTES(0x50, 0x40668-0x04);
+};
+struct UIManager {
+    PADDED_BYTES(0x00, 0x1C);
+    UIManagerInnerArray innerArray;
+    PADDED_BYTES(0x40688, 0x40DD0-0x04);
+};
+
+static_assert(offsetof(UIManager, innerArray) == 0x20, "UIManager.innerArray offset mismatch");
+static_assert(offsetof(UIManager, innerArray.uiPos1) == 0x58, "UIManagerInnerArray.uiPos1 offset mismatch");
+static_assert(offsetof(UIManager, innerArray.uiPos2) == 0x64, "UIManagerInnerArray.uiPos1 offset mismatch");
+static_assert(sizeof(UIManagerInnerArray) == 0x40668, "UIManagerInnerArray size mismatch");
+static_assert(sizeof(UIManager) == 0x40DD0, "UIManager size mismatch");
+
 // not identical memory layout wise
 struct Frustum {
     glm::vec4 planes[6];

include/pch.h

@@ -315,6 +315,10 @@ struct BEVec2 : BETypeCompatible {
     BEVec2() = default;
     BEVec2(float x, float y): x(x), y(y) {}
     BEVec2(BEType<float> x, BEType<float> y): x(x), y(y) {}
+
+    glm::fvec2 getLE() const {
+        return { x.getLE(), y.getLE() };
+    }
 };
 
 struct BEVec3 : BETypeCompatible {

resources/BreathOfTheWild_BetterVR/patch_RND_StereoRendering.asm

@@ -1106,4 +1106,60 @@ blr
 0x02C43450 = bla custom_ModifyProjectionUsingCamera
 
 ;0x0318FE7C = ba custom_ModifyProjectionUsingCamera
-;0x0318FEFC = ba import.coreinit.hook_ModifyProjectionUsingCamera
+;0x0318FEFC = ba import.coreinit.hook_ModifyProjectionUsingCamera
+
+
+; =================================================================================
+
+
+
+hook_updateUIPosition:
+lis r10, currentEyeSide@ha
+lwz r10, currentEyeSide@l(r10)
+lis r11, currentFrameCounter@ha
+lwz r11, currentFrameCounter@l(r11)
+; r12 holds uiManager instance
+ba import.coreinit.hook_UpdateUIPosition
+blr
+
+;0x03078ACC = ba hook_updateUIPosition
+
+;0x03060CD0 = blr
+;0x03A3BCC8 = blr
+
+
+; =================================================================================
+
+0x02FB2468 = orig_StaminaGaugeScreenPositionFn:
+
+hook_fixStaminaGaugeToScreenPosition:
+mflr r0
+stwu r1, -0x20(r1)
+stw r0, 0x24(r1)
+stw r3, 0x1C(r1)
+stw r4, 0x18(r1)
+stw r5, 0x14(r1)
+
+lis r3, orig_StaminaGaugeScreenPositionFn@ha
+addi r3, r3, orig_StaminaGaugeScreenPositionFn@l
+mtctr r3
+lwz r3, 0x1C(r1)
+bctrl ; call original function to get the original screen position
+
+lwz r4, 0x18(r1) ; r4 is a pointer to the 2D screen position that we need to overwrite
+lwz r5, 0x14(r1) ; r5 is a pointer to the world position
+bla import.coreinit.hook_FixStaminaGaugeScreenPosition
+
+lwz r5, 0x14(r1)
+lwz r4, 0x18(r1)
+lwz r3, 0x1C(r1)
+lwz r0, 0x24(r1)
+addi r1, r1, 0x20
+mtlr r0
+blr
+
+; replace the player pos to screen position with static screen coords
+0x02FB2608 = bla hook_fixStaminaGaugeToScreenPosition
+
+; force extra stamina gauge icons to just stay in place instead of dynamically hanging onto the regular stamina wheel once it appears
+0x02FB2760 = bla import.coreinit.hook_FixExtraStaminaGaugeIconPositions

src/hooking/camera.cpp

@@ -193,6 +193,65 @@ void CemuHooks::hook_UpdateCameraForGameplay(PPCInterpreter_t* hCPU) {
     s_framesSinceLastCameraUpdate = 0;
 }
 
+// turns out this only does the minimap ui, and not the stamina UI :/
+//void CemuHooks::hook_UpdateUIPosition(PPCInterpreter_t* hCPU) {
+//    hCPU->instructionPointer = hCPU->sprNew.LR;
+//
+//    EyeSide side = hCPU->gpr[10] == 0 ? EyeSide::LEFT : EyeSide::RIGHT;
+//    uint32_t currFrameCounter = hCPU->gpr[11];
+//    uint32_t doesUIManagerExist = hCPU->gpr[3] != 0;
+//    uint32_t uiManagerInstance = hCPU->gpr[12];
+//
+//    if (!doesUIManagerExist) {
+//        return;
+//    }
+//
+//    BEVec3 playerPosCopy = getMemory<BEVec3>(uiManagerInstance + offsetof(UIManager, innerArray.uiPos1));
+//    BEVec3 playerMtxPositionCopy = getMemory<BEVec3>(uiManagerInstance + offsetof(UIManager, innerArray.uiPos2));
+//
+//    Log::print<INFO>("[{}] Updating UI position (frame = {}, playerPos = {}, playerMtxPos = {})", side, currFrameCounter, playerPosCopy, playerMtxPositionCopy);
+//
+//    writeMemory(uiManagerInstance + offsetof(UIManager, innerArray.uiPos1), &playerPosCopy);
+//    writeMemory(uiManagerInstance + offsetof(UIManager, innerArray.uiPos2), &playerMtxPositionCopy);
+//}
+
+void CemuHooks::hook_FixStaminaGaugeScreenPosition(PPCInterpreter_t* hCPU) {
+    hCPU->instructionPointer = hCPU->sprNew.LR;
+
+    if (IsThirdPerson()) {
+        return;
+    }
+
+    BEVec2 staminaGauge2DPos;
+    readMemory(hCPU->gpr[4], &staminaGauge2DPos);
+    BEVec3 playerPosToCameraPos;
+    readMemory(hCPU->gpr[5], &playerPosToCameraPos);
+
+    Log::print<PPC>("Fixing stamina gauge position (oldPos = {}, playerPosToCameraPos = {})", staminaGauge2DPos.getLE(), playerPosToCameraPos);
+
+    staminaGauge2DPos = BEVec2{ -482.0f, +170.0f }; // nested under hearts
+    //staminaGauge2DPos = BEVec2{ 380.0f, 300.0f }; // above the status bars but at the top of the screen
+    //staminaGauge2DPos = BEVec2{ -220.0f, 300.0f }; // above the status bars but at the top of the screen
+    playerPosToCameraPos = BEVec3{ 0.0f, 0.0, 0.0f };
+
+    writeMemory(hCPU->gpr[4], &staminaGauge2DPos);
+    writeMemory(hCPU->gpr[5], &playerPosToCameraPos);
+}
+
+void CemuHooks::hook_FixExtraStaminaGaugeIconPositions(PPCInterpreter_t* hCPU) {
+    hCPU->instructionPointer = hCPU->sprNew.LR;
+
+    // original instruction that got replaced
+    hCPU->fpr[29].fp0 = 1.0f;
+
+    if (IsThirdPerson()) {
+        return;
+    }
+
+    // manually jump
+    hCPU->instructionPointer = 0x02FB29C4;
+}
+
 glm::mat4 CemuHooks::s_lastCameraMtx = glm::mat4(1.0f);
 
 void CemuHooks::hook_GetRenderCamera(PPCInterpreter_t* hCPU) {

src/hooking/cemu_hooks.h

@@ -46,6 +46,8 @@ class CemuHooks {
         osLib_registerHLEFunction("coreinit", "hook_PlayerLadderFix", &hook_PlayerLadderFix);
         osLib_registerHLEFunction("coreinit", "hook_PlayerIsRiding", &hook_PlayerIsRiding);
         osLib_registerHLEFunction("coreinit", "hook_PlayerIsRidingSandSeal", &hook_PlayerIsRidingSandSeal);
+        osLib_registerHLEFunction("coreinit", "hook_FixStaminaGaugeScreenPosition", &hook_FixStaminaGaugeScreenPosition);
+        osLib_registerHLEFunction("coreinit", "hook_FixExtraStaminaGaugeIconPositions", &hook_FixExtraStaminaGaugeIconPositions);
 
         // First-Person Model Hooks
         osLib_registerHLEFunction("coreinit", "hook_SetActorOpacity", &hook_SetActorOpacity);
@@ -246,6 +248,8 @@ class CemuHooks {
     static void hook_CalculateModelOpacity(PPCInterpreter_t* hCPU);
     static void hook_ModifyBoneMatrix(PPCInterpreter_t* hCPU);
     static void hook_ChangeWeaponMtx(PPCInterpreter_t* hCPU);
+    static void hook_FixStaminaGaugeScreenPosition(PPCInterpreter_t* hCPU);
+    static void hook_FixExtraStaminaGaugeIconPositions(PPCInterpreter_t* hCPU);
 
     // First-Person Weapon Hooks
     static void hook_EquipWeapon(PPCInterpreter_t* hCPU);