DashyFox/Tween
1
0
Fork 0
mirror of https://github.com/Show-maket/Tween.git synced 2025-09-13 03:12:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

common TimeWarp things was detected

Browse Source
This commit is contained in:
DashyFox
2025-09-04 16:46:03 +03:00
parent c4995cf075
commit cc5158eef0
1 changed files with 49 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
Tween.h
View File

@ -11,22 +11,18 @@ namespace EasingFunc {
// typedef float (*eFunc)(float); // тип easing-функции, как у Вас // typedef float (*eFunc)(float); // тип easing-функции, как у Вас
// Статические данные для обёртки
static const TimeWarp* g_warp = nullptr;
static eFunc g_baseEasing = nullptr;
// Обёртка с модификатором времени (вызывается Tween'ом) // Обёртка с модификатором времени (вызывается Tween'ом)
inline float _easingWithWarp(float t) { inline float _easingWithWarp(float t, const TimeWarp* warp, eFunc baseEasing) {
if (!g_warp || !g_baseEasing) return t; if (!warp || !baseEasing) return t;
float warpedT = g_warp->apply(t); float warpedT = warp->apply(t);
return g_baseEasing(warpedT); return baseEasing(warpedT);
} }
// Установить текущий модификатор времени // Создать обёртку с модификатором времени
inline eFunc withTimeWarp(eFunc easing, const TimeWarp& warp) { inline std::function<float(float)> withTimeWarp(eFunc easing, const TimeWarp& warp) {
g_warp = &warp; return [easing, &warp](float t) -> float {
g_baseEasing = easing; return _easingWithWarp(t, &warp, easing);
return _easingWithWarp; };
} }
}; // namespace EasingFunc }; // namespace EasingFunc
@ -91,6 +87,7 @@ private:
float to; float to;
float duration; float duration;
EasingFunc::eFunc easing = nullptr; EasingFunc::eFunc easing = nullptr;
std::function<float(float)> easingFunc = nullptr;
float progress; float progress;
bool isPlayingF; bool isPlayingF;
bool triggerLastTick = false; // Флаг последнего тика bool triggerLastTick = false; // Флаг последнего тика
@ -121,7 +118,13 @@ public:
progress = constrain(progress + dt, 0, duration); progress = constrain(progress + dt, 0, duration);
float normProgress = constrain(progress / duration, 0, 1); float normProgress = constrain(progress / duration, 0, 1);
current = Tween::lerp(from, to, easing(normProgress)); if (easingFunc) {
current = Tween::lerp(from, to, easingFunc(normProgress));
} else if (easing) {
current = Tween::lerp(from, to, easing(normProgress));
} else {
current = Tween::lerp(from, to, normProgress);
}
if (progress >= duration) { if (progress >= duration) {
current = to; current = to;
@ -142,6 +145,23 @@ public:
void start(float from_, float to_, uint16_t durationMs, EasingFunc::eFunc easing_ = nullptr) { void start(float from_, float to_, uint16_t durationMs, EasingFunc::eFunc easing_ = nullptr) {
// если easing не задан, используем линейную // если easing не задан, используем линейную
easing = (easing_ != nullptr) ? easing_ : EasingFunc::easeLinear; easing = (easing_ != nullptr) ? easing_ : EasingFunc::easeLinear;
easingFunc = nullptr; // сбрасываем функцию с TimeWarp
from = from_;
to = to_;
duration = durationMs / 1000.0f;
progress = 0;
current = from;
uint32_t now = millis();
oldMillis = now;
frameRateTimer = now;
isPlayingF = true;
triggerLastTick = false;
}
void start(float from_, float to_, uint16_t durationMs, std::function<float(float)> easingFunc_) {
easing = nullptr; // сбрасываем обычную функцию
easingFunc = easingFunc_;
from = from_; from = from_;
to = to_; to = to_;
@ -221,7 +241,8 @@ class AnimationChain : public TweenListener {
FromFunc fromFunc = nullptr; FromFunc fromFunc = nullptr;
float to; float to;
uint16_t duration; // мс uint16_t duration; // мс
EasingFunc::eFunc easing; EasingFunc::eFunc easing = nullptr;
std::function<float(float)> easingFunc = nullptr;
}; };
private: private:
@ -233,7 +254,11 @@ class AnimationChain : public TweenListener {
void launchCurrent() { void launchCurrent() {
const Anim& a = animations[currentIndex]; const Anim& a = animations[currentIndex];
tween.start(a.fromFunc ? a.fromFunc() : a.from, a.to, a.duration, a.easing); if (a.easingFunc) {
tween.start(a.fromFunc ? a.fromFunc() : a.from, a.to, a.duration, a.easingFunc);
} else {
tween.start(a.fromFunc ? a.fromFunc() : a.from, a.to, a.duration, a.easing);
}
} }
public: public:
@ -248,10 +273,16 @@ class AnimationChain : public TweenListener {
//------------------------------------------------------------------ //------------------------------------------------------------------
void addAnim(float from, float to, uint16_t duration, EasingFunc::eFunc easing = nullptr) { void addAnim(float from, float to, uint16_t duration, EasingFunc::eFunc easing = nullptr) {
animations.push_back({from, {}, to, duration, easing}); animations.push_back({from, {}, to, duration, easing, nullptr});
} }
void addAnim(FromFunc fromF, float to, uint16_t duration, EasingFunc::eFunc easing = nullptr) { void addAnim(FromFunc fromF, float to, uint16_t duration, EasingFunc::eFunc easing = nullptr) {
animations.push_back({0, fromF, to, duration, easing}); animations.push_back({0, fromF, to, duration, easing, nullptr});
}
void addAnim(float from, float to, uint16_t duration, std::function<float(float)> easingFunc) {
animations.push_back({from, {}, to, duration, nullptr, easingFunc});
}
void addAnim(FromFunc fromF, float to, uint16_t duration, std::function<float(float)> easingFunc) {
animations.push_back({0, fromF, to, duration, nullptr, easingFunc});
} }
void clear() { animations.clear(); } void clear() { animations.clear(); }