hersi
/
ExperimentalGear
1
0
Fork 0
Code Issues 14 Pull Requests Projects 1 Releases 6 Activity

+ level selector to filter wheel

This commit is contained in:
FajsiEx 2021-08-12 13:23:49 +02:00
parent 8bdcf11dc2
commit 21825d31a7
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/songselect/filterwheel.lua
View File

@ -122,7 +122,11 @@ function getFolderData(folderLabel)
local folderType = 'unknown'; local folderType = 'unknown';
if (string.find(folderLabel, 'Folder: ')) then if (string.find(folderLabel, 'Folder: ')) then
folderType = 'folder'; folderType = 'folder';
folderLabel = folderLabel:gsub('Folder: ', '') -- Delete the useless info folderLabel = folderLabel:gsub('Folder: ', '') -- Delete default prefix
elseif (string.find(folderLabel, 'Level: ')) then
folderType = 'level';
folderLabel = folderLabel:gsub('Level: ', '') -- Delete default prefix
folderLabel = 'LEVEL ' .. folderLabel;
end end
local labelMatcherString = string.upper(folderLabel) local labelMatcherString = string.upper(folderLabel)
@ -170,28 +174,32 @@ end
function drawFolderList() function drawFolderList()
local numOfItemsAround = 7; local numOfItemsAround = 7;
local selectedIndex = 1; local selectedIndex = 1;
local folderList = filters.folder;
if selectionMode == 'folders' then if selectionMode == 'folders' then
selectedIndex = selectedFolder selectedIndex = selectedFolder
folderList = filters.folder;
else else
selectedIndex = selectedLevel selectedIndex = selectedLevel
folderList = filters.level;
end end
local i = 1; local i = 1;
while (i <= numOfItemsAround) do while (i <= numOfItemsAround) do
local index = getCorrectedIndex(selectedIndex, -i) local index = getCorrectedIndex(selectedIndex, -i)
drawFolder(filters.folder[index], desh / 2 - ITEM_HEIGHT / 2 - drawFolder(folderList[index], desh / 2 - ITEM_HEIGHT / 2 -
ITEM_HEIGHT * i + transitionScrollOffsetY) ITEM_HEIGHT * i + transitionScrollOffsetY)
i = i + 1; i = i + 1;
end end
-- Draw the selected song -- Draw the selected song
drawFolder(filters.folder[selectedIndex], drawFolder(folderList[selectedIndex],
desh / 2 - ITEM_HEIGHT / 2 + transitionScrollOffsetY) desh / 2 - ITEM_HEIGHT / 2 + transitionScrollOffsetY)
i = 1; i = 1;
while (i <= numOfItemsAround) do while (i <= numOfItemsAround) do
local index = getCorrectedIndex(selectedIndex, i) local index = getCorrectedIndex(selectedIndex, i)
drawFolder(filters.folder[index], desh / 2 - ITEM_HEIGHT / 2 + drawFolder(folderList[index], desh / 2 - ITEM_HEIGHT / 2 +
ITEM_HEIGHT * i + transitionScrollOffsetY) ITEM_HEIGHT * i + transitionScrollOffsetY)
i = i + 1; i = i + 1;
end end