fix(Controls): replace deprecated THREE.Quaternion.slerp.

iTowns · Apr 27, 2021 · 2e27408 · 2e27408
1 parent 082d22c
commit 2e27408
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/Controls/PlanarControls.js b/src/Controls/PlanarControls.js
@@ -773,10 +773,9 @@ class PlanarControls extends THREE.EventDispatcher {
 
         // new rotation
         if (travelUseRotation === true) {
-            THREE.Quaternion.slerp(
+            this.camera.quaternion.slerpQuaternions(
                 travelStartRot,
                 travelEndRot,
-                this.camera.quaternion,
                 alpha,
             );
         }

diff --git a/src/Controls/StreetControls.js b/src/Controls/StreetControls.js
@@ -303,7 +303,7 @@ class StreetControls extends FirstPersonControls {
             })
             .onUpdate((d) => {
                 // 'manually' slerp the Quaternion to avoid rotation issues
-                THREE.Quaternion.slerp(startQuaternion, this.end.quaternion, this.camera.quaternion, d.t);
+                this.camera.quaternion.slerpQuaternions(startQuaternion, this.end.quaternion, d.t);
             })
             .start();
 

diff --git a/src/Utils/CameraUtils.js b/src/Utils/CameraUtils.js
@@ -221,10 +221,10 @@ class CameraRig extends THREE.Object3D {
             .onUpdate((d) => {
                 // rotate to coord destination in geocentric projection
                 if (view.referenceCrs == 'EPSG:4978') {
-                    THREE.Quaternion.slerp(this.start.quaternion, this.end.quaternion, this.quaternion, d.t);
+                    this.quaternion.slerpQuaternions(this.start.quaternion, this.end.quaternion, d.t);
                 }
                 // camera rotation
-                THREE.Quaternion.slerp(this.start.camera.quaternion, this.end.camera.quaternion, this.camera.quaternion, d.t);
+                this.camera.quaternion.slerpQuaternions(this.start.camera.quaternion, this.end.camera.quaternion, d.t);
                 // camera's target rotation
                 this.target.rotation.set(0, 0, 0);
                 this.target.rotateZ(THREE.MathUtils.lerp(this.start.target.rotation.z, this.end.target.rotation.z, d.t));