@inweb/viewer-three 27.1.1 → 27.1.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/extensions/components/AxesHelperComponent.js +12 -11
- package/dist/extensions/components/AxesHelperComponent.js.map +1 -1
- package/dist/extensions/components/AxesHelperComponent.min.js +1 -1
- package/dist/extensions/components/AxesHelperComponent.module.js +12 -11
- package/dist/extensions/components/AxesHelperComponent.module.js.map +1 -1
- package/dist/extensions/components/GridHelperComponent.js +4 -6
- package/dist/extensions/components/GridHelperComponent.js.map +1 -1
- package/dist/extensions/components/GridHelperComponent.min.js +1 -1
- package/dist/extensions/components/GridHelperComponent.module.js +4 -6
- package/dist/extensions/components/GridHelperComponent.module.js.map +1 -1
- package/dist/extensions/components/LightHelperComponent.js +5 -5
- package/dist/extensions/components/LightHelperComponent.js.map +1 -1
- package/dist/extensions/components/LightHelperComponent.min.js +1 -1
- package/dist/extensions/components/LightHelperComponent.module.js +6 -6
- package/dist/extensions/components/LightHelperComponent.module.js.map +1 -1
- package/dist/extensions/components/RoomEnvironmentComponent.js +1 -0
- package/dist/extensions/components/RoomEnvironmentComponent.js.map +1 -1
- package/dist/extensions/components/RoomEnvironmentComponent.min.js +1 -1
- package/dist/extensions/loaders/GLTFCloudLoader.js.map +1 -1
- package/dist/extensions/loaders/GLTFFileLoader.js.map +1 -1
- package/dist/extensions/loaders/IFCXLoader.js.map +1 -1
- package/dist/viewer-three.js +2630 -751
- package/dist/viewer-three.js.map +1 -1
- package/dist/viewer-three.min.js +4 -4
- package/dist/viewer-three.module.js +143 -89
- package/dist/viewer-three.module.js.map +1 -1
- package/extensions/components/AxesHelperComponent.ts +13 -12
- package/extensions/components/GridHelperComponent.ts +4 -6
- package/extensions/components/LightHelperComponent.ts +6 -6
- package/lib/Viewer/commands/SetDefaultViewPosition.d.ts +1 -1
- package/lib/Viewer/loaders/GLTFBinaryParser.d.ts +11 -0
- package/lib/Viewer/loaders/GLTFFileDynamicLoader.d.ts +0 -1
- package/lib/Viewer/loaders/JSONStreamParser.d.ts +5 -0
- package/package.json +11 -9
- package/src/Viewer/Viewer.ts +4 -7
- package/src/Viewer/commands/SetDefaultViewPosition.ts +3 -3
- package/src/Viewer/commands/ZoomTo.ts +6 -6
- package/src/Viewer/components/CameraComponent.ts +3 -3
- package/src/Viewer/components/LightComponent.ts +5 -8
- package/src/Viewer/components/SelectionComponent.ts +3 -1
- package/src/Viewer/draggers/CuttingPlaneDragger.ts +6 -6
- package/src/Viewer/draggers/FlyDragger.ts +1 -1
- package/src/Viewer/draggers/MeasureLineDragger.ts +10 -7
- package/src/Viewer/draggers/WalkDragger.ts +1 -1
- package/src/Viewer/loaders/DynamicGltfLoader/DynamicGltfLoader.js +63 -10
- package/src/Viewer/loaders/DynamicGltfLoader/GltfStructure.js +7 -1
- package/src/Viewer/loaders/{GLTFBinaryExtension.ts → GLTFBinaryParser.ts} +34 -29
- package/src/Viewer/loaders/GLTFCloudDynamicLoader.ts +10 -9
- package/src/Viewer/loaders/GLTFFileDynamicLoader.ts +9 -8
- package/src/Viewer/loaders/JSONStreamParser.ts +38 -0
- package/lib/Viewer/loaders/GLTFBinaryExtension.d.ts +0 -5
|
@@ -35,7 +35,7 @@ class AxesHelperComponent implements IComponent {
|
|
|
35
35
|
this.axesHelper2 = new AxesHelper(1);
|
|
36
36
|
this.modelHelpers = [];
|
|
37
37
|
|
|
38
|
-
this.axesHelper1.setColors("#ccc", "#ccc", "#ccc");
|
|
38
|
+
// this.axesHelper1.setColors("#ccc", "#ccc", "#ccc");
|
|
39
39
|
|
|
40
40
|
this.viewer = viewer;
|
|
41
41
|
this.viewer.addEventListener("initialize", this.syncHelper);
|
|
@@ -70,27 +70,28 @@ class AxesHelperComponent implements IComponent {
|
|
|
70
70
|
this.axesHelper1.removeFromParent();
|
|
71
71
|
this.axesHelper2.removeFromParent();
|
|
72
72
|
|
|
73
|
-
const
|
|
74
|
-
const
|
|
73
|
+
const extentsSize = this.viewer.extents.getSize(new Vector3()).length() || 1;
|
|
74
|
+
const extentsCenter = this.viewer.extents.getCenter(new Vector3());
|
|
75
75
|
|
|
76
76
|
this.axesHelper1.position.set(0, 0, 0);
|
|
77
|
-
this.axesHelper1.scale.setScalar(
|
|
77
|
+
this.axesHelper1.scale.setScalar(extentsSize * 1.5);
|
|
78
|
+
this.viewer.helpers.add(this.axesHelper1);
|
|
78
79
|
|
|
79
|
-
this.
|
|
80
|
-
this.axesHelper2.scale.setScalar(size);
|
|
80
|
+
if (this.viewer.models.length < 1) return;
|
|
81
81
|
|
|
82
|
-
this.
|
|
82
|
+
this.axesHelper2.position.copy(extentsCenter);
|
|
83
|
+
this.axesHelper2.scale.setScalar(extentsSize);
|
|
83
84
|
this.viewer.helpers.add(this.axesHelper2);
|
|
84
85
|
|
|
85
86
|
if (this.viewer.models.length < 2) return;
|
|
86
87
|
|
|
87
88
|
this.viewer.models.forEach((model) => {
|
|
88
|
-
const
|
|
89
|
-
const
|
|
90
|
-
const
|
|
89
|
+
const modelExtents = model.getExtents(new Box3());
|
|
90
|
+
const modelSize = modelExtents.getSize(new Vector3()).length() || 1;
|
|
91
|
+
const modelCenter = modelExtents.getCenter(new Vector3());
|
|
91
92
|
|
|
92
|
-
const helper = new AxesHelper(
|
|
93
|
-
helper.position.copy(
|
|
93
|
+
const helper = new AxesHelper(modelSize);
|
|
94
|
+
helper.position.copy(modelCenter);
|
|
94
95
|
|
|
95
96
|
this.modelHelpers.push(helper);
|
|
96
97
|
this.viewer.helpers.add(helper);
|
|
@@ -48,16 +48,14 @@ class GridHelperComponent implements IComponent {
|
|
|
48
48
|
syncHelper = () => {
|
|
49
49
|
this.gridHelper.removeFromParent();
|
|
50
50
|
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
const size = this.viewer.extents.getSize(new Vector3()).multiply(this.viewer.camera.up).length();
|
|
54
|
-
const center = this.viewer.extents.getCenter(new Vector3());
|
|
51
|
+
const extentsSizeUp = this.viewer.extents.getSize(new Vector3()).multiply(this.viewer.camera.up).length() || 1;
|
|
52
|
+
const extentsCenter = this.viewer.extents.getCenter(new Vector3());
|
|
55
53
|
|
|
56
54
|
const upY = new Vector3(0, 1, 0);
|
|
57
55
|
const up = new Vector3().copy(this.viewer.camera.up);
|
|
58
56
|
|
|
59
|
-
this.gridHelper.scale.setScalar(
|
|
60
|
-
this.gridHelper.position.copy(
|
|
57
|
+
this.gridHelper.scale.setScalar(extentsSizeUp);
|
|
58
|
+
this.gridHelper.position.copy(extentsCenter);
|
|
61
59
|
this.gridHelper.quaternion.setFromUnitVectors(upY, up);
|
|
62
60
|
|
|
63
61
|
this.viewer.helpers.add(this.gridHelper);
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
// acknowledge and accept the above terms.
|
|
22
22
|
///////////////////////////////////////////////////////////////////////////////
|
|
23
23
|
|
|
24
|
-
import { DirectionalLightHelper, HemisphereLightHelper, PointLightHelper,
|
|
24
|
+
import { DirectionalLightHelper, HemisphereLightHelper, PointLightHelper, Vector3 } from "three";
|
|
25
25
|
import { IComponent, components, Viewer } from "@inweb/viewer-three";
|
|
26
26
|
|
|
27
27
|
class LightHelperComponent implements IComponent {
|
|
@@ -53,15 +53,15 @@ class LightHelperComponent implements IComponent {
|
|
|
53
53
|
});
|
|
54
54
|
this.lightHelpers.length = 0;
|
|
55
55
|
|
|
56
|
-
const extentsSize = this.viewer.extents.
|
|
57
|
-
const
|
|
56
|
+
const extentsSize = this.viewer.extents.getSize(new Vector3()).length() || 1;
|
|
57
|
+
const helperSize = extentsSize / 20;
|
|
58
58
|
|
|
59
59
|
this.viewer.scene.traverse((object: any) => {
|
|
60
60
|
let helper: DirectionalLightHelper | HemisphereLightHelper | PointLightHelper;
|
|
61
61
|
|
|
62
|
-
if (object.isDirectionalLight) helper = new DirectionalLightHelper(object,
|
|
63
|
-
else if (object.isHemisphereLight) helper = new HemisphereLightHelper(object,
|
|
64
|
-
else if (object.isPointLight) helper = new PointLightHelper(object,
|
|
62
|
+
if (object.isDirectionalLight) helper = new DirectionalLightHelper(object, helperSize, "#aa0000");
|
|
63
|
+
else if (object.isHemisphereLight) helper = new HemisphereLightHelper(object, helperSize, "#ff9800");
|
|
64
|
+
else if (object.isPointLight) helper = new PointLightHelper(object, helperSize, "#ff9800");
|
|
65
65
|
|
|
66
66
|
if (helper) {
|
|
67
67
|
this.lightHelpers.push(helper);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@inweb/viewer-three",
|
|
3
|
-
"version": "27.1.
|
|
3
|
+
"version": "27.1.3",
|
|
4
4
|
"description": "JavaScript library for rendering CAD and BIM files in a browser using Three.js",
|
|
5
5
|
"homepage": "https://cloud.opendesign.com/docs/index.html",
|
|
6
6
|
"license": "SEE LICENSE IN LICENSE",
|
|
@@ -35,18 +35,20 @@
|
|
|
35
35
|
"docs": "typedoc"
|
|
36
36
|
},
|
|
37
37
|
"dependencies": {
|
|
38
|
-
"@inweb/client": "~27.1.
|
|
39
|
-
"@inweb/eventemitter2": "~27.1.
|
|
40
|
-
"@inweb/markup": "~27.1.
|
|
41
|
-
"@inweb/viewer-core": "~27.1.
|
|
38
|
+
"@inweb/client": "~27.1.3",
|
|
39
|
+
"@inweb/eventemitter2": "~27.1.3",
|
|
40
|
+
"@inweb/markup": "~27.1.3",
|
|
41
|
+
"@inweb/viewer-core": "~27.1.3"
|
|
42
42
|
},
|
|
43
43
|
"devDependencies": {
|
|
44
|
-
"@
|
|
44
|
+
"@streamparser/json": "^0.0.22",
|
|
45
|
+
"@types/three": "^0.182.0",
|
|
45
46
|
"potree-core": "^2.0.11",
|
|
46
|
-
"three": "^0.
|
|
47
|
+
"three": "^0.182.0"
|
|
47
48
|
},
|
|
48
49
|
"peerDependencies": {
|
|
49
|
-
"@
|
|
50
|
-
"three": "^0.
|
|
50
|
+
"@streamparser/json": "^0.0.22",
|
|
51
|
+
"@types/three": "^0.182.0",
|
|
52
|
+
"three": "^0.182.0"
|
|
51
53
|
}
|
|
52
54
|
}
|
package/src/Viewer/Viewer.ts
CHANGED
|
@@ -31,7 +31,6 @@ import {
|
|
|
31
31
|
Plane,
|
|
32
32
|
Raycaster,
|
|
33
33
|
Scene,
|
|
34
|
-
Sphere,
|
|
35
34
|
Vector2,
|
|
36
35
|
Vector3,
|
|
37
36
|
WebGLRenderer,
|
|
@@ -458,15 +457,14 @@ export class Viewer
|
|
|
458
457
|
if (model && typeof model.database === "string") {
|
|
459
458
|
file = model.file;
|
|
460
459
|
}
|
|
461
|
-
if (!model) throw new Error(`Format not supported`);
|
|
462
460
|
|
|
463
461
|
let format = params.format;
|
|
464
|
-
if (!format && typeof file["type"] === "string") format = file["type"].split(".").pop();
|
|
462
|
+
if (!format && file && typeof file["type"] === "string") format = file["type"].split(".").pop();
|
|
465
463
|
if (!format && typeof file === "string") format = file.split(".").pop();
|
|
466
464
|
if (!format && file instanceof globalThis.File) format = file.name.split(".").pop();
|
|
467
465
|
|
|
468
466
|
const loader: ILoader = loaders.createLoader(this, model, format);
|
|
469
|
-
if (!loader) throw new Error(`Format not supported`);
|
|
467
|
+
if (!loader) throw new Error(`Format not supported (${format})`);
|
|
470
468
|
this.loaders.push(loader);
|
|
471
469
|
|
|
472
470
|
this.emitEvent({ type: "geometrystart", file, model });
|
|
@@ -534,7 +532,6 @@ export class Viewer
|
|
|
534
532
|
this.helpers.clear();
|
|
535
533
|
|
|
536
534
|
this.extents.makeEmpty();
|
|
537
|
-
this.target.set(0, 0, 0);
|
|
538
535
|
|
|
539
536
|
this.syncOptions();
|
|
540
537
|
this.syncOverlay();
|
|
@@ -675,7 +672,7 @@ export class Viewer
|
|
|
675
672
|
|
|
676
673
|
const setOrthogonalCamera = (orthogonal_camera: IOrthogonalCamera) => {
|
|
677
674
|
if (orthogonal_camera) {
|
|
678
|
-
const extentsSize = this.extents.
|
|
675
|
+
const extentsSize = this.extents.getSize(new Vector3()).length() || 1;
|
|
679
676
|
const rendererSize = this.renderer.getSize(new Vector2());
|
|
680
677
|
const aspectRatio = rendererSize.x / rendererSize.y;
|
|
681
678
|
|
|
@@ -706,7 +703,7 @@ export class Viewer
|
|
|
706
703
|
|
|
707
704
|
const setPerspectiveCamera = (perspective_camera: IPerspectiveCamera) => {
|
|
708
705
|
if (perspective_camera) {
|
|
709
|
-
const extentsSize = this.extents.
|
|
706
|
+
const extentsSize = this.extents.getSize(new Vector3()).length() || 1;
|
|
710
707
|
const rendererSize = this.renderer.getSize(new Vector2());
|
|
711
708
|
const aspectRatio = rendererSize.x / rendererSize.y;
|
|
712
709
|
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
// acknowledge and accept the above terms.
|
|
22
22
|
///////////////////////////////////////////////////////////////////////////////
|
|
23
23
|
|
|
24
|
-
import { Quaternion,
|
|
24
|
+
import { Quaternion, Vector3 } from "three";
|
|
25
25
|
import type { Viewer } from "../Viewer";
|
|
26
26
|
import { zoomTo } from "./ZoomTo";
|
|
27
27
|
|
|
@@ -38,9 +38,9 @@ export const defaultViewPositions = {
|
|
|
38
38
|
nw: new Vector3(1, 1, 1).normalize(),
|
|
39
39
|
};
|
|
40
40
|
|
|
41
|
-
export function setDefaultViewPosition(viewer: Viewer, position
|
|
41
|
+
export function setDefaultViewPosition(viewer: Viewer, position = "sw"): void {
|
|
42
42
|
const extentsCenter = viewer.extents.getCenter(new Vector3());
|
|
43
|
-
const extentsSize = viewer.extents.
|
|
43
|
+
const extentsSize = viewer.extents.getSize(new Vector3()).length() || 1;
|
|
44
44
|
|
|
45
45
|
const upY = new Vector3(0, 1, 0);
|
|
46
46
|
const offsetY = defaultViewPositions[position] || defaultViewPositions["sw"];
|
|
@@ -21,14 +21,14 @@
|
|
|
21
21
|
// acknowledge and accept the above terms.
|
|
22
22
|
///////////////////////////////////////////////////////////////////////////////
|
|
23
23
|
|
|
24
|
-
import { Box3, MathUtils,
|
|
24
|
+
import { Box3, MathUtils, Vector2, Vector3 } from "three";
|
|
25
25
|
import type { Viewer } from "../Viewer";
|
|
26
26
|
|
|
27
27
|
export function zoomTo(viewer: Viewer, box: Box3): void {
|
|
28
28
|
if (box.isEmpty()) return;
|
|
29
29
|
|
|
30
30
|
const boxCenter = box.getCenter(new Vector3());
|
|
31
|
-
const boxSize = box.
|
|
31
|
+
const boxSize = box.getSize(new Vector3()).length() || 1;
|
|
32
32
|
|
|
33
33
|
const rendererSize = viewer.renderer.getSize(new Vector2());
|
|
34
34
|
const aspectRatio = rendererSize.x / rendererSize.y;
|
|
@@ -38,14 +38,14 @@ export function zoomTo(viewer: Viewer, box: Box3): void {
|
|
|
38
38
|
if (camera.isPerspectiveCamera) {
|
|
39
39
|
const offset = new Vector3(0, 0, 1)
|
|
40
40
|
.applyQuaternion(camera.quaternion)
|
|
41
|
-
.multiplyScalar(boxSize / Math.tan(MathUtils.degToRad(camera.fov * 0.5)));
|
|
41
|
+
.multiplyScalar(boxSize / (2 * Math.tan(MathUtils.degToRad(camera.fov * 0.5))));
|
|
42
42
|
|
|
43
43
|
camera.position.copy(offset).add(boxCenter);
|
|
44
44
|
camera.updateMatrixWorld();
|
|
45
45
|
}
|
|
46
46
|
if (camera.isOrthographicCamera) {
|
|
47
|
-
camera.top = boxSize;
|
|
48
|
-
camera.bottom = -boxSize;
|
|
47
|
+
camera.top = boxSize / 2;
|
|
48
|
+
camera.bottom = -boxSize / 2;
|
|
49
49
|
camera.left = camera.bottom * aspectRatio;
|
|
50
50
|
camera.right = camera.top * aspectRatio;
|
|
51
51
|
camera.zoom = 1;
|
|
@@ -53,7 +53,7 @@ export function zoomTo(viewer: Viewer, box: Box3): void {
|
|
|
53
53
|
|
|
54
54
|
const offset = new Vector3(0, 0, 1)
|
|
55
55
|
.applyQuaternion(camera.quaternion)
|
|
56
|
-
.multiplyScalar(viewer.extents.
|
|
56
|
+
.multiplyScalar(viewer.extents.getSize(new Vector3()).length() || 1);
|
|
57
57
|
|
|
58
58
|
camera.position.copy(offset).add(boxCenter);
|
|
59
59
|
camera.updateMatrixWorld();
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
// acknowledge and accept the above terms.
|
|
22
22
|
///////////////////////////////////////////////////////////////////////////////
|
|
23
23
|
|
|
24
|
-
import { MathUtils, OrthographicCamera, PerspectiveCamera,
|
|
24
|
+
import { MathUtils, OrthographicCamera, PerspectiveCamera, Vector2, Vector3 } from "three";
|
|
25
25
|
|
|
26
26
|
import { CameraMode, IComponent } from "@inweb/viewer-core";
|
|
27
27
|
import type { Viewer } from "../Viewer";
|
|
@@ -47,7 +47,7 @@ export class CameraComponent implements IComponent {
|
|
|
47
47
|
}
|
|
48
48
|
|
|
49
49
|
switchCamera(camera: any) {
|
|
50
|
-
const extentsSize = this.viewer.extents.
|
|
50
|
+
const extentsSize = this.viewer.extents.getSize(new Vector3()).length() || 1;
|
|
51
51
|
const rendererSize = this.viewer.renderer.getSize(new Vector2());
|
|
52
52
|
const aspectRatio = rendererSize.x / rendererSize.y;
|
|
53
53
|
|
|
@@ -95,7 +95,7 @@ export class CameraComponent implements IComponent {
|
|
|
95
95
|
if (currentCamera.isPerspectiveCamera) {
|
|
96
96
|
const fov = currentCamera.fov;
|
|
97
97
|
const distance = currentCamera.position.distanceTo(target);
|
|
98
|
-
const fieldHeight = 2 * Math.tan(MathUtils.degToRad(fov
|
|
98
|
+
const fieldHeight = 2 * Math.tan(MathUtils.degToRad(fov * 0.5)) * distance;
|
|
99
99
|
|
|
100
100
|
camera = new OrthographicCamera();
|
|
101
101
|
camera.top = fieldHeight / 2;
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
// acknowledge and accept the above terms.
|
|
22
22
|
///////////////////////////////////////////////////////////////////////////////
|
|
23
23
|
|
|
24
|
-
import { AmbientLight, DirectionalLight, HemisphereLight, Quaternion,
|
|
24
|
+
import { AmbientLight, DirectionalLight, HemisphereLight, Quaternion, Vector3 } from "three";
|
|
25
25
|
|
|
26
26
|
import { IComponent } from "@inweb/viewer-core";
|
|
27
27
|
import type { Viewer } from "../Viewer";
|
|
@@ -71,7 +71,7 @@ export class LightComponent implements IComponent {
|
|
|
71
71
|
if (this.viewer.extents.isEmpty()) return;
|
|
72
72
|
|
|
73
73
|
const extentsCenter = this.viewer.extents.getCenter(new Vector3());
|
|
74
|
-
const extentsSize = this.viewer.extents.
|
|
74
|
+
const extentsSize = this.viewer.extents.getSize(new Vector3()).length() || 1;
|
|
75
75
|
|
|
76
76
|
const upY = new Vector3(0, 1, 0);
|
|
77
77
|
const frontY = new Vector3(0, 0, -1);
|
|
@@ -83,19 +83,16 @@ export class LightComponent implements IComponent {
|
|
|
83
83
|
this.directionalLight.position
|
|
84
84
|
.copy(up)
|
|
85
85
|
.applyAxisAngle(front, (-Math.PI * 30) / 180)
|
|
86
|
-
.multiplyScalar(extentsSize
|
|
86
|
+
.multiplyScalar(extentsSize)
|
|
87
87
|
.add(extentsCenter);
|
|
88
88
|
this.directionalLight.target.position.copy(extentsCenter);
|
|
89
89
|
|
|
90
|
-
this.frontLight.position
|
|
91
|
-
.copy(front)
|
|
92
|
-
.multiplyScalar(extentsSize * 2)
|
|
93
|
-
.add(extentsCenter);
|
|
90
|
+
this.frontLight.position.copy(front).multiplyScalar(extentsSize).add(extentsCenter);
|
|
94
91
|
this.frontLight.target.position.copy(extentsCenter);
|
|
95
92
|
|
|
96
93
|
this.hemisphereLight.position
|
|
97
94
|
.copy(front)
|
|
98
|
-
.multiplyScalar(extentsSize *
|
|
95
|
+
.multiplyScalar(extentsSize * 1.5)
|
|
99
96
|
.add(extentsCenter);
|
|
100
97
|
|
|
101
98
|
this.viewer.scene.add(this.ambientLight);
|
|
@@ -63,8 +63,10 @@ export class SelectionComponent implements IComponent {
|
|
|
63
63
|
const upPosition = this.getMousePosition(event, new Vector2());
|
|
64
64
|
if (upPosition.distanceTo(this.downPosition) !== 0) return;
|
|
65
65
|
|
|
66
|
+
const extentsSize = this.viewer.extents.getSize(new Vector3()).length() || 1;
|
|
67
|
+
|
|
66
68
|
const snapper = new Snapper(this.viewer.camera, this.viewer.renderer, this.viewer.canvas);
|
|
67
|
-
snapper.threshold =
|
|
69
|
+
snapper.threshold = extentsSize / 10000;
|
|
68
70
|
|
|
69
71
|
let intersections = [];
|
|
70
72
|
this.viewer.models.forEach((model) => {
|
|
@@ -37,20 +37,20 @@ export class CuttingPlaneDragger extends OrbitDragger {
|
|
|
37
37
|
constructor(viewer: Viewer, normal: Vector3, color: number) {
|
|
38
38
|
super(viewer);
|
|
39
39
|
|
|
40
|
-
const
|
|
41
|
-
const
|
|
42
|
-
const constant = -
|
|
40
|
+
const extentsSize = viewer.extents.getSize(new Vector3()).length() || 1;
|
|
41
|
+
const extentsCenter = viewer.extents.getCenter(new Vector3());
|
|
42
|
+
const constant = -extentsCenter.dot(normal);
|
|
43
43
|
|
|
44
44
|
this.plane = new Plane(normal, constant);
|
|
45
45
|
|
|
46
46
|
if (!viewer.renderer.clippingPlanes) viewer.renderer.clippingPlanes = [];
|
|
47
47
|
viewer.renderer.clippingPlanes.push(this.plane);
|
|
48
48
|
|
|
49
|
-
this.planeHelper = new PlaneHelper(this.plane,
|
|
49
|
+
this.planeHelper = new PlaneHelper(this.plane, extentsSize, color, extentsCenter);
|
|
50
50
|
this.viewer.helpers.add(this.planeHelper);
|
|
51
51
|
|
|
52
52
|
this.planeCenter = new Object3D();
|
|
53
|
-
this.planeCenter.position.copy(
|
|
53
|
+
this.planeCenter.position.copy(extentsCenter);
|
|
54
54
|
this.viewer.helpers.add(this.planeCenter);
|
|
55
55
|
|
|
56
56
|
this.transform = new TransformControls(viewer.camera, viewer.canvas);
|
|
@@ -104,7 +104,7 @@ export class CuttingPlaneDragger extends OrbitDragger {
|
|
|
104
104
|
};
|
|
105
105
|
|
|
106
106
|
updatePlaneSize = () => {
|
|
107
|
-
this.planeHelper.size = this.viewer.extents.getSize(new Vector3()).length();
|
|
107
|
+
this.planeHelper.size = this.viewer.extents.getSize(new Vector3()).length() || 1;
|
|
108
108
|
this.viewer.update();
|
|
109
109
|
};
|
|
110
110
|
|
|
@@ -66,7 +66,7 @@ export class FlyDragger implements IDragger {
|
|
|
66
66
|
|
|
67
67
|
updateControls = () => {
|
|
68
68
|
const size = this.viewer.extents.getSize(new Vector3());
|
|
69
|
-
this.controls.movementSpeed = Math.min(size.x, size.y, size.z) / 2;
|
|
69
|
+
this.controls.movementSpeed = Math.min(size.x, size.y, size.z) / 2 || 1;
|
|
70
70
|
this.joyStickControls.movementSpeed = this.controls.movementSpeed;
|
|
71
71
|
this.joyStickControls.multiplier = this.controls.multiplier;
|
|
72
72
|
};
|
|
@@ -49,8 +49,10 @@ export class MeasureLineDragger extends OrbitDragger {
|
|
|
49
49
|
this.line = new MeasureLine(this.overlay, this.scale, this.units, this.precision);
|
|
50
50
|
this.overlay.addLine(this.line);
|
|
51
51
|
|
|
52
|
+
const extentsSize = this.viewer.extents.getSize(new Vector3()).length() || 1;
|
|
53
|
+
|
|
52
54
|
this.snapper = new Snapper(viewer.camera, viewer.renderer, viewer.canvas);
|
|
53
|
-
this.snapper.threshold =
|
|
55
|
+
this.snapper.threshold = extentsSize / 10000;
|
|
54
56
|
|
|
55
57
|
this.objects = [];
|
|
56
58
|
this.updateObjects();
|
|
@@ -170,7 +172,10 @@ export class MeasureLineDragger extends OrbitDragger {
|
|
|
170
172
|
const units = this.viewer.options.rulerUnit ?? "Default";
|
|
171
173
|
const precision = this.viewer.options.rulerPrecision ?? "Default";
|
|
172
174
|
|
|
173
|
-
if (
|
|
175
|
+
if (!model) {
|
|
176
|
+
this.scale = 1;
|
|
177
|
+
this.units = "";
|
|
178
|
+
} else if (units === "Default") {
|
|
174
179
|
this.scale = model.getUnitScale();
|
|
175
180
|
this.units = model.getUnitString();
|
|
176
181
|
} else {
|
|
@@ -178,11 +183,9 @@ export class MeasureLineDragger extends OrbitDragger {
|
|
|
178
183
|
this.units = units;
|
|
179
184
|
}
|
|
180
185
|
|
|
181
|
-
if (precision
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
this.precision = precision;
|
|
185
|
-
}
|
|
186
|
+
if (!model) this.precision = 2;
|
|
187
|
+
else if (precision === "Default") this.precision = model.getPrecision();
|
|
188
|
+
else this.precision = precision;
|
|
186
189
|
|
|
187
190
|
this.overlay.updateLineUnits(this.scale, this.units, this.precision);
|
|
188
191
|
};
|
|
@@ -74,7 +74,7 @@ export class WalkDragger implements IDragger {
|
|
|
74
74
|
|
|
75
75
|
updateControls = () => {
|
|
76
76
|
const size = this.viewer.extents.getSize(new Vector3());
|
|
77
|
-
this.controls.movementSpeed = Math.min(size.x, size.y, size.z) / 2;
|
|
77
|
+
this.controls.movementSpeed = Math.min(size.x, size.y, size.z) / 2 || 1;
|
|
78
78
|
this.joyStickControls.movementSpeed = this.controls.movementSpeed;
|
|
79
79
|
this.joyStickControls.multiplier = this.controls.multiplier;
|
|
80
80
|
};
|
|
@@ -1004,19 +1004,19 @@ export class DynamicGltfLoader {
|
|
|
1004
1004
|
const transformedBox = node.geometryExtents.clone();
|
|
1005
1005
|
const structureRoot = node.structure ? this.structureRoots.get(node.structure.id) : null;
|
|
1006
1006
|
|
|
1007
|
+
// Calculate relative transformation from node.group to structureRoot
|
|
1008
|
+
// This matches the logic used in merge methods
|
|
1007
1009
|
if (node.group) {
|
|
1008
|
-
const
|
|
1009
|
-
let
|
|
1010
|
+
const relativeMatrix = new Matrix4();
|
|
1011
|
+
let currentObject = node.group;
|
|
1010
1012
|
|
|
1011
|
-
while (
|
|
1012
|
-
|
|
1013
|
-
|
|
1014
|
-
}
|
|
1015
|
-
currentGroup = currentGroup.parent;
|
|
1013
|
+
while (currentObject && currentObject !== structureRoot) {
|
|
1014
|
+
relativeMatrix.premultiply(currentObject.matrix);
|
|
1015
|
+
currentObject = currentObject.parent;
|
|
1016
1016
|
}
|
|
1017
1017
|
|
|
1018
|
-
|
|
1019
|
-
transformedBox.applyMatrix4(
|
|
1018
|
+
if (!relativeMatrix.equals(new Matrix4())) {
|
|
1019
|
+
transformedBox.applyMatrix4(relativeMatrix);
|
|
1020
1020
|
}
|
|
1021
1021
|
}
|
|
1022
1022
|
|
|
@@ -1548,6 +1548,18 @@ export class DynamicGltfLoader {
|
|
|
1548
1548
|
for (const mesh of group.objects) {
|
|
1549
1549
|
const geometry = mesh.geometry.clone();
|
|
1550
1550
|
|
|
1551
|
+
const relativeMatrix = new Matrix4();
|
|
1552
|
+
let currentObject = mesh;
|
|
1553
|
+
|
|
1554
|
+
while (currentObject && currentObject !== rootGroup) {
|
|
1555
|
+
relativeMatrix.premultiply(currentObject.matrix);
|
|
1556
|
+
currentObject = currentObject.parent;
|
|
1557
|
+
}
|
|
1558
|
+
|
|
1559
|
+
if (!relativeMatrix.equals(new Matrix4())) {
|
|
1560
|
+
geometry.applyMatrix4(relativeMatrix);
|
|
1561
|
+
}
|
|
1562
|
+
|
|
1551
1563
|
const handle = mesh.userData.handle;
|
|
1552
1564
|
if (!this.objectIdToIndex.has(handle)) {
|
|
1553
1565
|
this.objectIdToIndex.set(handle, this.maxObjectId++);
|
|
@@ -1673,7 +1685,20 @@ export class DynamicGltfLoader {
|
|
|
1673
1685
|
let isEdge = false;
|
|
1674
1686
|
group.objects.forEach((line) => {
|
|
1675
1687
|
isEdge = line.userData.isEdge;
|
|
1676
|
-
const geometry = line.geometry;
|
|
1688
|
+
const geometry = line.geometry.clone();
|
|
1689
|
+
|
|
1690
|
+
const relativeMatrix = new Matrix4();
|
|
1691
|
+
let currentObject = line;
|
|
1692
|
+
|
|
1693
|
+
while (currentObject && currentObject !== rootGroup) {
|
|
1694
|
+
relativeMatrix.premultiply(currentObject.matrix);
|
|
1695
|
+
currentObject = currentObject.parent;
|
|
1696
|
+
}
|
|
1697
|
+
|
|
1698
|
+
if (!relativeMatrix.equals(new Matrix4())) {
|
|
1699
|
+
geometry.applyMatrix4(relativeMatrix);
|
|
1700
|
+
}
|
|
1701
|
+
|
|
1677
1702
|
const positionAttr = geometry.attributes.position;
|
|
1678
1703
|
const vertexCount = positionAttr.count;
|
|
1679
1704
|
|
|
@@ -1701,6 +1726,7 @@ export class DynamicGltfLoader {
|
|
|
1701
1726
|
}
|
|
1702
1727
|
|
|
1703
1728
|
vertexOffset += vertexCount;
|
|
1729
|
+
geometry.dispose();
|
|
1704
1730
|
});
|
|
1705
1731
|
|
|
1706
1732
|
const geometry = new BufferGeometry();
|
|
@@ -1787,6 +1813,20 @@ export class DynamicGltfLoader {
|
|
|
1787
1813
|
isEdge = line.userData.isEdge;
|
|
1788
1814
|
const geometry = line.geometry.clone();
|
|
1789
1815
|
|
|
1816
|
+
// Calculate transformation matrix relative to rootGroup
|
|
1817
|
+
const relativeMatrix = new Matrix4();
|
|
1818
|
+
let currentObject = line;
|
|
1819
|
+
|
|
1820
|
+
while (currentObject && currentObject !== rootGroup) {
|
|
1821
|
+
relativeMatrix.premultiply(currentObject.matrix);
|
|
1822
|
+
currentObject = currentObject.parent;
|
|
1823
|
+
}
|
|
1824
|
+
|
|
1825
|
+
// Apply the relative transformation
|
|
1826
|
+
if (!relativeMatrix.equals(new Matrix4())) {
|
|
1827
|
+
geometry.applyMatrix4(relativeMatrix);
|
|
1828
|
+
}
|
|
1829
|
+
|
|
1790
1830
|
const handle = line.userData.handle;
|
|
1791
1831
|
if (!this.objectIdToIndex.has(handle)) {
|
|
1792
1832
|
this.objectIdToIndex.set(handle, this.maxObjectId++);
|
|
@@ -1892,6 +1932,19 @@ export class DynamicGltfLoader {
|
|
|
1892
1932
|
|
|
1893
1933
|
for (const points of group.objects) {
|
|
1894
1934
|
const geometry = points.geometry.clone();
|
|
1935
|
+
|
|
1936
|
+
const relativeMatrix = new Matrix4();
|
|
1937
|
+
let currentObject = points;
|
|
1938
|
+
|
|
1939
|
+
while (currentObject && currentObject !== rootGroup) {
|
|
1940
|
+
relativeMatrix.premultiply(currentObject.matrix);
|
|
1941
|
+
currentObject = currentObject.parent;
|
|
1942
|
+
}
|
|
1943
|
+
|
|
1944
|
+
if (!relativeMatrix.equals(new Matrix4())) {
|
|
1945
|
+
geometry.applyMatrix4(relativeMatrix);
|
|
1946
|
+
}
|
|
1947
|
+
|
|
1895
1948
|
geometries.push(geometry);
|
|
1896
1949
|
optimizedObjects.push(points);
|
|
1897
1950
|
handles.add(points.userData.handle);
|
|
@@ -64,7 +64,13 @@ export class GltfStructure {
|
|
|
64
64
|
}
|
|
65
65
|
|
|
66
66
|
async initialize(loader) {
|
|
67
|
-
|
|
67
|
+
const json = await this.loadController.loadJson();
|
|
68
|
+
|
|
69
|
+
if (json.asset === undefined || json.asset.version[0] < 2) {
|
|
70
|
+
throw new Error("GltfStructure: Unsupported asset. glTF versions >=2.0 are supported.");
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
this.json = json;
|
|
68
74
|
this.loader = loader;
|
|
69
75
|
this.uri = this.json.buffers[0].uri || "";
|
|
70
76
|
}
|