mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-07-03 06:24:32 +00:00
Code Issues Releases Wiki Activity

Improve some skel anim edge cases; warning fixes. Also new Lua function.

Browse source 
+ entity_setAnimationTime()
This commit is contained in:
fgenesis 2022-11-16 22:46:56 +01:00
parent da8faf2bd9
commit 92ab459736
3 changed files with 47 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

48
BBGE/SkeletalSprite.cpp
View file

@ -552,24 +552,28 @@ float AnimationLayer::transitionAnimate(std::string anim, float time, int loop)
{
stringToLower(anim);
float totalTime =0;
if (createTransitionAnimation(anim, time))
if(Animation *a = this->s->getAnimation(anim))
{
timeMultiplier = 1;
currentAnimation = -1;
this->loop = 0;
timer = 0;
animating = 1;
animationLength = getCurrentAnimation()->getAnimationLength();
enqueueAnimation(anim, loop);
Animation *a = this->s->getAnimation(anim);
if (a)
if (time <= 0) // no transition?
{
if (loop > -1)
totalTime = a->getAnimationLength()*(loop+1) + time;
else
totalTime = a->getAnimationLength() + time;
animate(anim, loop);
}
else
{
createTransitionAnimation(*a, time);
timeMultiplier = 1;
currentAnimation = -1;
this->loop = 0;
timer = 0;
animating = 1;
animationLength = getCurrentAnimation()->getAnimationLength();
enqueueAnimation(anim, loop);
}
if (loop > -1)
totalTime = a->getAnimationLength()*(loop+1) + time;
else
totalTime = a->getAnimationLength() + time;
}
return totalTime;
}
@ -593,11 +597,8 @@ Animation* AnimationLayer::getCurrentAnimation()
return &s->animations[currentAnimation];
}
bool AnimationLayer::createTransitionAnimation(const std::string& anim, float time)
void AnimationLayer::createTransitionAnimation(Animation& to, float time)
{
Animation *to = s->getAnimation(anim);
if (!to) return false;
blendAnimation.keyframes.clear();
SkeletalKeyframe k;
k.t = 0;
@ -615,14 +616,11 @@ bool AnimationLayer::createTransitionAnimation(const std::string& anim, float ti
blendAnimation.keyframes.push_back(k);
SkeletalKeyframe k2;
SkeletalKeyframe *rk = to->getKeyframe(0);
if (!rk) return false;
k2 = *rk;
k2 = *to.getKeyframe(0);
k2.t = time;
blendAnimation.keyframes.push_back(k2);
blendAnimation.name = anim;
return true;
blendAnimation.name = to.name;
}
@ -908,7 +906,7 @@ void AnimationLayer::update(float dt)
{
timer += dt*timeMultiplier.x;
if (timer > animationLength)
if (timer >= animationLength)
{
float leftover;
if (animationLength > 0)

2
BBGE/SkeletalSprite.h
View file

@ -203,7 +203,7 @@ public:
void updateBones();
void stopAnimation();
float getAnimationLength();
bool createTransitionAnimation(const std::string& anim, float time);
void createTransitionAnimation(Animation& to, float time);
void playAnimation(int idx, int loop);
void playCurrentAnimation(int loop);
void enqueueAnimation(const std::string& anim, int loop);