consistent interpolationDecay for synthetic interaction (#3449)

Author: elalish

packages/model-viewer/src/features/controls.ts

@@ -231,7 +231,6 @@ const $lastSpherical = Symbol('lastSpherical');
 const $jumpCamera = Symbol('jumpCamera');
 const $initialized = Symbol('initialized');
 const $maintainThetaPhi = Symbol('maintainThetaPhi');
-const $setInterpolationDecay = Symbol('setInterpolationDecay');
 
 const $syncCameraOrbit = Symbol('syncCameraOrbit');
 const $syncFieldOfView = Symbol('syncFieldOfView');
@@ -477,6 +476,7 @@ export const ControlsMixin = <T extends Constructor<ModelViewerElementBase>>(
       super.updated(changedProperties);
 
       const controls = this[$controls];
+      const scene = this[$scene];
       const input = this[$userInputElement];
 
       if (changedProperties.has('cameraControls')) {
@@ -507,7 +507,7 @@ export const ControlsMixin = <T extends Constructor<ModelViewerElementBase>>(
       }
 
       if (changedProperties.has('bounds')) {
-        this[$scene].tightBounds = this.bounds === 'tight';
+        scene.tightBounds = this.bounds === 'tight';
       }
 
       if (changedProperties.has('interactionPrompt') ||
@@ -537,13 +537,14 @@ export const ControlsMixin = <T extends Constructor<ModelViewerElementBase>>(
       }
 
       if (changedProperties.has('interpolationDecay')) {
-        this[$setInterpolationDecay](this.interpolationDecay);
+        controls.setDamperDecayTime(this.interpolationDecay);
+        scene.setTargetDamperDecayTime(this.interpolationDecay);
       }
 
       if (this[$jumpCamera] === true) {
         Promise.resolve().then(() => {
           controls.jumpToGoal();
-          this[$scene].jumpToGoal();
+          scene.jumpToGoal();
           this[$jumpCamera] = false;
         });
       }
@@ -617,7 +618,6 @@ export const ControlsMixin = <T extends Constructor<ModelViewerElementBase>>(
       const moveTouches = () => {
         // cancel interaction if user interacts
         if (this[$controls].isUserChange) {
-          this[$setInterpolationDecay](this.interpolationDecay);
           for (const fingerElement of this[$fingerAnimatedContainers]) {
             fingerElement.style.opacity = '0';
           }
@@ -630,14 +630,12 @@ export const ControlsMixin = <T extends Constructor<ModelViewerElementBase>>(
           position.x = xy[i].x(time);
           position.y = xy[i].y(time);
         }
-        this[$setInterpolationDecay](0);
         dispatchTouches('pointermove');
 
         if (time < 1) {
           requestAnimationFrame(moveTouches);
         } else {
           dispatchTouches('pointerup');
-          this[$setInterpolationDecay](this.interpolationDecay);
           document.removeEventListener('visibilitychange', onVisibilityChange);
         }
       };
@@ -781,11 +779,6 @@ export const ControlsMixin = <T extends Constructor<ModelViewerElementBase>>(
       this[$promptElementVisibleTime] = Infinity;
     }
 
-    [$setInterpolationDecay](decay: number) {
-      this[$controls].setDamperDecayTime(decay);
-      this[$scene].setTargetDamperDecayTime(decay);
-    }
-
     /**
      * Updates the camera's near and far planes to enclose the scene when
      * orbiting at the supplied radius.