+ filter info thing to song select
This commit is contained in:
parent
9e3d6aab27
commit
9677cc2398
|
@ -124,8 +124,18 @@ end
|
||||||
function getFolderData(folderLabel)
|
function getFolderData(folderLabel)
|
||||||
local folderType = 'unknown';
|
local folderType = 'unknown';
|
||||||
local isSpecial = false;
|
local isSpecial = false;
|
||||||
|
|
||||||
local folderBgImage = defaultFolderBgImage;
|
local folderBgImage = defaultFolderBgImage;
|
||||||
|
|
||||||
|
if not folderLabel then
|
||||||
|
return {
|
||||||
|
type = folderType,
|
||||||
|
label = 'UNKNOWN',
|
||||||
|
bgImage = folderBgImage,
|
||||||
|
isSpecial = isSpecial
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
if selectionMode == 'levels' then
|
if selectionMode == 'levels' then
|
||||||
folderBgImage = subFolderBgImage
|
folderBgImage = subFolderBgImage
|
||||||
end
|
end
|
||||||
|
@ -285,6 +295,9 @@ render = function(deltatime, shown)
|
||||||
game.SetSkinSetting('_songWheelOverlayActive', 1);
|
game.SetSkinSetting('_songWheelOverlayActive', 1);
|
||||||
drawFilterWheel(deltatime)
|
drawFilterWheel(deltatime)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
game.SetSkinSetting('_songWheelActiveFolderLabel', getFolderData(filters.folder[selectedFolder]).label);
|
||||||
|
game.SetSkinSetting('_songWheelActiveSubFolderLabel', getFolderData(filters.level[selectedLevel]).label);
|
||||||
|
|
||||||
SongSelectHeader.draw(deltatime);
|
SongSelectHeader.draw(deltatime);
|
||||||
Footer.draw({noEnterTransition = true});
|
Footer.draw({noEnterTransition = true});
|
||||||
|
|
|
@ -22,6 +22,8 @@ local cursorImages = {
|
||||||
|
|
||||||
local diffCursorImage = gfx.CreateSkinImage("song_select/level_cursor.png", 1)
|
local diffCursorImage = gfx.CreateSkinImage("song_select/level_cursor.png", 1)
|
||||||
|
|
||||||
|
local filterInfoBgImage = gfx.CreateSkinImage("song_select/filter_info_bg.png", 1)
|
||||||
|
|
||||||
local searchBgImage = gfx.CreateSkinImage("song_select/search_bg.png", 1)
|
local searchBgImage = gfx.CreateSkinImage("song_select/search_bg.png", 1)
|
||||||
|
|
||||||
local headerTitleImage = gfx.CreateSkinImage("song_select/header/title.png", 1)
|
local headerTitleImage = gfx.CreateSkinImage("song_select/header/title.png", 1)
|
||||||
|
@ -440,6 +442,23 @@ function drawData() -- Draws the song data on the left panel
|
||||||
gfx.GlobalAlpha(1);
|
gfx.GlobalAlpha(1);
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function drawFilterInfo(deltatime)
|
||||||
|
gfx.BeginPath()
|
||||||
|
gfx.ImageRect(5, 95, 417*0.85, 163*0.85, filterInfoBgImage, 1, 0)
|
||||||
|
|
||||||
|
local folderLabel = game.GetSkinSetting('_songWheelActiveFolderLabel')
|
||||||
|
local subFolderLabel = game.GetSkinSetting('_songWheelActiveSubFolderLabel')
|
||||||
|
|
||||||
|
gfx.FontSize(24)
|
||||||
|
gfx.TextAlign(gfx.TEXT_ALIGN_CENTER + gfx.TEXT_ALIGN_MIDDLE)
|
||||||
|
|
||||||
|
gfx.BeginPath()
|
||||||
|
gfx.Text(folderLabel, 167, 131);
|
||||||
|
|
||||||
|
gfx.BeginPath()
|
||||||
|
gfx.Text(subFolderLabel, 195, 166);
|
||||||
|
end
|
||||||
|
|
||||||
function drawSearch()
|
function drawSearch()
|
||||||
if (not songwheel.searchInputActive) then
|
if (not songwheel.searchInputActive) then
|
||||||
return;
|
return;
|
||||||
|
@ -565,6 +584,8 @@ render = function (deltaTime)
|
||||||
|
|
||||||
drawData()
|
drawData()
|
||||||
|
|
||||||
|
drawFilterInfo(deltaTime)
|
||||||
|
|
||||||
drawSearch();
|
drawSearch();
|
||||||
|
|
||||||
if (game.GetSkinSetting('_songWheelOverlayActive') ~= 1) then
|
if (game.GetSkinSetting('_songWheelOverlayActive') ~= 1) then
|
||||||
|
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
Loading…
Reference in New Issue