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

- gap between songs at songselect & - debug logs

This commit is contained in:
FajsiEx 2021-07-29 20:32:21 +02:00
parent 921a1a352b
commit ba28b735da
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/songselect/songwheel.lua
View File

@ -1,4 +1,4 @@
game.Log("Something went wrong!", game.LOGGER_ERROR) -- game.Log("Something went wrong!", game.LOGGER_ERROR)
--Horizontal alignment --Horizontal alignment
TEXT_ALIGN_LEFT = 1 TEXT_ALIGN_LEFT = 1
@ -391,7 +391,7 @@ function deep_to_string(t)
end end
draw_song = function(song, x, y, w, h, selected) draw_song = function(song, x, y, w, h, selected)
game.Log("draw_song", game.LOGGER_ERROR); -- game.Log("draw_song", game.LOGGER_ERROR);
local diffIndex = math.min(selectedDiff, #song.difficulties) local diffIndex = math.min(selectedDiff, #song.difficulties)
local difficulty = song.difficulties[diffIndex] local difficulty = song.difficulties[diffIndex]
@ -401,7 +401,7 @@ draw_song = function(song, x, y, w, h, selected)
local clearLampA = 100 local clearLampA = 100
if difficulty ~= nil then if difficulty ~= nil then
game.Log(deep_to_string(difficulty), game.LOGGER_ERROR); -- game.Log(deep_to_string(difficulty), game.LOGGER_ERROR);
if difficulty.scores[1] ~= nil then if difficulty.scores[1] ~= nil then
if difficulty.topBadge == 1 then -- fail/played if difficulty.topBadge == 1 then -- fail/played
clearLampR = 255 clearLampR = 255
@ -435,7 +435,7 @@ draw_song = function(song, x, y, w, h, selected)
end end
end end
end end
game.Log(" past difficulty check", game.LOGGER_ERROR); -- game.Log(" past difficulty check", game.LOGGER_ERROR);
check_or_create_cache(song) check_or_create_cache(song)
gfx.BeginPath() gfx.BeginPath()
@ -705,7 +705,7 @@ draw_songwheel = function(x,y,w,h)
for i = math.max(selectedIndex - wheelSize/2, 1), math.max(selectedIndex - 1,0) do for i = math.max(selectedIndex - wheelSize/2, 1), math.max(selectedIndex - 1,0) do
local song = songwheel.songs[i] local song = songwheel.songs[i]
local xpos = x + width local xpos = x + width
local offsetY = (selectedIndex - i + ioffset/2) * ( height * 1.05) local offsetY = (selectedIndex - i + ioffset/2) * ( height * 1.0)
local ypos = y+((h/2 - height/2) - offsetY) local ypos = y+((h/2 - height/2) - offsetY)
draw_song(song, xpos, ypos, width, height) draw_song(song, xpos, ypos, width, height)
end end
@ -714,7 +714,7 @@ draw_songwheel = function(x,y,w,h)
for i = math.min(selectedIndex + wheelSize/2, #songwheel.songs), selectedIndex + 1,-1 do for i = math.min(selectedIndex + wheelSize/2, #songwheel.songs), selectedIndex + 1,-1 do
local song = songwheel.songs[i] local song = songwheel.songs[i]
local xpos = x + width local xpos = x + width
local offsetY = (selectedIndex - i + ioffset/2) * ( height * 1.05) local offsetY = (selectedIndex - i + ioffset/2) * ( height * 1.0)
local ypos = y+((h/2 - height/2) - (selectedIndex - i) - offsetY) local ypos = y+((h/2 - height/2) - (selectedIndex - i) - offsetY)
local alpha = 255 - (selectedIndex - i + ioffset) * 31 local alpha = 255 - (selectedIndex - i + ioffset) * 31
draw_song(song, xpos, ypos, width, height) draw_song(song, xpos, ypos, width, height)
@ -801,7 +801,7 @@ render = function(deltaTime)
timer = (timer + deltaTime) timer = (timer + deltaTime)
timer = timer % 2 timer = timer % 2
resx,resy = game.GetResolution(); resx,resy = game.GetResolution();
game.Log("res :: " .. resx .. "," .. resy, game.LOGGER_ERROR); -- game.Log("res :: " .. resx .. "," .. resy, game.LOGGER_ERROR);
adjustScreen(resx,resy); adjustScreen(resx,resy);
gfx.BeginPath(); gfx.BeginPath();
gfx.LoadSkinFont("dfmarugoth.ttf"); gfx.LoadSkinFont("dfmarugoth.ttf");