ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-04 06:38:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ease] Flux fixups.

Browse Source
This commit is contained in:
Jeroen van Rijn
2022-03-27 16:49:22 +02:00
parent 2c498c132e
commit b1c2c0ea7a
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/math/ease/ease.odin
+8 -10
View File
@@ -25,7 +25,7 @@ quadratic_out :: proc "contextless" (p: $T) -> T where intrinsics.type_is_float(
// y = -(1/2)((2x-1)*(2x-3) - 1) ; [0.5, 1] // y = -(1/2)((2x-1)*(2x-3) - 1) ; [0.5, 1]
quadratic_in_out :: proc "contextless" (p: $T) -> T where intrinsics.type_is_float(T) { quadratic_in_out :: proc "contextless" (p: $T) -> T where intrinsics.type_is_float(T) {
if p < 0.5 { if p < 0.5 {
return 2 * p * p; return 2 * p * p
} else { } else {
return (-2 * p * p) + (4 * p) - 1 return (-2 * p * p) + (4 * p) - 1
} }
@@ -337,7 +337,6 @@ Flux_Tween :: struct($T: typeid) {
goal: T, goal: T,
delay: f64, // in seconds delay: f64, // in seconds
delay_delta: f64,
duration: time.Duration, duration: time.Duration,
progress: f64, progress: f64,
@@ -414,25 +413,24 @@ flux_tween_init :: proc(tween: ^Flux_Tween($T), duration: time.Duration) where i
// calls callbacks in all stages, when they're filled // calls callbacks in all stages, when they're filled
// deletes tween from the map after completion // deletes tween from the map after completion
flux_update :: proc(flux: ^Flux_Map($T), dt: f64) where intrinsics.type_is_float(T) { flux_update :: proc(flux: ^Flux_Map($T), dt: f64) where intrinsics.type_is_float(T) {
size := len(flux.values)
dt := dt
for key, tween in &flux.values { for key, tween in &flux.values {
delay_remainder := f64(0) delay_remainder := f64(0)
// Update delay if necessary.
if tween.delay > 0 { if tween.delay > 0 {
// Update delay
tween.delay -= dt tween.delay -= dt
if tween.delay < 0 { if tween.delay < 0 {
// We finished the delay, but in doing so consumed part of this frame's `dt` budget. // We finished the delay, but in doing so consumed part of this frame's `dt` budget.
// Keep track of it so we can apply it to this tween without affecting others. // Keep track of it so we can apply it to this tween without affecting others.
delay_remainder = tween.delay delay_remainder = tween.delay
// We're done with this delay. // We're done with this delay.
tween.delay = 0 tween.delay = 0
} }
} else { }
// We either had no delay, or the delay has been consumed.
// We either had no delay, or the delay has been consumed.
if tween.delay <= 0 {
if !tween.inited { if !tween.inited {
flux_tween_init(&tween, tween.duration) flux_tween_init(&tween, tween.duration)