@shapediver/viewer.data-engine.geometry-engine 1.15.4 → 1.15.7
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.
|
@@ -6,7 +6,6 @@ export declare class TextureLoader {
|
|
|
6
6
|
private _baseUri?;
|
|
7
7
|
private readonly _converter;
|
|
8
8
|
private readonly _httpClient;
|
|
9
|
-
private _loadData;
|
|
10
9
|
private _loaded;
|
|
11
10
|
constructor(_content: IGLTF_v2, _bufferViewLoader: BufferViewLoader, _baseUri?: string | undefined);
|
|
12
11
|
getTexture(textureId: number): HTMLImageElement;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TextureLoader.d.ts","sourceRoot":"","sources":["../../../src/gltfv2/loaders/TextureLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,6CAA6C,CAAA;AAItE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAErD,qBAAa,aAAa;
|
|
1
|
+
{"version":3,"file":"TextureLoader.d.ts","sourceRoot":"","sources":["../../../src/gltfv2/loaders/TextureLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,6CAA6C,CAAA;AAItE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAErD,qBAAa,aAAa;IAcV,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAAY,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAAoB,OAAO,CAAC,QAAQ,CAAC;IAXxH,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAsD;IACjF,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAyD;IAErF,OAAO,CAAC,OAAO,CAER;gBAMsB,QAAQ,EAAE,QAAQ,EAAmB,iBAAiB,EAAE,gBAAgB,EAAU,QAAQ,CAAC,oBAAQ;IAMzH,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,gBAAgB;IAOzC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAsDrC"}
|
|
@@ -22,7 +22,6 @@ class TextureLoader {
|
|
|
22
22
|
// #region Properties (4)
|
|
23
23
|
this._converter = tsyringe_1.container.resolve(viewer_shared_services_1.Converter);
|
|
24
24
|
this._httpClient = tsyringe_1.container.resolve(viewer_shared_services_1.HttpClient);
|
|
25
|
-
this._loadData = this._httpClient.loadData.bind(this._httpClient);
|
|
26
25
|
this._loaded = {};
|
|
27
26
|
}
|
|
28
27
|
// #endregion Constructors (1)
|
|
@@ -58,7 +57,7 @@ class TextureLoader {
|
|
|
58
57
|
const blob = new Blob([new Uint8Array(array)], { type: image.mimeType });
|
|
59
58
|
const dataUri = window.URL.createObjectURL(blob);
|
|
60
59
|
promises.push(new Promise(resolve => {
|
|
61
|
-
this.
|
|
60
|
+
this._httpClient.loadTexture(dataUri)
|
|
62
61
|
.then(response => {
|
|
63
62
|
this._converter.responseToImage(response).then(img => {
|
|
64
63
|
this._loaded[textureId] = img;
|
|
@@ -70,7 +69,7 @@ class TextureLoader {
|
|
|
70
69
|
else {
|
|
71
70
|
const url = DATA_URI_REGEX.test(image.uri) || HTTPS_URI_REGEX.test(image.uri) ? image.uri : `${this._baseUri}/${image.uri}`;
|
|
72
71
|
promises.push(new Promise(resolve => {
|
|
73
|
-
this.
|
|
72
|
+
this._httpClient.loadTexture(url)
|
|
74
73
|
.then(response => {
|
|
75
74
|
this._converter.responseToImage(response).then(img => {
|
|
76
75
|
this._loaded[textureId] = img;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TextureLoader.js","sourceRoot":"","sources":["../../../src/gltfv2/loaders/TextureLoader.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,+EAAwF;AACxF,uCAAoC;AAIpC,MAAa,aAAa;
|
|
1
|
+
{"version":3,"file":"TextureLoader.js","sourceRoot":"","sources":["../../../src/gltfv2/loaders/TextureLoader.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shapediver/viewer.data-engine.geometry-engine",
|
|
3
|
-
"version": "1.15.
|
|
3
|
+
"version": "1.15.7",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"author": "Michael Oppitz <michael@shapediver.com>",
|
|
@@ -36,15 +36,15 @@
|
|
|
36
36
|
"testEnvironment": "node"
|
|
37
37
|
},
|
|
38
38
|
"dependencies": {
|
|
39
|
-
"@shapediver/sdk.geometry-api-sdk-v2": "^1.0.
|
|
40
|
-
"@shapediver/viewer.data-engine.material-engine": "1.15.
|
|
41
|
-
"@shapediver/viewer.data-engine.shared-types": "1.15.
|
|
42
|
-
"@shapediver/viewer.rendering-engine.camera-engine": "1.15.
|
|
43
|
-
"@shapediver/viewer.rendering-engine.light-engine": "1.15.
|
|
44
|
-
"@shapediver/viewer.shared.build-data": "1.15.
|
|
45
|
-
"@shapediver/viewer.shared.node-tree": "1.15.
|
|
46
|
-
"@shapediver/viewer.shared.services": "1.15.
|
|
47
|
-
"@shapediver/viewer.shared.types": "1.15.
|
|
39
|
+
"@shapediver/sdk.geometry-api-sdk-v2": "^1.0.24",
|
|
40
|
+
"@shapediver/viewer.data-engine.material-engine": "1.15.7",
|
|
41
|
+
"@shapediver/viewer.data-engine.shared-types": "1.15.7",
|
|
42
|
+
"@shapediver/viewer.rendering-engine.camera-engine": "1.15.7",
|
|
43
|
+
"@shapediver/viewer.rendering-engine.light-engine": "1.15.7",
|
|
44
|
+
"@shapediver/viewer.shared.build-data": "1.15.7",
|
|
45
|
+
"@shapediver/viewer.shared.node-tree": "1.15.7",
|
|
46
|
+
"@shapediver/viewer.shared.services": "1.15.7",
|
|
47
|
+
"@shapediver/viewer.shared.types": "1.15.7",
|
|
48
48
|
"axios": "^0.21.1",
|
|
49
49
|
"gl-matrix": "3.3.0",
|
|
50
50
|
"tsyringe": "^4.5.0"
|
|
@@ -54,5 +54,5 @@
|
|
|
54
54
|
"path": false,
|
|
55
55
|
"os": false
|
|
56
56
|
},
|
|
57
|
-
"gitHead": "
|
|
57
|
+
"gitHead": "2b597ac1cf5808ace220b88a91b37c7852663785"
|
|
58
58
|
}
|