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 b1a78af..0000000 Binary files a/textures/song_select/score_bg.png and /dev/null differ