@shapediver/viewer.data-engine.data-engine 1.11.10 → 1.12.1
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 +26 -30
- package/dist/DataEngine.js.map +1 -1
- package/package.json +10 -10
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,EAAmB,QAAQ,EAAE,MAAM,qCAAqC,CAAA;AAK/E,OAAO,EAAE,+BAA+B,EAAE,MAAM,qCAAqC,CAAA;AAErF,qBACa,UAAU;IAGnB,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAqE;IACrG,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAgG;IACzI,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAyD;IACrF,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;IACzF,OAAO,CAAC,SAAS,CAAuG;IAM3G,WAAW,CAAC,OAAO,EAAE,+BAA+B,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,GAAG,gBAAgB,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"DataEngine.d.ts","sourceRoot":"","sources":["../src/DataEngine.ts"],"names":[],"mappings":"AAMA,OAAO,EAAmB,QAAQ,EAAE,MAAM,qCAAqC,CAAA;AAK/E,OAAO,EAAE,+BAA+B,EAAE,MAAM,qCAAqC,CAAA;AAErF,qBACa,UAAU;IAGnB,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAqE;IACrG,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAgG;IACzI,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAyD;IACrF,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;IACzF,OAAO,CAAC,SAAS,CAAuG;IAM3G,WAAW,CAAC,OAAO,EAAE,+BAA+B,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,GAAG,gBAAgB,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC;CAyDtJ"}
|
package/dist/DataEngine.js
CHANGED
|
@@ -50,48 +50,44 @@ let DataEngine = class DataEngine {
|
|
|
50
50
|
throw this._logger.handleError(viewer_shared_services_1.LOGGINGTOPIC.DATA_PROCESSING, `DataEngine.loadContent`, error);
|
|
51
51
|
}
|
|
52
52
|
try {
|
|
53
|
-
|
|
54
|
-
if (content.transformations && Array.isArray(content.transformations)) {
|
|
55
|
-
for (let i = 0; i < content.transformations.length; i++) {
|
|
56
|
-
const t = content.transformations[i];
|
|
57
|
-
if (Array.isArray(t) && t.length === 16)
|
|
58
|
-
transformations.push({
|
|
59
|
-
id: 'content_' + i,
|
|
60
|
-
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])
|
|
61
|
-
});
|
|
62
|
-
}
|
|
63
|
-
}
|
|
53
|
+
let node;
|
|
64
54
|
if (content.format === 'glb' || content.format === 'gltf') {
|
|
65
|
-
|
|
66
|
-
node.transformations = transformations.concat(node.transformations);
|
|
67
|
-
return node;
|
|
55
|
+
node = yield this._geometryEngine.loadContent(content, this._loadData);
|
|
68
56
|
}
|
|
69
57
|
else if (content.format === 'material') {
|
|
70
|
-
|
|
71
|
-
node.transformations = transformations.concat(node.transformations);
|
|
72
|
-
return node;
|
|
58
|
+
node = yield this._materialEngine.loadContent(content, this._loadData);
|
|
73
59
|
}
|
|
74
60
|
else if (content.format === 'tag2d' || content.format === 'anchor') {
|
|
75
|
-
|
|
76
|
-
node.transformations = transformations.concat(node.transformations);
|
|
77
|
-
return node;
|
|
61
|
+
node = yield this._htmlElementAnchorEngine.loadContent(content, this._loadData);
|
|
78
62
|
}
|
|
79
63
|
else if (content.format === 'tag3d') {
|
|
80
|
-
|
|
81
|
-
node.transformations = transformations.concat(node.transformations);
|
|
82
|
-
return node;
|
|
64
|
+
node = yield this._tag3dEngine.loadContent(content, this._loadData);
|
|
83
65
|
}
|
|
84
66
|
else if (content.format === 'sdtf') {
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
67
|
+
node = yield this._sdtfEngine.loadContent(content, this._loadData);
|
|
68
|
+
}
|
|
69
|
+
else {
|
|
70
|
+
node = new viewer_shared_node_tree_1.TreeNode('custom');
|
|
71
|
+
node.data.push(new viewer_shared_types_1.CustomData(Object.assign({}, content)));
|
|
72
|
+
}
|
|
73
|
+
const transformationNode = new viewer_shared_node_tree_1.TreeNode('transformation');
|
|
74
|
+
if (content.transformations && Array.isArray(content.transformations)) {
|
|
75
|
+
for (let i = 0; i < content.transformations.length; i++) {
|
|
76
|
+
const t = content.transformations[i];
|
|
77
|
+
if (Array.isArray(t) && t.length === 16) {
|
|
78
|
+
const nodeInstance = node.cloneInstance();
|
|
79
|
+
nodeInstance.transformations = [{
|
|
80
|
+
id: 'content_' + i,
|
|
81
|
+
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])
|
|
82
|
+
}].concat(node.transformations);
|
|
83
|
+
transformationNode.addChild(nodeInstance);
|
|
84
|
+
}
|
|
85
|
+
}
|
|
88
86
|
}
|
|
89
87
|
else {
|
|
90
|
-
|
|
91
|
-
customNode.data.push(new viewer_shared_types_1.CustomData(Object.assign({}, content)));
|
|
92
|
-
customNode.transformations = transformations.concat(customNode.transformations);
|
|
93
|
-
return customNode;
|
|
88
|
+
transformationNode.addChild(node);
|
|
94
89
|
}
|
|
90
|
+
return transformationNode;
|
|
95
91
|
}
|
|
96
92
|
catch (e) {
|
|
97
93
|
throw this._logger.handleError(viewer_shared_services_1.LOGGINGTOPIC.DATA_PROCESSING, `DataEngine.loadContent`, e);
|
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,iFAA+E;AAC/E,+EAA0H;AAC1H,6HAAmG;AAEnG,yCAAgC;AAIhC,IAAa,UAAU,GAAvB,MAAa,UAAU;IAAvB;QAGqB,oBAAe,GAAmC,oBAAS,CAAC,OAAO,CAAC,mDAAc,CAAC,CAAC;QACpF,6BAAwB,GAAqD,oBAAS,CAAC,OAAO,CAAC,uEAAuB,CAAC,CAAC;QACxH,gBAAW,GAA2B,oBAAS,CAAC,OAAO,CAAC,mCAAU,CAAC,CAAC;QACpE,YAAO,GAAmB,oBAAS,CAAC,OAAO,CAAC,+BAAM,CAAC,CAAC;QACpD,oBAAe,GAAmC,oBAAS,CAAC,OAAO,CAAC,mDAAc,CAAC,CAAC;QACpF,gBAAW,GAA2B,oBAAS,CAAC,OAAO,CAAC,2CAAU,CAAC,CAAC;QACpE,iBAAY,GAA6B,oBAAS,CAAC,OAAO,CAAC,6CAAW,CAAC,CAAC;QACjF,cAAS,GAAsD,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;
|
|
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": "1.
|
|
3
|
+
"version": "1.12.1",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"author": "Michael Oppitz <michael@shapediver.com>",
|
|
@@ -37,16 +37,16 @@
|
|
|
37
37
|
},
|
|
38
38
|
"dependencies": {
|
|
39
39
|
"@shapediver/sdk.geometry-api-sdk-v2": "^1.0.15",
|
|
40
|
-
"@shapediver/viewer.data-engine.geometry-engine": "1.
|
|
41
|
-
"@shapediver/viewer.data-engine.html-element-anchor-engine": "1.
|
|
42
|
-
"@shapediver/viewer.data-engine.material-engine": "1.
|
|
43
|
-
"@shapediver/viewer.data-engine.sdtf-engine": "1.
|
|
44
|
-
"@shapediver/viewer.data-engine.tag3d-engine": "1.
|
|
45
|
-
"@shapediver/viewer.shared.node-tree": "1.
|
|
46
|
-
"@shapediver/viewer.shared.services": "1.
|
|
47
|
-
"@shapediver/viewer.shared.types": "1.
|
|
40
|
+
"@shapediver/viewer.data-engine.geometry-engine": "1.12.1",
|
|
41
|
+
"@shapediver/viewer.data-engine.html-element-anchor-engine": "1.12.1",
|
|
42
|
+
"@shapediver/viewer.data-engine.material-engine": "1.12.1",
|
|
43
|
+
"@shapediver/viewer.data-engine.sdtf-engine": "1.12.1",
|
|
44
|
+
"@shapediver/viewer.data-engine.tag3d-engine": "1.12.1",
|
|
45
|
+
"@shapediver/viewer.shared.node-tree": "1.12.1",
|
|
46
|
+
"@shapediver/viewer.shared.services": "1.12.1",
|
|
47
|
+
"@shapediver/viewer.shared.types": "1.12.1",
|
|
48
48
|
"gl-matrix": "3.3.0",
|
|
49
49
|
"tsyringe": "^4.5.0"
|
|
50
50
|
},
|
|
51
|
-
"gitHead": "
|
|
51
|
+
"gitHead": "a7b934141141a8bef0f74e689fef76ac27a14427"
|
|
52
52
|
}
|