@combeenation/3d-viewer 19.0.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/manager/dimension-line-manager.d.ts +12 -3
- package/dist/lib-cjs/manager/dimension-line-manager.js +39 -32
- package/dist/lib-cjs/manager/dimension-line-manager.js.map +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/manager/dimension-line-manager.ts +47 -33
- package/src/utils/node-utils.ts +59 -3
- package/src/viewer.ts +23 -1
|
@@ -3,6 +3,10 @@ import { Color3, HtmlAnchorOptions, LinesMesh, TransformNode, Vector3, Viewer }
|
|
|
3
3
|
* Options for dimension line creation
|
|
4
4
|
*/
|
|
5
5
|
export declare type DimensionLineOptions = Pick<HtmlAnchorOptions, 'occlusion' | 'scaling'> & {
|
|
6
|
+
/**
|
|
7
|
+
* Can be used to filter affected html anchors in {@link DimensionLineManager.removeAllDimensionLines}
|
|
8
|
+
*/
|
|
9
|
+
group?: string;
|
|
6
10
|
/**
|
|
7
11
|
* Default: `Color3.Black()`
|
|
8
12
|
*/
|
|
@@ -48,7 +52,8 @@ export declare class DimensionLineManager {
|
|
|
48
52
|
protected _dimensionLineObjs: {
|
|
49
53
|
[name: string]: {
|
|
50
54
|
linesMesh: LinesMesh;
|
|
51
|
-
|
|
55
|
+
htmlSpanElement: HTMLSpanElement;
|
|
56
|
+
options: DimensionLineOptions;
|
|
52
57
|
};
|
|
53
58
|
};
|
|
54
59
|
/**
|
|
@@ -65,7 +70,8 @@ export declare class DimensionLineManager {
|
|
|
65
70
|
*/
|
|
66
71
|
setDefaultDimensionLineOptions(defaultLineOptions: Partial<DimensionLineOptions>): void;
|
|
67
72
|
/**
|
|
68
|
-
* Create dimension line between two points
|
|
73
|
+
* Create dimension line between two points.\
|
|
74
|
+
* Already existing dimension line gets updated in place, which is useful for dynamic operations like dragging.
|
|
69
75
|
*/
|
|
70
76
|
addDimensionLine(name: string, startPoint: Vector3, endPoint: Vector3, options?: Partial<DimensionLineOptions>): void;
|
|
71
77
|
/**
|
|
@@ -74,6 +80,9 @@ export declare class DimensionLineManager {
|
|
|
74
80
|
removeDimensionLine(name: string): void;
|
|
75
81
|
/**
|
|
76
82
|
* Remove all dimension lines that have been created with the `DimensionLineManager`
|
|
83
|
+
*
|
|
84
|
+
* @param groups if set, only dimension lines which are part of these groups will be removed\
|
|
85
|
+
* if left `undefined`, ALL dimension lines will be removed
|
|
77
86
|
*/
|
|
78
|
-
removeAllDimensionLines(): void;
|
|
87
|
+
removeAllDimensionLines(groups?: string[]): void;
|
|
79
88
|
}
|
|
@@ -39,16 +39,15 @@ class DimensionLineManager {
|
|
|
39
39
|
(0, lodash_es_1.merge)(this._defaultLineOptions, defaultLineOptions);
|
|
40
40
|
}
|
|
41
41
|
/**
|
|
42
|
-
* Create dimension line between two points
|
|
42
|
+
* Create dimension line between two points.\
|
|
43
|
+
* Already existing dimension line gets updated in place, which is useful for dynamic operations like dragging.
|
|
43
44
|
*/
|
|
44
45
|
addDimensionLine(name, startPoint, endPoint, options) {
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
const
|
|
50
|
-
(0, lodash_es_1.merge)(resDefaultOptions, options);
|
|
51
|
-
const { lineColor, closingLineHeight, closingLineDirection: closingLineDirectionIn, parentNode, occlusion, scaling, labelTextCb, labelCssClass, } = resDefaultOptions;
|
|
46
|
+
var _a;
|
|
47
|
+
const existingDimLine = this._dimensionLineObjs[name];
|
|
48
|
+
const resOptions = Object.assign({}, this._defaultLineOptions);
|
|
49
|
+
(0, lodash_es_1.merge)(resOptions, options);
|
|
50
|
+
const { lineColor, closingLineHeight, closingLineDirection: closingLineDirectionIn, parentNode, occlusion, scaling, labelTextCb, labelCssClass, } = resOptions;
|
|
52
51
|
let closingLineDirection = closingLineDirectionIn;
|
|
53
52
|
if (!closingLineDirection) {
|
|
54
53
|
// evaluate closing line direction if not given
|
|
@@ -65,6 +64,9 @@ class DimensionLineManager {
|
|
|
65
64
|
const closingLineEndPts = [relEndPt.add(closingLineOffsetVector), relEndPt.subtract(closingLineOffsetVector)];
|
|
66
65
|
const linesMesh = index_1.MeshBuilder.CreateLineSystem(`${DimensionLineManager.DIMENSION_LINE_KEY}_${name}`, {
|
|
67
66
|
lines: [[relStartPt, relEndPt], closingLineStartPts, closingLineEndPts],
|
|
67
|
+
// updates existing lines mesh if available
|
|
68
|
+
instance: existingDimLine === null || existingDimLine === void 0 ? void 0 : existingDimLine.linesMesh,
|
|
69
|
+
updatable: true,
|
|
68
70
|
});
|
|
69
71
|
linesMesh.position = lineCenter;
|
|
70
72
|
linesMesh.color = lineColor;
|
|
@@ -77,33 +79,34 @@ class DimensionLineManager {
|
|
|
77
79
|
}
|
|
78
80
|
const lengthM = index_1.Vector3.Distance(startPoint, endPoint);
|
|
79
81
|
const labelText = labelTextCb(lengthM);
|
|
80
|
-
// create default html element
|
|
81
|
-
const
|
|
82
|
-
|
|
82
|
+
// create default html element or update existing one
|
|
83
|
+
const htmlSpanElement = (_a = existingDimLine === null || existingDimLine === void 0 ? void 0 : existingDimLine.htmlSpanElement) !== null && _a !== void 0 ? _a : document.createElement('span');
|
|
84
|
+
htmlSpanElement.textContent = labelText;
|
|
83
85
|
if (labelCssClass) {
|
|
84
|
-
|
|
86
|
+
htmlSpanElement.classList.add(labelCssClass);
|
|
85
87
|
}
|
|
86
88
|
else {
|
|
87
89
|
const labelHeight = 24;
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
90
|
+
htmlSpanElement.style.display = 'block';
|
|
91
|
+
htmlSpanElement.style.height = `${labelHeight}px`;
|
|
92
|
+
htmlSpanElement.style.lineHeight = `${labelHeight}px`;
|
|
93
|
+
htmlSpanElement.style.fontSize = `${(labelHeight * 2) / 3}px`;
|
|
94
|
+
htmlSpanElement.style.fontFamily = 'Arial';
|
|
95
|
+
htmlSpanElement.style.border = `1px solid black`;
|
|
96
|
+
htmlSpanElement.style.paddingLeft = `${labelHeight / 2}px`;
|
|
97
|
+
htmlSpanElement.style.paddingRight = `${labelHeight / 2}px`;
|
|
98
|
+
htmlSpanElement.style.borderRadius = `${labelHeight / 2}px`;
|
|
99
|
+
htmlSpanElement.style.background = 'white';
|
|
98
100
|
}
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
101
|
+
if (!existingDimLine) {
|
|
102
|
+
this.viewer.htmlAnchorManager.addHtmlAnchor(name, htmlSpanElement, index_1.Vector3.Zero(), {
|
|
103
|
+
parentNode: linesMesh,
|
|
104
|
+
group: DimensionLineManager.DIMENSION_LINE_KEY,
|
|
105
|
+
occlusion,
|
|
106
|
+
scaling,
|
|
107
|
+
});
|
|
108
|
+
}
|
|
109
|
+
this._dimensionLineObjs[name] = { linesMesh, htmlSpanElement, options: resOptions };
|
|
107
110
|
}
|
|
108
111
|
/**
|
|
109
112
|
* Remove dimension line and disposes all associated ressources
|
|
@@ -120,9 +123,13 @@ class DimensionLineManager {
|
|
|
120
123
|
}
|
|
121
124
|
/**
|
|
122
125
|
* Remove all dimension lines that have been created with the `DimensionLineManager`
|
|
126
|
+
*
|
|
127
|
+
* @param groups if set, only dimension lines which are part of these groups will be removed\
|
|
128
|
+
* if left `undefined`, ALL dimension lines will be removed
|
|
123
129
|
*/
|
|
124
|
-
removeAllDimensionLines() {
|
|
125
|
-
Object.
|
|
130
|
+
removeAllDimensionLines(groups) {
|
|
131
|
+
const entriesToRemove = Object.entries(this._dimensionLineObjs).filter(([_, { options }]) => groups === undefined || (options.group !== undefined && groups.includes(options.group)));
|
|
132
|
+
entriesToRemove.forEach(([dimLineName]) => {
|
|
126
133
|
this.removeDimensionLine(dimLineName);
|
|
127
134
|
});
|
|
128
135
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dimension-line-manager.js","sourceRoot":"","sources":["../../../src/manager/dimension-line-manager.ts"],"names":[],"mappings":";;;AAAA,oCAAmH;AACnH,yCAAkC;
|
|
1
|
+
{"version":3,"file":"dimension-line-manager.js","sourceRoot":"","sources":["../../../src/manager/dimension-line-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -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
|
@@ -5,6 +5,10 @@ import { merge } from 'lodash-es';
|
|
|
5
5
|
* Options for dimension line creation
|
|
6
6
|
*/
|
|
7
7
|
export type DimensionLineOptions = Pick<HtmlAnchorOptions, 'occlusion' | 'scaling'> & {
|
|
8
|
+
/**
|
|
9
|
+
* Can be used to filter affected html anchors in {@link DimensionLineManager.removeAllDimensionLines}
|
|
10
|
+
*/
|
|
11
|
+
group?: string;
|
|
8
12
|
/**
|
|
9
13
|
* Default: `Color3.Black()`
|
|
10
14
|
*/
|
|
@@ -62,7 +66,8 @@ export class DimensionLineManager {
|
|
|
62
66
|
protected _dimensionLineObjs: {
|
|
63
67
|
[name: string]: {
|
|
64
68
|
linesMesh: LinesMesh;
|
|
65
|
-
|
|
69
|
+
htmlSpanElement: HTMLSpanElement;
|
|
70
|
+
options: DimensionLineOptions;
|
|
66
71
|
};
|
|
67
72
|
} = {};
|
|
68
73
|
|
|
@@ -87,7 +92,8 @@ export class DimensionLineManager {
|
|
|
87
92
|
}
|
|
88
93
|
|
|
89
94
|
/**
|
|
90
|
-
* Create dimension line between two points
|
|
95
|
+
* Create dimension line between two points.\
|
|
96
|
+
* Already existing dimension line gets updated in place, which is useful for dynamic operations like dragging.
|
|
91
97
|
*/
|
|
92
98
|
public addDimensionLine(
|
|
93
99
|
name: string,
|
|
@@ -95,13 +101,10 @@ export class DimensionLineManager {
|
|
|
95
101
|
endPoint: Vector3,
|
|
96
102
|
options?: Partial<DimensionLineOptions>
|
|
97
103
|
): void {
|
|
98
|
-
|
|
99
|
-
console.warn(`Dimension line "${name}" already exists`);
|
|
100
|
-
return;
|
|
101
|
-
}
|
|
104
|
+
const existingDimLine = this._dimensionLineObjs[name];
|
|
102
105
|
|
|
103
|
-
const
|
|
104
|
-
merge(
|
|
106
|
+
const resOptions = { ...this._defaultLineOptions };
|
|
107
|
+
merge(resOptions, options);
|
|
105
108
|
const {
|
|
106
109
|
lineColor,
|
|
107
110
|
closingLineHeight,
|
|
@@ -111,7 +114,7 @@ export class DimensionLineManager {
|
|
|
111
114
|
scaling,
|
|
112
115
|
labelTextCb,
|
|
113
116
|
labelCssClass,
|
|
114
|
-
} =
|
|
117
|
+
} = resOptions;
|
|
115
118
|
|
|
116
119
|
let closingLineDirection = closingLineDirectionIn;
|
|
117
120
|
if (!closingLineDirection) {
|
|
@@ -131,6 +134,9 @@ export class DimensionLineManager {
|
|
|
131
134
|
|
|
132
135
|
const linesMesh = MeshBuilder.CreateLineSystem(`${DimensionLineManager.DIMENSION_LINE_KEY}_${name}`, {
|
|
133
136
|
lines: [[relStartPt, relEndPt], closingLineStartPts, closingLineEndPts],
|
|
137
|
+
// updates existing lines mesh if available
|
|
138
|
+
instance: existingDimLine?.linesMesh,
|
|
139
|
+
updatable: true,
|
|
134
140
|
});
|
|
135
141
|
linesMesh.position = lineCenter;
|
|
136
142
|
linesMesh.color = lineColor;
|
|
@@ -145,35 +151,36 @@ export class DimensionLineManager {
|
|
|
145
151
|
const lengthM = Vector3.Distance(startPoint, endPoint);
|
|
146
152
|
const labelText = labelTextCb(lengthM);
|
|
147
153
|
|
|
148
|
-
// create default html element
|
|
149
|
-
const
|
|
150
|
-
|
|
154
|
+
// create default html element or update existing one
|
|
155
|
+
const htmlSpanElement = existingDimLine?.htmlSpanElement ?? document.createElement('span');
|
|
156
|
+
htmlSpanElement.textContent = labelText;
|
|
151
157
|
|
|
152
158
|
if (labelCssClass) {
|
|
153
|
-
|
|
159
|
+
htmlSpanElement.classList.add(labelCssClass);
|
|
154
160
|
} else {
|
|
155
161
|
const labelHeight = 24;
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
162
|
+
htmlSpanElement.style.display = 'block';
|
|
163
|
+
htmlSpanElement.style.height = `${labelHeight}px`;
|
|
164
|
+
htmlSpanElement.style.lineHeight = `${labelHeight}px`;
|
|
165
|
+
htmlSpanElement.style.fontSize = `${(labelHeight * 2) / 3}px`;
|
|
166
|
+
htmlSpanElement.style.fontFamily = 'Arial';
|
|
167
|
+
htmlSpanElement.style.border = `1px solid black`;
|
|
168
|
+
htmlSpanElement.style.paddingLeft = `${labelHeight / 2}px`;
|
|
169
|
+
htmlSpanElement.style.paddingRight = `${labelHeight / 2}px`;
|
|
170
|
+
htmlSpanElement.style.borderRadius = `${labelHeight / 2}px`;
|
|
171
|
+
htmlSpanElement.style.background = 'white';
|
|
166
172
|
}
|
|
167
173
|
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
174
|
+
if (!existingDimLine) {
|
|
175
|
+
this.viewer.htmlAnchorManager.addHtmlAnchor(name, htmlSpanElement, Vector3.Zero(), {
|
|
176
|
+
parentNode: linesMesh,
|
|
177
|
+
group: DimensionLineManager.DIMENSION_LINE_KEY,
|
|
178
|
+
occlusion,
|
|
179
|
+
scaling,
|
|
180
|
+
});
|
|
181
|
+
}
|
|
175
182
|
|
|
176
|
-
this._dimensionLineObjs[name] = { linesMesh,
|
|
183
|
+
this._dimensionLineObjs[name] = { linesMesh, htmlSpanElement, options: resOptions };
|
|
177
184
|
}
|
|
178
185
|
|
|
179
186
|
/**
|
|
@@ -194,9 +201,16 @@ export class DimensionLineManager {
|
|
|
194
201
|
|
|
195
202
|
/**
|
|
196
203
|
* Remove all dimension lines that have been created with the `DimensionLineManager`
|
|
204
|
+
*
|
|
205
|
+
* @param groups if set, only dimension lines which are part of these groups will be removed\
|
|
206
|
+
* if left `undefined`, ALL dimension lines will be removed
|
|
197
207
|
*/
|
|
198
|
-
public removeAllDimensionLines(): void {
|
|
199
|
-
Object.
|
|
208
|
+
public removeAllDimensionLines(groups?: string[]): void {
|
|
209
|
+
const entriesToRemove = Object.entries(this._dimensionLineObjs).filter(
|
|
210
|
+
([_, { options }]) => groups === undefined || (options.group !== undefined && groups.includes(options.group))
|
|
211
|
+
);
|
|
212
|
+
|
|
213
|
+
entriesToRemove.forEach(([dimLineName]) => {
|
|
200
214
|
this.removeDimensionLine(dimLineName);
|
|
201
215
|
});
|
|
202
216
|
}
|
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
|
*/
|