birdulon
/
RhythmGame
1
0
Fork 0
Code Issues 11 Pull Requests Releases 1 Wiki Activity

[WIP] Menu smooth scroll scaling

This commit is contained in:
Luke Hubmayer-Werner 2019-11-25 15:06:34 +10:30
parent c4536eeb0d
commit ad6f62fc38
1 changed files with 50 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
Menu.gd
View File

@ -6,8 +6,10 @@ var genres = {}
enum ChartDifficulty {EASY, BASIC, ADV, EXPERT, MASTER} enum ChartDifficulty {EASY, BASIC, ADV, EXPERT, MASTER}
var selected_genre := 0 var selected_genre: int = 0
var selected_song := 0 var selected_song: int = 0
var selected_song_delta: float = 0.0 # For floaty display scrolling
var selected_song_speed: float = 0.5 # For floaty display scrolling
var selected_difficulty = ChartDifficulty.ADV var selected_difficulty = ChartDifficulty.ADV
var TitleFont := preload("res://assets/MenuTitleFont.tres") var TitleFont := preload("res://assets/MenuTitleFont.tres")
@ -45,6 +47,13 @@ func _ready():
# Called every frame. 'delta' is the elapsed time since the previous frame. # Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(delta): func _process(delta):
selected_song_delta += selected_song_speed * delta
if selected_song_delta > 0.5:
selected_song_delta -= 1.0
selected_song += 1
elif selected_song_delta < -0.5:
selected_song_delta += 1.0
selected_song -= 1
update() update()
func draw_string_centered(font, position, string, color := Color.white): func draw_string_centered(font, position, string, color := Color.white):
@ -71,45 +80,55 @@ func _draw():
var spacer_x = 12 var spacer_x = 12
var spacer_y = 64 var spacer_y = 64
var outline_px = 3 var outline_px = 3
var x = -(size + spacer_x)*2 var center_x = 0.0
var y = -(size + spacer_y) var sel_scales := [1.0, 0.8, 0.64, 0.512, 0.4096]
var sel_scales := [1.0, 0.8, 0.64, 0.512] var bg_scales := [0.64, 0.64, 0.64, 0.512, 0.4096]
var sel_cumscales := [1.0, 1.8, 2.44, 2.952]
var bg_scales := [0.64, 0.64, 0.64, 0.512]
var bg_cumscales := [0.64, 1.28, 1.92, 2.432]
var gy := -160 var gy := -160.0
for g in len(genres): for g in len(genres):
var selected: bool = (g == selected_genre) var selected: bool = (g == selected_genre)
var scales = sel_scales if selected else bg_scales var base_scales = sel_scales if selected else bg_scales
# var cumscales = sel_cumscales if selected else bg_cumscales var scales = []
scales.resize(len(base_scales)*2-1)
if selected_song_delta >= 0.0:
scales[0] = lerp(base_scales[0], base_scales[1], selected_song_delta)
for i in len(base_scales)-1:
scales[i+1] = lerp(base_scales[i+1], base_scales[i], selected_song_delta)
for i in len(base_scales)-2:
scales[-i-1] = lerp(base_scales[i+1], base_scales[i+2], selected_song_delta)
var i = len(base_scales)
scales[i] = base_scales[-1]
else:
scales[0] = lerp(base_scales[0], base_scales[1], -selected_song_delta)
for i in len(base_scales)-1:
scales[-i-1] = lerp(base_scales[i+1], base_scales[i], -selected_song_delta)
for i in len(base_scales)-2:
scales[i+1] = lerp(base_scales[i+1], base_scales[i+2], -selected_song_delta)
var i = len(base_scales)
scales[-i] = base_scales[-1]
var subsize = size * scales[0]
var gx = center_x - (subsize + spacer_x) * selected_song_delta
var genre = genres.keys()[g] var genre = genres.keys()[g]
draw_string_centered(GenreFont, Vector2(0, gy), genre) draw_string_centered(GenreFont, Vector2(0, gy), genre)
var songslist = genres[genre] var songslist = genres[genre]
var s = len(songslist) var s = len(songslist)
var key = songslist[selected_song%s] var key = songslist[selected_song % s]
var subsize = size * scales[0] var y = gy + spacer_y
y = gy + spacer_y var x = -subsize/2.0
var gx = -subsize/2.0 draw_songtile(key, Vector2(gx+x, y), subsize, selected, selected_difficulty)
draw_songtile(key, Vector2(gx, y), subsize, selected) for i in [1, 2, 3, 4]:
for i in [1, 2, 3]: x += subsize + spacer_x
gx += subsize + spacer_x
subsize = size * scales[i] subsize = size * scales[i]
draw_songtile(songslist[(selected_song+i)%s], Vector2(gx, y), subsize) draw_songtile(songslist[(selected_song+i) % s], Vector2(gx+x, y), subsize)
draw_songtile(songslist[(selected_song-i)%s], Vector2(-gx - subsize, y), subsize) subsize = size * scales[0]
# var gx = size * (cumscales[i] - scales[0]*0.5 - scales[i]*0.5) + spacer_x * i x = -subsize/2.0
# draw_songtile(songslist[(selected_song+i)%s], Vector2(gx - subsize/2.0, y), subsize) for i in [1, 2, 3, 4]:
# draw_songtile(songslist[(selected_song-i)%s], Vector2(-gx - subsize/2.0, y), subsize) x += subsize + spacer_x
subsize = size * scales[-i]
draw_songtile(songslist[(selected_song-i) % s], Vector2(gx-x - subsize, y), subsize)
gy += size + (spacer_y * 2) gy += size + (spacer_y * 2)
# for key in song_images:
# draw_texture_rect(song_images[key], Rect2(x, y, size, size), false)
# draw_string_centered(TitleFont, Vector2(x+size/2.0, y+size), song_defs[key]["title"], Color(0.95, 0.95, 1.0))
# x += size + spacer_x
# if x >= (size + spacer_x)*2:
# x = -(size + spacer_x)*2
# y += size + spacer_y
func _input(event): func _input(event):
if event.is_action_pressed("ui_right"): if event.is_action_pressed("ui_right"):