more menu isolation, new multiplier numbers

831 lines now! 3k lines gone!!!!! woo hoo
Encore-Developers · Nov 18, 2024 · a47d09a · a47d09a
1 parent 72ae742
commit a47d09a
Show file tree

Hide file tree

Showing 11 changed files with 1,224 additions and 1,178 deletions.
diff --git a/Encore/Assets/ui/Frame 1.png b/Encore/Assets/ui/Frame 1.png
diff --git a/Encore/Assets/ui/mult_number.png b/Encore/Assets/ui/mult_number.png
diff --git a/Encore/src/gameplay/gameplayRenderer.cpp b/Encore/src/gameplay/gameplayRenderer.cpp
@@ -301,6 +301,7 @@ void gameplayRenderer::LoadGameplayAssets() {
 
     GameplayRenderTexture = LoadRenderTexture(GetScreenWidth(), GetScreenHeight());
 
+
     sustainPlane = GenMeshPlane(0.8f, 1.0f, 1, 1);
     soloPlane = GenMeshPlane(1.0f, 1.0f, 1, 1);
     Image invSolo = LoadImageFromTexture(gprAssets.soloTexture);
@@ -1161,16 +1162,21 @@ void gameplayRenderer::RenderHud(Player *player, float length) {
     SetShaderValueTexture(
         gprAssets.FullComboIndicator, gprAssets.TopTextureLoc, gprAssets.MultFCTex2
     );
-    DrawModel(gprAssets.MultInnerDot, Vector3 { 0, 0.0f, 1.1f }, 1.1, WHITE);
-    DrawModel(gprAssets.MultFill, Vector3 { 0, 0.0f, 1.1f }, 1.1, WHITE);
-    DrawModel(gprAssets.MultOuterFrame, Vector3 { 0, 0.0f, 1.1f }, 1.1, WHITE);
+
+    // DrawModel(gprAssets.MultInnerDot, Vector3 { 0, 0.0f, 1.1f }, 1.1, WHITE);
+    DrawModel(gprAssets.MultFill, Vector3 { 0, 0.0f, 1.1f }, 1.0, WHITE);
+    DrawModel(gprAssets.MultOuterFrame, Vector3 { 0, 0.0f, 1.1f }, 1.0, WHITE);
     DrawModel(
         gprAssets.MultInnerFrame,
         Vector3 { 0, 0.0f, 1.1f },
-        1.1,
+        1.0,
         ColorBrightness(player->AccentColor, -0.4)
     );
-
+    DrawModelEx(gprAssets.multNumber,
+        Vector3 { 0, 0.0f, 1.075f },
+        {0},0,
+        {1.0, 1.15, 1.15},
+        WHITE);
     DrawRenderTexture();
 }
 
@@ -1192,6 +1198,9 @@ void gameplayRenderer::RenderGameplay(Player *player, double curSongTime, Song s
     // 1) : (!player->stats->Multiplayer ? ((float)(player->stats->multiplier() / 2) - 1)
     // / (float)player->stats->maxMultForMeter() : (float)(player->stats->multiplier() -
     // 1)));
+    SetShaderValue(gprAssets.multNumberShader, gprAssets.uvOffsetXLoc, &player->stats->uvOffsetX, SHADER_UNIFORM_FLOAT);
+    SetShaderValue(gprAssets.multNumberShader, gprAssets.uvOffsetYLoc, &player->stats->uvOffsetY, SHADER_UNIFORM_FLOAT);
+
     float multFill =
         (!player->stats->Overdrive ? (float)(player->stats->multiplier() - 1)
                                    : ((float)(player->stats->multiplier() / 2) - 1))