funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2026-04-02 18:25:30 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Animations should now be updating the components ComponentInfo.

Browse Source
This commit is contained in:
Don Honerbrink
2015-11-25 17:54:22 +00:00
parent 7fa6c6209f
commit 5c0a748927
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
RetroFE/Source/Graphics/Animate/AnimationManager.cpp
View File

@@ -67,24 +67,25 @@ bool AnimationManager::updateChain(float dt, AnimationChain *chain)
ComponentData *endInfo = &a->end; ComponentData *endInfo = &a->end;
ComponentData *startInfo = &a->start; ComponentData *startInfo = &a->start;
ComponentData *currentInfo = &a->component->info;
if(endInfo->isMaskSet(COMPONENT_DATA_X_MASK)) { if(endInfo->isMaskSet(COMPONENT_DATA_X_MASK)) {
endInfo->x = (int)Tween::calculate(a->algorithm, a->elapsedTime, a->duration, startInfo->x, endInfo->x - startInfo->x); currentInfo->x = (int)Tween::calculate(a->algorithm, a->elapsedTime, a->duration, startInfo->x, endInfo->x - startInfo->x);
} }
if(endInfo->isMaskSet(COMPONENT_DATA_Y_MASK)) { if(endInfo->isMaskSet(COMPONENT_DATA_Y_MASK)) {
endInfo->y = (int)Tween::calculate(a->algorithm, a->elapsedTime, a->duration, startInfo->y, endInfo->y - startInfo->y); currentInfo->y = (int)Tween::calculate(a->algorithm, a->elapsedTime, a->duration, startInfo->y, endInfo->y - startInfo->y);
} }
if(endInfo->isMaskSet(COMPONENT_DATA_ALPHA_MASK)) { if(endInfo->isMaskSet(COMPONENT_DATA_ALPHA_MASK)) {
endInfo->alpha = (float)Tween::calculate(a->algorithm, a->elapsedTime, a->duration, startInfo->alpha, endInfo->alpha - startInfo->alpha); currentInfo->alpha = (float)Tween::calculate(a->algorithm, a->elapsedTime, a->duration, startInfo->alpha, endInfo->alpha - startInfo->alpha);
} }
if(endInfo->isMaskSet(COMPONENT_DATA_ROTATE_MASK)) { if(endInfo->isMaskSet(COMPONENT_DATA_ROTATE_MASK)) {
endInfo->rotate = (float)Tween::calculate(a->algorithm, a->elapsedTime, a->duration, startInfo->rotate, endInfo->rotate - startInfo->rotate); currentInfo->rotate = (float)Tween::calculate(a->algorithm, a->elapsedTime, a->duration, startInfo->rotate, endInfo->rotate - startInfo->rotate);
} }
if(endInfo->isMaskSet(COMPONENT_DATA_WIDTH_MASK)) { if(endInfo->isMaskSet(COMPONENT_DATA_WIDTH_MASK)) {
endInfo->width = (int)Tween::calculate(a->algorithm, a->elapsedTime, a->duration, startInfo->width, endInfo->width - startInfo->width); currentInfo->width = (int)Tween::calculate(a->algorithm, a->elapsedTime, a->duration, startInfo->width, endInfo->width - startInfo->width);
} }
if(endInfo->isMaskSet(COMPONENT_DATA_HEIGHT_MASK)) { if(endInfo->isMaskSet(COMPONENT_DATA_HEIGHT_MASK)) {
endInfo->height = (int)Tween::calculate(a->algorithm, a->elapsedTime, a->duration, startInfo->height, endInfo->height - startInfo->height); currentInfo->height = (int)Tween::calculate(a->algorithm, a->elapsedTime, a->duration, startInfo->height, endInfo->height - startInfo->height);
} }
} }
else { else {