mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-28 14:59:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add BounceFromStart and BounceInfinitely animation modes

Browse Source
This commit is contained in:
Malin Ejdbo
2021-03-23 13:42:05 +01:00
parent 0a9af8f0ed
commit 7ae3922132
3 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/base/rendering/renderablemodel.cpp
+17 -4
View File
@@ -173,7 +173,8 @@ namespace {
Once,
LoopFromStart,
LoopInfinitely,
Bounce
BounceFromStart,
BounceInfinitely
};
// The mode of how the animation should be played back.
@@ -375,8 +376,11 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
case Parameters::AnimationMode::LoopInfinitely:
_animationMode = AnimationMode::LoopInfinitely;
break;
case Parameters::AnimationMode::Bounce:
_animationMode = AnimationMode::Bounce;
case Parameters::AnimationMode::BounceFromStart:
_animationMode = AnimationMode::BounceFromStart;
break;
case Parameters::AnimationMode::BounceInfinitely:
_animationMode = AnimationMode::BounceInfinitely;
break;
case Parameters::AnimationMode::Once:
default:
@@ -654,10 +658,19 @@ void RenderableModel::update(const UpdateData& data) {
realtiveTime += duration;
}
break;
case AnimationMode::Bounce:
case AnimationMode::BounceFromStart:
realtiveTime =
duration - abs(fmod(now - startTime, 2 * duration) - duration);
break;
case AnimationMode::BounceInfinitely: {
double modulo = fmod(now - startTime, 2 * duration);
if (modulo < 0) {
modulo += 2 * duration;
}
realtiveTime =
duration - abs(modulo - duration);
break;
}
case AnimationMode::Once:
default:
realtiveTime = now - startTime;