Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update gemini-viewer to v0.2.49 #104

Merged
merged 1 commit into from
Jul 14, 2023
Merged

Update gemini-viewer to v0.2.49 #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions public/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,25 +29,25 @@
"url": "./demo/dxf_2.html"
}, {
"title": "Drawing comparison with 1 viewport",
"url": "./demo/dxf_3.html"
"url": "./demo/dxf_3_compare_with_1_viewport.html"
}, {
"title": "Drawing comparison with 2 viewports",
"url": "./demo/dxf_8.html"
"url": "./demo/dxf_8_compare_with_2_viewports.html"
}, {
"title": "Upload files and compare with 2 viewports",
"url": "./demo/dxf_10.html"
"url": "./demo/dxf_10_upload_files_to_compre.html"
}, {
"title": "Markups",
"url": "./demo/dxf_5.html"
"url": "./demo/dxf_5_markups.html"
}, {
"title": "Take screenshot via markup",
"url": "./demo/dxf_9.html"
"url": "./demo/dxf_9_screenshot.html"
}, {
"title": "Hotpoints",
"url": "./demo/dxf_6.html"
"url": "./demo/dxf_6_hotpoints.html"
}, {
"title": "Building 1&2",
"url": "./demo/dxf_7.html"
"url": "./demo/dxf_7_building1_2.html"
}]
}, {
"title": "Panoramas",
Expand Down
14 changes: 13 additions & 1 deletion public/demo/bim_0.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,14 @@
<div id="myCanvas" class="container"></div>
</div>
<script type="module">
import { BimViewer, ToolbarMenuId } from "./demo/libs/gemini-viewer.esm.min.js";
import {
AxisGizmoPlugin,
BimViewer,
MeasurementPlugin,
NavCubePlugin,
SectionPlugin,
ToolbarMenuId,
} from "./demo/libs/gemini-viewer.esm.min.js";

const project = {
"id": "rac_basic_sample_project",
Expand All @@ -43,6 +50,11 @@
const toolbar = viewer.toolbar;
toolbar.updateMenu(ToolbarMenuId.BimTree, { visible: false });

new AxisGizmoPlugin(viewer);
new MeasurementPlugin(viewer);
new NavCubePlugin(viewer);
new SectionPlugin(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.
const decoderPath = "./demo/three/js/libs/draco/gltf/";
Expand Down
18 changes: 14 additions & 4 deletions public/demo/bim_1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,14 @@
<div id="myCanvas" class="container"></div>
</div>
<script type="module">
import { BimViewer, ToolbarMenuId } from "./demo/libs/gemini-viewer.esm.min.js";
import {
AxisGizmoPlugin,
BimViewer,
BottomBarPlugin,
GroundShadowPlugin,
NavCubePlugin,
ToolbarMenuId,
} from "./demo/libs/gemini-viewer.esm.min.js";

const project = {
id: "Duplex",
Expand All @@ -39,18 +46,21 @@
{
containerId: "myCanvas",
language: "en",
enableAxisGizmo: true,
toolbarMenuConfig: {
[ToolbarMenuId.Measure]: { visible: false },
[ToolbarMenuId.Fullscreen]: { visible: false },
[ToolbarMenuId.BimTree]: { visible: false },
},
enableBottomBar: true,
enableNavCube: true,
enableContextMenu: true,
},
project.camera
);

new AxisGizmoPlugin(viewer);
new BottomBarPlugin(viewer);
new GroundShadowPlugin(viewer);
new NavCubePlugin(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.
const decoderPath = "./demo/three/js/libs/draco/gltf/";
Expand Down
14 changes: 13 additions & 1 deletion public/demo/bim_2_overlay_with_dxf.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,14 @@
<div id="myCanvas" class="container"></div>
</div>
<script type="module">
import { BimViewer, ToolbarMenuId } from "./demo/libs/gemini-viewer.esm.min.js";
import {
AxisGizmoPlugin,
BimViewer,
MeasurementPlugin,
NavCubePlugin,
SectionPlugin,
ToolbarMenuId,
} from "./demo/libs/gemini-viewer.esm.min.js";

const project = {
"id": "building1",
Expand Down Expand Up @@ -46,6 +53,11 @@
const toolbar = viewer.toolbar;
toolbar.updateMenu(ToolbarMenuId.BimTree, { visible: false });

new AxisGizmoPlugin(viewer);
new MeasurementPlugin(viewer);
new NavCubePlugin(viewer);
new SectionPlugin(viewer);

// font file is needed for loading dxf
// const fontFiles = ["./demo/three/fonts/Microsoft_YaHei_Regular.typeface.json"];
const fontFiles = ["./demo/three/fonts/hztxt.shx", "./demo/three/fonts/simplex.shx"];
Expand Down
16 changes: 14 additions & 2 deletions public/demo/dxf_0.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,15 @@
<div id="myCanvas" class="container"></div>
</div>
<script type="module">
import { DxfViewer, ViewerEvent,ToolbarMenuId } from "./demo/libs/gemini-viewer.esm.min.js";
import {
AxisGizmoPlugin,
BottomBarPlugin,
DxfViewer,
MeasurementPlugin,
StatsPlugin,
ToolbarMenuId,
ViewerEvent,
} from "./demo/libs/gemini-viewer.esm.min.js";
import DxfSettingsPanel from './demo/settings/DxfSettingsPanel.js';
import LayerManager from './demo/layerManager/LayerManager.js';

Expand All @@ -32,7 +40,6 @@
};
const viewerCfg = {
containerId: "myCanvas",
enableAxisGizmo: true,
enableToolbar: true,
enableSpinner: true,
enableProgressBar: true,
Expand Down Expand Up @@ -77,6 +84,11 @@
await viewer.setFont(fontFiles);
window.viewer = viewer;

new AxisGizmoPlugin(viewer, { ignoreZAxis: true });
new BottomBarPlugin(viewer);
new MeasurementPlugin(viewer);
new StatsPlugin(viewer);

const onProgress = (event) => {
const progress = ((event.loaded * 100) / event.total).toFixed(1);
console.log(`[Demo] Loading progress: ${progress}%`);
Expand Down
16 changes: 14 additions & 2 deletions public/demo/dxf_1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,15 @@
<div id="myCanvas" class="container"></div>
</div>
<script type="module">
import { DxfViewer,ToolbarMenuId } from "./demo/libs/gemini-viewer.esm.min.js";
import {
AxisGizmoPlugin,
BottomBarPlugin,
DxfViewer,
MeasurementPlugin,
StatsPlugin,
ToolbarMenuId,
ViewerEvent,
} from "./demo/libs/gemini-viewer.esm.min.js";
import DxfSettingsPanel from './demo/settings/DxfSettingsPanel.js';
import LayerManager from "./demo/layerManager/LayerManager.js";

Expand All @@ -32,7 +40,6 @@
};
const viewerCfg = {
containerId: "myCanvas",
enableAxisGizmo: true,
enableToolbar: true,
enableSpinner: true,
enableProgressBar: true,
Expand Down Expand Up @@ -77,6 +84,11 @@
await viewer.setFont(fontFiles);
window.viewer = viewer;

new AxisGizmoPlugin(viewer);
new BottomBarPlugin(viewer);
new MeasurementPlugin(viewer);
new StatsPlugin(viewer);

const onProgress = (event) => {
const progress = ((event.loaded * 100) / event.total).toFixed(1);
console.log(`[Demo] Loading progress: ${progress}%`);
Expand Down
21 changes: 13 additions & 8 deletions public/demo/dxf_10.html → ...c/demo/dxf_10_upload_files_to_compre.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,14 @@
</div>
<script type="module">
import {
DxfCompareHelper,
ToolbarMenuId,
AxisGizmoPlugin,
BottomBarPlugin,
DxfCompareHelper,
DxfViewer,
MeasurementPlugin,
StatsPlugin,
ToolbarMenuId,
ViewerEvent,
} from "./demo/libs/gemini-viewer.esm.min.js";
import DxfComparePanel from "./demo/compare/dxfComparePanel.js";
import DxfSettingsPanel from "./demo/settings/DxfSettingsPanel.js";
Expand All @@ -83,25 +89,24 @@
const compareHelper = new DxfCompareHelper(
{
containerId: "myCanvas1",
enableAxisGizmo: true,
enableStats: true,
enableToolbar: true,
enableBottomBar: true,
enableSelection: true,
},
{
containerId: "myCanvas2",
enableAxisGizmo: true,
enableStats: true,
enableToolbar: true,
enableBottomBar: true,
enableSelection: true,
}
);
window.compareHelper = compareHelper;
const fontFiles = ["./demo/three/fonts/hztxt.shx", "./demo/three/fonts/simplex.shx"];
await compareHelper.setFont(fontFiles);

new AxisGizmoPlugin(compareHelper.viewer, { ignoreZAxis: true });
new MeasurementPlugin(compareHelper.viewer);
new AxisGizmoPlugin(compareHelper.viewer2, { ignoreZAxis: true });
new MeasurementPlugin(compareHelper.viewer2);

compareHelper.viewer.toolbar.updateMenus(
overrideToolbarConfig(compareHelper.viewer1)
);
Expand Down
16 changes: 14 additions & 2 deletions public/demo/dxf_2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,15 @@
<div id="myCanvas" class="container"></div>
</div>
<script type="module">
import { DxfViewer, ToolbarMenuId } from "./demo/libs/gemini-viewer.esm.min.js";
import {
AxisGizmoPlugin,
BottomBarPlugin,
DxfViewer,
MeasurementPlugin,
StatsPlugin,
ToolbarMenuId,
ViewerEvent,
} from "./demo/libs/gemini-viewer.esm.min.js";
import DxfSettingsPanel from './demo/settings/DxfSettingsPanel.js';
import LayerManager from "./demo/layerManager/LayerManager.js";

Expand All @@ -32,7 +40,6 @@
};
const viewerCfg = {
containerId: "myCanvas",
enableAxisGizmo: true,
enableToolbar: true,
enableSpinner: true,
enableProgressBar: true,
Expand Down Expand Up @@ -77,6 +84,11 @@
await viewer.setFont(fontFiles);
window.viewer = viewer;

new AxisGizmoPlugin(viewer);
new BottomBarPlugin(viewer);
new MeasurementPlugin(viewer);
new StatsPlugin(viewer);

const onProgress = (event) => {
const progress = ((event.loaded * 100) / event.total).toFixed(1);
console.log(`[Demo] Loading progress: ${progress}%`);
Expand Down
14 changes: 12 additions & 2 deletions public/demo/dxf_3.html → ...c/demo/dxf_3_compare_with_1_viewport.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,14 @@
<div id="myCanvas" class="container"></div>
</div>
<script type="module">
import { BaseDxfCompareHelper, DxfViewer, ToolbarMenuId } from "./demo/libs/gemini-viewer.esm.min.js";
import {
AxisGizmoPlugin,
BaseDxfCompareHelper,
DxfViewer,
MeasurementPlugin,
ToolbarMenuId,
ViewerEvent,
} from "./demo/libs/gemini-viewer.esm.min.js";
import DxfComparePanel from "./demo/compare/dxfComparePanel.js"
import DxfSettingsPanel from "./demo/settings/DxfSettingsPanel.js";
import LayerManager from "./demo/layerManager/LayerManager.js";
Expand All @@ -29,7 +36,6 @@
const url2 = "./demo/models/dxf/doors_and_windows_mopdified.dxf";
const config = {
containerId: "myCanvas",
enableAxisGizmo: true,
enableToolbar: true,
enableSpinner: true,
enableProgressBar: true,
Expand Down Expand Up @@ -75,6 +81,10 @@
await compareHelper.setFont(fontFiles);
window.compareHelper = compareHelper;

const viewer = compareHelper.viewer;
new AxisGizmoPlugin(viewer, { ignoreZAxis: true });
new MeasurementPlugin(viewer);

const onProgress = (event) => {
const progress = ((event.loaded * 100) / event.total).toFixed(1);
console.log(`[Demo] Loading progress: ${progress}%`);
Expand Down
10 changes: 8 additions & 2 deletions public/demo/dxf_5.html → public/demo/dxf_5_markups.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,12 @@
</div>
</div>
<script type="module">
import { DxfViewer, ViewerEvent, ToolbarMenuId } from "./demo/libs/gemini-viewer.esm.min.js";
import {
AxisGizmoPlugin,
DxfViewer,
ToolbarMenuId,
ViewerEvent,
} from "./demo/libs/gemini-viewer.esm.min.js";
import DxfSettingsPanel from './demo/settings/DxfSettingsPanel.js';
import LayerManager from './demo/layerManager/LayerManager.js';

Expand All @@ -93,7 +98,6 @@
};
const viewerCfg = {
containerId: "myCanvas",
enableAxisGizmo: true,
enableSpinner: true,
enableProgressBar: true,
enableLayoutBar: true,
Expand Down Expand Up @@ -137,6 +141,8 @@
await viewer.setFont(fontFiles);
window.viewer = viewer;

new AxisGizmoPlugin(viewer, { ignoreZAxis: true });

const onProgress = (event) => {
const progress = ((event.loaded * 100) / event.total).toFixed(1);
console.log(`[Demo] Loading progress: ${progress}%`);
Expand Down
Loading