Merge branch 'master' of https://github.com/FajsiEx/exceed

scripts/songselect/songwheel.lua

@@ -4,7 +4,6 @@ local Background = require('components.background');
 
 local VolforceCalc = require('components.volforceCalc');
 
-local backgroundImage = gfx.CreateSkinImage("song_select/bg.png", 1)
 local dataPanelImage = gfx.CreateSkinImage("song_select/data_bg_overlay.png", 1)
 local dataGlowOverlayImage = gfx.CreateSkinImage("song_select/data_panel/data_glow_overlay.png", 1)
 local gradeBgImage = gfx.CreateSkinImage("song_select/data_panel/grade_bg.png", 1)
@@ -14,6 +13,9 @@ local illustratedBgImage = gfx.CreateSkinImage("song_select/data_panel/illust_bg
 local songPlateBg = gfx.CreateSkinImage("song_select/plate/bg.png", 1)
 local songPlateBottomBarOverlayImage = gfx.CreateSkinImage("song_select/plate/bottom_bar_overlay.png", 1)
 
+local scrollbarBgImage =  gfx.CreateSkinImage("song_select/scrollbar/bg.png", 1)
+local scrollbarFillImage =  gfx.CreateSkinImage("song_select/scrollbar/fill.png", 1)
+
 local laserAnimBaseImage =  gfx.CreateSkinImage("song_select/laser_anim.png", 1)
 
 local top50OverlayImage = gfx.CreateSkinImage("song_select/top50.png", 1)
@@ -367,6 +369,26 @@ function drawCursor()
     gfx.ImageRect(desw/2-14, desh/2-213/2, 555, 213, cursorImage, 1, 0)
 end
 
+function drawScrollbar()
+    gfx.BeginPath()
+    local bgW = 13*0.85;
+    local bgH = 1282*0.85;
+    local scrollPosX = desw-20
+    local scrollPosY = desh/2-bgH/2
+
+    gfx.ImageRect(scrollPosX, scrollPosY, bgW, bgH, scrollbarBgImage, 1, 0)
+
+    gfx.BeginPath()
+    local fillW = 27*0.85
+    local fillH = 65*0.85
+    local fillPosOffsetY = (bgH-fillH)*(
+        (selectedIndex-1) /
+        math.max(1,#songwheel.songs-1)
+    )
+
+    gfx.ImageRect(scrollPosX-6, scrollPosY+fillPosOffsetY, fillW, fillH, scrollbarFillImage, 1, 0)
+end
+
 local scoreNumbers = load_number_image("score_num");
 function drawData() -- Draws the song data on the left panel
     local song = songwheel.songs[selectedIndex];
@@ -619,6 +641,7 @@ render = function (deltaTime)
 
     drawSongList()
     drawCursor()
+    drawScrollbar()
 
     drawData()