@inweb/viewer-three 27.10.0 → 27.11.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
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
///////////////////////////////////////////////////////////////////////////////
|
|
23
23
|
|
|
24
24
|
import { GLTFLoader } from "three/examples/jsm/loaders/GLTFLoader.js";
|
|
25
|
-
import { GLTFLoadingManager, Loader, loaders, ModelImpl, Viewer } from "@inweb/viewer-three";
|
|
25
|
+
import { GLTFLoadingManager, GLTFLoadParams, Loader, loaders, ModelImpl, Viewer } from "@inweb/viewer-three";
|
|
26
26
|
|
|
27
27
|
class GLTFCloudLoader extends Loader {
|
|
28
28
|
public viewer: Viewer;
|
|
@@ -47,7 +47,7 @@ class GLTFCloudLoader extends Loader {
|
|
|
47
47
|
);
|
|
48
48
|
}
|
|
49
49
|
|
|
50
|
-
override async load(model: any): Promise<this> {
|
|
50
|
+
override async load(model: any, format?: string, params: GLTFLoadParams = {}): Promise<this> {
|
|
51
51
|
const url = `${model.httpClient.serverUrl}${model.path}/${model.database}`;
|
|
52
52
|
this.manager = new GLTFLoadingManager(url);
|
|
53
53
|
|
|
@@ -64,7 +64,9 @@ class GLTFCloudLoader extends Loader {
|
|
|
64
64
|
if (!this.viewer.scene) return this;
|
|
65
65
|
|
|
66
66
|
const modelImpl = new ModelImpl(gltf.scene);
|
|
67
|
-
modelImpl.id = model.file.id;
|
|
67
|
+
modelImpl.id = params.modelId || model.file.id;
|
|
68
|
+
modelImpl.highlighter = this.viewer.getComponent("HighlighterComponent") as any;
|
|
69
|
+
modelImpl.initialize();
|
|
68
70
|
|
|
69
71
|
this.viewer.scene.add(gltf.scene);
|
|
70
72
|
this.viewer.models.push(modelImpl);
|
|
@@ -71,6 +71,8 @@ export class GLTFFileLoader extends Loader {
|
|
|
71
71
|
|
|
72
72
|
const modelImpl = new ModelImpl(gltf.scene);
|
|
73
73
|
modelImpl.id = params.modelId || this.extractFileName(file);
|
|
74
|
+
modelImpl.highlighter = this.viewer.getComponent("HighlighterComponent") as any;
|
|
75
|
+
modelImpl.initialize();
|
|
74
76
|
|
|
75
77
|
this.viewer.scene.add(gltf.scene);
|
|
76
78
|
this.viewer.models.push(modelImpl);
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
///////////////////////////////////////////////////////////////////////////////
|
|
23
23
|
|
|
24
24
|
import { Scene } from "three";
|
|
25
|
-
import { Loader, ModelImpl, Viewer } from "@inweb/viewer-three";
|
|
25
|
+
import { GLTFLoadParams, Loader, ModelImpl, Viewer } from "@inweb/viewer-three";
|
|
26
26
|
import { parse, clear } from "./render.js";
|
|
27
27
|
|
|
28
28
|
export class IFCXCloudLoader extends Loader {
|
|
@@ -42,7 +42,7 @@ export class IFCXCloudLoader extends Loader {
|
|
|
42
42
|
);
|
|
43
43
|
}
|
|
44
44
|
|
|
45
|
-
override async load(file: any): Promise<this> {
|
|
45
|
+
override async load(file: any, format?: string, params: GLTFLoadParams = {}): Promise<this> {
|
|
46
46
|
const progress = (progress: number) => {
|
|
47
47
|
this.viewer.emitEvent({ type: "geometryprogress", data: progress, file });
|
|
48
48
|
};
|
|
@@ -63,7 +63,9 @@ export class IFCXCloudLoader extends Loader {
|
|
|
63
63
|
});
|
|
64
64
|
|
|
65
65
|
const modelImpl = new ModelImpl(scene);
|
|
66
|
-
modelImpl.id = file.id;
|
|
66
|
+
modelImpl.id = params.modelId || file.id;
|
|
67
|
+
modelImpl.highlighter = this.viewer.getComponent("HighlighterComponent") as any;
|
|
68
|
+
modelImpl.initialize();
|
|
67
69
|
|
|
68
70
|
this.viewer.scene.add(scene);
|
|
69
71
|
this.viewer.models.push(modelImpl);
|
|
@@ -70,6 +70,8 @@ export class IFCXFileLoader extends Loader {
|
|
|
70
70
|
|
|
71
71
|
const modelImpl = new ModelImpl(scene);
|
|
72
72
|
modelImpl.id = params.modelId || this.extractFileName(file);
|
|
73
|
+
modelImpl.highlighter = this.viewer.getComponent("HighlighterComponent") as any;
|
|
74
|
+
modelImpl.initialize();
|
|
73
75
|
|
|
74
76
|
this.viewer.scene.add(scene);
|
|
75
77
|
this.viewer.models.push(modelImpl);
|
|
@@ -85,6 +85,8 @@ export class PotreeFileLoader extends Loader {
|
|
|
85
85
|
const modelImpl = new PotreeModelImpl(pco);
|
|
86
86
|
modelImpl.id = params.modelId || this.extractFileName(file);
|
|
87
87
|
modelImpl.pco = pco;
|
|
88
|
+
modelImpl.highlighter = this.viewer.getComponent("HighlighterComponent") as any;
|
|
89
|
+
modelImpl.initialize();
|
|
88
90
|
|
|
89
91
|
this.viewer.scene.add(pco);
|
|
90
92
|
this.viewer.models.push(modelImpl);
|
package/lib/Viewer/Viewer.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Box3, Group,
|
|
1
|
+
import { Box3, Group, OrthographicCamera, PerspectiveCamera, Plane, Scene, Vector3, WebGLRenderer } from "three";
|
|
2
2
|
import { EffectComposer } from "three/examples/jsm/postprocessing/EffectComposer.js";
|
|
3
3
|
import { RenderPass } from "three/examples/jsm/postprocessing/RenderPass.js";
|
|
4
4
|
import { FXAAPass } from "three/examples/jsm/postprocessing/FXAAPass.js";
|
|
@@ -7,7 +7,7 @@ import { SSAARenderPass } from "three/examples/jsm/postprocessing/SSAARenderPass
|
|
|
7
7
|
import { OutputPass } from "three/examples/jsm/postprocessing/OutputPass.js";
|
|
8
8
|
import { EventEmitter2 } from "@inweb/eventemitter2";
|
|
9
9
|
import { Assembly, Client, Model, File } from "@inweb/client";
|
|
10
|
-
import { CanvasEventMap, FileSource, IComponent, IDragger, IInfo, ILoader, IOptions, IViewer, IViewpoint, OptionsEventMap, ViewerEventMap } from "@inweb/viewer-core";
|
|
10
|
+
import { CanvasEventMap, FileSource, IComponent, IDragger, IInfo, ILoader, IOptions, IViewer, IViewpoint, OptionsEventMap, Selector, ViewerEventMap, VisibilityManager } from "@inweb/viewer-core";
|
|
11
11
|
import { IMarkup, IWorldTransform } from "@inweb/markup";
|
|
12
12
|
import { IModelImpl } from "./models/ModelImpl.types";
|
|
13
13
|
/**
|
|
@@ -32,10 +32,12 @@ export declare class Viewer extends EventEmitter2<ViewerEventMap & CanvasEventMa
|
|
|
32
32
|
ssaaRenderPass: SSAARenderPass | undefined;
|
|
33
33
|
outputPass: OutputPass | undefined;
|
|
34
34
|
composer: EffectComposer | undefined;
|
|
35
|
-
|
|
35
|
+
selector: Selector;
|
|
36
|
+
visibilityManager: VisibilityManager;
|
|
37
|
+
explodeScale: number;
|
|
38
|
+
clippingPlanes: Plane[];
|
|
36
39
|
extents: Box3;
|
|
37
40
|
target: Vector3;
|
|
38
|
-
clippingPlanes: Plane[];
|
|
39
41
|
private _activeDragger;
|
|
40
42
|
private _components;
|
|
41
43
|
private _renderNeeded;
|
|
@@ -110,11 +112,15 @@ export declare class Viewer extends EventEmitter2<ViewerEventMap & CanvasEventMa
|
|
|
110
112
|
* @param params.mode - File opening mode. Can be one of:
|
|
111
113
|
*
|
|
112
114
|
* - `file` - Single file mode. Unloads an open file and opens a new one. This is default mode.
|
|
113
|
-
* - `assembly` -
|
|
115
|
+
* - `assembly` - Multi-model mode. Appends a file to an already open file.
|
|
116
|
+
*
|
|
117
|
+
* @param params.modelId - Unique model ID in the multi-model scene. Used as a model prefix when
|
|
118
|
+
* selecting, hiding or isolating objects. Must not contain the ":" (colon). Required when loading a
|
|
119
|
+
* file as `ArrayBuffer` or `Data URL`. Default value depends on the `FileSource`:
|
|
120
|
+
*
|
|
121
|
+
* - `file ID` - when loading a file from Open Cloud Server.
|
|
122
|
+
* - `file name` - when loading from local File or URL.
|
|
114
123
|
*
|
|
115
|
-
* @param params.modelId - Unique model ID in the assembly (multi-model scene). Used as a model prefix
|
|
116
|
-
* when selecting objects (see {@link getSelected2}). Must not contain the ":" (colon). Required when
|
|
117
|
-
* loading a file as `ArrayBuffer` or `Data URL`.
|
|
118
124
|
* @param params.requestHeader - The
|
|
119
125
|
* {@link https://developer.mozilla.org/docs/Glossary/Request_header | request header} used in HTTP
|
|
120
126
|
* request.
|
|
@@ -148,14 +154,26 @@ export declare class Viewer extends EventEmitter2<ViewerEventMap & CanvasEventMa
|
|
|
148
154
|
syncOverlay(): void;
|
|
149
155
|
clearOverlay(): void;
|
|
150
156
|
clearSlices(): void;
|
|
151
|
-
getSelected(): string[];
|
|
157
|
+
getSelected(multimodel?: boolean): string[];
|
|
152
158
|
getSelected2(): string[];
|
|
153
159
|
setSelected(handles?: string[]): void;
|
|
154
160
|
setSelected2(handles?: string[]): void;
|
|
161
|
+
select(handles: string | string[]): void;
|
|
162
|
+
deselect(handles: string | string[]): void;
|
|
163
|
+
toggleSelection(handles: string | string[]): void;
|
|
155
164
|
clearSelected(): void;
|
|
165
|
+
getHidden(multimodel?: boolean): string[];
|
|
166
|
+
getIsolated(multimodel?: boolean): string[];
|
|
167
|
+
hide(handle: string | string[]): void;
|
|
156
168
|
hideSelected(): void;
|
|
169
|
+
hideAll(): void;
|
|
170
|
+
isolate(handle: string | string[]): void;
|
|
157
171
|
isolateSelected(): void;
|
|
172
|
+
show(handle: string | string[]): void;
|
|
158
173
|
showAll(): void;
|
|
174
|
+
zoomExtents(): void;
|
|
175
|
+
zoomTo(handles: string | string[]): void;
|
|
176
|
+
zoomToSelected(): void;
|
|
159
177
|
explode(index?: number): void;
|
|
160
178
|
collect(): void;
|
|
161
179
|
activeDragger(): IDragger | null;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import type { Viewer } from "../Viewer";
|
|
2
|
-
export declare function getSelected(viewer: Viewer): string[];
|
|
2
|
+
export declare function getSelected(viewer: Viewer, multimodel?: boolean): string[];
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import type { Viewer } from "../Viewer";
|
|
2
|
-
export declare function setSelected(viewer: Viewer, handles?: string[]): void;
|
|
2
|
+
export declare function setSelected(viewer: Viewer, handles?: string | string[]): void;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import type { Viewer } from "../Viewer";
|
|
2
|
-
export declare function setSelected2(viewer: Viewer,
|
|
2
|
+
export declare function setSelected2(viewer: Viewer, handles2?: string | string[]): void;
|
|
@@ -2,7 +2,8 @@ import { LineBasicMaterial, MeshPhongMaterial, Object3D, WebGLRenderTarget } fro
|
|
|
2
2
|
import { LineMaterial } from "three/examples/jsm/lines/LineMaterial.js";
|
|
3
3
|
import { IComponent, ResizeEvent } from "@inweb/viewer-core";
|
|
4
4
|
import { Viewer } from "../Viewer";
|
|
5
|
-
|
|
5
|
+
import { IHighlighter } from "../models/Highlighter.types";
|
|
6
|
+
export declare class HighlighterComponent implements IComponent, IHighlighter {
|
|
6
7
|
protected viewer: Viewer;
|
|
7
8
|
renderTarget: WebGLRenderTarget;
|
|
8
9
|
facesMaterial: MeshPhongMaterial;
|
|
@@ -11,8 +12,8 @@ export declare class HighlighterComponent implements IComponent {
|
|
|
11
12
|
lineGlowMaterial: LineMaterial;
|
|
12
13
|
constructor(viewer: Viewer);
|
|
13
14
|
dispose(): void;
|
|
14
|
-
|
|
15
|
-
|
|
15
|
+
highlightObjects(objects: Object3D[]): void;
|
|
16
|
+
unhighlightObjects(objects: Object3D[]): void;
|
|
16
17
|
geometryEnd: () => void;
|
|
17
18
|
syncOptions: () => void;
|
|
18
19
|
syncHighlightColors(): void;
|
|
@@ -1,21 +1,13 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Vector2 } from "three";
|
|
2
2
|
import type { IComponent } from "@inweb/viewer-core";
|
|
3
3
|
import type { Viewer } from "../Viewer";
|
|
4
|
-
import type { IModelImpl } from "../models/ModelImpl.types";
|
|
5
|
-
import type { HighlighterComponent } from "./HighlighterComponent";
|
|
6
4
|
export declare class SelectionComponent implements IComponent {
|
|
7
5
|
protected viewer: Viewer;
|
|
8
6
|
protected downPosition: Vector2;
|
|
9
|
-
protected highlighter: HighlighterComponent;
|
|
10
7
|
constructor(viewer: Viewer);
|
|
11
8
|
dispose(): void;
|
|
12
9
|
onPointerDown: (event: PointerEvent) => void;
|
|
13
10
|
onPointerUp: (event: PointerEvent) => void;
|
|
14
11
|
onDoubleClick: (event: MouseEvent) => void;
|
|
15
12
|
getMousePosition(event: MouseEvent, target: Vector2): Vector2;
|
|
16
|
-
select(objects: Object3D | Object3D[], model?: IModelImpl): void;
|
|
17
|
-
deselect(objects: Object3D | Object3D[], model?: IModelImpl): void;
|
|
18
|
-
toggleSelection(objects: Object3D | Object3D[], model?: IModelImpl): void;
|
|
19
|
-
clearSelection(): void;
|
|
20
|
-
initHighlighter: () => void;
|
|
21
13
|
}
|
|
@@ -21,11 +21,11 @@ import { IDraggersRegistry } from "@inweb/viewer-core";
|
|
|
21
21
|
*
|
|
22
22
|
* constructor(viewer: Viewer) {
|
|
23
23
|
* this.viewer = viewer;
|
|
24
|
-
* this.viewer.addEventListener("pointermove", this.onPointerMove);
|
|
24
|
+
* this.viewer.canvas.addEventListener("pointermove", this.onPointerMove);
|
|
25
25
|
* }
|
|
26
26
|
*
|
|
27
27
|
* override dispose() {
|
|
28
|
-
* this.viewer.removeEventListener("pointermove", this.onPointerMove);
|
|
28
|
+
* this.viewer.canvas.removeEventListener("pointermove", this.onPointerMove);
|
|
29
29
|
* }
|
|
30
30
|
*
|
|
31
31
|
* onPointerMove = (event: PointerEvent) => {
|
|
@@ -4,17 +4,19 @@ import { ModelImpl } from "../../models/ModelImpl";
|
|
|
4
4
|
import { DynamicGltfLoader } from "./DynamicGltfLoader.js";
|
|
5
5
|
export declare class DynamicModelImpl extends ModelImpl {
|
|
6
6
|
gltfLoader: DynamicGltfLoader;
|
|
7
|
+
initialize(): void;
|
|
7
8
|
getInfo(): IInfo;
|
|
8
9
|
getExtents(target: Box3): Box3;
|
|
9
10
|
getObjects(): Object3D[];
|
|
10
11
|
getVisibleObjects(): Object3D[];
|
|
11
|
-
getObjectsByHandles(handles: string
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
12
|
+
getObjectsByHandles(handles: string[]): Object3D[];
|
|
13
|
+
getHandles(): string[];
|
|
14
|
+
getHandlesByObjects(objects: Object3D[]): string[];
|
|
15
|
+
hide(handles: string[]): this;
|
|
16
|
+
isolate(handles: string[]): this;
|
|
17
|
+
show(handles: string[]): this;
|
|
18
|
+
showAll(): this;
|
|
19
|
+
highlight(handles: string[]): this;
|
|
20
|
+
unhighlight(handles: string[]): this;
|
|
19
21
|
explode(scale?: number, coeff?: number): this;
|
|
20
22
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Loader, LoadParams } from "@inweb/viewer-core";
|
|
1
|
+
import { IOptions, Loader, LoadParams } from "@inweb/viewer-core";
|
|
2
2
|
import { Viewer } from "../Viewer";
|
|
3
3
|
import { DynamicGltfLoader } from "./DynamicGltfLoader/DynamicGltfLoader.js";
|
|
4
4
|
export declare class GLTFCloudDynamicLoader extends Loader {
|
|
@@ -10,4 +10,8 @@ export declare class GLTFCloudDynamicLoader extends Loader {
|
|
|
10
10
|
isSupport(file: any): boolean;
|
|
11
11
|
load(model: any, format?: string, params?: LoadParams): Promise<this>;
|
|
12
12
|
cancel(): void;
|
|
13
|
+
getHighlightSettings(options?: IOptions): any;
|
|
14
|
+
syncHighlightSettings: ({ data }: {
|
|
15
|
+
data: any;
|
|
16
|
+
}) => void;
|
|
13
17
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Loader } from "@inweb/viewer-core";
|
|
1
|
+
import { IOptions, Loader } from "@inweb/viewer-core";
|
|
2
2
|
import { Viewer } from "../Viewer";
|
|
3
3
|
import { GLTFLoadParams } from "./GLTFLoadingManager";
|
|
4
4
|
export declare class GLTFFileDynamicLoader extends Loader {
|
|
@@ -11,4 +11,8 @@ export declare class GLTFFileDynamicLoader extends Loader {
|
|
|
11
11
|
isSupport(file: any, format?: string): boolean;
|
|
12
12
|
load(file: any, format?: string, params?: GLTFLoadParams): Promise<this>;
|
|
13
13
|
cancel(): void;
|
|
14
|
+
getHighlightSettings(options?: IOptions): any;
|
|
15
|
+
syncHighlightSettings: ({ data }: {
|
|
16
|
+
data: any;
|
|
17
|
+
}) => void;
|
|
14
18
|
}
|
|
@@ -13,7 +13,9 @@ import { ILoadersRegistry } from "@inweb/viewer-core";
|
|
|
13
13
|
*
|
|
14
14
|
* - Load raw data from file and convert it to the `Three.js` scene.
|
|
15
15
|
* - Add scene to the viewer `scene`.
|
|
16
|
-
* - Create `ModelImpl` instance with unique model ID
|
|
16
|
+
* - Create `ModelImpl` instance with unique model ID.
|
|
17
|
+
* - Set model objects highlighter, if the model itself does not support highlighting.
|
|
18
|
+
* - Add model it to the viewer `models` list.
|
|
17
19
|
* - Synchronize viewer options and overlay.
|
|
18
20
|
* - Update the viewer.
|
|
19
21
|
*
|
|
@@ -53,6 +55,8 @@ import { ILoadersRegistry } from "@inweb/viewer-core";
|
|
|
53
55
|
*
|
|
54
56
|
* const modelImpl = new ModelImpl(scene);
|
|
55
57
|
* modelImpl.id = params.modelId;
|
|
58
|
+
* modelImpl.highlighter = this.viewer.getComponent("HighlighterComponent") as any;
|
|
59
|
+
* modelImpl.initialize();
|
|
56
60
|
*
|
|
57
61
|
* this.viewer.scene.add(scene);
|
|
58
62
|
* this.viewer.models.push(modelImpl);
|
|
@@ -1,13 +1,16 @@
|
|
|
1
1
|
import { Box3, Object3D } from "three";
|
|
2
2
|
import { IInfo } from "@inweb/viewer-core";
|
|
3
3
|
import { IModelImpl } from "./ModelImpl.types";
|
|
4
|
+
import { IHighlighter } from "./Highlighter.types";
|
|
4
5
|
export declare class ModelImpl implements IModelImpl {
|
|
5
6
|
id: string;
|
|
6
7
|
scene: Object3D;
|
|
7
|
-
|
|
8
|
+
highlighter: IHighlighter;
|
|
8
9
|
private originalObjects;
|
|
10
|
+
private handleToObjects;
|
|
9
11
|
constructor(scene: Object3D);
|
|
10
12
|
dispose(): void;
|
|
13
|
+
initialize(): void;
|
|
11
14
|
getUnits(): string;
|
|
12
15
|
getUnitScale(): number;
|
|
13
16
|
getUnitString(): string;
|
|
@@ -16,14 +19,15 @@ export declare class ModelImpl implements IModelImpl {
|
|
|
16
19
|
getExtents(target: Box3): Box3;
|
|
17
20
|
getObjects(): Object3D[];
|
|
18
21
|
getVisibleObjects(): Object3D[];
|
|
19
|
-
getObjectsByHandles(handles: string
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
22
|
+
getObjectsByHandles(handles: string[]): Object3D[];
|
|
23
|
+
getHandles(): string[];
|
|
24
|
+
getHandlesByObjects(objects: Object3D[]): string[];
|
|
25
|
+
hide(handles: string[]): this;
|
|
26
|
+
hideAll(): this;
|
|
27
|
+
isolate(handles: string[]): this;
|
|
28
|
+
show(handles: string[]): this;
|
|
29
|
+
showAll(): this;
|
|
30
|
+
highlight(handles: string[]): this;
|
|
31
|
+
unhighlight(handles: string[]): this;
|
|
28
32
|
explode(scale?: number, coeff?: number): this;
|
|
29
33
|
}
|
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
import { Box3, Object3D } from "three";
|
|
2
2
|
import { IInfo, IModel } from "@inweb/viewer-core";
|
|
3
|
+
import { IHighlighter } from "./Highlighter.types";
|
|
3
4
|
/**
|
|
4
5
|
* Basic model implementation.
|
|
5
6
|
*/
|
|
6
7
|
export interface IModelImpl extends IModel {
|
|
7
8
|
scene: Object3D;
|
|
9
|
+
highlighter?: IHighlighter;
|
|
10
|
+
initialize(): void;
|
|
8
11
|
getUnits(): string;
|
|
9
12
|
getUnitScale(): number;
|
|
10
13
|
getUnitString(): string;
|
|
@@ -13,14 +16,7 @@ export interface IModelImpl extends IModel {
|
|
|
13
16
|
getExtents(target: Box3): Box3;
|
|
14
17
|
getObjects(): Object3D[];
|
|
15
18
|
getVisibleObjects(): Object3D[];
|
|
16
|
-
getObjectsByHandles(handles: string
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
hideAllObjects(): this;
|
|
20
|
-
isolateObjects(objects: Object3D | Object3D[]): this;
|
|
21
|
-
showObjects(objects: Object3D | Object3D[]): this;
|
|
22
|
-
showAllObjects(): this;
|
|
23
|
-
highlightObjects(objects: Object3D | Object3D[]): this;
|
|
24
|
-
unhighlightObjects(objects: Object3D | Object3D[]): this;
|
|
25
|
-
explode(scale: number, coeff?: number): this;
|
|
19
|
+
getObjectsByHandles(handles: string[]): Object3D[];
|
|
20
|
+
getHandles(): string[];
|
|
21
|
+
getHandlesByObjects(objects: Object3D[]): string[];
|
|
26
22
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@inweb/viewer-three",
|
|
3
|
-
"version": "27.
|
|
3
|
+
"version": "27.11.0",
|
|
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,10 +35,10 @@
|
|
|
35
35
|
"docs": "typedoc"
|
|
36
36
|
},
|
|
37
37
|
"dependencies": {
|
|
38
|
-
"@inweb/client": "~27.
|
|
39
|
-
"@inweb/eventemitter2": "~27.
|
|
40
|
-
"@inweb/markup": "~27.
|
|
41
|
-
"@inweb/viewer-core": "~27.
|
|
38
|
+
"@inweb/client": "~27.11.0",
|
|
39
|
+
"@inweb/eventemitter2": "~27.11.0",
|
|
40
|
+
"@inweb/markup": "~27.11.0",
|
|
41
|
+
"@inweb/viewer-core": "~27.11.0"
|
|
42
42
|
},
|
|
43
43
|
"devDependencies": {
|
|
44
44
|
"@streamparser/json": "^0.0.22",
|