KlemenPl/PixelDefense
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update instead of overwrite value in easing system

Browse Source
This commit is contained in:
Klemen Plestenjak
2023-12-29 20:26:46 +01:00
parent d73f7804a8
commit b48c353c14
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
game/systems/s_animation.c
View File

@@ -66,6 +66,7 @@ void updateEasingSystem(ecs_iter_t *it) {
easing[i].elapsed += dt; easing[i].elapsed += dt;
f32 alpha = easing[i].elapsed / easing[i].duration; f32 alpha = easing[i].elapsed / easing[i].duration;
alpha = BZ_MIN(1.0f, alpha); alpha = BZ_MIN(1.0f, alpha);
f32 prevX = easing[i].x;
easing[i].x = bzEase(easing[i].easingFunc, alpha); easing[i].x = bzEase(easing[i].easingFunc, alpha);
const Easing *e = &easing[i]; const Easing *e = &easing[i];
@@ -74,10 +75,13 @@ void updateEasingSystem(ecs_iter_t *it) {
x = e->easeStart + e->easeTarget * x + e->easeOffset; x = e->easeStart + e->easeTarget * x + e->easeOffset;
// Outer // Outer
x = e->start + e->target * x + e->offset; x = e->start + e->target * x + e->offset;
easing->x = x;
u8 *compData = ecs_get_mut_id(ECS, entity, easing[i].compID); u8 *compData = ecs_get_mut_id(ECS, entity, easing[i].compID);
compData += easing[i].memberOffset; compData += easing[i].memberOffset;
f32 *out = (f32 *) compData;
*(f32 *) compData = x; *out -= prevX;
*out += x;
} }
} }