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

> cleanup

This commit is contained in:
FajsiEx 2021-11-20 19:36:00 +01:00
parent 716223a629
commit a03852ce9b
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/songselect/filterwheel.lua
View File

@ -101,10 +101,6 @@ local transitionScrollScale = 0;
local transitionScrollOffsetY = 0; local transitionScrollOffsetY = 0;
local scrollingUp = false; local scrollingUp = false;
local transitionEnterReverse = false;
local transitionEnterScale = 0;
local transitionEnterOffsetY = 0;
local transitionLeaveScale = 1; local transitionLeaveScale = 1;
local transitionLeaveReappearTimer = 0; local transitionLeaveReappearTimer = 0;
local TRANSITION_LEAVE_DURATION = 0.1; local TRANSITION_LEAVE_DURATION = 0.1;
@ -226,7 +222,7 @@ function drawFolderList()
folderList = filters.level; folderList = filters.level;
end end
yOffset = transitionEnterOffsetY + transitionScrollOffsetY; local yOffset = transitionScrollOffsetY;
local i = 1; local i = 1;
while (i <= numOfItemsAround) do while (i <= numOfItemsAround) do
@ -336,13 +332,8 @@ render = function(deltatime, shown)
if not shown then if not shown then
game.SetSkinSetting('_songWheelOverlayActive', 0); game.SetSkinSetting('_songWheelOverlayActive', 0);
if (transitionEnterScale <= 0) then
game.SetSkinSetting('_songWheelDespawnSelectorElements', 0);
end
else else
game.SetSkinSetting('_songWheelOverlayActive', 1); game.SetSkinSetting('_songWheelOverlayActive', 1);
game.SetSkinSetting('_songWheelDespawnSelectorElements', 1);
end end
game.SetSkinSetting('_songWheelActiveFolderLabel', getFolderData(filters.folder[selectedFolder]).label); game.SetSkinSetting('_songWheelActiveFolderLabel', getFolderData(filters.folder[selectedFolder]).label);

5
scripts/songselect/songwheel.lua
View File

@ -138,10 +138,9 @@ local transitionFlashScale = 0;
local transitionFlashAlpha = 1; local transitionFlashAlpha = 1;
local isFilterWheelActive = false; local isFilterWheelActive = false;
local transitionLeaveReappearTimer = 0;
local transitionLeaveScale = 0; local transitionLeaveScale = 0;
local transitionLeaveReappearTimer = 0;
local TRANSITION_LEAVE_DURATION = 0.1; local TRANSITION_LEAVE_DURATION = 0.1;
local transitionLeaveOffsetY = 0; -- TODO: remove
function resetLayoutInformation() function resetLayoutInformation()
resx, resy = game.GetResolution() resx, resy = game.GetResolution()
@ -366,7 +365,7 @@ function drawSongList()
local numOfSongsAround = 7; -- How many songs should be up and how many should be down of the selected one local numOfSongsAround = 7; -- How many songs should be up and how many should be down of the selected one
local yOffset = transitionLeaveOffsetY + transitionScrollOffsetY; local yOffset = transitionScrollOffsetY;
local i=1; local i=1;
while (i <= numOfSongsAround) do while (i <= numOfSongsAround) do