ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

SceneGraph: prefix private Animable members with an underscore. 

And minor other coding style updates. This code is old, wow!
pull/231/head
Vladimír Vondruš 8 years ago
parent
0b491309fb
commit
72a3d67902
2 changed files with 32 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      src/Magnum/SceneGraph/Animable.h
  2. 56
      src/Magnum/SceneGraph/Animable.hpp

9
src/Magnum/SceneGraph/Animable.h
Unescape View File

@ -169,7 +169,7 @@ template<UnsignedInt dimensions, class T> class Animable: public AbstractGrouped
Float duration() const { return _duration; }
/** @brief Animation state */
AnimationState state() const { return currentState; }
AnimationState state() const { return _currentState; }
/**
* @brief Set animation state
@ -318,12 +318,11 @@ template<UnsignedInt dimensions, class T> class Animable: public AbstractGrouped
private:
Float _duration;
Float startTime, pauseTime;
AnimationState previousState;
AnimationState currentState;
Float _startTime, _pauseTime;
AnimationState _previousState, _currentState;
bool _repeated;
UnsignedShort _repeatCount;
UnsignedShort repeats;
UnsignedShort _repeats;
};
/**

56
src/Magnum/SceneGraph/Animable.hpp
Unescape View File

@ -36,20 +36,20 @@
namespace Magnum { namespace SceneGraph {
template<UnsignedInt dimensions, class T> Animable<dimensions, T>::Animable(AbstractObject<dimensions, T>& object, AnimableGroup<dimensions, T>* group): AbstractGroupedFeature<dimensions, Animable<dimensions, T>, T>(object, group), _duration(0.0f), startTime(Constants::inf()), pauseTime(-Constants::inf()), previousState(AnimationState::Stopped), currentState(AnimationState::Stopped), _repeated(false), _repeatCount(0), repeats(0) {}
template<UnsignedInt dimensions, class T> Animable<dimensions, T>::Animable(AbstractObject<dimensions, T>& object, AnimableGroup<dimensions, T>* group): AbstractGroupedFeature<dimensions, Animable<dimensions, T>, T>{object, group}, _duration{0.0f}, _startTime{Constants::inf()}, _pauseTime{-Constants::inf()}, _previousState{AnimationState::Stopped}, _currentState{AnimationState::Stopped}, _repeated{false}, _repeatCount{0}, _repeats{0} {}
template<UnsignedInt dimensions, class T> Animable<dimensions, T>::~Animable() {}
template<UnsignedInt dimensions, class T> Animable<dimensions, T>& Animable<dimensions, T>::setState(AnimationState state) {
if(currentState == state) return *this;
if(_currentState == state) return *this;
/* Not allowed (for sanity) */
if(previousState == AnimationState::Stopped && state == AnimationState::Paused)
if(_previousState == AnimationState::Stopped && state == AnimationState::Paused)
return *this;
/* Wake up the group in case no animations are running */
animables()->wakeUp = true;
currentState = state;
_currentState = state;
return *this;
}
@ -70,67 +70,67 @@ template<UnsignedInt dimensions, class T> void AnimableGroup<dimensions, T>::ste
/* The animation was stopped recently, just decrease count of running
animations if the animation was running before */
if(animable.previousState != AnimationState::Stopped && animable.currentState == AnimationState::Stopped) {
if(animable.previousState == AnimationState::Running)
if(animable._previousState != AnimationState::Stopped && animable._currentState == AnimationState::Stopped) {
if(animable._previousState == AnimationState::Running)
--_runningCount;
animable.previousState = AnimationState::Stopped;
animable._previousState = AnimationState::Stopped;
animable.animationStopped();
continue;
/* The animation was paused recently, set pause time to previous frame time */
} else if(animable.previousState == AnimationState::Running && animable.currentState == AnimationState::Paused) {
animable.previousState = AnimationState::Paused;
animable.pauseTime = time;
} else if(animable._previousState == AnimationState::Running && animable._currentState == AnimationState::Paused) {
animable._previousState = AnimationState::Paused;
animable._pauseTime = time;
--_runningCount;
animable.animationPaused();
continue;
/* Skip the rest for not running animations */
} else if(animable.currentState != AnimationState::Running) {
CORRADE_INTERNAL_ASSERT(animable.previousState == animable.currentState);
} else if(animable._currentState != AnimationState::Running) {
CORRADE_INTERNAL_ASSERT(animable._previousState == animable._currentState);
continue;
/* The animation was started recently, set start time to previous frame
time, reset repeat count */
} else if(animable.previousState == AnimationState::Stopped) {
animable.previousState = AnimationState::Running;
animable.startTime = time;
animable.repeats = 0;
} else if(animable._previousState == AnimationState::Stopped) {
animable._previousState = AnimationState::Running;
animable._startTime = time;
animable._repeats = 0;
++_runningCount;
animable.animationStarted();
/* The animation was resumed recently, add pause duration to start time */
} else if(animable.previousState == AnimationState::Paused) {
animable.previousState = AnimationState::Running;
animable.startTime += time - animable.pauseTime;
} else if(animable._previousState == AnimationState::Paused) {
animable._previousState = AnimationState::Running;
animable._startTime += time - animable._pauseTime;
++_runningCount;
animable.animationResumed();
}
CORRADE_INTERNAL_ASSERT(animable.previousState == AnimationState::Running);
CORRADE_INTERNAL_ASSERT(animable._previousState == AnimationState::Running);
/* Animation time exceeded duration */
if(animable._duration != 0.0f && time-animable.startTime > animable._duration) {
if(animable._duration != 0.0f && time-animable._startTime > animable._duration) {
/* Not repeated or repeat count exceeded, stop */
if(!animable._repeated || animable.repeats+1 == animable._repeatCount) {
animable.previousState = AnimationState::Stopped;
animable.currentState = AnimationState::Stopped;
if(!animable._repeated || animable._repeats + 1 == animable._repeatCount) {
animable._previousState = AnimationState::Stopped;
animable._currentState = AnimationState::Stopped;
--_runningCount;
animable.animationStopped();
continue;
}
/* Increase repeat count and add duration to startTime */
++animable.repeats;
animable.startTime += animable._duration;
++animable._repeats;
animable._startTime += animable._duration;
}
/* Animation is still running, perform animation step */
CORRADE_ASSERT(time-animable.startTime >= 0.0f,
CORRADE_ASSERT(time - animable._startTime >= 0.0f,
"SceneGraph::AnimableGroup::step(): animation was started in future - probably wrong time passed", );
CORRADE_ASSERT(delta >= 0.0f,
"SceneGraph::AnimableGroup::step(): negative delta passed", );
animable.animationStep(time - animable.startTime, delta);
animable.animationStep(time - animable._startTime, delta);
}
CORRADE_INTERNAL_ASSERT((_runningCount <= AnimableGroup<dimensions, T>::size()));

Write Preview
Loading…
Cancel
Save