Compare commits

...

2 Commits

Author SHA1 Message Date
7d25037b83 Update Tween.h 2026-02-18 16:40:11 +03:00
7f22882900 forceUpdate methods 2025-12-24 17:26:26 +03:00

193
Tween.h
View File

@ -46,11 +46,16 @@ class Tween {
private: private:
static inline Tween* head = nullptr; static inline Tween* head = nullptr;
static inline Tween* last = nullptr; static inline Tween* last = nullptr;
Tween* next; Tween* next = nullptr;
TweenListener* listener = nullptr; TweenListener* listener = nullptr;
public: public:
Tween(const Tween&) = delete;
Tween& operator=(const Tween&) = delete;
Tween(Tween&& other) noexcept;
Tween& operator=(Tween&& other) noexcept;
Tween(uint16_t fps = 30) { Tween(uint16_t fps = 30) {
setFps(fps); setFps(fps);
frameRateTimer = millis(); frameRateTimer = millis();
@ -78,6 +83,20 @@ public:
/////// ///////
private: private:
void unlinkFromList() {
if (Tween::head == nullptr) return;
if (this == Tween::head) {
Tween::head = this->next;
if (this == Tween::last) Tween::last = nullptr;
} else {
Tween* prev = Tween::head;
while (prev && prev->next != this) prev = prev->next;
if (prev) prev->next = this->next;
if (this == Tween::last) Tween::last = prev;
}
this->next = nullptr;
}
uint16_t frameTime; uint16_t frameTime;
float dt; float dt;
uint32_t oldMillis; uint32_t oldMillis;
@ -184,6 +203,92 @@ public:
triggerLastTick = false; triggerLastTick = false;
} }
// =========================================================
// Force Update API - принудительное обновление параметров
// =========================================================
// Принудительное обновление начальной точки (from) без сброса прогресса
// Пересчитывает current на основе нового from и текущего прогресса
void forceUpdateFrom(float newFrom) {
from = newFrom;
if (isPlayingF && duration > 0.0f) {
// Пересчитываем current на основе нового from и текущего прогресса
float normProgress = constrain(progress / duration, 0, 1);
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);
}
} else {
// Если не играет или duration = 0, просто обновляем from
current = from;
}
}
// Принудительное обновление конечной точки (to) без сброса прогресса
// Пересчитывает current на основе нового to и текущего прогресса
void forceUpdateTo(float newTo) {
to = newTo;
if (isPlayingF && duration > 0.0f) {
// Пересчитываем current на основе нового to и текущего прогресса
float normProgress = constrain(progress / duration, 0, 1);
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);
}
} else {
// Если не играет или duration = 0, просто обновляем to и current
current = to;
}
}
// Принудительное обновление обеих точек (from и to) без сброса прогресса
// Пересчитывает current на основе новых точек и текущего прогресса
void forceUpdateFromTo(float newFrom, float newTo) {
from = newFrom;
to = newTo;
if (isPlayingF && duration > 0.0f) {
// Пересчитываем current на основе новых точек и текущего прогресса
float normProgress = constrain(progress / duration, 0, 1);
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);
}
} else {
// Если не играет или duration = 0, устанавливаем current в from
current = from;
}
}
// Принудительное обновление прогресса (progress) без сброса других параметров
// Пересчитывает current на основе нового прогресса
// newProgress - абсолютное значение прогресса (0..duration)
void forceUpdateProgress(float newProgress) {
progress = constrain(newProgress, 0, duration);
if (duration > 0.0f) {
// Пересчитываем current на основе нового прогресса
float normProgress = constrain(progress / duration, 0, 1);
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);
}
} else {
// Если duration = 0, устанавливаем current в to
current = to;
}
}
bool isPlaying() const { bool isPlaying() const {
return isPlayingF || triggerLastTick; // Учитываем последний тик return isPlayingF || triggerLastTick; // Учитываем последний тик
} }
@ -214,21 +319,83 @@ public:
static float lerp(float a, float b, float t) { static float lerp(float a, float b, float t) {
return a + (b - a) * t; return a + (b - a) * t;
} }
private:
// int clamp(int value, int a, int b) {
// if (a > b) {
// a ^= b;
// b ^= a;
// a ^= b;
// }
// if (value < a) return a;
// else if (value > b) return b;
// else return value;
// }
}; };
//----------------------------------------------------------------------
// TWEEN MOVE SEMANTICS
//----------------------------------------------------------------------
inline Tween::Tween(Tween&& other) noexcept {
unlinkFromList();
next = other.next;
listener = other.listener;
frameTime = other.frameTime;
dt = other.dt;
oldMillis = other.oldMillis;
frameRateTimer = other.frameRateTimer;
from = other.from;
to = other.to;
duration = other.duration;
easing = other.easing;
easingFunc = std::move(other.easingFunc);
progress = other.progress;
isPlayingF = other.isPlayingF;
triggerLastTick = other.triggerLastTick;
current = other.current;
other.next = nullptr;
other.listener = nullptr;
other.easing = nullptr;
other.easingFunc = nullptr;
other.isPlayingF = false;
other.triggerLastTick = false;
if (Tween::head == &other) Tween::head = this;
else {
Tween* prev = Tween::head;
while (prev && prev->next != &other) prev = prev->next;
if (prev) prev->next = this;
}
if (Tween::last == &other) Tween::last = this;
}
inline Tween& Tween::operator=(Tween&& other) noexcept {
if (this != &other) {
unlinkFromList();
next = other.next;
listener = other.listener;
frameTime = other.frameTime;
dt = other.dt;
oldMillis = other.oldMillis;
frameRateTimer = other.frameRateTimer;
from = other.from;
to = other.to;
duration = other.duration;
easing = other.easing;
easingFunc = std::move(other.easingFunc);
progress = other.progress;
isPlayingF = other.isPlayingF;
triggerLastTick = other.triggerLastTick;
current = other.current;
other.next = nullptr;
other.listener = nullptr;
other.easing = nullptr;
other.easingFunc = nullptr;
other.isPlayingF = false;
other.triggerLastTick = false;
if (Tween::head == &other) Tween::head = this;
else {
Tween* prev = Tween::head;
while (prev && prev->next != &other) prev = prev->next;
if (prev) prev->next = this;
}
if (Tween::last == &other) Tween::last = this;
}
return *this;
}
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// ANIMATION CHAIN // ANIMATION CHAIN