@shapediver/viewer.data-engine.data-engine 2.0.12 → 2.1.2
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/DataEngine.d.ts.map +1 -1
- package/dist/DataEngine.js +4 -1
- package/dist/DataEngine.js.map +1 -1
- package/package.json +11 -10
- package/src/DataEngine.ts +7 -4
package/dist/DataEngine.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataEngine.d.ts","sourceRoot":"","sources":["../src/DataEngine.ts"],"names":[],"mappings":"AAMA,OAAO,
|
|
1
|
+
{"version":3,"file":"DataEngine.d.ts","sourceRoot":"","sources":["../src/DataEngine.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,SAAS,EAAY,MAAM,qCAAqC,CAAA;AAKzE,OAAO,EAAE,+BAA+B,EAAE,MAAM,qCAAqC,CAAA;AAGrF,qBACa,UAAU;IAGnB,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAqE;IACrG,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAgG;IACzI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA6C;IACrE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAqE;IACrG,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAyD;IACrF,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA4D;IAM5E,WAAW,CAAC,OAAO,EAAE,+BAA+B,GAAG,OAAO,CAAC,SAAS,CAAC;CAqDzF"}
|
package/dist/DataEngine.js
CHANGED
|
@@ -26,6 +26,7 @@ const viewer_shared_node_tree_1 = require("@shapediver/viewer.shared.node-tree")
|
|
|
26
26
|
const viewer_shared_services_1 = require("@shapediver/viewer.shared.services");
|
|
27
27
|
const viewer_data_engine_html_element_anchor_engine_1 = require("@shapediver/viewer.data-engine.html-element-anchor-engine");
|
|
28
28
|
const gl_matrix_1 = require("gl-matrix");
|
|
29
|
+
const viewer_shared_node_tree_utils_1 = require("@shapediver/viewer.shared.node-tree-utils");
|
|
29
30
|
let DataEngine = class DataEngine {
|
|
30
31
|
constructor() {
|
|
31
32
|
// #region Properties (6)
|
|
@@ -71,12 +72,14 @@ let DataEngine = class DataEngine {
|
|
|
71
72
|
for (let i = 0; i < content.transformations.length; i++) {
|
|
72
73
|
const t = content.transformations[i];
|
|
73
74
|
if (Array.isArray(t) && t.length === 16) {
|
|
74
|
-
const nodeInstance = node.
|
|
75
|
+
const nodeInstance = node.clone();
|
|
75
76
|
nodeInstance.transformations = [{
|
|
76
77
|
id: 'content_' + i,
|
|
77
78
|
matrix: gl_matrix_1.mat4.fromValues(t[0], t[1], t[2], t[3], t[4], t[5], t[6], t[7], t[8], t[9], t[10], t[11], t[12], t[13], t[14], t[15])
|
|
78
79
|
}].concat(node.transformations);
|
|
80
|
+
transformationNode.updateVersion();
|
|
79
81
|
transformationNode.addChild(nodeInstance);
|
|
82
|
+
viewer_shared_node_tree_utils_1.NodeTreeUtils.cloneSkinData(node, nodeInstance);
|
|
80
83
|
}
|
|
81
84
|
}
|
|
82
85
|
}
|
package/dist/DataEngine.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataEngine.js","sourceRoot":"","sources":["../src/DataEngine.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,uCAA+C;AAC/C,yEAA4D;AAC5D,uGAA+E;AAC/E,uGAA+E;AAC/E,+FAAuE;AACvE,iGAAyE;AACzE,
|
|
1
|
+
{"version":3,"file":"DataEngine.js","sourceRoot":"","sources":["../src/DataEngine.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shapediver/viewer.data-engine.data-engine",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.1.2",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"author": "Michael Oppitz <michael@shapediver.com>",
|
|
@@ -40,17 +40,18 @@
|
|
|
40
40
|
},
|
|
41
41
|
"dependencies": {
|
|
42
42
|
"@shapediver/sdk.geometry-api-sdk-v2": "^1.0.26",
|
|
43
|
-
"@shapediver/viewer.data-engine.geometry-engine": "2.
|
|
44
|
-
"@shapediver/viewer.data-engine.html-element-anchor-engine": "2.
|
|
45
|
-
"@shapediver/viewer.data-engine.material-engine": "2.
|
|
46
|
-
"@shapediver/viewer.data-engine.sdtf-engine": "2.
|
|
47
|
-
"@shapediver/viewer.data-engine.tag3d-engine": "2.
|
|
48
|
-
"@shapediver/viewer.shared.node-tree": "2.
|
|
49
|
-
"@shapediver/viewer.shared.
|
|
50
|
-
"@shapediver/viewer.shared.
|
|
43
|
+
"@shapediver/viewer.data-engine.geometry-engine": "2.1.2",
|
|
44
|
+
"@shapediver/viewer.data-engine.html-element-anchor-engine": "2.1.2",
|
|
45
|
+
"@shapediver/viewer.data-engine.material-engine": "2.1.2",
|
|
46
|
+
"@shapediver/viewer.data-engine.sdtf-engine": "2.1.2",
|
|
47
|
+
"@shapediver/viewer.data-engine.tag3d-engine": "2.1.2",
|
|
48
|
+
"@shapediver/viewer.shared.node-tree": "2.1.2",
|
|
49
|
+
"@shapediver/viewer.shared.node-tree-utils": "2.1.2",
|
|
50
|
+
"@shapediver/viewer.shared.services": "2.1.2",
|
|
51
|
+
"@shapediver/viewer.shared.types": "2.1.2",
|
|
51
52
|
"axios": "^0.21.1",
|
|
52
53
|
"gl-matrix": "3.3.0",
|
|
53
54
|
"tsyringe": "^4.5.0"
|
|
54
55
|
},
|
|
55
|
-
"gitHead": "
|
|
56
|
+
"gitHead": "fb0624317d043edaa75b7341beeb674b1c0cb43f"
|
|
56
57
|
}
|
package/src/DataEngine.ts
CHANGED
|
@@ -4,12 +4,13 @@ import { GeometryEngine } from '@shapediver/viewer.data-engine.geometry-engine'
|
|
|
4
4
|
import { MaterialEngine } from '@shapediver/viewer.data-engine.material-engine'
|
|
5
5
|
import { SDTFEngine } from '@shapediver/viewer.data-engine.sdtf-engine'
|
|
6
6
|
import { Tag3dEngine } from '@shapediver/viewer.data-engine.tag3d-engine'
|
|
7
|
-
import {
|
|
8
|
-
import {
|
|
7
|
+
import { ITreeNode, TreeNode } from '@shapediver/viewer.shared.node-tree'
|
|
8
|
+
import { Logger, LOGGING_TOPIC, ShapeDiverViewerDataProcessingError } from '@shapediver/viewer.shared.services'
|
|
9
9
|
import { HTMLElementAnchorEngine } from '@shapediver/viewer.data-engine.html-element-anchor-engine'
|
|
10
10
|
|
|
11
11
|
import { mat4 } from 'gl-matrix'
|
|
12
12
|
import { ShapeDiverResponseOutputContent } from '@shapediver/sdk.geometry-api-sdk-v2'
|
|
13
|
+
import { NodeTreeUtils } from '@shapediver/viewer.shared.node-tree-utils'
|
|
13
14
|
|
|
14
15
|
@singleton()
|
|
15
16
|
export class DataEngine {
|
|
@@ -27,7 +28,7 @@ export class DataEngine {
|
|
|
27
28
|
// #region Public Methods (1)
|
|
28
29
|
|
|
29
30
|
public async loadContent(content: ShapeDiverResponseOutputContent): Promise<ITreeNode> {
|
|
30
|
-
if(!content || (content && !content.format)) {
|
|
31
|
+
if (!content || (content && !content.format)) {
|
|
31
32
|
const error = new ShapeDiverViewerDataProcessingError('DataEngine cannot load content.');
|
|
32
33
|
throw this._logger.handleError(LOGGING_TOPIC.DATA_PROCESSING, `DataEngine.loadContent`, error);
|
|
33
34
|
}
|
|
@@ -55,7 +56,7 @@ export class DataEngine {
|
|
|
55
56
|
for (let i = 0; i < content.transformations.length; i++) {
|
|
56
57
|
const t = content.transformations[i];
|
|
57
58
|
if (Array.isArray(t) && t.length === 16) {
|
|
58
|
-
const nodeInstance = node.
|
|
59
|
+
const nodeInstance = node.clone();
|
|
59
60
|
nodeInstance.transformations = [{
|
|
60
61
|
id: 'content_' + i,
|
|
61
62
|
matrix: mat4.fromValues(t[0], t[1], t[2], t[3],
|
|
@@ -63,7 +64,9 @@ export class DataEngine {
|
|
|
63
64
|
t[8], t[9], t[10], t[11],
|
|
64
65
|
t[12], t[13], t[14], t[15])
|
|
65
66
|
}].concat(node.transformations);
|
|
67
|
+
transformationNode.updateVersion()
|
|
66
68
|
transformationNode.addChild(nodeInstance)
|
|
69
|
+
NodeTreeUtils.cloneSkinData(node, nodeInstance)
|
|
67
70
|
}
|
|
68
71
|
}
|
|
69
72
|
} else {
|