@combeenation/3d-viewer 19.1.0 → 19.2.0-beta1
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/lib-cjs/buildinfo.json +1 -1
- package/dist/lib-cjs/commonjs.tsconfig.tsbuildinfo +1 -1
- package/dist/lib-cjs/utils/node-utils.d.ts +19 -3
- package/dist/lib-cjs/utils/node-utils.js +38 -0
- package/dist/lib-cjs/utils/node-utils.js.map +1 -1
- package/dist/lib-cjs/viewer.d.ts +10 -0
- package/dist/lib-cjs/viewer.js +20 -0
- package/dist/lib-cjs/viewer.js.map +1 -1
- package/package.json +1 -1
- package/src/utils/node-utils.ts +59 -3
- package/src/viewer.ts +23 -1
|
@@ -1,7 +1,10 @@
|
|
|
1
|
-
import { Mesh } from '..';
|
|
2
|
-
export declare type
|
|
1
|
+
import { AssetContainer, Mesh, Scene, TransformNode } from '..';
|
|
2
|
+
export declare type BakeGeometrySettings = {
|
|
3
3
|
keepTransformation?: boolean;
|
|
4
4
|
};
|
|
5
|
+
export declare type CreateTransformNodeSettings = {
|
|
6
|
+
parentNode?: TransformNode;
|
|
7
|
+
};
|
|
5
8
|
/**
|
|
6
9
|
* Removes transformation data from the mesh and stores it in the geometry, which is called "baking".
|
|
7
10
|
* Also considers the geometry change from morph targets and skeletons.
|
|
@@ -10,8 +13,21 @@ export declare type BakeGeometryOptions = {
|
|
|
10
13
|
* is baked as well. Baking morph targets only is a use case when preparing a mesh for CSG operations,
|
|
11
14
|
* which doesn't consider morph targets (yet).
|
|
12
15
|
*/
|
|
13
|
-
declare function bakeGeometryOfMesh(mesh: Mesh, settings?:
|
|
16
|
+
declare function bakeGeometryOfMesh(mesh: Mesh, settings?: BakeGeometrySettings): void;
|
|
17
|
+
/**
|
|
18
|
+
* Get a `TransformNode` by name or create one if not already available.\
|
|
19
|
+
* Optionally set a parent node for the new `TransformNode` right away.
|
|
20
|
+
*/
|
|
21
|
+
declare function getOrCreateTransformNode(nodeName: string, scene: Scene, settings?: CreateTransformNodeSettings): TransformNode;
|
|
22
|
+
/**
|
|
23
|
+
* Returns the root node of a models asset container.\
|
|
24
|
+
* This can be useful to reposition an entire (cloned) model.\
|
|
25
|
+
* Function expects only one root `TransformNode` and will return `undefined` otherwise.
|
|
26
|
+
*/
|
|
27
|
+
declare function getRootNodeOfModel(assetContainer: AssetContainer): TransformNode | undefined;
|
|
14
28
|
export declare const NodeUtils: {
|
|
15
29
|
bakeGeometryOfMesh: typeof bakeGeometryOfMesh;
|
|
30
|
+
getOrCreateTransformNode: typeof getOrCreateTransformNode;
|
|
31
|
+
getRootNodeOfModel: typeof getRootNodeOfModel;
|
|
16
32
|
};
|
|
17
33
|
export {};
|
|
@@ -48,6 +48,42 @@ function bakeGeometryOfMesh(mesh, settings) {
|
|
|
48
48
|
mesh.bakeCurrentTransformIntoVertices();
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
|
+
/**
|
|
52
|
+
* Get a `TransformNode` by name or create one if not already available.\
|
|
53
|
+
* Optionally set a parent node for the new `TransformNode` right away.
|
|
54
|
+
*/
|
|
55
|
+
function getOrCreateTransformNode(nodeName, scene, settings) {
|
|
56
|
+
const { parentNode } = settings !== null && settings !== void 0 ? settings : {};
|
|
57
|
+
const node = scene.getTransformNodeByName(nodeName);
|
|
58
|
+
if (node) {
|
|
59
|
+
return node;
|
|
60
|
+
}
|
|
61
|
+
else {
|
|
62
|
+
const newNode = new __1.TransformNode(nodeName, scene);
|
|
63
|
+
newNode.parent = parentNode !== null && parentNode !== void 0 ? parentNode : null;
|
|
64
|
+
return newNode;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
/**
|
|
68
|
+
* Returns the root node of a models asset container.\
|
|
69
|
+
* This can be useful to reposition an entire (cloned) model.\
|
|
70
|
+
* Function expects only one root `TransformNode` and will return `undefined` otherwise.
|
|
71
|
+
*/
|
|
72
|
+
function getRootNodeOfModel(assetContainer) {
|
|
73
|
+
// `assetContainer.rootNodes` can also contain other `Node` types like lights or cameras, which we don't want here
|
|
74
|
+
const rootNodes = assetContainer.rootNodes.filter(node => node instanceof __1.TransformNode);
|
|
75
|
+
if (rootNodes.length === 0) {
|
|
76
|
+
console.warn(`No root node found for associated model`);
|
|
77
|
+
return undefined;
|
|
78
|
+
}
|
|
79
|
+
else if (rootNodes.length > 1) {
|
|
80
|
+
console.warn(`Mutltiple root nodes found for associated model`);
|
|
81
|
+
return undefined;
|
|
82
|
+
}
|
|
83
|
+
else {
|
|
84
|
+
return rootNodes[0];
|
|
85
|
+
}
|
|
86
|
+
}
|
|
51
87
|
/**
|
|
52
88
|
* @param kind morph targets can affect various vertices kinds, whereas "position" is the most common one
|
|
53
89
|
* still other kinds (like normals or tangents) can be affected as well and can be provided on this input
|
|
@@ -88,5 +124,7 @@ function _getVerticesDataFromMorphTarget(kind, morphTarget) {
|
|
|
88
124
|
// export functions under "namespace", so that they can found easier in consuming code
|
|
89
125
|
exports.NodeUtils = {
|
|
90
126
|
bakeGeometryOfMesh,
|
|
127
|
+
getOrCreateTransformNode,
|
|
128
|
+
getRootNodeOfModel,
|
|
91
129
|
};
|
|
92
130
|
//# sourceMappingURL=node-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-utils.js","sourceRoot":"","sources":["../../../src/utils/node-utils.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"node-utils.js","sourceRoot":"","sources":["../../../src/utils/node-utils.ts"],"names":[],"mappings":"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"}
|
package/dist/lib-cjs/viewer.d.ts
CHANGED
|
@@ -62,6 +62,7 @@ export declare class Viewer {
|
|
|
62
62
|
protected _textureManager: TextureManager;
|
|
63
63
|
protected _viewerSettings: ViewerSettings;
|
|
64
64
|
protected _isRenderLoopPaused: boolean;
|
|
65
|
+
protected _isBlurred: boolean;
|
|
65
66
|
get scene(): Scene;
|
|
66
67
|
get engine(): AbstractEngine;
|
|
67
68
|
get cameraManager(): CameraManager;
|
|
@@ -100,6 +101,15 @@ export declare class Viewer {
|
|
|
100
101
|
* Resume render loop when paused by {@link pauseRendering} function
|
|
101
102
|
*/
|
|
102
103
|
resumeRendering(): void;
|
|
104
|
+
/**
|
|
105
|
+
* Blurs viewer to hide certain actions like loading assets, changing material or redrawing the scene.\
|
|
106
|
+
* Blur depth can be changed via input parameter and defaults to 3px.
|
|
107
|
+
*/
|
|
108
|
+
applyBlur(blurDepth?: number): void;
|
|
109
|
+
/**
|
|
110
|
+
* Removes blur, as set by `applyBlur` function
|
|
111
|
+
*/
|
|
112
|
+
removeBlur(): void;
|
|
103
113
|
/**
|
|
104
114
|
* Destroys this viewer instance and disposes Babylon.js engine and all scene content
|
|
105
115
|
*/
|
package/dist/lib-cjs/viewer.js
CHANGED
|
@@ -69,6 +69,7 @@ class Viewer {
|
|
|
69
69
|
useParallelShaderCompile: true,
|
|
70
70
|
};
|
|
71
71
|
this._isRenderLoopPaused = false;
|
|
72
|
+
this._isBlurred = false;
|
|
72
73
|
(0, lodash_es_1.merge)(this._viewerSettings, viewerSettings);
|
|
73
74
|
this._init(defaultSceneSettings);
|
|
74
75
|
}
|
|
@@ -137,6 +138,25 @@ class Viewer {
|
|
|
137
138
|
resumeRendering() {
|
|
138
139
|
this._isRenderLoopPaused = false;
|
|
139
140
|
}
|
|
141
|
+
/**
|
|
142
|
+
* Blurs viewer to hide certain actions like loading assets, changing material or redrawing the scene.\
|
|
143
|
+
* Blur depth can be changed via input parameter and defaults to 3px.
|
|
144
|
+
*/
|
|
145
|
+
applyBlur(blurDepth = 3) {
|
|
146
|
+
if (this.canvas && !this._isBlurred) {
|
|
147
|
+
this.canvas.style.filter = `blur(${blurDepth}px)`;
|
|
148
|
+
this._isBlurred = true;
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
/**
|
|
152
|
+
* Removes blur, as set by `applyBlur` function
|
|
153
|
+
*/
|
|
154
|
+
removeBlur() {
|
|
155
|
+
if (this.canvas && this._isBlurred) {
|
|
156
|
+
this.canvas.style.filter = '';
|
|
157
|
+
this._isBlurred = false;
|
|
158
|
+
}
|
|
159
|
+
}
|
|
140
160
|
/**
|
|
141
161
|
* Destroys this viewer instance and disposes Babylon.js engine and all scene content
|
|
142
162
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"viewer.js","sourceRoot":"","sources":["../../src/viewer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sEAAyC;AACzC,+CAAiC;AACjC,mCAqBiB;AACjB,kGAAmG;AACnG,4DAAiE;AACjE,yCAA6C;AAwC7C;;;;;;;;;GASG;AACH,MAAa,MAAM;
|
|
1
|
+
{"version":3,"file":"viewer.js","sourceRoot":"","sources":["../../src/viewer.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/utils/node-utils.ts
CHANGED
|
@@ -1,8 +1,21 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
AssetContainer,
|
|
3
|
+
FloatArray,
|
|
4
|
+
Geometry,
|
|
5
|
+
Mesh,
|
|
6
|
+
MorphTarget,
|
|
7
|
+
MorphTargetManager,
|
|
8
|
+
Scene,
|
|
9
|
+
TransformNode,
|
|
10
|
+
VertexBuffer,
|
|
11
|
+
} from '..';
|
|
2
12
|
|
|
3
|
-
export type
|
|
13
|
+
export type BakeGeometrySettings = {
|
|
4
14
|
keepTransformation?: boolean;
|
|
5
15
|
};
|
|
16
|
+
export type CreateTransformNodeSettings = {
|
|
17
|
+
parentNode?: TransformNode;
|
|
18
|
+
};
|
|
6
19
|
|
|
7
20
|
/**
|
|
8
21
|
* Removes transformation data from the mesh and stores it in the geometry, which is called "baking".
|
|
@@ -12,7 +25,7 @@ export type BakeGeometryOptions = {
|
|
|
12
25
|
* is baked as well. Baking morph targets only is a use case when preparing a mesh for CSG operations,
|
|
13
26
|
* which doesn't consider morph targets (yet).
|
|
14
27
|
*/
|
|
15
|
-
function bakeGeometryOfMesh(mesh: Mesh, settings?:
|
|
28
|
+
function bakeGeometryOfMesh(mesh: Mesh, settings?: BakeGeometrySettings): void {
|
|
16
29
|
const { keepTransformation } = settings ?? {};
|
|
17
30
|
|
|
18
31
|
if (!mesh.geometry) {
|
|
@@ -58,6 +71,47 @@ function bakeGeometryOfMesh(mesh: Mesh, settings?: BakeGeometryOptions): void {
|
|
|
58
71
|
}
|
|
59
72
|
}
|
|
60
73
|
|
|
74
|
+
/**
|
|
75
|
+
* Get a `TransformNode` by name or create one if not already available.\
|
|
76
|
+
* Optionally set a parent node for the new `TransformNode` right away.
|
|
77
|
+
*/
|
|
78
|
+
function getOrCreateTransformNode(
|
|
79
|
+
nodeName: string,
|
|
80
|
+
scene: Scene,
|
|
81
|
+
settings?: CreateTransformNodeSettings
|
|
82
|
+
): TransformNode {
|
|
83
|
+
const { parentNode } = settings ?? {};
|
|
84
|
+
const node = scene.getTransformNodeByName(nodeName);
|
|
85
|
+
|
|
86
|
+
if (node) {
|
|
87
|
+
return node;
|
|
88
|
+
} else {
|
|
89
|
+
const newNode = new TransformNode(nodeName, scene);
|
|
90
|
+
newNode.parent = parentNode ?? null;
|
|
91
|
+
|
|
92
|
+
return newNode;
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
/**
|
|
97
|
+
* Returns the root node of a models asset container.\
|
|
98
|
+
* This can be useful to reposition an entire (cloned) model.\
|
|
99
|
+
* Function expects only one root `TransformNode` and will return `undefined` otherwise.
|
|
100
|
+
*/
|
|
101
|
+
function getRootNodeOfModel(assetContainer: AssetContainer): TransformNode | undefined {
|
|
102
|
+
// `assetContainer.rootNodes` can also contain other `Node` types like lights or cameras, which we don't want here
|
|
103
|
+
const rootNodes = assetContainer.rootNodes.filter(node => node instanceof TransformNode) as TransformNode[];
|
|
104
|
+
if (rootNodes.length === 0) {
|
|
105
|
+
console.warn(`No root node found for associated model`);
|
|
106
|
+
return undefined;
|
|
107
|
+
} else if (rootNodes.length > 1) {
|
|
108
|
+
console.warn(`Mutltiple root nodes found for associated model`);
|
|
109
|
+
return undefined;
|
|
110
|
+
} else {
|
|
111
|
+
return rootNodes[0];
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
|
|
61
115
|
/**
|
|
62
116
|
* @param kind morph targets can affect various vertices kinds, whereas "position" is the most common one
|
|
63
117
|
* still other kinds (like normals or tangents) can be affected as well and can be provided on this input
|
|
@@ -109,4 +163,6 @@ function _getVerticesDataFromMorphTarget(kind: string, morphTarget: MorphTarget)
|
|
|
109
163
|
// export functions under "namespace", so that they can found easier in consuming code
|
|
110
164
|
export const NodeUtils = {
|
|
111
165
|
bakeGeometryOfMesh,
|
|
166
|
+
getOrCreateTransformNode,
|
|
167
|
+
getRootNodeOfModel,
|
|
112
168
|
};
|
package/src/viewer.ts
CHANGED
|
@@ -110,7 +110,8 @@ export class Viewer {
|
|
|
110
110
|
useParallelShaderCompile: true,
|
|
111
111
|
};
|
|
112
112
|
|
|
113
|
-
protected _isRenderLoopPaused
|
|
113
|
+
protected _isRenderLoopPaused = false;
|
|
114
|
+
protected _isBlurred = false;
|
|
114
115
|
|
|
115
116
|
get scene(): Scene {
|
|
116
117
|
return this._scene;
|
|
@@ -196,6 +197,27 @@ export class Viewer {
|
|
|
196
197
|
this._isRenderLoopPaused = false;
|
|
197
198
|
}
|
|
198
199
|
|
|
200
|
+
/**
|
|
201
|
+
* Blurs viewer to hide certain actions like loading assets, changing material or redrawing the scene.\
|
|
202
|
+
* Blur depth can be changed via input parameter and defaults to 3px.
|
|
203
|
+
*/
|
|
204
|
+
public applyBlur(blurDepth = 3): void {
|
|
205
|
+
if (this.canvas && !this._isBlurred) {
|
|
206
|
+
this.canvas.style.filter = `blur(${blurDepth}px)`;
|
|
207
|
+
this._isBlurred = true;
|
|
208
|
+
}
|
|
209
|
+
}
|
|
210
|
+
|
|
211
|
+
/**
|
|
212
|
+
* Removes blur, as set by `applyBlur` function
|
|
213
|
+
*/
|
|
214
|
+
public removeBlur(): void {
|
|
215
|
+
if (this.canvas && this._isBlurred) {
|
|
216
|
+
this.canvas.style.filter = '';
|
|
217
|
+
this._isBlurred = false;
|
|
218
|
+
}
|
|
219
|
+
}
|
|
220
|
+
|
|
199
221
|
/**
|
|
200
222
|
* Destroys this viewer instance and disposes Babylon.js engine and all scene content
|
|
201
223
|
*/
|