fix minimap zoom position

fallahn · Aug 23, 2024 · 4bcdf26 · 4bcdf26
1 parent ebdf2c3
commit 4bcdf26
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/crogine.sln b/crogine.sln
@@ -703,8 +703,8 @@ Global
 		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Release|Any CPU.ActiveCfg = Release|Win32
 		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Release|ARM.ActiveCfg = Release|Win32
 		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Release|ARM64.ActiveCfg = Release|Win32
-		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Release|x64.ActiveCfg = Release|x64
-		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Release|x64.Build.0 = Release|x64
+		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Release|x64.ActiveCfg = ReleaseGNS|x64
+		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Release|x64.Build.0 = ReleaseGNS|x64
 		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Release|x86.ActiveCfg = Release|Win32
 		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Release|x86.Build.0 = Release|Win32
 		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Release-asan|Any CPU.ActiveCfg = Release-asan|Win32

diff --git a/samples/golf/buildnumber.h b/samples/golf/buildnumber.h
@@ -3,7 +3,7 @@
 #ifndef BUILD_NUMBER_H_ 
 #define BUILD_NUMBER_H_ 
 
-#define BUILDNUMBER 7113
-#define BUILDNUMBER_STR "7113" 
+#define BUILDNUMBER 7114
+#define BUILDNUMBER_STR "7114" 
 
 #endif /* BUILD_NUMBER_H_ */
diff --git a/samples/golf/src/golf/GameConsts.hpp b/samples/golf/src/golf/GameConsts.hpp
@@ -359,9 +359,9 @@ static inline std::int32_t courseOfTheMonth()
 static inline float getWindMultiplier(float ballHeight, float distanceToPin)
 {
     static constexpr float MinWind = 10.f;
-    static constexpr float MaxWind = 30.f;
+    static constexpr float MaxWind = 32.f;
 
-    static constexpr float MinHeight = 24.f;// 40.f;
+    static constexpr float MinHeight = 20.f;// 40.f;
     static constexpr float MaxHeight = 30.f;// 50.f;
     const float HeightMultiplier = std::clamp((ballHeight - MinHeight) / (MaxHeight / MinHeight), 0.f, 1.f);
 

diff --git a/samples/golf/src/golf/GolfStateUI.cpp b/samples/golf/src/golf/GolfStateUI.cpp
@@ -1580,7 +1580,7 @@ void GolfState::buildUI()
     };
 
     //these are const so calc them once here and capture them
-    glm::vec2 mapOffset = glm::vec2(MiniMapSize.y / MapSizeMultiplier, (MiniMapSize.x - 32.f) / MapSizeMultiplier) * glm::vec2(MapSizeRatio.y, MapSizeRatio.x);
+    glm::vec2 mapOffset = glm::vec2(MapSize.y / MapSizeMultiplier, (MapSize.x/* - 32.f*/) / MapSizeMultiplier) * glm::vec2(MapSizeRatio.y, MapSizeRatio.x);
     const float l = glm::length(mapOffset);
     mapOffset = glm::normalize(mapOffset);