Skip to content

ofxAssimp: Convert animation mixer animation clip references to weak_ptrs #8393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ofTheo merged 1 commit into from
Mar 26, 2025
Merged

ofxAssimp: Convert animation mixer animation clip references to weak_ptrs #8393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 31 additions & 12 deletions addons/ofxAssimp/src/ofxAssimpAnimationMixer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ using namespace ofxAssimp;

//--------------------------------------------------------------
bool AnimationClip::shouldRemove( const AnimationClip& ac ) {
return ac.bRemove;
return (ac.animationWeak.expired() || ac.bRemove);
}

//--------------------------------------------------------------
Expand All @@ -31,8 +31,11 @@ AnimationClip& AnimationMixer::getAnimationClip(const std::string& aname) {
return dummy;
}
for( auto& anim : mAnimationClips ) {
if( anim.animation.getName() == aname ) {
return anim;
if(anim.animationWeak.expired()) {continue;}
if( auto alock = anim.animationWeak.lock() ) {
if( alock->getName() == aname ) {
return anim;
}
}
}
ofLogWarning("ofxAssimp::AnimationMixer::getAnimationClip") << " could not find clip " << aname;
Expand All @@ -57,9 +60,12 @@ bool AnimationMixer::remove( int aindex ) {
bool AnimationMixer::remove( const std::string& aname ) {
int tindex = -1;
for(int i = 0; i < (int)mAnimationClips.size(); i++) {
if( mAnimationClips[i].animation.getName() == aname ) {
tindex = i;
break;
if(mAnimationClips[i].animationWeak.expired()) {continue;}
if( auto alock = mAnimationClips[i].animationWeak.lock() ) {
if( alock->getName() == aname ) {
tindex = i;
break;
}
}
}
if( tindex > -1 ) {
Expand All @@ -76,22 +82,31 @@ void AnimationMixer::removeAll() {
//--------------------------------------------------------------
void AnimationMixer::playAll() {
for( auto& anim : mAnimationClips ) {
anim.animation.play();
if(anim.animationWeak.expired()) {continue;}
if( auto alock = anim.animationWeak.lock() ) {
alock->play();
}
}
}

//--------------------------------------------------------------
void AnimationMixer::stopAll() {
for( auto& anim : mAnimationClips ) {
anim.animation.stop();
if(anim.animationWeak.expired()) {continue;}
if( auto alock = anim.animationWeak.lock() ) {
alock->stop();
}
}
}

//--------------------------------------------------------------
void AnimationMixer::update(float aElapsedTimef) {
for(auto& anim : mAnimationClips ) {
// std::cout << "AnimationMixer :: update : " << anim.animation.getName() << " position: " << anim.animation.getPositionInSeconds() << std::endl;
anim.animation.update();
if(anim.animationWeak.expired()) {continue;}
if( auto alock = anim.animationWeak.lock() ) {
alock->update();
}
}

float tdelta = std::max( std::min(aElapsedTimef-mLastUpdateTime, 10.f), ai_epsilon);
Expand Down Expand Up @@ -166,9 +181,13 @@ void AnimationMixer::transition( const std::string& aname, float aduration, bool
// first get the targeted animation //
int animIndex = -1;
for( int i = 0; i < (int)mAnimationClips.size(); i++ ) {
if( mAnimationClips[i].animation.getName() == aname ) {
animIndex = i;
break;
// if( mAnimationClips[i].animation.getName() == aname ) {
if(mAnimationClips[i].animationWeak.expired()) {continue;}
if( auto alock = mAnimationClips[i].animationWeak.lock() ) {
if( alock->getName() == aname ) {
animIndex = i;
break;
}
}
}
if( animIndex < 0 ) {
Expand Down
13 changes: 10 additions & 3 deletions addons/ofxAssimp/src/ofxAssimpAnimationMixer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ class AnimationClip {
static bool shouldRemove( const AnimationClip& ac );

AnimationClip() {}
AnimationClip(Animation anim, float aweight) {
animation = anim;
AnimationClip(std::shared_ptr<Animation> anim, float aweight) {
animationWeak = anim;
weight = aweight;
}
// AnimationClip(const Animation& anim, float aweight, bool abOneShot) {
Expand All @@ -39,8 +39,15 @@ class AnimationClip {

void tagForRemoval() {bRemove=true;}

void resetAnimation() {
if( auto alock = animationWeak.lock() ) {
alock->reset();
}
}

float weight = 1.0f;
Animation animation;
// Animation animation;
std::weak_ptr<Animation> animationWeak;

//protected:
float mTargetWeight = -1.f;
Expand Down
8 changes: 6 additions & 2 deletions addons/ofxAssimp/src/ofxAssimpNode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,14 @@ void Node::update( const std::shared_ptr<ofxAssimp::AnimationMixer>& aAnimMixer
bool bHasSomeKeys = false;
int clipWithKeysIndex = 0;
for( auto& animClip : mixer->getAnimationClips() ) {
auto& keyCollection = mSrcNode->getKeyCollection(animClip.animation.getUid());

auto animation = animClip.animationWeak.lock();
if( !animation ) {continue;}

auto& keyCollection = mSrcNode->getKeyCollection(animation->getUid());

if( keyCollection.hasKeys() ) {
auto animTime = animClip.animation.getPositionInTicks() + animClip.animation.getStartTick();
auto animTime = animation->getPositionInTicks() + animation->getStartTick();
tempPos += animClip.weight * keyCollection.getPosition( animTime );
tempScale += animClip.weight * keyCollection.getScale( animTime );
// TODO: Keep an eye on this :O
Expand Down
48 changes: 33 additions & 15 deletions addons/ofxAssimp/src/ofxAssimpScene.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,17 @@ bool Scene::processScene() {

if(mSrcScene){
if( mSrcScene->getImportSettings().importAnimations ) {
mAnimations = mSrcScene->getAnimations();
mAnimations.clear();
// mAnimations = mSrcScene->getAnimations();
auto& srcAnims = mSrcScene->getAnimations();
for( auto& srcA : srcAnims ) {
auto nanim = std::make_shared<ofxAssimp::Animation>( srcA );
mAnimations.push_back(nanim);
}
if(mAnimations.size() > 0 ) {
// add a default mixer
mAnimMixer = std::make_shared<AnimationMixer>();
mAnimMixer->add( AnimationClip( mAnimations[0], 1.0f ));
mAnimMixer->getAnimationClip(0).animation.play();
mAnimationIndex = -1; // set to -1 so it will trigger playing
setCurrentAnimation(0);
getCurrentAnimation().play();
}
}

Expand Down Expand Up @@ -354,6 +359,13 @@ void Scene::flagSceneDirty() {
mBSceneDirty = true;
}

std::shared_ptr<AnimationMixer> Scene::_getAnimationMixer() {
if( !mAnimMixer ) {
mAnimMixer = std::make_shared<AnimationMixer>();
}
return mAnimMixer;
}

void Scene::updateAnimations() {
if( mAnimMixer ) {
mAnimMixer->update(ofGetElapsedTimef());
Expand Down Expand Up @@ -480,7 +492,10 @@ ofxAssimp::Animation& Scene::getCurrentAnimation() {
return dummyAnimation;
}
if( mAnimMixer && mAnimMixer->getNumAnimationClips() > 0 ) {
return mAnimMixer->getAnimationClips().back().animation;
// return mAnimMixer->getAnimationClips().back().animation;
if( auto alock = mAnimMixer->getAnimationClips().back().animationWeak.lock() ) {
return *alock;
}
}
ofLogWarning("ofxAssimp::Scene::getCurrentAnimation") << " does not have current animation!";
return dummyAnimation;
Expand All @@ -495,10 +510,11 @@ bool Scene::setCurrentAnimation( int aindex ) {
ofLogWarning("ofxAssimp::Scene::setAnimation") << " already have this as the index!";
return false;
}
_getAnimationMixer();
mAnimationIndex = ofClamp(aindex, 0, mAnimations.size()-1);
mAnimMixer->removeAll();
mAnimMixer->add( AnimationClip( mAnimations[mAnimationIndex], 1.0f ));
mAnimMixer->getAnimationClips().back().animation.reset();
mAnimMixer->getAnimationClips().back().resetAnimation();
return true;
}

Expand All @@ -516,10 +532,11 @@ bool Scene::transitionCurrentAnimation( int aTargetAnimIndex, float aduration )
ofLogWarning("ofxAssimp::Scene::setAnimation") << " no animations!!";
return false;
}
_getAnimationMixer();
mAnimationIndex = ofClamp(aTargetAnimIndex, 0, mAnimations.size()-1);
mAnimMixer->add( AnimationClip( mAnimations[mAnimationIndex], 1.f-mAnimMixer->getTotalClipWeights() ));
mAnimMixer->transition(mAnimations[mAnimationIndex].getName(), aduration );
mAnimMixer->getAnimationClips().back().animation.reset();
mAnimMixer->transition(mAnimations[mAnimationIndex]->getName(), aduration );
mAnimMixer->getAnimationClips().back().resetAnimation();
return true;
}

Expand All @@ -539,7 +556,7 @@ bool Scene::hasAnimation( const std::string& aname ) {
int Scene::getAnimationIndex( const std::string& aname ) {
int tindex = -1;
for( int i = 0; i < (int)mAnimations.size(); i++ ) {
if( mAnimations[i].getName() == aname ) {
if( mAnimations[i] && mAnimations[i]->getName() == aname ) {
tindex = i;
break;
}
Expand All @@ -553,7 +570,7 @@ ofxAssimp::Animation& Scene::getAnimation(int aindex) {
return dummyAnimation;
}
aindex = ofClamp(aindex, 0, mAnimations.size()-1);
return mAnimations[aindex];
return *mAnimations[aindex];
}

ofxAssimp::Animation& Scene::getAnimation(const std::string& aname) {
Expand All @@ -579,10 +596,11 @@ bool Scene::addAnimation( int aSrcAnimIndex, const std::string& aNewAnimName, fl
return false;
}
auto& canim = mAnimations[aSrcAnimIndex];
ofxAssimp::Animation nanim = mAnimations[aSrcAnimIndex];
nanim.setup(aStartTick, aEndTick);
nanim.setName(aNewAnimName);
nanim.setLoopType(aLoopType);
// ofxAssimp::Animation nanim = mAnimations[aSrcAnimIndex];
auto nanim = std::make_shared<ofxAssimp::Animation>( *mAnimations[aSrcAnimIndex] );
nanim->setup(aStartTick, aEndTick);
nanim->setName(aNewAnimName);
nanim->setLoopType(aLoopType);
mAnimations.push_back(nanim);
return true;
}
Expand Down
4 changes: 3 additions & 1 deletion addons/ofxAssimp/src/ofxAssimpScene.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@ class Scene : public ofxAssimp::Node {


protected:
std::shared_ptr<AnimationMixer> _getAnimationMixer();
void updateAnimations();
void updateMeshesFromBones();

Expand All @@ -292,7 +293,8 @@ class Scene : public ofxAssimp::Node {
// the skeletons are the root bones
std::vector< std::shared_ptr<ofxAssimp::Skeleton> > mSkeletons;
std::vector< std::shared_ptr<ofxAssimp::Node> > mNullNodes;
std::vector<ofxAssimp::Animation> mAnimations;
// std::vector<ofxAssimp::Animation> mAnimations;
std::vector< std::shared_ptr<ofxAssimp::Animation> > mAnimations;

int mAnimationIndex = 0;

Expand Down