Skip to content

Commit 59860db

Browse files
authored
Merge pull request #113 from pattern-x/feature/move-libs
Move fonts and draco scripts to under libs folder
2 parents 2884756 + 21aed0e commit 59860db

35 files changed

+178
-426
lines changed

public/config.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
"url": "./demo/bim_3_explode.html"
1818
}]
1919
}, {
20-
"title": "2D drawings",
20+
"title": "2D drawings / PDFs",
2121
"subMenus": [{
22-
"title": "Upload your local dxf",
22+
"title": "Upload your local dxf or pdf",
2323
"url": "./demo/empty_dxf_project.html"
2424
}, {
2525
"title": "Rac basic sample project dwg",
@@ -48,6 +48,9 @@
4848
}, {
4949
"title": "Building 1&2",
5050
"url": "./demo/dxf_7_building1_2.html"
51+
}, {
52+
"title": "Rac basic sample project pdf",
53+
"url": "./demo/pdf_0.html"
5154
}]
5255
}, {
5356
"title": "Panoramas",

public/demo/bim_0.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656

5757
// draco decoder path is needed to load draco encoded models.
5858
// gemini-viewer js sdk user maintains draco decoder code somewhere, and provides the path here.
59-
const decoderPath = "./demo/three/js/libs/draco/gltf/";
59+
const decoderPath = "./demo/libs/draco/gltf/";
6060
viewer.setDracoDecoderPath(decoderPath);
6161

6262
viewer.loadModel(modelCfg, (event) => {

public/demo/bim_1.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949

5050
// draco decoder path is needed to load draco encoded models.
5151
// gemini-viewer js sdk user maintains draco decoder code somewhere, and provides the path here.
52-
const decoderPath = "./demo/three/js/libs/draco/gltf/";
52+
const decoderPath = "./demo/libs/draco/gltf/";
5353
viewer.setDracoDecoderPath(decoderPath);
5454

5555
viewer.loadModel(modelCfg, (event) => {

public/demo/bim_2_overlay_with_dxf.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@
5858
new SectionPlugin(viewer);
5959

6060
// font file is needed for loading dxf
61-
// const fontFiles = ["./fonts/Microsoft_YaHei_Regular.typeface.json"];
62-
const fontFiles = ["./fonts/hztxt.shx", "./fonts/simplex.shx"];
61+
// const fontFiles = ["./demo/libs/fonts/Microsoft_YaHei_Regular.typeface.json"];
62+
const fontFiles = ["./demo/libs/fonts/hztxt.shx", "./demo/libs/fonts/simplex.shx"];
6363
await viewer.setFont(fontFiles);
6464

6565
// draco decoder path is needed to load draco encoded models.
6666
// gemini-viewer js sdk user maintains draco decoder code somewhere, and provides the path here.
67-
const decoderPath = "./demo/three/js/libs/draco/gltf/";
67+
const decoderPath = "./demo/libs/draco/gltf/";
6868
viewer.setDracoDecoderPath(decoderPath);
6969

7070
project.models.forEach((modelCfg) => {

public/demo/bim_3_explode.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252

5353
// draco decoder path is needed to load draco encoded models.
5454
// gemini-viewer js sdk user maintains draco decoder code somewhere, and provides the path here.
55-
const decoderPath = "./demo/three/js/libs/draco/gltf/";
55+
const decoderPath = "./demo/libs/draco/gltf/";
5656
viewer.setDracoDecoderPath(decoderPath);
5757

5858
viewer.loadModel(modelCfg, (event) => {

public/demo/dxf_0.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
enableLayoutBar: true,
4747
};
4848
const viewer = new DxfViewer(viewerCfg);
49-
const fontFiles = ["./fonts/hztxt.shx", "./fonts/simplex.shx"];
49+
const fontFiles = ["./demo/libs/fonts/hztxt.shx", "./demo/libs/fonts/simplex.shx"];
5050
await viewer.setFont(fontFiles);
5151
window.viewer = viewer;
5252

public/demo/dxf_1.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
enableLayoutBar: true,
4747
};
4848
const viewer = new DxfViewer(viewerCfg);
49-
const fontFiles = ["./fonts/hztxt.shx", "./fonts/simplex.shx"];
49+
const fontFiles = ["./demo/libs/fonts/hztxt.shx", "./demo/libs/fonts/simplex.shx"];
5050
await viewer.setFont(fontFiles);
5151
window.viewer = viewer;
5252

public/demo/dxf_10_upload_files_to_compre.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
}
9999
);
100100
window.compareHelper = compareHelper;
101-
const fontFiles = ["./fonts/hztxt.shx", "./fonts/simplex.shx"];
101+
const fontFiles = ["./demo/libs/fonts/hztxt.shx", "./demo/libs/fonts/simplex.shx"];
102102
await compareHelper.setFont(fontFiles);
103103

104104
const menuConfig = getToolbarMenuConfig(compareHelper.viewer);

public/demo/dxf_2.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
enableLayoutBar: true,
4747
};
4848
const viewer = new DxfViewer(viewerCfg);
49-
const fontFiles = ["./fonts/hztxt.shx", "./fonts/simplex.shx"];
49+
const fontFiles = ["./demo/libs/fonts/hztxt.shx", "./demo/libs/fonts/simplex.shx"];
5050
await viewer.setFont(fontFiles);
5151
window.viewer = viewer;
5252

public/demo/dxf_3_compare_with_1_viewport.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
enableLayoutBar: true,
4343
};
4444
const compareHelper = new BaseDxfCompareHelper(config);
45-
// const fontFiles = ["./fonts/Microsoft_YaHei_Regular.typeface.json"];
46-
const fontFiles = ["./fonts/hztxt.shx", "./fonts/simplex.shx"];
45+
// const fontFiles = ["./demo/libs/fonts/Microsoft_YaHei_Regular.typeface.json"];
46+
const fontFiles = ["./demo/libs/fonts/hztxt.shx", "./demo/libs/fonts/simplex.shx"];
4747
await compareHelper.setFont(fontFiles);
4848
window.compareHelper = compareHelper;
4949

0 commit comments

Comments
 (0)