From 2292908baf6997e29d345538aa560d95f2a6ae43 Mon Sep 17 00:00:00 2001
From: FajsiEx <fajsiexofficial@gmail.com>
Date: Fri, 6 Aug 2021 20:18:18 +0200
Subject: [PATCH] + bars to songwheel

---
 scripts/components/bars.lua       |  30 ++++++++++++++++--------------
 scripts/songselect/songwheel.lua  |   5 ++++-
 textures/song_select/score_bg.png | Bin 1721 -> 0 bytes
 3 files changed, 20 insertions(+), 15 deletions(-)
 delete mode 100644 textures/song_select/score_bg.png

diff --git a/scripts/components/bars.lua b/scripts/components/bars.lua
index d7cff0e..01deea4 100644
--- a/scripts/components/bars.lua
+++ b/scripts/components/bars.lua
@@ -116,6 +116,7 @@ local progressTransitions = function ()
 end
 
 local draw = function ()
+    gfx.Save()
     resx, resy = game.GetResolution();
 
     -- Draw top background
@@ -125,28 +126,29 @@ local draw = function ()
     gfx.Fill();
     gfx.ClosePath();
 
-    -- Draw the 'glow' effect
-    gfx.LoadSkinFont("digital/digital.ttf");
-    gfx.TextAlign(gfx.TEXT_ALIGN_CENTER + gfx.TEXT_ALIGN_MIDDLE);
-	gfx.FontSize(47);
-	gfx.FillColor(128,200,255,190);
+    -- -- Draw the 'glow' effect
+    -- gfx.LoadSkinFont("Digital-Serial-Bold.ttf");
+    -- gfx.TextAlign(gfx.TEXT_ALIGN_CENTER + gfx.TEXT_ALIGN_MIDDLE);
+	-- gfx.FontSize(47);
+	-- gfx.FillColor(128,200,255,190);
 
-    gfx.Text(titleText, resx/2+1, TOP_BAR_HEIGHT/2+1);
-    gfx.Text(titleText, resx/2+1, TOP_BAR_HEIGHT/2-1);
-    gfx.Text(titleText, resx/2-1, TOP_BAR_HEIGHT/2+1);
-    gfx.Text(titleText, resx/2-1, TOP_BAR_HEIGHT/2+1);
+    -- gfx.Text(titleText, resx/2+1, TOP_BAR_HEIGHT/2+1);
+    -- gfx.Text(titleText, resx/2+1, TOP_BAR_HEIGHT/2-1);
+    -- gfx.Text(titleText, resx/2-1, TOP_BAR_HEIGHT/2+1);
+    -- gfx.Text(titleText, resx/2-1, TOP_BAR_HEIGHT/2+1);
 
-    -- Draw top label
+    -- -- Draw top label
 
-	gfx.FillColor(255,255,255);
-    gfx.Text(titleText, resx/2, TOP_BAR_HEIGHT/2);
-    -- Draw the top label lines
-    drawTopBarLines()
+	-- gfx.FillColor(255,255,255);
+    -- gfx.Text(titleText, resx/2, TOP_BAR_HEIGHT/2);
+    -- -- Draw the top label lines
+    -- drawTopBarLines()
     gfx.LoadSkinFont("NotoSans-Regular.ttf");
 
     drawBottomBar();
 
     progressTransitions();
+    gfx.Restore()
 end
 
 return {
diff --git a/scripts/songselect/songwheel.lua b/scripts/songselect/songwheel.lua
index 1f3d426..4a2a122 100644
--- a/scripts/songselect/songwheel.lua
+++ b/scripts/songselect/songwheel.lua
@@ -1,5 +1,6 @@
 
 local Easing = require('common.easings');
+local Bars = require('components.bars');
 
 local backgroundImage = gfx.CreateSkinImage("song_select/bg.png", 1)
 local dataPanelImage = gfx.CreateSkinImage("song_select/data_bg_overlay.png", 1)
@@ -513,13 +514,15 @@ render = function (deltaTime)
 
     drawSearch();
 
+    Bars.draw();
+
 
     gfx.BeginPath();
     gfx.FontSize(18)
     gfx.TextAlign(gfx.TEXT_ALIGN_LEFT + gfx.TEXT_ALIGN_TOP)
     local debugScrollingUp= "FALSE"
     if scrollingUp then debugScrollingUp = "TRUE" end;
-    gfx.Text('DELTA: ' .. deltaTime .. ' // SELECTED_INDEX: ' .. selectedIndex .. ' // SELECTED_DIFF: ' .. selectedDifficulty .. ' // SCROLLING_UP: ' .. debugScrollingUp .. ' // AC_TS: ' .. transitionAfterscrollScale, 8, 8);
+    gfx.Text('S_I: ' .. selectedIndex .. ' // S_D: ' .. selectedDifficulty .. ' // S_UP: ' .. debugScrollingUp .. ' // AC_TS: ' .. transitionAfterscrollScale, 8, 8);
 end
 
 set_index = function(newIndex)
diff --git a/textures/song_select/score_bg.png b/textures/song_select/score_bg.png
deleted file mode 100644
index b1a78afe9e8f9c0ba04efb9d86e44e9224ea3a8f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1721
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
P00000NkvXXu0mjfNrF@~