@shapediver/viewer.data-engine.data-engine 1.8.14 → 1.10.5
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 +5 -3
- package/dist/DataEngine.d.ts.map +1 -1
- package/dist/DataEngine.js +18 -16
- package/dist/DataEngine.js.map +1 -1
- package/package.json +11 -11
package/dist/DataEngine.d.ts
CHANGED
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
import { TreeNode } from '@shapediver/viewer.shared.node-tree';
|
|
2
|
-
import {
|
|
2
|
+
import { ShapeDiverResponseOutputContent } from '@shapediver/sdk.geometry-api-sdk-v2';
|
|
3
3
|
export declare class DataEngine {
|
|
4
4
|
private readonly _geometryEngine;
|
|
5
5
|
private readonly _htmlElementAnchorEngine;
|
|
6
|
+
private readonly _httpClient;
|
|
7
|
+
private readonly _logger;
|
|
6
8
|
private readonly _materialEngine;
|
|
7
9
|
private readonly _sdtfEngine;
|
|
8
10
|
private readonly _tag3dEngine;
|
|
9
|
-
private
|
|
10
|
-
loadContent(content:
|
|
11
|
+
private _loadData;
|
|
12
|
+
loadContent(content: ShapeDiverResponseOutputContent, loadData?: (img: string) => Promise<Blob>): Promise<TreeNode>;
|
|
11
13
|
}
|
|
12
14
|
//# sourceMappingURL=DataEngine.d.ts.map
|
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;
|
|
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,CAAoF;IAMxF,WAAW,CAAC,OAAO,EAAE,+BAA+B,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC;CA4DnI"}
|
package/dist/DataEngine.js
CHANGED
|
@@ -30,16 +30,24 @@ let DataEngine = class DataEngine {
|
|
|
30
30
|
constructor() {
|
|
31
31
|
this._geometryEngine = tsyringe_1.container.resolve(viewer_data_engine_geometry_engine_1.GeometryEngine);
|
|
32
32
|
this._htmlElementAnchorEngine = tsyringe_1.container.resolve(viewer_data_engine_html_element_anchor_engine_1.HTMLElementAnchorEngine);
|
|
33
|
+
this._httpClient = tsyringe_1.container.resolve(viewer_shared_services_1.HttpClient);
|
|
34
|
+
this._logger = tsyringe_1.container.resolve(viewer_shared_services_1.Logger);
|
|
33
35
|
this._materialEngine = tsyringe_1.container.resolve(viewer_data_engine_material_engine_1.MaterialEngine);
|
|
34
36
|
this._sdtfEngine = tsyringe_1.container.resolve(viewer_data_engine_sdtf_engine_1.SDTFEngine);
|
|
35
37
|
this._tag3dEngine = tsyringe_1.container.resolve(viewer_data_engine_tag3d_engine_1.Tag3dEngine);
|
|
36
|
-
this.
|
|
38
|
+
this._loadData = this._httpClient.loadData.bind(this._httpClient);
|
|
37
39
|
}
|
|
38
|
-
loadContent(content) {
|
|
40
|
+
loadContent(content, loadData) {
|
|
39
41
|
return __awaiter(this, void 0, void 0, function* () {
|
|
42
|
+
if (loadData) {
|
|
43
|
+
this._loadData = loadData;
|
|
44
|
+
}
|
|
45
|
+
else {
|
|
46
|
+
this._loadData = this._httpClient.loadData.bind(this._httpClient);
|
|
47
|
+
}
|
|
40
48
|
if (!content || (content && !content.format)) {
|
|
41
|
-
|
|
42
|
-
|
|
49
|
+
const error = new viewer_shared_services_1.ShapeDiverViewerDataProcessingError('DataEngine cannot load content.');
|
|
50
|
+
throw this._logger.handleError(viewer_shared_services_1.LOGGINGTOPIC.DATAPROCESSING, `DataEngine.loadContent`, error);
|
|
43
51
|
}
|
|
44
52
|
try {
|
|
45
53
|
const transformations = [];
|
|
@@ -54,27 +62,27 @@ let DataEngine = class DataEngine {
|
|
|
54
62
|
}
|
|
55
63
|
}
|
|
56
64
|
if (content.format === 'glb' || content.format === 'gltf') {
|
|
57
|
-
const node = yield this._geometryEngine.loadContent(content);
|
|
65
|
+
const node = yield this._geometryEngine.loadContent(content, this._loadData);
|
|
58
66
|
node.transformations = transformations.concat(node.transformations);
|
|
59
67
|
return node;
|
|
60
68
|
}
|
|
61
69
|
else if (content.format === 'material') {
|
|
62
|
-
const node = yield this._materialEngine.loadContent(content);
|
|
70
|
+
const node = yield this._materialEngine.loadContent(content, this._loadData);
|
|
63
71
|
node.transformations = transformations.concat(node.transformations);
|
|
64
72
|
return node;
|
|
65
73
|
}
|
|
66
74
|
else if (content.format === 'tag2d' || content.format === 'anchor') {
|
|
67
|
-
const node = yield this._htmlElementAnchorEngine.loadContent(content);
|
|
75
|
+
const node = yield this._htmlElementAnchorEngine.loadContent(content, this._loadData);
|
|
68
76
|
node.transformations = transformations.concat(node.transformations);
|
|
69
77
|
return node;
|
|
70
78
|
}
|
|
71
79
|
else if (content.format === 'tag3d') {
|
|
72
|
-
const node = yield this._tag3dEngine.loadContent(content);
|
|
80
|
+
const node = yield this._tag3dEngine.loadContent(content, this._loadData);
|
|
73
81
|
node.transformations = transformations.concat(node.transformations);
|
|
74
82
|
return node;
|
|
75
83
|
}
|
|
76
84
|
else if (content.format === 'sdtf') {
|
|
77
|
-
const node = yield this._sdtfEngine.loadContent(content);
|
|
85
|
+
const node = yield this._sdtfEngine.loadContent(content, this._loadData);
|
|
78
86
|
node.transformations = transformations.concat(node.transformations);
|
|
79
87
|
return node;
|
|
80
88
|
}
|
|
@@ -86,13 +94,7 @@ let DataEngine = class DataEngine {
|
|
|
86
94
|
}
|
|
87
95
|
}
|
|
88
96
|
catch (e) {
|
|
89
|
-
|
|
90
|
-
this._logger.httpError(viewer_shared_services_1.LOGGINGTOPIC.DATAPROCESSING, e, `DataEngine.loadContent: An error occurred while loading the ${content.format}. ${e.message}`, e.response.status, false);
|
|
91
|
-
}
|
|
92
|
-
else {
|
|
93
|
-
this._logger.error(viewer_shared_services_1.LOGGINGTOPIC.DATAPROCESSING, e, `DataEngine.loadContent: An error occurred while loading the ${content.format}. ${e.message}`, false);
|
|
94
|
-
}
|
|
95
|
-
return new viewer_shared_node_tree_1.TreeNode();
|
|
97
|
+
throw this._logger.handleError(viewer_shared_services_1.LOGGINGTOPIC.DATAPROCESSING, `DataEngine.loadContent`, e);
|
|
96
98
|
}
|
|
97
99
|
});
|
|
98
100
|
}
|
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,+
|
|
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.10.5",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"author": "Michael Oppitz <michael@shapediver.com>",
|
|
@@ -36,17 +36,17 @@
|
|
|
36
36
|
"testEnvironment": "node"
|
|
37
37
|
},
|
|
38
38
|
"dependencies": {
|
|
39
|
-
"@shapediver/
|
|
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.
|
|
39
|
+
"@shapediver/sdk.geometry-api-sdk-v2": "^1.0.11",
|
|
40
|
+
"@shapediver/viewer.data-engine.geometry-engine": "^1.10.5",
|
|
41
|
+
"@shapediver/viewer.data-engine.html-element-anchor-engine": "^1.10.5",
|
|
42
|
+
"@shapediver/viewer.data-engine.material-engine": "^1.10.5",
|
|
43
|
+
"@shapediver/viewer.data-engine.sdtf-engine": "^1.10.5",
|
|
44
|
+
"@shapediver/viewer.data-engine.tag3d-engine": "^1.10.5",
|
|
45
|
+
"@shapediver/viewer.shared.node-tree": "^1.10.5",
|
|
46
|
+
"@shapediver/viewer.shared.services": "^1.10.5",
|
|
47
|
+
"@shapediver/viewer.shared.types": "^1.10.5",
|
|
48
48
|
"gl-matrix": "3.3.0",
|
|
49
49
|
"tsyringe": "^4.5.0"
|
|
50
50
|
},
|
|
51
|
-
"gitHead": "
|
|
51
|
+
"gitHead": "7222c8f2b99331a3e8b40a91ff1dc87f16a82176"
|
|
52
52
|
}
|