Fix crash during animation (#553)

Co-authored-by: Ivan Shafran <[email protected]>
SceneView · Oct 19, 2024 · 2969a2c · 2969a2c
1 parent 2b785cc
commit 2969a2c
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/sceneview/src/main/java/io/github/sceneview/node/ModelNode.kt b/sceneview/src/main/java/io/github/sceneview/node/ModelNode.kt
@@ -418,8 +418,10 @@ open class ModelNode(
     }
 
     private fun applyAnimations(frameTimeNanos: Long) {
-        playingAnimations.forEach { (index, animation) ->
-            if (animation.speed == 0f) return@forEach
+        val iterator = playingAnimations.iterator()
+        while (iterator.hasNext()) {
+            val (index, animation) = iterator.next()
+            if (animation.speed == 0f) continue
 
             animator.let { animator ->
                 val elapsedTimeSeconds = frameTimeNanos.intervalSeconds(animation.startTime)
@@ -434,7 +436,7 @@ open class ModelNode(
                 animator.applyAnimation(index, animationTime)
 
                 if (!animation.loop && adjustedTimeSeconds >= animationDuration) {
-                    playingAnimations.remove(index)
+                    iterator.remove()
                 }
             }
         }