Some Fixes

- Made scale debug report an integer as it should be in the developer view - Testing out improved stability on delta by falling back to last scale
NVIDIAGameWorks · May 9, 2024 · 2fd2c6a · 2fd2c6a
1 parent ca86482
commit 2fd2c6a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/build_common.ps1 b/build_common.ps1
@@ -37,9 +37,8 @@ Write-Host "vswhere found at: $vsWhere" -ForegroundColor Yellow
 #
 # Get path to Visual Studio installation using vswhere.
 #
-$vsPath = &$vsWhere -latest -version "[16.0,18.0)" -products * `
- -requires Microsoft.Component.MSBuild `
- -property installationPath
+$vsPath = "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community"
+Write-Host "$vsPath" -ForegroundColor Yellow
 If ([string]::IsNullOrEmpty("$vsPath")) {
   Write-Error "Failed to find Visual Studio 2019 installation. Aborting." -ErrorAction Stop
 }

diff --git a/src/dxvk/imgui/dxvk_imgui.cpp b/src/dxvk/imgui/dxvk_imgui.cpp
@@ -1448,7 +1448,7 @@ namespace dxvk {
                 if (c->m_type == CameraType::Sky)
                 {
                   ImGui::Text("Sky Offset: %.2f %.2f %.2f", c->m_skyOffset.x, c->m_skyOffset.y, c->m_skyOffset.z);
-                  ImGui::Text("Sky Scale: %.2f", c->m_skyScale);
+                  ImGui::Text("Sky Scale: %i", c->m_skyScale);
                 }
                 ImGui::Text("Vertical FOV: %.1f", c->getFov() * kRadiansToDegrees);
                 ImGui::Text("Near / Far plane: %.1f / %.1f", c->getNearPlane(), c->getFarPlane());

diff --git a/src/dxvk/rtx_render/rtx_camera_manager.cpp b/src/dxvk/rtx_render/rtx_camera_manager.cpp
@@ -281,16 +281,15 @@ namespace dxvk {
               skyCamera.setSkyScale(RtxOptions::Get()->skyDefaultScale());
               break;
             case SkyScaleCalibrationMode::DeltaAutomatic:
-              if ( !areClose(curSkyPos, lastSkyPos) && shouldUpdateMainCamera ) {
+              if ( !areClose(curSkyPos, lastSkyPos) ) {
                 float mdiff = lengthSqr(curCamPos - lastCamPos);
                 float sdiff = lengthSqr(curSkyPos - lastSkyPos);
 
-                int new_scale = 1;
                 if (sdiff != 0) {
                   float ratio_scale = mdiff / sdiff;
-                  new_scale = ratio_scale > 0 ? static_cast<int>( std::sqrt(ratio_scale) ) : 1;
+                  int new_scale = ratio_scale >= 1 ? static_cast<int>( std::sqrt(ratio_scale) ) : skyCamera.m_lastSkyScale;
+                  skyCamera.setSkyScale(new_scale);
                 }
-                skyCamera.setSkyScale(new_scale);
               }
               break;
             case SkyScaleCalibrationMode::SourceEngineAutomatic: