Merge pull request #105 from pattern-x/feature/update-demo

Update some demo pages
pattern-x · Jul 15, 2023 · 4644d13 · 4644d13
2 parents 19f360c + d4fe390
commit 4644d13
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 84 deletions.
diff --git a/public/config.json b/public/config.json
@@ -12,6 +12,9 @@
   }, {
     "title": "Overlay 3d model with dxf",
     "url": "./demo/bim_2_overlay_with_dxf.html"
+  }, {
+    "title": "Model explode",
+    "url": "./demo/bim_3_explode.html"
   }]
 }, {
   "title": "2D drawings",

diff --git a/public/demo/bim_0.html b/public/demo/bim_0.html
@@ -25,28 +25,18 @@
             ToolbarMenuId,
         } from "./demo/libs/gemini-viewer.esm.min.js";
 
-        const project = {
-            "id": "rac_basic_sample_project",
-            "name": "Rac basic sample project",
-            "camera": {
-                "eye": [-70, 25, 50],
-                "look": [-35, 0, 35],
-                "up": [0, 1, 0],
-                "far": 10000
-            },
-            "models": [{
-                "name": "Rac basic sample project",
-                "src": "./demo/models/gltf/rac_basic_sample_project.gltf",
-                "position": [0, 0, 0],
-                "rotation": [0, 0, 0],
-                "scale": [1, 1, 1],
-                "edges": true,
-                "visible": true
-            }]
-        }
-        const viewer = new BimViewer({
+        const filename = "rac_basic_sample_project.gltf";
+        const modelCfg = {
+            modelId: filename,
+            name: filename,
+            src: `./demo/models/gltf/${filename}`,
+            edges: true,
+        };
+        const viewerCfg = {
             containerId: "myCanvas",
-        }, project.camera);
+            language: "en",
+        }
+        const viewer = new BimViewer(viewerCfg);
         const toolbar = viewer.toolbar;
         toolbar.updateMenu(ToolbarMenuId.BimTree, { visible: false });
 
@@ -60,21 +50,12 @@
         const decoderPath = "./demo/three/js/libs/draco/gltf/";
         viewer.setDracoDecoderPath(decoderPath);
 
-        // loadProjectModel
-        let counter = 0; // to indicate how many models are loading
-        project.models.forEach((modelCfg) => {
-            if (modelCfg.visible === false) {
-                // visible is true by default
-                return; // only load visible ones
-            }
-            counter++;
-            viewer.loadModel(modelCfg, (event) => {
-                console.log(`[Demo] Loading model ${modelCfg.src}`);
-            }, (event) => {
-                console.error("[Demo] Failed to load " + modelCfg.src + ". " + event.message);
-            }).then(() => {
-                    console.log(`[Demo] Loaded model ${modelCfg.src}`);
-            });
+        viewer.loadModel(modelCfg, (event) => {
+            console.log(`[Demo] Loading model ${modelCfg.src}`);
+        }, (event) => {
+            console.error("[Demo] Failed to load " + modelCfg.src + ". " + event.message);
+        }).then(() => {
+            console.log(`[Demo] Loaded model ${modelCfg.src}`);
         });
     </script>
 </body>

diff --git a/public/demo/bim_1.html b/public/demo/bim_1.html
@@ -25,36 +25,24 @@
             ToolbarMenuId,
         } from "./demo/libs/gemini-viewer.esm.min.js";
 
-        const project = {
-            id: "Duplex",
-            name: "Duplex",
-            models: [
-                {
-                    name: "Duplex",
-                    src: "./demo/models/gltf/Duplex.gltf",
-                    position: [0, 0, 0],
-                    rotation: [0, 0, 0],
-                    scale: [1, 1, 1],
-                    instantiate: false,
-                    merge: false,
-                    edges: true,
-                    visible: true,
-                },
-            ],
+        const filename = "Duplex.gltf";
+        const modelCfg = {
+            modelId: filename,
+            name: filename,
+            src: `./demo/models/gltf/${filename}`,
+            edges: true,
         };
-        const viewer = new BimViewer(
-            {
-                containerId: "myCanvas",
-                language: "en",
-                toolbarMenuConfig: {
-                    [ToolbarMenuId.Measure]: { visible: false },
-                    [ToolbarMenuId.Fullscreen]: { visible: false },
-                    [ToolbarMenuId.BimTree]: { visible: false },
-                },
-                enableContextMenu: true,
+        const viewerCfg = {
+            containerId: "myCanvas",
+            language: "en",
+            toolbarMenuConfig: {
+                [ToolbarMenuId.Measure]: { visible: false },
+                [ToolbarMenuId.Fullscreen]: { visible: false },
+                [ToolbarMenuId.BimTree]: { visible: false },
             },
-            project.camera
-        );
+            enableContextMenu: true,
+        }
+        const viewer = new BimViewer(viewerCfg);
 
         new AxisGizmoPlugin(viewer);
         new BottomBarPlugin(viewer);
@@ -66,22 +54,12 @@
         const decoderPath = "./demo/three/js/libs/draco/gltf/";
         viewer.setDracoDecoderPath(decoderPath);
 
-        // loadProjectModel
-        let counter = 0; // to indicate how many models are loading
-        project.models.forEach((modelCfg) => {
-            if (modelCfg.visible === false) {
-                // visible is true by default
-                return; // only load visible ones
-            }
-            counter++;
-            viewer.loadModel(modelCfg, (event) => {
-                    console.log(`[Demo] Loading model ${modelCfg.src}`);
-                }, (event) => {
-                    console.error("[Demo] Failed to load " + modelCfg.src + ". " + event.message);
-                }
-            ).then(() => {
-                    console.log(`[Demo] Loaded model ${modelCfg.src}`);
-            });
+        viewer.loadModel(modelCfg, (event) => {
+            console.log(`[Demo] Loading model ${modelCfg.src}`);
+        }, (event) => {
+            console.error("[Demo] Failed to load " + modelCfg.src + ". " + event.message);
+        }).then(() => {
+            console.log(`[Demo] Loaded model ${modelCfg.src}`);
         });
     </script>
 </body>

diff --git a/public/demo/bim_2_overlay_with_dxf.html b/public/demo/bim_2_overlay_with_dxf.html
@@ -49,7 +49,7 @@
         }
         const viewer = new BimViewer({
             containerId: "myCanvas",
-        }, project.camera);
+        });
         const toolbar = viewer.toolbar;
         toolbar.updateMenu(ToolbarMenuId.BimTree, { visible: false });
 
@@ -68,14 +68,11 @@
         const decoderPath = "./demo/three/js/libs/draco/gltf/";
         viewer.setDracoDecoderPath(decoderPath);
 
-        // loadProjectModel
-        let counter = 0; // to indicate how many models are loading
         project.models.forEach((modelCfg) => {
             if (modelCfg.visible === false) {
                 // visible is true by default
                 return; // only load visible ones
             }
-            counter++;
             viewer.loadModel(modelCfg, (event) => {
                 console.log(`[Demo] Loading model ${modelCfg.src}`);
             }, (event) => {