Close #1449 virtual-tour: compat with autorotate

mistic100 · Oct 2, 2024 · b211023 · b211023
1 parent fddc34d
commit b211023
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/packages/autorotate-plugin/src/AutorotateButton.ts b/packages/autorotate-plugin/src/AutorotateButton.ts
@@ -43,7 +43,7 @@ export class AutorotateButton extends AbstractButton {
 
     onClick() {
         if (this.plugin.isEnabled()) {
-            this.plugin.config.autostartOnIdle = false;
+            this.plugin.disableOnIdle();
         }
         this.plugin.toggle();
     }

diff --git a/packages/autorotate-plugin/src/AutorotatePlugin.ts b/packages/autorotate-plugin/src/AutorotatePlugin.ts
@@ -78,6 +78,7 @@ export class AutorotatePlugin extends AbstractConfigurablePlugin<
 
     private readonly state = {
         initialStart: true,
+        disableOnIdle: false,
         /** if the automatic rotation is enabled */
         enabled: false,
         /** current index in keypoints */
@@ -259,6 +260,7 @@ export class AutorotatePlugin extends AbstractConfigurablePlugin<
         }
 
         this.state.initialStart = false;
+        this.state.disableOnIdle = false;
         this.state.enabled = true;
 
         this.dispatchEvent(new AutorotateEvent(true));
@@ -305,6 +307,13 @@ export class AutorotatePlugin extends AbstractConfigurablePlugin<
         }
     }
 
+    /**
+     * @internal
+     */
+    disableOnIdle() {
+        this.state.disableOnIdle = true;
+    }
+
     /**
      * Launches the standard animation
      */
@@ -363,7 +372,7 @@ export class AutorotatePlugin extends AbstractConfigurablePlugin<
      */
     private __beforeRender(timestamp: number) {
         if (
-            (this.state.initialStart || this.config.autostartOnIdle)
+            (this.state.initialStart || this.config.autostartOnIdle && !this.state.disableOnIdle)
             && this.viewer.state.idleTime > 0
             && timestamp - this.viewer.state.idleTime > this.config.autostartDelay
         ) {

diff --git a/packages/virtual-tour-plugin/src/VirtualTourPlugin.ts b/packages/virtual-tour-plugin/src/VirtualTourPlugin.ts
@@ -446,6 +446,8 @@ export class VirtualTourPlugin extends AbstractConfigurablePlugin<
                     })
                 );
 
+                this.viewer.resetIdleTimer();
+
                 return true;
             })
             .catch((err) => {
-Original file line number
+Diff line change
@@ Expand Up @@
                         })
                     );
+                    this.viewer.resetIdleTimer();
                     return true;
                 })
                 .catch((err) => {
@@ Expand Down @@