Illusion/O2048
1
0
Fork 0
mirror of https://github.com/IllusionMan1212/O2048.git synced 2026-10-24 10:12:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

zephr/game: more easing functions and change tile animation easing

Browse Source
This commit is contained in:
Illusion
2024-01-26 03:14:20 +02:00
parent 07c6275684
commit 98c3a0f8af
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game.odin
+8 -8
View File
@@ -578,8 +578,8 @@ update_positions :: proc(delta_t: time.Duration) {
continue continue
} }
if src.anim_timer < TILE_ANIM_DURATION { if src.anim_timer < TILE_ANIM_DURATION {
src.position.x = math.lerp(src.start_pos.x, src.new_pos.x, zephr.ease_out_cubic(cast(f32)src.anim_timer / cast(f32)TILE_ANIM_DURATION)) src.position.x = math.lerp(src.start_pos.x, src.new_pos.x, cast(f32)zephr.ease_in_out_back(cast(f64)src.anim_timer / cast(f64)TILE_ANIM_DURATION))
src.position.y = math.lerp(src.start_pos.y, src.new_pos.y, zephr.ease_out_cubic(cast(f32)src.anim_timer / cast(f32)TILE_ANIM_DURATION)) src.position.y = math.lerp(src.start_pos.y, src.new_pos.y, cast(f32)zephr.ease_in_out_back(cast(f64)src.anim_timer / cast(f64)TILE_ANIM_DURATION))
src.anim_timer += delta_t src.anim_timer += delta_t
} else { } else {
dest := &game.board[cast(int)src.new_pos.x][cast(int)src.new_pos.y] dest := &game.board[cast(int)src.new_pos.x][cast(int)src.new_pos.y]
@@ -619,8 +619,8 @@ update_positions :: proc(delta_t: time.Duration) {
continue continue
} }
if src.anim_timer < TILE_ANIM_DURATION { if src.anim_timer < TILE_ANIM_DURATION {
src.position.x = math.lerp(src.start_pos.x, src.new_pos.x, zephr.ease_out_cubic(cast(f32)src.anim_timer / cast(f32)TILE_ANIM_DURATION)) src.position.x = math.lerp(src.start_pos.x, src.new_pos.x, cast(f32)zephr.ease_in_out_back(cast(f64)src.anim_timer / cast(f64)TILE_ANIM_DURATION))
src.position.y = math.lerp(src.start_pos.y, src.new_pos.y, zephr.ease_out_cubic(cast(f32)src.anim_timer / cast(f32)TILE_ANIM_DURATION)) src.position.y = math.lerp(src.start_pos.y, src.new_pos.y, cast(f32)zephr.ease_in_out_back(cast(f64)src.anim_timer / cast(f64)TILE_ANIM_DURATION))
src.anim_timer += delta_t src.anim_timer += delta_t
} else { } else {
dest := &game.board[cast(int)src.new_pos.x][cast(int)src.new_pos.y] dest := &game.board[cast(int)src.new_pos.x][cast(int)src.new_pos.y]
@@ -660,8 +660,8 @@ update_positions :: proc(delta_t: time.Duration) {
continue continue
} }
if src.anim_timer < TILE_ANIM_DURATION { if src.anim_timer < TILE_ANIM_DURATION {
src.position.x = math.lerp(src.start_pos.x, src.new_pos.x, zephr.ease_out_cubic(cast(f32)src.anim_timer / cast(f32)TILE_ANIM_DURATION)) src.position.x = math.lerp(src.start_pos.x, src.new_pos.x, cast(f32)zephr.ease_in_out_back(cast(f64)src.anim_timer / cast(f64)TILE_ANIM_DURATION))
src.position.y = math.lerp(src.start_pos.y, src.new_pos.y, zephr.ease_out_cubic(cast(f32)src.anim_timer / cast(f32)TILE_ANIM_DURATION)) src.position.y = math.lerp(src.start_pos.y, src.new_pos.y, cast(f32)zephr.ease_in_out_back(cast(f64)src.anim_timer / cast(f64)TILE_ANIM_DURATION))
src.anim_timer += delta_t src.anim_timer += delta_t
} else { } else {
dest := &game.board[cast(int)src.new_pos.x][cast(int)src.new_pos.y] dest := &game.board[cast(int)src.new_pos.x][cast(int)src.new_pos.y]
@@ -701,8 +701,8 @@ update_positions :: proc(delta_t: time.Duration) {
continue continue
} }
if src.anim_timer < TILE_ANIM_DURATION { if src.anim_timer < TILE_ANIM_DURATION {
src.position.x = math.lerp(src.start_pos.x, src.new_pos.x, zephr.ease_out_cubic(cast(f32)src.anim_timer / cast(f32)TILE_ANIM_DURATION)) src.position.x = math.lerp(src.start_pos.x, src.new_pos.x, cast(f32)zephr.ease_in_out_back(cast(f64)src.anim_timer / cast(f64)TILE_ANIM_DURATION))
src.position.y = math.lerp(src.start_pos.y, src.new_pos.y, zephr.ease_out_cubic(cast(f32)src.anim_timer / cast(f32)TILE_ANIM_DURATION)) src.position.y = math.lerp(src.start_pos.y, src.new_pos.y, cast(f32)zephr.ease_in_out_back(cast(f64)src.anim_timer / cast(f64)TILE_ANIM_DURATION))
src.anim_timer += delta_t src.anim_timer += delta_t
} else { } else {
dest := &game.board[cast(int)src.new_pos.x][cast(int)src.new_pos.y] dest := &game.board[cast(int)src.new_pos.x][cast(int)src.new_pos.y]
zephr/zephr_math.odin
+11
View File
@@ -194,3 +194,14 @@ ease_out_bounce :: proc(t: $T) -> T where intrinsics.type_is_numeric(T) {
return n1 * (t) * t + 0.984375; return n1 * (t) * t + 0.984375;
} }
} }
ease_in_out_quint :: proc(t: f32) -> f32 {
return t < 0.5 ? 16 * t * t * t * t * t : 1 - math.pow(-2 * t + 2, 5) / 2
}
ease_in_out_back :: proc(t: f64) -> f64 {
c1 := 1.70158;
c2 := c1 * 1.525;
return (math.pow(2 * t, 2) * ((c2 + 1) * 2 * t - c2)) / 2 if t < 0.5 else (math.pow(2 * t - 2, 2) * ((c2 + 1) * (t * 2 - 2) + c2) + 2) / 2
}