From 7b9c7d926da49cc8eae720303df32e0c4c0a0536 Mon Sep 17 00:00:00 2001 From: blueloveTH Date: Mon, 27 Nov 2023 16:06:52 +0800 Subject: [PATCH] rename `easing` functions --- docs/modules/easing.md | 62 +++++++++++++++++++------------------- include/typings/easing.pyi | 62 +++++++++++++++++++------------------- src/easing.cpp | 2 +- tests/80_easing.py | 2 +- 4 files changed, 64 insertions(+), 64 deletions(-) diff --git a/docs/modules/easing.md b/docs/modules/easing.md index 7ec54d6d..8664776f 100644 --- a/docs/modules/easing.md +++ b/docs/modules/easing.md @@ -5,34 +5,34 @@ label: easing Python wrapper for [easing functions](https://easings.net/). -+ `EaseLinear(x: float) -> float` -+ `EaseInSine(x: float) -> float` -+ `EaseOutSine(x: float) -> float` -+ `EaseInOutSine(x: float) -> float` -+ `EaseInQuad(x: float) -> float` -+ `EaseOutQuad(x: float) -> float` -+ `EaseInOutQuad(x: float) -> float` -+ `EaseInCubic(x: float) -> float` -+ `EaseOutCubic(x: float) -> float` -+ `EaseInOutCubic(x: float) -> float` -+ `EaseInQuart(x: float) -> float` -+ `EaseOutQuart(x: float) -> float` -+ `EaseInOutQuart(x: float) -> float` -+ `EaseInQuint(x: float) -> float` -+ `EaseOutQuint(x: float) -> float` -+ `EaseInOutQuint(x: float) -> float` -+ `EaseInExpo(x: float) -> float` -+ `EaseOutExpo(x: float) -> float` -+ `EaseInOutExpo(x: float) -> float` -+ `EaseInCirc(x: float) -> float` -+ `EaseOutCirc(x: float) -> float` -+ `EaseInOutCirc(x: float) -> float` -+ `EaseInBack(x: float) -> float` -+ `EaseOutBack(x: float) -> float` -+ `EaseInOutBack(x: float) -> float` -+ `EaseInElastic(x: float) -> float` -+ `EaseOutElastic(x: float) -> float` -+ `EaseInOutElastic(x: float) -> float` -+ `EaseInBounce(x: float) -> float` -+ `EaseOutBounce(x: float) -> float` -+ `EaseInOutBounce(x: float) -> float` \ No newline at end of file ++ `easing.Linear(t: float) -> float` ++ `easing.InSine(t: float) -> float` ++ `easing.OutSine(t: float) -> float` ++ `easing.InOutSine(t: float) -> float` ++ `easing.InQuad(t: float) -> float` ++ `easing.OutQuad(t: float) -> float` ++ `easing.InOutQuad(t: float) -> float` ++ `easing.InCubic(t: float) -> float` ++ `easing.OutCubic(t: float) -> float` ++ `easing.InOutCubic(t: float) -> float` ++ `easing.InQuart(t: float) -> float` ++ `easing.OutQuart(t: float) -> float` ++ `easing.InOutQuart(t: float) -> float` ++ `easing.InQuint(t: float) -> float` ++ `easing.OutQuint(t: float) -> float` ++ `easing.InOutQuint(t: float) -> float` ++ `easing.InExpo(t: float) -> float` ++ `easing.OutExpo(t: float) -> float` ++ `easing.InOutExpo(t: float) -> float` ++ `easing.InCirc(t: float) -> float` ++ `easing.OutCirc(t: float) -> float` ++ `easing.InOutCirc(t: float) -> float` ++ `easing.InBack(t: float) -> float` ++ `easing.OutBack(t: float) -> float` ++ `easing.InOutBack(t: float) -> float` ++ `easing.InElastic(t: float) -> float` ++ `easing.OutElastic(t: float) -> float` ++ `easing.InOutElastic(t: float) -> float` ++ `easing.InBounce(t: float) -> float` ++ `easing.OutBounce(t: float) -> float` ++ `easing.InOutBounce(t: float) -> float` \ No newline at end of file diff --git a/include/typings/easing.pyi b/include/typings/easing.pyi index 5565541f..9306e0c7 100644 --- a/include/typings/easing.pyi +++ b/include/typings/easing.pyi @@ -1,31 +1,31 @@ -def EaseLinear(x: float) -> float: ... -def EaseInSine(x: float) -> float: ... -def EaseOutSine(x: float) -> float: ... -def EaseInOutSine(x: float) -> float: ... -def EaseInQuad(x: float) -> float: ... -def EaseOutQuad(x: float) -> float: ... -def EaseInOutQuad(x: float) -> float: ... -def EaseInCubic(x: float) -> float: ... -def EaseOutCubic(x: float) -> float: ... -def EaseInOutCubic(x: float) -> float: ... -def EaseInQuart(x: float) -> float: ... -def EaseOutQuart(x: float) -> float: ... -def EaseInOutQuart(x: float) -> float: ... -def EaseInQuint(x: float) -> float: ... -def EaseOutQuint(x: float) -> float: ... -def EaseInOutQuint(x: float) -> float: ... -def EaseInExpo(x: float) -> float: ... -def EaseOutExpo(x: float) -> float: ... -def EaseInOutExpo(x: float) -> float: ... -def EaseInCirc(x: float) -> float: ... -def EaseOutCirc(x: float) -> float: ... -def EaseInOutCirc(x: float) -> float: ... -def EaseInBack(x: float) -> float: ... -def EaseOutBack(x: float) -> float: ... -def EaseInOutBack(x: float) -> float: ... -def EaseInElastic(x: float) -> float: ... -def EaseOutElastic(x: float) -> float: ... -def EaseInOutElastic(x: float) -> float: ... -def EaseInBounce(x: float) -> float: ... -def EaseOutBounce(x: float) -> float: ... -def EaseInOutBounce(x: float) -> float: ... +def Linear(t: float) -> float: ... +def InSine(t: float) -> float: ... +def OutSine(t: float) -> float: ... +def InOutSine(t: float) -> float: ... +def InQuad(t: float) -> float: ... +def OutQuad(t: float) -> float: ... +def InOutQuad(t: float) -> float: ... +def InCubic(t: float) -> float: ... +def OutCubic(t: float) -> float: ... +def InOutCubic(t: float) -> float: ... +def InQuart(t: float) -> float: ... +def OutQuart(t: float) -> float: ... +def InOutQuart(t: float) -> float: ... +def InQuint(t: float) -> float: ... +def OutQuint(t: float) -> float: ... +def InOutQuint(t: float) -> float: ... +def InExpo(t: float) -> float: ... +def OutExpo(t: float) -> float: ... +def InOutExpo(t: float) -> float: ... +def InCirc(t: float) -> float: ... +def OutCirc(t: float) -> float: ... +def InOutCirc(t: float) -> float: ... +def InBack(t: float) -> float: ... +def OutBack(t: float) -> float: ... +def InOutBack(t: float) -> float: ... +def InElastic(t: float) -> float: ... +def OutElastic(t: float) -> float: ... +def InOutElastic(t: float) -> float: ... +def InBounce(t: float) -> float: ... +def OutBounce(t: float) -> float: ... +def InOutBounce(t: float) -> float: ... diff --git a/src/easing.cpp b/src/easing.cpp index c2c3557b..1c52136f 100644 --- a/src/easing.cpp +++ b/src/easing.cpp @@ -209,7 +209,7 @@ void add_module_easing(VM* vm){ PyObject* mod = vm->new_module("easing"); #define EASE(name) \ - vm->bind_func<1>(mod, "Ease"#name, [](VM* vm, ArgsView args){ \ + vm->bind_func<1>(mod, #name, [](VM* vm, ArgsView args){ \ f64 t = CAST(f64, args[0]); \ return VAR(ease##name(t)); \ }); diff --git a/tests/80_easing.py b/tests/80_easing.py index ee5cede5..0ac0431f 100644 --- a/tests/80_easing.py +++ b/tests/80_easing.py @@ -5,7 +5,7 @@ def validate(val): assert isinstance(val, float) for k, f in easing.__dict__.items(): - if k.startswith("Ease"): + if callable(f): validate(f(0.2)) validate(f(0.5)) validate(f(0.8))