@inweb/viewer-three 27.10.0 → 27.12.0
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/loaders/GLTFCloudLoader.js +4 -2
- package/dist/extensions/loaders/GLTFCloudLoader.js.map +1 -1
- package/dist/extensions/loaders/GLTFCloudLoader.min.js +1 -1
- package/dist/extensions/loaders/GLTFCloudLoader.module.js +4 -2
- package/dist/extensions/loaders/GLTFCloudLoader.module.js.map +1 -1
- package/dist/extensions/loaders/GLTFFileLoader.js +2 -0
- package/dist/extensions/loaders/GLTFFileLoader.js.map +1 -1
- package/dist/extensions/loaders/GLTFFileLoader.min.js +1 -1
- package/dist/extensions/loaders/GLTFFileLoader.module.js +2 -0
- package/dist/extensions/loaders/GLTFFileLoader.module.js.map +1 -1
- package/dist/extensions/loaders/IFCXLoader.js +6 -2
- package/dist/extensions/loaders/IFCXLoader.js.map +1 -1
- package/dist/extensions/loaders/IFCXLoader.min.js +1 -1
- package/dist/extensions/loaders/IFCXLoader.module.js +6 -2
- package/dist/extensions/loaders/IFCXLoader.module.js.map +1 -1
- package/dist/extensions/loaders/PotreeLoader.js +2 -0
- package/dist/extensions/loaders/PotreeLoader.js.map +1 -1
- package/dist/extensions/loaders/PotreeLoader.min.js +1 -1
- package/dist/extensions/loaders/PotreeLoader.module.js +2 -0
- package/dist/extensions/loaders/PotreeLoader.module.js.map +1 -1
- package/dist/viewer-three.js +880 -258
- package/dist/viewer-three.js.map +1 -1
- package/dist/viewer-three.min.js +4 -4
- package/dist/viewer-three.module.js +765 -258
- package/dist/viewer-three.module.js.map +1 -1
- package/extensions/loaders/GLTFCloudLoader.ts +5 -3
- package/extensions/loaders/GLTFFileLoader.ts +2 -0
- package/extensions/loaders/IFCX/IFCXCloudLoader.ts +5 -3
- package/extensions/loaders/IFCX/IFCXFileLoader.ts +2 -0
- package/extensions/loaders/Potree/PotreeFileLoader.ts +2 -0
- package/lib/Viewer/Viewer.d.ts +27 -9
- package/lib/Viewer/commands/Deselect.d.ts +2 -0
- package/lib/Viewer/commands/Explode.d.ts +1 -1
- package/lib/Viewer/commands/GetHidden.d.ts +2 -0
- package/lib/Viewer/commands/GetIsolated.d.ts +2 -0
- package/lib/Viewer/commands/GetSelected.d.ts +1 -1
- package/lib/Viewer/commands/Hide.d.ts +2 -0
- package/lib/Viewer/commands/HideAll.d.ts +2 -0
- package/lib/Viewer/commands/Isolate.d.ts +2 -0
- package/lib/Viewer/commands/Select.d.ts +2 -0
- package/lib/Viewer/commands/SetSelected.d.ts +1 -1
- package/lib/Viewer/commands/SetSelected2.d.ts +1 -1
- package/lib/Viewer/commands/Show.d.ts +2 -0
- package/lib/Viewer/commands/ToHandles.d.ts +2 -0
- package/lib/Viewer/commands/ToHandles2.d.ts +2 -0
- package/lib/Viewer/commands/ToggleSelection.d.ts +2 -0
- package/lib/Viewer/commands/Zoom.d.ts +3 -0
- package/lib/Viewer/commands/ZoomExtents.d.ts +2 -0
- package/lib/Viewer/commands/ZoomTo.d.ts +1 -2
- package/lib/Viewer/components/HighlighterComponent.d.ts +4 -3
- package/lib/Viewer/components/SelectionComponent.d.ts +1 -9
- package/lib/Viewer/components/index.d.ts +1 -1
- package/lib/Viewer/draggers/index.d.ts +2 -2
- package/lib/Viewer/loaders/DynamicGltfLoader/DynamicModelImpl.d.ts +10 -8
- package/lib/Viewer/loaders/GLTFCloudDynamicLoader.d.ts +5 -1
- package/lib/Viewer/loaders/GLTFFileDynamicLoader.d.ts +5 -1
- package/lib/Viewer/loaders/index.d.ts +5 -1
- package/lib/Viewer/models/Highlighter.types.d.ts +5 -0
- package/lib/Viewer/models/ModelImpl.d.ts +14 -10
- package/lib/Viewer/models/ModelImpl.types.d.ts +6 -10
- package/package.json +5 -5
- package/src/Viewer/Viewer.ts +131 -26
- package/src/Viewer/commands/ClearSelected.ts +3 -6
- package/src/Viewer/commands/Deselect.ts +35 -0
- package/src/Viewer/commands/Explode.ts +4 -3
- package/src/Viewer/commands/GetHidden.ts +30 -0
- package/src/Viewer/commands/GetIsolated.ts +30 -0
- package/src/Viewer/commands/GetSelected.ts +4 -4
- package/src/Viewer/commands/GetSelected2.ts +4 -7
- package/src/Viewer/commands/Hide.ts +35 -0
- package/src/Viewer/commands/HideAll.ts +32 -0
- package/src/Viewer/commands/HideSelected.ts +1 -11
- package/src/Viewer/commands/Isolate.ts +41 -0
- package/src/Viewer/commands/IsolateSelected.ts +1 -4
- package/src/Viewer/commands/ResetView.ts +1 -1
- package/src/Viewer/commands/Select.ts +36 -0
- package/src/Viewer/commands/SelectModel.ts +4 -8
- package/src/Viewer/commands/SetDefaultViewPosition.ts +2 -2
- package/src/Viewer/commands/SetSelected.ts +8 -11
- package/src/Viewer/commands/SetSelected2.ts +5 -16
- package/src/Viewer/commands/Show.ts +34 -0
- package/src/Viewer/commands/ShowAll.ts +2 -2
- package/src/Viewer/commands/{ZoomToObjects.ts → ToHandles.ts} +7 -10
- package/src/Viewer/commands/ToHandles2.ts +43 -0
- package/src/Viewer/commands/ToggleSelection.ts +40 -0
- package/src/Viewer/commands/Zoom.ts +66 -0
- package/src/Viewer/commands/{ZoomToExtents.ts → ZoomExtents.ts} +3 -3
- package/src/Viewer/commands/ZoomTo.ts +12 -38
- package/src/Viewer/commands/ZoomToSelected.ts +1 -7
- package/src/Viewer/commands/index.ts +24 -5
- package/src/Viewer/components/HighlighterComponent.ts +14 -12
- package/src/Viewer/components/SelectionComponent.ts +12 -76
- package/src/Viewer/components/index.ts +1 -1
- package/src/Viewer/draggers/OrbitDragger.ts +2 -2
- package/src/Viewer/draggers/index.ts +2 -2
- package/src/Viewer/loaders/DynamicGltfLoader/DynamicGltfLoader.js +429 -2
- package/src/Viewer/loaders/DynamicGltfLoader/DynamicModelImpl.ts +26 -35
- package/src/Viewer/loaders/GLTFCloudDynamicLoader.ts +33 -3
- package/src/Viewer/loaders/GLTFFileDynamicLoader.ts +32 -2
- package/src/Viewer/loaders/index.ts +5 -1
- package/src/Viewer/models/Highlighter.types.ts +30 -0
- package/src/Viewer/models/ModelImpl.ts +68 -57
- package/src/Viewer/models/ModelImpl.types.ts +8 -17
- package/lib/Viewer/commands/ZoomToExtents.d.ts +0 -2
- package/lib/Viewer/commands/ZoomToObjects.d.ts +0 -2
|
@@ -26,29 +26,25 @@ import { Intersection, Object3D, Vector2, Vector3 } from "three";
|
|
|
26
26
|
import type { IComponent } from "@inweb/viewer-core";
|
|
27
27
|
import type { Viewer } from "../Viewer";
|
|
28
28
|
import type { IModelImpl } from "../models/ModelImpl.types";
|
|
29
|
-
import type { HighlighterComponent } from "./HighlighterComponent";
|
|
30
29
|
import { Snapper } from "../measurement/Snapper";
|
|
31
30
|
|
|
32
31
|
export class SelectionComponent implements IComponent {
|
|
33
32
|
protected viewer: Viewer;
|
|
34
33
|
protected downPosition: Vector2;
|
|
35
|
-
protected highlighter: HighlighterComponent;
|
|
36
34
|
|
|
37
35
|
constructor(viewer: Viewer) {
|
|
38
36
|
this.viewer = viewer;
|
|
39
37
|
this.downPosition = new Vector2();
|
|
40
38
|
|
|
41
|
-
this.viewer.addEventListener("pointerdown", this.onPointerDown);
|
|
42
|
-
this.viewer.addEventListener("pointerup", this.onPointerUp);
|
|
43
|
-
this.viewer.addEventListener("dblclick", this.onDoubleClick);
|
|
44
|
-
this.viewer.addEventListener("initialize", this.initHighlighter);
|
|
39
|
+
this.viewer.canvas.addEventListener("pointerdown", this.onPointerDown);
|
|
40
|
+
this.viewer.canvas.addEventListener("pointerup", this.onPointerUp);
|
|
41
|
+
this.viewer.canvas.addEventListener("dblclick", this.onDoubleClick);
|
|
45
42
|
}
|
|
46
43
|
|
|
47
44
|
dispose() {
|
|
48
|
-
this.viewer.removeEventListener("pointerdown", this.onPointerDown);
|
|
49
|
-
this.viewer.removeEventListener("pointerup", this.onPointerUp);
|
|
50
|
-
this.viewer.removeEventListener("dblclick", this.onDoubleClick);
|
|
51
|
-
this.viewer.removeEventListener("initialize", this.initHighlighter);
|
|
45
|
+
this.viewer.canvas.removeEventListener("pointerdown", this.onPointerDown);
|
|
46
|
+
this.viewer.canvas.removeEventListener("pointerup", this.onPointerUp);
|
|
47
|
+
this.viewer.canvas.removeEventListener("dblclick", this.onDoubleClick);
|
|
52
48
|
}
|
|
53
49
|
|
|
54
50
|
onPointerDown = (event: PointerEvent) => {
|
|
@@ -78,84 +74,24 @@ export class SelectionComponent implements IComponent {
|
|
|
78
74
|
});
|
|
79
75
|
intersections = intersections.sort((a, b) => a.distance - b.distance);
|
|
80
76
|
|
|
81
|
-
if (!event.shiftKey) this.clearSelection();
|
|
82
|
-
|
|
83
77
|
if (intersections.length > 0) {
|
|
84
78
|
const model = intersections[0].model;
|
|
85
|
-
const handles = model.getHandlesByObjects(intersections[0].object);
|
|
86
|
-
const objects = model.getObjectsByHandles(handles);
|
|
79
|
+
const handles = model.getHandlesByObjects([intersections[0].object]);
|
|
87
80
|
|
|
88
|
-
if (!event.shiftKey) this.
|
|
89
|
-
else this.toggleSelection(
|
|
81
|
+
if (!event.shiftKey) this.viewer.setSelected(handles);
|
|
82
|
+
else this.viewer.toggleSelection(handles);
|
|
83
|
+
} else {
|
|
84
|
+
if (!event.shiftKey) this.viewer.clearSelected();
|
|
90
85
|
}
|
|
91
|
-
|
|
92
|
-
this.viewer.update();
|
|
93
|
-
|
|
94
|
-
this.viewer.emitEvent({ type: "select", data: undefined, handles: this.viewer.getSelected() });
|
|
95
|
-
this.viewer.emitEvent({ type: "select2", data: undefined, handles: this.viewer.getSelected2() });
|
|
96
86
|
};
|
|
97
87
|
|
|
98
88
|
onDoubleClick = (event: MouseEvent) => {
|
|
99
89
|
if (event.button !== 0) return;
|
|
100
90
|
|
|
101
|
-
this.viewer.
|
|
91
|
+
this.viewer.zoomToSelected();
|
|
102
92
|
};
|
|
103
93
|
|
|
104
94
|
getMousePosition(event: MouseEvent, target: Vector2): Vector2 {
|
|
105
95
|
return target.set(event.clientX, event.clientY);
|
|
106
96
|
}
|
|
107
|
-
|
|
108
|
-
select(objects: Object3D | Object3D[], model?: IModelImpl) {
|
|
109
|
-
if (!model) {
|
|
110
|
-
this.viewer.models.forEach((model) => this.select(objects, model));
|
|
111
|
-
return;
|
|
112
|
-
}
|
|
113
|
-
|
|
114
|
-
if (!Array.isArray(objects)) objects = [objects];
|
|
115
|
-
if (objects.length === 0) return;
|
|
116
|
-
|
|
117
|
-
model.highlightObjects(objects);
|
|
118
|
-
this.highlighter.highlight(objects);
|
|
119
|
-
|
|
120
|
-
objects.forEach((object) => this.viewer.selected.push(object));
|
|
121
|
-
objects.forEach((object) => (object.userData.isSelected = true));
|
|
122
|
-
}
|
|
123
|
-
|
|
124
|
-
deselect(objects: Object3D | Object3D[], model?: IModelImpl) {
|
|
125
|
-
if (!model) {
|
|
126
|
-
this.viewer.models.forEach((model) => this.select(objects, model));
|
|
127
|
-
return;
|
|
128
|
-
}
|
|
129
|
-
|
|
130
|
-
if (!Array.isArray(objects)) objects = [objects];
|
|
131
|
-
if (objects.length === 0) return;
|
|
132
|
-
|
|
133
|
-
model.unhighlightObjects(objects);
|
|
134
|
-
this.highlighter.unhighlight(objects);
|
|
135
|
-
|
|
136
|
-
this.viewer.selected = this.viewer.selected.filter((x) => !objects.includes(x));
|
|
137
|
-
objects.forEach((object) => (object.userData.isSelected = false));
|
|
138
|
-
}
|
|
139
|
-
|
|
140
|
-
toggleSelection(objects: Object3D | Object3D[], model?: IModelImpl) {
|
|
141
|
-
if (!Array.isArray(objects)) objects = [objects];
|
|
142
|
-
if (objects.length === 0) return;
|
|
143
|
-
|
|
144
|
-
if (objects[0].userData.isSelected) this.deselect(objects, model);
|
|
145
|
-
else this.select(objects, model);
|
|
146
|
-
}
|
|
147
|
-
|
|
148
|
-
clearSelection() {
|
|
149
|
-
if (this.viewer.selected.length === 0) return;
|
|
150
|
-
|
|
151
|
-
this.viewer.models.forEach((model) => model.unhighlightObjects(this.viewer.selected));
|
|
152
|
-
this.highlighter.unhighlight(this.viewer.selected);
|
|
153
|
-
|
|
154
|
-
this.viewer.selected.forEach((object) => (object.userData.isSelected = false));
|
|
155
|
-
this.viewer.selected.length = 0;
|
|
156
|
-
}
|
|
157
|
-
|
|
158
|
-
initHighlighter = () => {
|
|
159
|
-
this.highlighter = this.viewer.getComponent("HighlighterComponent") as HighlighterComponent;
|
|
160
|
-
};
|
|
161
97
|
}
|
|
@@ -49,7 +49,7 @@ export class OrbitDragger implements IDragger {
|
|
|
49
49
|
this.viewer.addEventListener("drawviewpoint", this.updateControls);
|
|
50
50
|
this.viewer.addEventListener("changecameramode", this.updateControlsCamera);
|
|
51
51
|
this.viewer.addEventListener("optionschange", this.updateZoomSpeed);
|
|
52
|
-
this.viewer.addEventListener("contextmenu", this.stopContextMenu);
|
|
52
|
+
this.viewer.canvas.addEventListener("contextmenu", this.stopContextMenu);
|
|
53
53
|
this.updateControls();
|
|
54
54
|
this.updateControlsCamera();
|
|
55
55
|
}
|
|
@@ -62,7 +62,7 @@ export class OrbitDragger implements IDragger {
|
|
|
62
62
|
this.viewer.removeEventListener("drawviewpoint", this.updateControls);
|
|
63
63
|
this.viewer.removeEventListener("changecameramode", this.updateControlsCamera);
|
|
64
64
|
this.viewer.removeEventListener("optionschange", this.updateZoomSpeed);
|
|
65
|
-
this.viewer.removeEventListener("contextmenu", this.stopContextMenu);
|
|
65
|
+
this.viewer.canvas.removeEventListener("contextmenu", this.stopContextMenu);
|
|
66
66
|
|
|
67
67
|
this.orbit.removeEventListener("start", this.controlsStart);
|
|
68
68
|
this.orbit.removeEventListener("change", this.controlsChange);
|
|
@@ -56,11 +56,11 @@ import { ZoomDragger } from "./ZoomDragger";
|
|
|
56
56
|
*
|
|
57
57
|
* constructor(viewer: Viewer) {
|
|
58
58
|
* this.viewer = viewer;
|
|
59
|
-
* this.viewer.addEventListener("pointermove", this.onPointerMove);
|
|
59
|
+
* this.viewer.canvas.addEventListener("pointermove", this.onPointerMove);
|
|
60
60
|
* }
|
|
61
61
|
*
|
|
62
62
|
* override dispose() {
|
|
63
|
-
* this.viewer.removeEventListener("pointermove", this.onPointerMove);
|
|
63
|
+
* this.viewer.canvas.removeEventListener("pointermove", this.onPointerMove);
|
|
64
64
|
* }
|
|
65
65
|
*
|
|
66
66
|
* onPointerMove = (event: PointerEvent) => {
|