fix some of the ease functions from interpolation (#15706)

# Objective

- Followup to #15675
- Some of the functions are wrong, noticed in #15703: `Sine`, `Elastic`
and `Back`

## Solution

- Fix them and make them deterministic


![ease-fixed-functions](https://github.com/user-attachments/assets/8a4d5c0c-36fa-4a49-a189-5b832dc24721)
This commit is contained in:
François Mockers 2024-10-07 21:08:32 +02:00 committed by GitHub
parent 90c6f24371
commit 1869e45c49
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 76 additions and 18 deletions

View file

@ -84,6 +84,64 @@ where
} }
} }
mod easing_functions {
use core::f32::consts::{FRAC_PI_2, FRAC_PI_3, PI};
use crate::{ops, FloatPow};
#[inline]
pub(crate) fn sine_in(t: f32) -> f32 {
1.0 - ops::cos(t * FRAC_PI_2)
}
#[inline]
pub(crate) fn sine_out(t: f32) -> f32 {
ops::sin(t * FRAC_PI_2)
}
#[inline]
pub(crate) fn back_in(t: f32) -> f32 {
let c = 1.70158;
(c + 1.0) * t.cubed() - c * t.squared()
}
#[inline]
pub(crate) fn back_out(t: f32) -> f32 {
let c = 1.70158;
1.0 + (c + 1.0) * (t - 1.0).cubed() + c * (t - 1.0).squared()
}
#[inline]
pub(crate) fn back_in_out(t: f32) -> f32 {
let c1 = 1.70158;
let c2 = c1 + 1.525;
if t < 0.5 {
(2.0 * t).squared() * ((c2 + 1.0) * 2.0 * t - c2) / 2.0
} else {
((2.0 * t - 2.0).squared() * ((c2 + 1.0) * (2.0 * t - 2.0) + c2) + 2.0) / 2.0
}
}
#[inline]
pub(crate) fn elastic_in(t: f32) -> f32 {
-ops::powf(2.0, 10.0 * t - 10.0) * ops::sin((t * 10.0 - 10.75) * 2.0 * FRAC_PI_3)
}
#[inline]
pub(crate) fn elastic_out(t: f32) -> f32 {
ops::powf(2.0, -10.0 * t) * ops::sin((t * 10.0 - 0.75) * 2.0 * FRAC_PI_3) + 1.0
}
#[inline]
pub(crate) fn elastic_in_out(t: f32) -> f32 {
let c = (2.0 * PI) / 4.5;
if t < 0.5 {
-ops::powf(2.0, 20.0 * t - 10.0) * ops::sin((t * 20.0 - 11.125) * c) / 2.0
} else {
ops::powf(2.0, -20.0 * t + 10.0) * ops::sin((t * 20.0 - 11.125) * c) / 2.0 + 1.0
}
}
}
impl EasingCurve<f32, FunctionCurve<f32, fn(f32) -> f32>> { impl EasingCurve<f32, FunctionCurve<f32, fn(f32) -> f32>> {
/// A [`Curve`] mapping the [unit interval] to itself. /// A [`Curve`] mapping the [unit interval] to itself.
/// ///
@ -107,8 +165,8 @@ impl EasingCurve<f32, FunctionCurve<f32, fn(f32) -> f32>> {
EaseFunction::QuinticIn => Ease::quintic_in, EaseFunction::QuinticIn => Ease::quintic_in,
EaseFunction::QuinticOut => Ease::quintic_out, EaseFunction::QuinticOut => Ease::quintic_out,
EaseFunction::QuinticInOut => Ease::quintic_in_out, EaseFunction::QuinticInOut => Ease::quintic_in_out,
EaseFunction::SineIn => Ease::sine_in, EaseFunction::SineIn => easing_functions::sine_in,
EaseFunction::SineOut => Ease::sine_out, EaseFunction::SineOut => easing_functions::sine_out,
EaseFunction::SineInOut => Ease::sine_in_out, EaseFunction::SineInOut => Ease::sine_in_out,
EaseFunction::CircularIn => Ease::circular_in, EaseFunction::CircularIn => Ease::circular_in,
EaseFunction::CircularOut => Ease::circular_out, EaseFunction::CircularOut => Ease::circular_out,
@ -116,12 +174,12 @@ impl EasingCurve<f32, FunctionCurve<f32, fn(f32) -> f32>> {
EaseFunction::ExponentialIn => Ease::exponential_in, EaseFunction::ExponentialIn => Ease::exponential_in,
EaseFunction::ExponentialOut => Ease::exponential_out, EaseFunction::ExponentialOut => Ease::exponential_out,
EaseFunction::ExponentialInOut => Ease::exponential_in_out, EaseFunction::ExponentialInOut => Ease::exponential_in_out,
EaseFunction::ElasticIn => Ease::elastic_in, EaseFunction::ElasticIn => easing_functions::elastic_in,
EaseFunction::ElasticOut => Ease::elastic_out, EaseFunction::ElasticOut => easing_functions::elastic_out,
EaseFunction::ElasticInOut => Ease::elastic_in_out, EaseFunction::ElasticInOut => easing_functions::elastic_in_out,
EaseFunction::BackIn => Ease::back_in, EaseFunction::BackIn => easing_functions::back_in,
EaseFunction::BackOut => Ease::back_out, EaseFunction::BackOut => easing_functions::back_out,
EaseFunction::BackInOut => Ease::back_in_out, EaseFunction::BackInOut => easing_functions::back_in_out,
EaseFunction::BounceIn => Ease::bounce_in, EaseFunction::BounceIn => Ease::bounce_in,
EaseFunction::BounceOut => Ease::bounce_out, EaseFunction::BounceOut => Ease::bounce_out,
EaseFunction::BounceInOut => Ease::bounce_in_out, EaseFunction::BounceInOut => Ease::bounce_in_out,
@ -378,7 +436,7 @@ pub enum EaseFunction {
/// Behaves as `EaseFunction::QuinticIn` for t < 0.5 and as `EaseFunction::QuinticOut` for t >= 0.5 /// Behaves as `EaseFunction::QuinticIn` for t < 0.5 and as `EaseFunction::QuinticOut` for t >= 0.5
QuinticInOut, QuinticInOut,
/// `f(t) = sin((t - 1.0) * π / 2.0) + 1.0` /// `f(t) = 1.0 - cos(t * π / 2.0)`
SineIn, SineIn,
/// `f(t) = sin(t * π / 2.0)` /// `f(t) = sin(t * π / 2.0)`
SineOut, SineOut,
@ -392,23 +450,23 @@ pub enum EaseFunction {
/// Behaves as `EaseFunction::CircularIn` for t < 0.5 and as `EaseFunction::CircularOut` for t >= 0.5 /// Behaves as `EaseFunction::CircularIn` for t < 0.5 and as `EaseFunction::CircularOut` for t >= 0.5
CircularInOut, CircularInOut,
/// `f(t) = 2.0.powf(10.0 * (t - 1.0))` /// `f(t) = 2.0^(10.0 * (t - 1.0))`
ExponentialIn, ExponentialIn,
/// `f(t) = 1.0 - 2.0.powf(-10.0 * t)` /// `f(t) = 1.0 - 2.0^(-10.0 * t)`
ExponentialOut, ExponentialOut,
/// Behaves as `EaseFunction::ExponentialIn` for t < 0.5 and as `EaseFunction::ExponentialOut` for t >= 0.5 /// Behaves as `EaseFunction::ExponentialIn` for t < 0.5 and as `EaseFunction::ExponentialOut` for t >= 0.5
ExponentialInOut, ExponentialInOut,
/// `f(t) = sin(13.0 * π / 2.0 * t) * 2.0.powf(10.0 * (t - 1.0))` /// `f(t) = -2.0^(10.0 * t - 10.0) * sin((t * 10.0 - 10.75) * 2.0 * π / 3.0)`
ElasticIn, ElasticIn,
/// `f(t) = sin(-13.0 * π / 2.0 * (t + 1.0)) * 2.0.powf(-10.0 * t) + 1.0` /// `f(t) = 2.0^(-10.0 * t) * sin((t * 10.0 - 0.75) * 2.0 * π / 3.0) + 1.0`
ElasticOut, ElasticOut,
/// Behaves as `EaseFunction::ElasticIn` for t < 0.5 and as `EaseFunction::ElasticOut` for t >= 0.5 /// Behaves as `EaseFunction::ElasticIn` for t < 0.5 and as `EaseFunction::ElasticOut` for t >= 0.5
ElasticInOut, ElasticInOut,
/// `f(t) = t³ - t * sin(t * π)` /// `f(t) = 2.70158 * t³ - 1.70158 * t²`
BackIn, BackIn,
/// `f(t) = 1.0 - (1.0 - t)³ - t * sin((1.0 - t) * π))` /// `f(t) = 1.0 + 2.70158 * (t - 1.0)³ - 1.70158 * (t - 1.0)²`
BackOut, BackOut,
/// Behaves as `EaseFunction::BackIn` for t < 0.5 and as `EaseFunction::BackOut` for t >= 0.5 /// Behaves as `EaseFunction::BackIn` for t < 0.5 and as `EaseFunction::BackOut` for t >= 0.5
BackInOut, BackInOut,

View file

@ -22,6 +22,9 @@ fn setup(mut commands: Commands) {
}; };
for (i, functions) in [ for (i, functions) in [
easing::EaseFunction::SineIn,
easing::EaseFunction::SineOut,
easing::EaseFunction::SineInOut,
easing::EaseFunction::QuadraticIn, easing::EaseFunction::QuadraticIn,
easing::EaseFunction::QuadraticOut, easing::EaseFunction::QuadraticOut,
easing::EaseFunction::QuadraticInOut, easing::EaseFunction::QuadraticInOut,
@ -40,9 +43,6 @@ fn setup(mut commands: Commands) {
easing::EaseFunction::ExponentialIn, easing::EaseFunction::ExponentialIn,
easing::EaseFunction::ExponentialOut, easing::EaseFunction::ExponentialOut,
easing::EaseFunction::ExponentialInOut, easing::EaseFunction::ExponentialInOut,
easing::EaseFunction::SineIn,
easing::EaseFunction::SineOut,
easing::EaseFunction::SineInOut,
easing::EaseFunction::ElasticIn, easing::EaseFunction::ElasticIn,
easing::EaseFunction::ElasticOut, easing::EaseFunction::ElasticOut,
easing::EaseFunction::ElasticInOut, easing::EaseFunction::ElasticInOut,