kraken_engine/kraken
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed crash that occurred when a non-looped animation is stopped by reaching the last frame.

Browse Source
This commit is contained in:
Kearwood Gilbert
2013-06-01 13:00:52 -07:00
parent 73cdad122b
commit 4eca1c16d2
2 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
KREngine/kraken/KRAnimationManager.cpp
View File

@@ -45,6 +45,24 @@ KRAnimationManager::~KRAnimationManager() {
void KRAnimationManager::startFrame(float deltaTime) void KRAnimationManager::startFrame(float deltaTime)
{ {
for(std::set<KRAnimation *>::iterator itr = m_animationsToUpdate.begin(); itr != m_animationsToUpdate.end(); itr++) {
KRAnimation *animation = *itr;
std::set<KRAnimation *>::iterator active_animations_itr = m_activeAnimations.find(animation);
if(animation->isPlaying()) {
// Add playing animations to the active animations list
if(active_animations_itr == m_activeAnimations.end()) {
m_activeAnimations.insert(animation);
}
} else {
// Remove stopped animations from the active animations list
if(active_animations_itr != m_activeAnimations.end()) {
m_activeAnimations.erase(active_animations_itr);
}
}
}
m_animationsToUpdate.clear();
for(std::set<KRAnimation *>::iterator active_animations_itr = m_activeAnimations.begin(); active_animations_itr != m_activeAnimations.end(); active_animations_itr++) { for(std::set<KRAnimation *>::iterator active_animations_itr = m_activeAnimations.begin(); active_animations_itr != m_activeAnimations.end(); active_animations_itr++) {
KRAnimation *animation = *active_animations_itr; KRAnimation *animation = *active_animations_itr;
animation->update(deltaTime); animation->update(deltaTime);
@@ -79,17 +97,6 @@ void KRAnimationManager::addAnimation(KRAnimation *new_animation)
void KRAnimationManager::updateActiveAnimations(KRAnimation *animation) void KRAnimationManager::updateActiveAnimations(KRAnimation *animation)
{ {
std::set<KRAnimation *>::iterator active_animations_itr = m_activeAnimations.find(animation); m_animationsToUpdate.insert(animation);
if(animation->isPlaying()) {
// Add playing animations to the active animations list
if(active_animations_itr == m_activeAnimations.end()) {
m_activeAnimations.insert(animation);
}
} else {
// Remove stopped animations from the active animations list
if(active_animations_itr != m_activeAnimations.end()) {
m_activeAnimations.erase(active_animations_itr);
}
}
} }

1
KREngine/kraken/KRAnimationManager.h
View File

@@ -58,6 +58,7 @@ public:
private: private:
unordered_map<std::string, KRAnimation *> m_animations; unordered_map<std::string, KRAnimation *> m_animations;
set<KRAnimation *> m_activeAnimations; set<KRAnimation *> m_activeAnimations;
set<KRAnimation *> m_animationsToUpdate;
}; };