maobo/cup_edit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stop animations are completed

Browse Source
This commit is contained in:
Nick Fisher
2023-09-15 13:51:38 +08:00
parent 9e51890ea1
commit 96556d5af0
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ios/src/AssetManager.cpp
View File

@@ -250,7 +250,8 @@ void AssetManager::updateAnimations() {
for (auto& asset : _assets) { for (auto& asset : _assets) {
vector<AnimationStatus> completed; vector<int> completed;
int index = 0;
for(auto& anim : asset.mAnimations) { for(auto& anim : asset.mAnimations) {
auto elapsed = float(std::chrono::duration_cast<std::chrono::milliseconds>(now - anim.mStart).count()) / 1000.0f; auto elapsed = float(std::chrono::duration_cast<std::chrono::milliseconds>(now - anim.mStart).count()) / 1000.0f;
@@ -314,10 +315,14 @@ void AssetManager::updateAnimations() {
} }
// animation has completed // animation has completed
} else { } else {
completed.push_back(anim); completed.push_back(index);
asset.fadeGltfAnimationIndex = -1; asset.fadeGltfAnimationIndex = -1;
} }
asset.mAnimator->updateBoneMatrices(); asset.mAnimator->updateBoneMatrices();
index++;
}
for(auto& it : completed) {
asset.mAnimations.erase(asset.mAnimations.begin() + it);
} }
} }
} }
@@ -655,6 +660,8 @@ void AssetManager::playAnimation(EntityId e, int index, bool loop, bool reverse,
animation.mDuration = asset.mAnimator->getAnimationDuration(index); animation.mDuration = asset.mAnimator->getAnimationDuration(index);
asset.mAnimations.push_back(animation); asset.mAnimations.push_back(animation);
Log("Current animation count %d ", asset.mAnimations.size());
} }
void AssetManager::stopAnimation(EntityId entityId, int index) { void AssetManager::stopAnimation(EntityId entityId, int index) {