+ bars to songwheel

This commit is contained in:
FajsiEx 2021-08-06 20:18:18 +02:00
parent c8ec5935fd
commit 2292908baf
3 changed files with 20 additions and 15 deletions

View File

@ -116,6 +116,7 @@ local progressTransitions = function ()
end end
local draw = function () local draw = function ()
gfx.Save()
resx, resy = game.GetResolution(); resx, resy = game.GetResolution();
-- Draw top background -- Draw top background
@ -125,28 +126,29 @@ local draw = function ()
gfx.Fill(); gfx.Fill();
gfx.ClosePath(); gfx.ClosePath();
-- Draw the 'glow' effect -- -- Draw the 'glow' effect
gfx.LoadSkinFont("digital/digital.ttf"); -- gfx.LoadSkinFont("Digital-Serial-Bold.ttf");
gfx.TextAlign(gfx.TEXT_ALIGN_CENTER + gfx.TEXT_ALIGN_MIDDLE); -- gfx.TextAlign(gfx.TEXT_ALIGN_CENTER + gfx.TEXT_ALIGN_MIDDLE);
gfx.FontSize(47); -- gfx.FontSize(47);
gfx.FillColor(128,200,255,190); -- 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.FillColor(255,255,255);
gfx.Text(titleText, resx/2, TOP_BAR_HEIGHT/2); -- gfx.Text(titleText, resx/2, TOP_BAR_HEIGHT/2);
-- Draw the top label lines -- -- Draw the top label lines
drawTopBarLines() -- drawTopBarLines()
gfx.LoadSkinFont("NotoSans-Regular.ttf"); gfx.LoadSkinFont("NotoSans-Regular.ttf");
drawBottomBar(); drawBottomBar();
progressTransitions(); progressTransitions();
gfx.Restore()
end end
return { return {

View File

@ -1,5 +1,6 @@
local Easing = require('common.easings'); local Easing = require('common.easings');
local Bars = require('components.bars');
local backgroundImage = gfx.CreateSkinImage("song_select/bg.png", 1) local backgroundImage = gfx.CreateSkinImage("song_select/bg.png", 1)
local dataPanelImage = gfx.CreateSkinImage("song_select/data_bg_overlay.png", 1) local dataPanelImage = gfx.CreateSkinImage("song_select/data_bg_overlay.png", 1)
@ -513,13 +514,15 @@ render = function (deltaTime)
drawSearch(); drawSearch();
Bars.draw();
gfx.BeginPath(); gfx.BeginPath();
gfx.FontSize(18) gfx.FontSize(18)
gfx.TextAlign(gfx.TEXT_ALIGN_LEFT + gfx.TEXT_ALIGN_TOP) gfx.TextAlign(gfx.TEXT_ALIGN_LEFT + gfx.TEXT_ALIGN_TOP)
local debugScrollingUp= "FALSE" local debugScrollingUp= "FALSE"
if scrollingUp then debugScrollingUp = "TRUE" end; 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 end
set_index = function(newIndex) set_index = function(newIndex)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB