Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 33c27b1

Browse filesBrowse files
pattern-xpattern-x
authored
Merge pull request #107 from pattern-x/feature/upgrade
Upgrade gemini-viewer-threejs to v0.2.51
2 parents ad877dc + f193289 commit 33c27b1
Copy full SHA for 33c27b1

File tree

Expand file treeCollapse file tree

7 files changed

+22
-16
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

7 files changed

+22
-16
lines changed
Open diff view settings
Collapse file

‎public/demo/bim_0.html‎

Copy file name to clipboardExpand all lines: public/demo/bim_0.html
+5-1Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
MeasurementPlugin,
2323
NavCubePlugin,
2424
SectionPlugin,
25+
SkyboxPlugin,
2526
ToolbarMenuId,
2627
} from "./demo/libs/gemini-viewer.esm.min.js";
2728

@@ -35,6 +36,7 @@
3536
const viewerCfg = {
3637
containerId: "myCanvas",
3738
language: "en",
39+
enableProgressBar: true,
3840
}
3941
const viewer = new BimViewer(viewerCfg);
4042
const toolbar = viewer.toolbar;
@@ -44,14 +46,16 @@
4446
new MeasurementPlugin(viewer);
4547
new NavCubePlugin(viewer);
4648
new SectionPlugin(viewer);
49+
new SkyboxPlugin(viewer);
4750

4851
// draco decoder path is needed to load draco encoded models.
4952
// gemini-viewer js sdk user maintains draco decoder code somewhere, and provides the path here.
5053
const decoderPath = "./demo/three/js/libs/draco/gltf/";
5154
viewer.setDracoDecoderPath(decoderPath);
5255

5356
viewer.loadModel(modelCfg, (event) => {
54-
console.log(`[Demo] Loading model ${modelCfg.src}`);
57+
const progress = ((event.loaded * 100) / event.total).toFixed(1);
58+
console.log(`[Demo] Loading '${modelCfg.id || modelCfg.name}' progress: ${progress}%`);
5559
}, (event) => {
5660
console.error("[Demo] Failed to load " + modelCfg.src + ". " + event.message);
5761
}).then(() => {
Collapse file

‎public/demo/bim_1.html‎

Copy file name to clipboardExpand all lines: public/demo/bim_1.html
+3-1Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
[ToolbarMenuId.BimTree]: { visible: false },
4242
},
4343
enableContextMenu: true,
44+
enableProgressBar: true,
4445
}
4546
const viewer = new BimViewer(viewerCfg);
4647

@@ -55,7 +56,8 @@
5556
viewer.setDracoDecoderPath(decoderPath);
5657

5758
viewer.loadModel(modelCfg, (event) => {
58-
console.log(`[Demo] Loading model ${modelCfg.src}`);
59+
const progress = ((event.loaded * 100) / event.total).toFixed(1);
60+
console.log(`[Demo] Loading '${modelCfg.id || modelCfg.name}' progress: ${progress}%`);
5961
}, (event) => {
6062
console.error("[Demo] Failed to load " + modelCfg.src + ". " + event.message);
6163
}).then(() => {
Collapse file

‎public/demo/bim_2_overlay_with_dxf.html‎

Copy file name to clipboardExpand all lines: public/demo/bim_2_overlay_with_dxf.html
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@
7474
return; // only load visible ones
7575
}
7676
viewer.loadModel(modelCfg, (event) => {
77-
console.log(`[Demo] Loading model ${modelCfg.src}`);
77+
const progress = ((event.loaded * 100) / event.total).toFixed(1);
78+
console.log(`[Demo] Loading '${modelCfg.id || modelCfg.name}' progress: ${progress}%`);
7879
}, (event) => {
7980
console.error("[Demo] Failed to load " + modelCfg.src + ". " + event.message);
8081
}).then(() => {
Collapse file

‎public/demo/bim_3_explode.html‎

Copy file name to clipboardExpand all lines: public/demo/bim_3_explode.html
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@
5656
viewer.setDracoDecoderPath(decoderPath);
5757

5858
viewer.loadModel(modelCfg, (event) => {
59-
console.log(`[Demo] Loading model ${modelCfg.src}`);
59+
const progress = ((event.loaded * 100) / event.total).toFixed(1);
60+
console.log(`[Demo] Loading '${modelCfg.id || modelCfg.name}' progress: ${progress}%`);
6061
}, (event) => {
6162
console.error("[Demo] Failed to load " + modelCfg.src + ". " + event.message);
6263
}).then(() => {
Collapse file

‎public/demo/dxf_10_upload_files_to_compre.html‎

Copy file name to clipboardExpand all lines: public/demo/dxf_10_upload_files_to_compre.html
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
new MeasurementPlugin(compareHelper.viewer2);
109109

110110
compareHelper.viewer.toolbar.updateMenus(
111-
overrideToolbarConfig(compareHelper.viewer1)
111+
overrideToolbarConfig(compareHelper.viewer)
112112
);
113113
compareHelper.viewer2.toolbar.updateMenus(
114114
overrideToolbarConfig(compareHelper.viewer2)
Collapse file

‎public/demo/dxf_8_compare_with_2_viewports.html‎

Copy file name to clipboardExpand all lines: public/demo/dxf_8_compare_with_2_viewports.html
+2-6Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,8 @@
9191
new AxisGizmoPlugin(compareHelper.viewer2, { ignoreZAxis: true });
9292
new MeasurementPlugin(compareHelper.viewer2);
9393

94-
compareHelper.viewer.toolbar?.updateMenus(
95-
overrideToolbarConfig(compareHelper.viewer1)
96-
);
97-
compareHelper.viewer2.toolbar?.updateMenus(
98-
overrideToolbarConfig(compareHelper.viewer2)
99-
);
94+
compareHelper.viewer.toolbar?.updateMenus(overrideToolbarConfig(compareHelper.viewer));
95+
compareHelper.viewer2.toolbar?.updateMenus(overrideToolbarConfig(compareHelper.viewer2));
10096

10197
const syncCameraBtn = document.getElementById("syncCamera");
10298
let enableSyncCamera = false;
Collapse file

‎public/demo/empty_model_project.html‎

Copy file name to clipboardExpand all lines: public/demo/empty_model_project.html
+7-5Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@
9999
[ToolbarMenuId.BimTree]: { visible: false },
100100
},
101101
enableContextMenu: true,
102+
enableProgressBar: true,
102103
},
103104
project.camera
104105
);
@@ -124,12 +125,13 @@
124125
}
125126
counter++;
126127
viewer.loadModel(modelCfg, (event) => {
127-
console.log(`[Demo] Loading model ${modelCfg.src}`);
128-
}, (event) => {
129-
console.error(`[Demo] Failed to load ${modelCfg.src}. " + event.message`);
130-
}
128+
const progress = ((event.loaded * 100) / event.total).toFixed(1);
129+
console.log(`[Demo] Loading '${modelCfg.id || modelCfg.name}' progress: ${progress}%`);
130+
}, (event) => {
131+
console.error(`[Demo] Failed to load ${modelCfg.src}. " + event.message`);
132+
}
131133
).then(() => {
132-
console.log(`[Demo] Loaded model ${modelCfg.src}`);
134+
console.log(`[Demo] Loaded model ${modelCfg.src}`);
133135
});
134136
});
135137

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.