Improve mod settings to allow bool to be used in if checks & more

And more cleanup!

Author: Crementif

resources/BreathOfTheWild_BetterVR/patch_RND_Find3DFrameBuffer.asm

@@ -194,6 +194,7 @@ lwz r3, 0x86C(r3)
 li r4, 1
 stb r4, 0x318(r3)
 
+; also uses r0 which contains the LR register to decide if this is the camera or a save game snapshot
 lis r4, currentFrameCounter@ha
 lwz r4, currentFrameCounter@l(r4)
 lis r5, currentEyeSide@ha

src/hooking/framebuffer.cpp

@@ -45,11 +45,12 @@ void VkDeviceOverrides::DestroyImage(const vkroots::VkDeviceDispatch& pDispatch,
 void CemuHooks::hook_FixCameraSaveFilesAndInventory(PPCInterpreter_t* hCPU) {
     hCPU->instructionPointer = hCPU->sprNew.LR;
 
+    uint32_t originCaller = hCPU->gpr[0];
     uint32_t isEnabling3DFramebufferCapture = hCPU->gpr[3];
     EyeSide side = (EyeSide)hCPU->gpr[4];
     uint32_t frameIdx = hCPU->gpr[5];
 
-    Log::print<PPC>("hook_FixCameraSaveFilesAndInventory: isEnabling3DFramebufferCapture={}, side={}, frameIdx={}", isEnabling3DFramebufferCapture, side, frameIdx);
+    Log::print<PPC>("[{:08X}] hook_FixCameraSaveFilesAndInventory: isEnabling3DFramebufferCapture={:08X}, side={}, frameIdx={}", originCaller, isEnabling3DFramebufferCapture, side, frameIdx);
     VRManager::instance().XR->GetRenderer()->SignalGameCapturing3DFrameBuffer();
 }
 

src/rendering/renderer.cpp

@@ -453,7 +453,7 @@ std::vector<XrCompositionLayerQuad> RND_Renderer::Layer2D::FinishRendering(XrTim
     glm::vec3 headPosition = (ToGLM(leftPose.position) + ToGLM(rightPose.position)) * 0.5f;
     glm::quat headOrientation = glm::slerp(ToGLM(leftPose.orientation), ToGLM(rightPose.orientation), 0.5f);
 
-    const float DISTANCE = GetSettings().hudDistance.Get();
+    const float DISTANCE = GetSettings().hudDistance;
     constexpr float LERP_SPEED = 0.05f;
 
     XrPosef layerPose = { { 0.0f, 0.0f, 0.0f, 1.0f }, { 0.0f, 0.0f, 0.0f } };
@@ -492,7 +492,7 @@ std::vector<XrCompositionLayerQuad> RND_Renderer::Layer2D::FinishRendering(XrTim
     const float height = aspectRatio <= 1.0f ? 1.0f / aspectRatio : 1.0f;
 
     // todo: change space to head space if we want to follow the head
-    const float LAYER_SIZE = GetSettings().hudSize.Get();
+    const float LAYER_SIZE = GetSettings().hudSize;
 
     std::vector<XrCompositionLayerQuad> layers;
 

src/rendering/vulkan_imgui.cpp

@@ -667,12 +667,12 @@ void RND_Renderer::ImGuiOverlay::DrawHelpMenu() {
     auto DrawLayerSettingsRow = [&](const char* label, bool* changed, FloatSetting<float>& distanceSetting, FloatSetting<float>& scaleSetting) {
         DrawSettingRow(label, [&]() {
             auto applyValues = [&](float distance, float scale) {
-                distanceSetting.Set(distance);
-                scaleSetting.Set(scale);
+                distanceSetting = distance;
+                scaleSetting = scale;
             };
 
-            float distance = distanceSetting.Get();
-            float scale = scaleSetting.Get();
+            float distance = distanceSetting;
+            float scale = scaleSetting;
             std::string distanceIdStr = std::format("##{}_Distance", label);
             std::string scaleIdStr = std::format("##{}_Scale", label);
 
@@ -683,15 +683,15 @@ void RND_Renderer::ImGuiOverlay::DrawHelpMenu() {
 
             ImGui::PushItemWidth(sliderWidth);
             if (ImGui::SliderFloat(distanceIdStr.c_str(), &distance, distanceSetting.min, distanceSetting.max, formatDistance(distance).c_str())) {
-                applyValues(std::clamp(distance, distanceSetting.min, distanceSetting.max), scaleSetting.Get());
+                applyValues(std::clamp(distance, distanceSetting.min, distanceSetting.max), scaleSetting);
                 *changed = true;
             }
             ImGui::PopItemWidth();
             ImGui::SameLine();
 
             ImGui::PushItemWidth(sliderWidth);
             if (ImGui::SliderFloat(scaleIdStr.c_str(), &scale, scaleSetting.min, scaleSetting.max, "%.2fx scale")) {
-                applyValues(distanceSetting.Get(), std::clamp(scale, scaleSetting.min, scaleSetting.max));
+                applyValues(distanceSetting, std::clamp(scale, scaleSetting.min, scaleSetting.max));
                 *changed = true;
             }
             ImGui::PopItemWidth();
@@ -726,7 +726,7 @@ void RND_Renderer::ImGuiOverlay::DrawHelpMenu() {
                 ImGui::PopStyleVar();
                 if (DrawStyledTab(ICON_KI_COG "Settings", 0)) {
                     ImGui::Separator();
-                    CameraMode cameraMode = settings.cameraMode.Get();
+                    CameraMode cameraMode = settings.cameraMode;
                     DrawSettingRow("Camera Mode", [&]() {
                         settings.cameraMode.AddRadioToGUI(&changed, ModSettings::toDisplayString);
                     });
@@ -878,8 +878,8 @@ void RND_Renderer::ImGuiOverlay::DrawHelpMenu() {
                     });
 
                     if (settings.performanceOverlay != PerformanceOverlayMode::DISABLE) {
-                        static const int freqOptions[] = { 30, 60, 72, 80, 90, 120, 144 };
-                        int currentFreq = (int)settings.performanceOverlayFrequency.Get();
+                        static const uint32_t freqOptions[] = { 30, 60, 72, 80, 90, 120, 144 };
+                        uint32_t currentFreq = settings.performanceOverlayFrequency;
                         int freqIdx = 5; // Default to 90
                         for (int i = 0; i < std::size(freqOptions); i++) {
                             if (freqOptions[i] == currentFreq) {