fix repetitions and pingpong update bug

google · Jan 22, 2025 · cceb8c1 · cceb8c1
1 parent 4b2e77b
commit cceb8c1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/packages/model-viewer/src/features/animation.ts b/packages/model-viewer/src/features/animation.ts
@@ -267,7 +267,7 @@ export const AnimationMixin = <T extends Constructor<ModelViewerElementBase>>(
           LoopPingPong :
           (repetitions === 1 ? LoopOnce : LoopRepeat);
 
-      const needsToStop = !!options.repetitions;
+      const needsToStop = !!options.repetitions || "pingpong" in options;
 
       this[$scene].appendAnimation(
           animationName ? animationName : this.animationName,

diff --git a/packages/model-viewer/src/three-components/ModelScene.ts b/packages/model-viewer/src/three-components/ModelScene.ts
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import {NeutralToneMapping, AnimationAction, AnimationActionLoopStyles, AnimationClip, AnimationMixer, AnimationMixerEventMap, Box3, Camera, Euler, Event as ThreeEvent, LoopOnce, LoopPingPong, LoopRepeat, Material, Matrix3, Mesh, Object3D, PerspectiveCamera, Raycaster, Scene, Sphere, Texture, ToneMapping, Triangle, Vector2, Vector3, WebGLRenderer, XRTargetRaySpace} from 'three';
+import {AnimationAction, AnimationActionLoopStyles, AnimationClip, AnimationMixer, AnimationMixerEventMap, Box3, Camera, Euler, Event as ThreeEvent, LoopOnce, LoopPingPong, LoopRepeat, Material, Matrix3, Mesh, NeutralToneMapping, Object3D, PerspectiveCamera, Raycaster, Scene, Sphere, Texture, ToneMapping, Triangle, Vector2, Vector3, WebGLRenderer, XRTargetRaySpace} from 'three';
 import {CSS2DRenderer} from 'three/examples/jsm/renderers/CSS2DRenderer.js';
 import {reduceVertices} from 'three/examples/jsm/utils/SceneUtils.js';
 
@@ -907,6 +907,9 @@ export class ModelScene extends Scene {
       }
 
       if (!action.isRunning()) {
+        if (action.time == animationClip.duration) {
+          action.stop();
+        }
         action.setLoop(loopMode, repetitionCount);
         action.paused = false;
         action.enabled = true;