@shapediver/viewer.data-engine.geometry-engine 2.12.7 → 3.0.0
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/gltfv2/loaders/BufferLoader.js +1 -1
- package/dist/gltfv2/loaders/BufferLoader.js.map +1 -1
- package/dist/gltfv2/loaders/TextureLoader.d.ts +1 -1
- package/dist/gltfv2/loaders/TextureLoader.d.ts.map +1 -1
- package/dist/gltfv2/loaders/TextureLoader.js +17 -2
- package/dist/gltfv2/loaders/TextureLoader.js.map +1 -1
- package/package.json +10 -10
- package/src/gltfv2/loaders/BufferLoader.ts +2 -2
- package/src/gltfv2/loaders/TextureLoader.ts +18 -4
|
@@ -59,7 +59,7 @@ class BufferLoader {
|
|
|
59
59
|
let data = dataUriRegexResult[3];
|
|
60
60
|
data = decodeURIComponent(data);
|
|
61
61
|
if (isBase64)
|
|
62
|
-
data =
|
|
62
|
+
data = (0, viewer_shared_services_1.atobCustom)(data);
|
|
63
63
|
const view = new Uint8Array(data.length);
|
|
64
64
|
for (let i = 0; i < data.length; i++) {
|
|
65
65
|
view[i] = data.charCodeAt(i);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BufferLoader.js","sourceRoot":"","sources":["../../../src/gltfv2/loaders/BufferLoader.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,+
|
|
1
|
+
{"version":3,"file":"BufferLoader.js","sourceRoot":"","sources":["../../../src/gltfv2/loaders/BufferLoader.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ export declare class TextureLoader {
|
|
|
9
9
|
private _loaded;
|
|
10
10
|
constructor(_content: IGLTF_v2, _bufferViewLoader: BufferViewLoader, _baseUri?: string | undefined);
|
|
11
11
|
getTexture(textureId: number): {
|
|
12
|
-
image: HTMLImageElement;
|
|
12
|
+
image: HTMLImageElement | ArrayBuffer;
|
|
13
13
|
blob: Blob;
|
|
14
14
|
};
|
|
15
15
|
load(): Promise<void>;
|
|
@@ -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,CAAC;AAGvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,qBAAa,aAAa;IAiBV,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAAY,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAAoB,OAAO,CAAC,QAAQ,CAAC;IAdxH,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiC;IAC5D,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAmC;IAE/D,OAAO,CAAC,OAAO,CAKR;gBAMsB,QAAQ,EAAE,QAAQ,EAAmB,iBAAiB,EAAE,gBAAgB,EAAU,QAAQ,CAAC,oBAAQ;IAMzH,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG;QAClC,KAAK,EAAE,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"TextureLoader.d.ts","sourceRoot":"","sources":["../../../src/gltfv2/loaders/TextureLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,6CAA6C,CAAC;AAGvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,qBAAa,aAAa;IAiBV,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAAY,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAAoB,OAAO,CAAC,QAAQ,CAAC;IAdxH,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiC;IAC5D,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAmC;IAE/D,OAAO,CAAC,OAAO,CAKR;gBAMsB,QAAQ,EAAE,QAAQ,EAAmB,iBAAiB,EAAE,gBAAgB,EAAU,QAAQ,CAAC,oBAAQ;IAMzH,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG;QAClC,KAAK,EAAE,gBAAgB,GAAG,WAAW,CAAC;QACtC,IAAI,EAAE,IAAI,CAAA;KACb;IAOY,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CA0ErC"}
|
|
@@ -75,8 +75,23 @@ class TextureLoader {
|
|
|
75
75
|
promises.push(new Promise((resolve, reject) => {
|
|
76
76
|
this._httpClient.loadTexture(url)
|
|
77
77
|
.then(response => {
|
|
78
|
-
|
|
79
|
-
|
|
78
|
+
if (typeof window !== 'undefined') {
|
|
79
|
+
viewer_shared_services_1.Converter.instance.responseToImage(response).then(img => {
|
|
80
|
+
this._loaded[textureId] = {
|
|
81
|
+
image: img,
|
|
82
|
+
blob: response.data.blob
|
|
83
|
+
};
|
|
84
|
+
resolve();
|
|
85
|
+
})
|
|
86
|
+
.catch(e => reject(e));
|
|
87
|
+
}
|
|
88
|
+
else {
|
|
89
|
+
this._loaded[textureId] = {
|
|
90
|
+
image: response.data.buffer,
|
|
91
|
+
blob: response.data.blob
|
|
92
|
+
};
|
|
93
|
+
resolve();
|
|
94
|
+
}
|
|
80
95
|
})
|
|
81
96
|
.catch(e => reject(e));
|
|
82
97
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TextureLoader.js","sourceRoot":"","sources":["../../../src/gltfv2/loaders/TextureLoader.ts"],"names":[],"mappings":"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
|
|
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": "
|
|
3
|
+
"version": "3.0.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"author": "Michael Oppitz <michael@shapediver.com>",
|
|
@@ -40,14 +40,14 @@
|
|
|
40
40
|
},
|
|
41
41
|
"dependencies": {
|
|
42
42
|
"@shapediver/sdk.geometry-api-sdk-v2": "1.8.2",
|
|
43
|
-
"@shapediver/viewer.data-engine.material-engine": "
|
|
44
|
-
"@shapediver/viewer.data-engine.shared-types": "
|
|
45
|
-
"@shapediver/viewer.rendering-engine.camera-engine": "
|
|
46
|
-
"@shapediver/viewer.rendering-engine.light-engine": "
|
|
47
|
-
"@shapediver/viewer.shared.build-data": "
|
|
48
|
-
"@shapediver/viewer.shared.node-tree": "
|
|
49
|
-
"@shapediver/viewer.shared.services": "
|
|
50
|
-
"@shapediver/viewer.shared.types": "
|
|
43
|
+
"@shapediver/viewer.data-engine.material-engine": "3.0.0",
|
|
44
|
+
"@shapediver/viewer.data-engine.shared-types": "3.0.0",
|
|
45
|
+
"@shapediver/viewer.rendering-engine.camera-engine": "3.0.0",
|
|
46
|
+
"@shapediver/viewer.rendering-engine.light-engine": "3.0.0",
|
|
47
|
+
"@shapediver/viewer.shared.build-data": "3.0.0",
|
|
48
|
+
"@shapediver/viewer.shared.node-tree": "3.0.0",
|
|
49
|
+
"@shapediver/viewer.shared.services": "3.0.0",
|
|
50
|
+
"@shapediver/viewer.shared.types": "3.0.0",
|
|
51
51
|
"axios": "^1.2.6",
|
|
52
52
|
"gl-matrix": "3.3.0"
|
|
53
53
|
},
|
|
@@ -56,5 +56,5 @@
|
|
|
56
56
|
"path": false,
|
|
57
57
|
"os": false
|
|
58
58
|
},
|
|
59
|
-
"gitHead": "
|
|
59
|
+
"gitHead": "b6b0010bf5d5652aa338df8016405d97f33fcabb"
|
|
60
60
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { IGLTF_v2 } from '@shapediver/viewer.data-engine.shared-types';
|
|
2
|
-
import { HttpClient, HttpResponse } from '@shapediver/viewer.shared.services';
|
|
2
|
+
import { HttpClient, HttpResponse, atobCustom } from '@shapediver/viewer.shared.services';
|
|
3
3
|
|
|
4
4
|
export class BufferLoader {
|
|
5
5
|
// #region Properties (2)
|
|
@@ -55,7 +55,7 @@ export class BufferLoader {
|
|
|
55
55
|
const isBase64 = !!dataUriRegexResult[2];
|
|
56
56
|
let data = dataUriRegexResult[3];
|
|
57
57
|
data = decodeURIComponent(data);
|
|
58
|
-
if (isBase64) data =
|
|
58
|
+
if (isBase64) data = atobCustom(data);
|
|
59
59
|
|
|
60
60
|
const view = new Uint8Array(data.length);
|
|
61
61
|
for (let i = 0; i < data.length; i++) {
|
|
@@ -11,7 +11,7 @@ export class TextureLoader {
|
|
|
11
11
|
|
|
12
12
|
private _loaded: {
|
|
13
13
|
[key: string]: {
|
|
14
|
-
image: HTMLImageElement,
|
|
14
|
+
image: HTMLImageElement | ArrayBuffer,
|
|
15
15
|
blob: Blob
|
|
16
16
|
}
|
|
17
17
|
} = {};
|
|
@@ -27,7 +27,7 @@ export class TextureLoader {
|
|
|
27
27
|
// #region Public Methods (2)
|
|
28
28
|
|
|
29
29
|
public getTexture(textureId: number): {
|
|
30
|
-
image: HTMLImageElement,
|
|
30
|
+
image: HTMLImageElement | ArrayBuffer,
|
|
31
31
|
blob: Blob
|
|
32
32
|
} {
|
|
33
33
|
if (!this._content.textures) throw new Error('TextureLoader.getTexture: Textures not available.');
|
|
@@ -83,8 +83,22 @@ export class TextureLoader {
|
|
|
83
83
|
new Promise<void>((resolve, reject) => {
|
|
84
84
|
this._httpClient.loadTexture(url!)
|
|
85
85
|
.then(response => {
|
|
86
|
-
|
|
87
|
-
|
|
86
|
+
if(typeof window !== 'undefined') {
|
|
87
|
+
Converter.instance.responseToImage(response).then(img => {
|
|
88
|
+
this._loaded[textureId] = {
|
|
89
|
+
image: img,
|
|
90
|
+
blob: response.data.blob
|
|
91
|
+
};
|
|
92
|
+
resolve();
|
|
93
|
+
})
|
|
94
|
+
.catch(e => reject(e));
|
|
95
|
+
} else {
|
|
96
|
+
this._loaded[textureId] = {
|
|
97
|
+
image: response.data.buffer,
|
|
98
|
+
blob: response.data.blob
|
|
99
|
+
};
|
|
100
|
+
resolve();
|
|
101
|
+
}
|
|
88
102
|
})
|
|
89
103
|
.catch(e => reject(e));
|
|
90
104
|
})
|