add user music volume to options

add larger power bar to driving range when using steam deck
fallahn · Jul 11, 2023 · b2d263f · b2d263f
1 parent b743c32
commit b2d263f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
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 684
-#define BUILDNUMBER_STR "684" 
+#define BUILDNUMBER 685
+#define BUILDNUMBER_STR "685" 
 
 #endif /* BUILD_NUMBER_H_ */
diff --git a/samples/golf/src/golf/DrivingStateUI.cpp b/samples/golf/src/golf/DrivingStateUI.cpp
@@ -528,11 +528,17 @@ void DrivingState::createUI()
     {
         auto& [dir, currTime] = e.getComponent<cro::Callback>().getUserData<std::pair<std::int32_t, float>>();
 
+#ifdef USE_GNS
+        const float ScaleMultiplier = Social::isSteamdeck() ? 2.f : 1.f;
+#else
+        const float ScaleMultiplier = 1.f;
+#endif
+
         if (dir == 0)
         {
             //grow
             currTime = std::min(1.f, currTime + dt);
-            const float scale = cro::Util::Easing::easeOutElastic(currTime);
+            const float scale = cro::Util::Easing::easeOutElastic(currTime) * ScaleMultiplier;
 
             e.getComponent<cro::Transform>().setScale({ scale, scale });
 
@@ -546,9 +552,9 @@ void DrivingState::createUI()
         {
             //shrink
             currTime = std::max(0.f, currTime - (dt * 2.f));
-            const float scale = cro::Util::Easing::easeOutBack(currTime);
+            const float scale = cro::Util::Easing::easeOutBack(currTime) * ScaleMultiplier;
 
-            e.getComponent<cro::Transform>().setScale({ scale, 1.f });
+            e.getComponent<cro::Transform>().setScale({ scale, ScaleMultiplier });
 
             if (currTime == 0)
             {
@@ -838,6 +844,13 @@ void DrivingState::createUI()
 
         //relocate the power bar
         auto uiPos = glm::vec2(uiSize.x / 2.f, UIBarHeight / 2.f);
+#ifdef USE_GNS
+        if (Social::isSteamdeck())
+        {
+            uiPos.y *= 2.f;
+            spinEnt.getComponent<cro::Transform>().move({ 0.f, 32.f, 0.f });
+        }
+#endif
         rootNode.getComponent<cro::Transform>().setPosition(uiPos);
     };
 

diff --git a/samples/golf/src/golf/GolfStateUI.cpp b/samples/golf/src/golf/GolfStateUI.cpp
@@ -706,7 +706,7 @@ void GolfState::buildUI()
         {
             //shrink
             currTime = std::max(0.f, currTime - (dt * 2.f));
-            const float scale = cro::Util::Easing::easeOutBack(currTime * ScaleMultiplier);
+            const float scale = cro::Util::Easing::easeOutBack(currTime) * ScaleMultiplier;
 
             e.getComponent<cro::Transform>().setScale({ scale, ScaleMultiplier });
 

diff --git a/samples/golf/src/golf/OptionsState.cpp b/samples/golf/src/golf/OptionsState.cpp
@@ -114,7 +114,8 @@ namespace
         "Menu Volume",
         "Voice Volume",
         "Vehicle Volume",
-        "Environment"
+        "Environment",
+        "User Music"
     };
     //generally static vars would be a bad idea, but in this case
     //a static index value will remember the last channel between