add timeout, increase version

codefluegel · Dec 2, 2024 · ba874f7 · ba874f7
1 parent 4ad40d8
commit ba874f7
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 3 deletions.
diff --git a/library.json b/library.json
@@ -2,8 +2,8 @@
   "title": "Virtual3DTour",
   "description": "Explore an interactive world in 3D.",
   "majorVersion": 1,
-  "minorVersion": 1,
-  "patchVersion": 0,
+  "minorVersion": 0,
+  "patchVersion": 5,
   "runnable": 1,
   "author": "codefluegel",
   "license": "MIT",

diff --git a/scripts/components/Main.js b/scripts/components/Main.js
@@ -44,7 +44,50 @@ export default class Main extends React.Component {
         modelViewerInstance: modelViewer,
         animations: modelViewer.availableAnimations,
       });
+      setTimeout(() => {
+        this.setState({
+          loadingSpinner: false,
+        });
+      }, 5000);
     });
+    setTimeout(() => {
+      this.setState({
+        loadingSpinner: false,
+      });
+    }, 5000);
+  }
+
+  componentDidUpdate(prevProps, prevState) {
+    // Check if a specific prop or state has changed to trigger the update logic
+    const modelViewer = document.getElementById('model-viewer');
+
+    if (!modelViewer) {
+      return;
+    }
+
+    modelViewer.autoRotate = false;
+
+    modelViewer.addEventListener('load', () => {
+      // Create hotspots and set model viewer instance
+      this.setState({
+        loadingSpinner: false,
+        interactions: this.state.interactions,
+        modelViewerInstance: modelViewer,
+        animations: modelViewer.availableAnimations,
+      });
+
+      setTimeout(() => {
+        this.setState({
+          loadingSpinner: false,
+        });
+      }, 500);
+      console.log(1);
+    });
+    setTimeout(() => {
+      this.setState({
+        loadingSpinner: false,
+      });
+    }, 5000);
   }
 
   componentWillUnmount() {
@@ -94,6 +137,9 @@ export default class Main extends React.Component {
 
   goToStartModel() {
     this.navigateToModel(this.context.params.startModelId);
+    this.setState({
+      loadingSpinner: false,
+    });
   }
 
   navigateToModel(modelId) {

diff --git a/scripts/components/ModelViewer/ModelViewer.js b/scripts/components/ModelViewer/ModelViewer.js
@@ -16,7 +16,7 @@ const ModelViewer = (props) => {
     const timeoutId = setTimeout(() => {
       sethotspots(hotspots);
       setFilePath(getSource(modelPath, contentId));
-    }, 100);
+    }, 500);
 
     return () => clearTimeout(timeoutId);
   }, [hotspots]);