Merge pull request #107 from pattern-x/feature/upgrade

Upgrade gemini-viewer-threejs to v0.2.51
This commit is contained in:
pattern-x
2023-07-20 09:16:15 +08:00
committed by GitHub
7 changed files with 22 additions and 16 deletions

View File

@ -22,6 +22,7 @@
MeasurementPlugin,
NavCubePlugin,
SectionPlugin,
SkyboxPlugin,
ToolbarMenuId,
} from "./demo/libs/gemini-viewer.esm.min.js";
@ -35,6 +36,7 @@
const viewerCfg = {
containerId: "myCanvas",
language: "en",
enableProgressBar: true,
}
const viewer = new BimViewer(viewerCfg);
const toolbar = viewer.toolbar;
@ -44,6 +46,7 @@
new MeasurementPlugin(viewer);
new NavCubePlugin(viewer);
new SectionPlugin(viewer);
new SkyboxPlugin(viewer);
// draco decoder path is needed to load draco encoded models.
// gemini-viewer js sdk user maintains draco decoder code somewhere, and provides the path here.
@ -51,7 +54,8 @@
viewer.setDracoDecoderPath(decoderPath);
viewer.loadModel(modelCfg, (event) => {
console.log(`[Demo] Loading model ${modelCfg.src}`);
const progress = ((event.loaded * 100) / event.total).toFixed(1);
console.log(`[Demo] Loading '${modelCfg.id || modelCfg.name}' progress: ${progress}%`);
}, (event) => {
console.error("[Demo] Failed to load " + modelCfg.src + ". " + event.message);
}).then(() => {

View File

@ -41,6 +41,7 @@
[ToolbarMenuId.BimTree]: { visible: false },
},
enableContextMenu: true,
enableProgressBar: true,
}
const viewer = new BimViewer(viewerCfg);
@ -55,7 +56,8 @@
viewer.setDracoDecoderPath(decoderPath);
viewer.loadModel(modelCfg, (event) => {
console.log(`[Demo] Loading model ${modelCfg.src}`);
const progress = ((event.loaded * 100) / event.total).toFixed(1);
console.log(`[Demo] Loading '${modelCfg.id || modelCfg.name}' progress: ${progress}%`);
}, (event) => {
console.error("[Demo] Failed to load " + modelCfg.src + ". " + event.message);
}).then(() => {

View File

@ -74,7 +74,8 @@
return; // only load visible ones
}
viewer.loadModel(modelCfg, (event) => {
console.log(`[Demo] Loading model ${modelCfg.src}`);
const progress = ((event.loaded * 100) / event.total).toFixed(1);
console.log(`[Demo] Loading '${modelCfg.id || modelCfg.name}' progress: ${progress}%`);
}, (event) => {
console.error("[Demo] Failed to load " + modelCfg.src + ". " + event.message);
}).then(() => {

View File

@ -56,7 +56,8 @@
viewer.setDracoDecoderPath(decoderPath);
viewer.loadModel(modelCfg, (event) => {
console.log(`[Demo] Loading model ${modelCfg.src}`);
const progress = ((event.loaded * 100) / event.total).toFixed(1);
console.log(`[Demo] Loading '${modelCfg.id || modelCfg.name}' progress: ${progress}%`);
}, (event) => {
console.error("[Demo] Failed to load " + modelCfg.src + ". " + event.message);
}).then(() => {

View File

@ -108,7 +108,7 @@
new MeasurementPlugin(compareHelper.viewer2);
compareHelper.viewer.toolbar.updateMenus(
overrideToolbarConfig(compareHelper.viewer1)
overrideToolbarConfig(compareHelper.viewer)
);
compareHelper.viewer2.toolbar.updateMenus(
overrideToolbarConfig(compareHelper.viewer2)

View File

@ -91,12 +91,8 @@
new AxisGizmoPlugin(compareHelper.viewer2, { ignoreZAxis: true });
new MeasurementPlugin(compareHelper.viewer2);
compareHelper.viewer.toolbar?.updateMenus(
overrideToolbarConfig(compareHelper.viewer1)
);
compareHelper.viewer2.toolbar?.updateMenus(
overrideToolbarConfig(compareHelper.viewer2)
);
compareHelper.viewer.toolbar?.updateMenus(overrideToolbarConfig(compareHelper.viewer));
compareHelper.viewer2.toolbar?.updateMenus(overrideToolbarConfig(compareHelper.viewer2));
const syncCameraBtn = document.getElementById("syncCamera");
let enableSyncCamera = false;

View File

@ -99,6 +99,7 @@
[ToolbarMenuId.BimTree]: { visible: false },
},
enableContextMenu: true,
enableProgressBar: true,
},
project.camera
);
@ -124,12 +125,13 @@
}
counter++;
viewer.loadModel(modelCfg, (event) => {
console.log(`[Demo] Loading model ${modelCfg.src}`);
}, (event) => {
console.error(`[Demo] Failed to load ${modelCfg.src}. " + event.message`);
}
const progress = ((event.loaded * 100) / event.total).toFixed(1);
console.log(`[Demo] Loading '${modelCfg.id || modelCfg.name}' progress: ${progress}%`);
}, (event) => {
console.error(`[Demo] Failed to load ${modelCfg.src}. " + event.message`);
}
).then(() => {
console.log(`[Demo] Loaded model ${modelCfg.src}`);
console.log(`[Demo] Loaded model ${modelCfg.src}`);
});
});