diff --git a/scripts/songtransition.lua b/scripts/songtransition.lua index a4614ad..0fcc95f 100644 --- a/scripts/songtransition.lua +++ b/scripts/songtransition.lua @@ -1,7 +1,11 @@ game.LoadSkinSample('song_transition_screen/transition_enter.wav'); +local refBgImage = gfx.CreateSkinImage("songtransition/bg_old.png", 0) + local bgImage = gfx.CreateSkinImage("songtransition/bg.png", 0) +local glowOverlayImage = gfx.CreateSkinImage("songtransition/glowy.png", 0) +local albumBgImage = gfx.CreateSkinImage("songtransition/album_crop.png", 0) local difficultyNumbers; @@ -120,9 +124,14 @@ function sign(x) end function render_screen(progress) + gfx.BeginPath() gfx.ImageRect(0, 0, 1080, 1920, bgImage,1,0); - + gfx.BeginPath() + gfx.ImageRect(0, 0, 1080, 1920, glowOverlayImage,1,0); + gfx.BeginPath() + gfx.ImageRect(235-128, 385-128, 608+256, 608+256, albumBgImage,1,0); + local jacket = song.jacket == 0 and noJacket or song.jacket gfx.BeginPath(); gfx.ImageRect(235, 385, 608, 608, jacket, 1, 0) @@ -167,32 +176,12 @@ function render_screen(progress) gfx.Text('BPM', 127, 1140) gfx.Text(song.bpm, 127, 1167) + -- temp ref overlay + -- gfx.BeginPath() + -- gfx.ImageRect(0, 0, 1080, 1920, refBgImage,0.5,0); + gfx.ClosePath(); gfx.Restore(); - --- for i=0,resx/50 do --- local dir = sign((i % 2) - 0.5) --- local yoff = dir * resy * (1 - progress) --- gfx.Save() --- gfx.Translate(0,yoff) --- gfx.BeginPath() --- gfx.Rect(60 * i, yoff, 60, resy) --- gfx.FillColor(0,64, 150 + 25 * dir) --- gfx.Fill() --- gfx.Restore() --- end --- local y = (resy/2 + 100) * (math.sin(0.5 * progress * math.pi)^7) - 200 --- gfx.Save() --- gfx.BeginPath() --- gfx.Translate(resx/2, y) --- gfx.Restore() --- gfx.Translate(resx/2, resy - y - 50) --- gfx.FillColor(255,255,255) --- gfx.TextAlign(gfx.TEXT_ALIGN_CENTER + gfx.TEXT_ALIGN_TOP) --- gfx.FontSize(80) --- gfx.Text(song.title,0,0) --- gfx.FontSize(55) --- gfx.Text(song.artist,0,80) end function reset()