Show exact resolution and add 1.5x multiplier

Author: Crementif

launcher/main.cpp

@@ -688,25 +688,31 @@ static bool InstallDownloadedGraphicsOverride(const LauncherPaths& paths, const
             bool replacedAny = false;
             if (probeResult.leftWidth != 0 && probeResult.leftHeight != 0) {
                 struct BetterVRPresetPlaceholder {
+                    const char* nameToken;
                     const char* widthToken;
                     const char* heightToken;
                     double multiplier;
-                    const char* label;
+                    const char* multiplierLabel;
                 };
 
                 static constexpr BetterVRPresetPlaceholder PresetPlaceholders[] = {
-                    { "__BETTERVR_05_WIDTH__", "__BETTERVR_05_HEIGHT__", 0.5, "0.5x" },
-                    { "__BETTERVR_10_WIDTH__", "__BETTERVR_10_HEIGHT__", 1.0, "1x" },
-                    { "__BETTERVR_20_WIDTH__", "__BETTERVR_20_HEIGHT__", 2.0, "2x" },
-                    { "__BETTERVR_30_WIDTH__", "__BETTERVR_30_HEIGHT__", 3.0, "3x" },
-                    { "__BETTERVR_40_WIDTH__", "__BETTERVR_40_HEIGHT__", 4.0, "4x" },
+                    { "__BETTERVR_05_NAME__", "__BETTERVR_05_WIDTH__", "__BETTERVR_05_HEIGHT__", 0.5, "0.5x" },
+                    { "__BETTERVR_10_NAME__", "__BETTERVR_10_WIDTH__", "__BETTERVR_10_HEIGHT__", 1.0, "1x" },
+                    { "__BETTERVR_15_NAME__", "__BETTERVR_15_WIDTH__", "__BETTERVR_15_HEIGHT__", 1.5, "1.5x" },
+                    { "__BETTERVR_20_NAME__", "__BETTERVR_20_WIDTH__", "__BETTERVR_20_HEIGHT__", 2.0, "2x" },
+                    { "__BETTERVR_30_NAME__", "__BETTERVR_30_WIDTH__", "__BETTERVR_30_HEIGHT__", 3.0, "3x" },
+                    { "__BETTERVR_40_NAME__", "__BETTERVR_40_WIDTH__", "__BETTERVR_40_HEIGHT__", 4.0, "4x" },
                 };
 
                 for (const BetterVRPresetPlaceholder& preset : PresetPlaceholders) {
                     const std::pair<uint32_t, uint32_t> adjustedResolution = GetNearestRulesCompatibleEyeResolution(double(probeResult.leftWidth) * preset.multiplier, double(probeResult.leftHeight) * preset.multiplier);
-                    LogLine("Adjusted BetterVR " + std::string(preset.label) + " resolution: " + std::to_string(adjustedResolution.first) + "x" + std::to_string(adjustedResolution.second));
-                    replacedAny |= ReplaceTextToken(contents, preset.widthToken, std::to_string(adjustedResolution.first));
-                    replacedAny |= ReplaceTextToken(contents, preset.heightToken, std::to_string(adjustedResolution.second));
+                    const std::string adjustedWidth = std::to_string(adjustedResolution.first);
+                    const std::string adjustedHeight = std::to_string(adjustedResolution.second);
+                    const std::string resolutionLabel = adjustedWidth + "x" + adjustedHeight;
+                    LogLine("Adjusted BetterVR " + std::string(preset.multiplierLabel) + " resolution: " + resolutionLabel);
+                    replacedAny |= ReplaceTextToken(contents, preset.nameToken, resolutionLabel);
+                    replacedAny |= ReplaceTextToken(contents, preset.widthToken, adjustedWidth);
+                    replacedAny |= ReplaceTextToken(contents, preset.heightToken, adjustedHeight);
                 }
             }
 

resources/BreathOfTheWild_Graphics/rules.txt

@@ -33,32 +33,38 @@ $enableUltrawideDebugLogging:int = 0
 # VR Resolution Multiplier (BetterVR)
 
 [Preset]
-name = 0.5x (Only For 8K VR headsets)
+name = __BETTERVR_05_NAME__ (0.5x, Not Recommended Except For 8K VR headsets)
 category = VR Resolution Multiplier
 $width = __BETTERVR_05_WIDTH__
 $height = __BETTERVR_05_HEIGHT__
 
 [Preset]
-name = 1x (Native Headset Resolution, Default)
+name = __BETTERVR_10_NAME__ (1x, Native Headset Resolution, Default)
 category = VR Resolution Multiplier
 default = 1
 $width = __BETTERVR_10_WIDTH__
 $height = __BETTERVR_10_HEIGHT__
 
 [Preset]
-name = 2x (Good For Anti-Aliasing, Recommended)
+name = __BETTERVR_15_NAME__ (1.5x, Balanced Quality)
+category = VR Resolution Multiplier
+$width = __BETTERVR_15_WIDTH__
+$height = __BETTERVR_15_HEIGHT__
+
+[Preset]
+name = __BETTERVR_20_NAME__ (2x, Better Anti-Aliasing, Recommended)
 category = VR Resolution Multiplier
 $width = __BETTERVR_20_WIDTH__
 $height = __BETTERVR_20_HEIGHT__
 
 [Preset]
-name = 3x (Best Anti-Aliasing, Requires A Good GPU)
+name = __BETTERVR_30_NAME__ (3x, Best Anti-Aliasing, Requires A Good GPU)
 category = VR Resolution Multiplier
 $width = __BETTERVR_30_WIDTH__
 $height = __BETTERVR_30_HEIGHT__
 
 [Preset]
-name = 4x (Likely Costs Performance)
+name = __BETTERVR_40_NAME__ (4x, Likely Costs Performance)
 category = VR Resolution Multiplier
 $width = __BETTERVR_40_WIDTH__
 $height = __BETTERVR_40_HEIGHT__

src/utils/logger.h

@@ -174,6 +174,13 @@ struct std::formatter<BESeadLookAtCamera> : std::formatter<string> {
     }
 };
 
+template <>
+struct std::formatter<LookAtMatrix> : std::formatter<string> {
+    auto format(const LookAtMatrix& cam, std::format_context& ctx) const {
+        return std::format_to(ctx.out(), "pos = {}, target = {}, up = {}, unknown = {}, zNear = {}, zFar = {}", cam.pos, cam.target, cam.up, cam.unknown, cam.zNear.getLE(), cam.zFar.getLE());
+    }
+};
+
 
 template <>
 struct std::formatter<D3D_FEATURE_LEVEL> : std::formatter<string> {