Fix #802 visible range prevents autorotate

mistic100 · Jan 10, 2023 · 2bdcb4d · 2bdcb4d
1 parent 9b4d300
commit 2bdcb4d
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 16 deletions.
diff --git a/docs/README.md b/docs/README.md
@@ -3,7 +3,7 @@ home: true
 heroImage: logo.png
 heroText: Photo Sphere Viewer
 heroAlt: Photo Sphere Viewer
-tagline: A JavaScript library to display Photo Sphere panoramas
+tagline: A JavaScript library to display 360° sphere panoramas
 actionText: Get Started →
 actionLink: /guide/
 features:

diff --git a/packages/autorotate-plugin/src/AutorotatePlugin.ts b/packages/autorotate-plugin/src/AutorotatePlugin.ts
@@ -304,23 +304,34 @@ export class AutorotatePlugin extends AbstractPlugin<AutorotatePluginEvents> {
      * Launches the standard animation
      */
     private __animate() {
-        this.viewer.dynamics.position.roll(
-            {
-                yaw: this.config.autorotateSpeed < 0,
-            },
-            Math.abs(this.config.autorotateSpeed / this.viewer.config.moveSpeed)
-        );
-
-        this.viewer.dynamics.position.goto(
-            {
-                pitch: this.config.autorotatePitch ?? this.viewer.config.defaultPitch,
-            },
-            Math.abs(this.config.autorotateSpeed / this.viewer.config.moveSpeed)
-        );
-
+        // do the zoom before the rotation
+        let p: PromiseLike<any>;
         if (!utils.isNil(this.config.autorotateZoomLvl)) {
-            this.viewer.dynamics.zoom.goto(this.config.autorotateZoomLvl);
+            p = this.viewer.animate({
+                zoom: this.config.autorotateZoomLvl,
+                // "2" is magic, and kinda related to the "PI/4" in animate()
+                speed: `${this.viewer.config.zoomSpeed * 2}rpm`,
+            });
         }
+        else {
+            p = Promise.resolve();
+        }
+
+        p.then(() => {
+            this.viewer.dynamics.position.roll(
+                {
+                    yaw: this.config.autorotateSpeed < 0,
+                },
+                Math.abs(this.config.autorotateSpeed / this.viewer.config.moveSpeed)
+            );
+
+            this.viewer.dynamics.position.goto(
+                {
+                    pitch: this.config.autorotatePitch ?? this.viewer.config.defaultPitch,
+                },
+                Math.abs(this.config.autorotateSpeed / this.viewer.config.moveSpeed)
+            );
+        });
     }
 
     /**