@loaders.gl/textures 4.0.0-alpha.16 → 4.0.0-alpha.18
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/basis-worker-node.js +47 -52
- package/dist/basis-worker.js +26 -14
- package/dist/compressed-texture-worker.js +26 -14
- package/dist/crunch-worker.js +18 -6
- package/dist/dist.min.js +23 -11
- package/dist/es5/lib/parsers/basis-module-loader.js +15 -15
- package/dist/es5/lib/parsers/basis-module-loader.js.map +1 -1
- package/dist/es5/lib/parsers/parse-basis.js +7 -7
- package/dist/es5/lib/parsers/parse-basis.js.map +1 -1
- package/dist/es5/lib/texture-api/deep-load.js.map +1 -1
- package/dist/es5/lib/utils/version.js +1 -1
- package/dist/esm/lib/parsers/basis-module-loader.js +6 -6
- package/dist/esm/lib/parsers/basis-module-loader.js.map +1 -1
- package/dist/esm/lib/parsers/parse-basis.js +3 -3
- package/dist/esm/lib/parsers/parse-basis.js.map +1 -1
- package/dist/esm/lib/texture-api/deep-load.js.map +1 -1
- package/dist/esm/lib/utils/version.js +1 -1
- package/dist/ktx2-basis-writer-worker-node.js +40 -45
- package/dist/ktx2-basis-writer-worker.js +19 -7
- package/dist/lib/parsers/basis-module-loader.d.ts +1 -1
- package/dist/lib/parsers/basis-module-loader.d.ts.map +1 -1
- package/dist/lib/parsers/basis-module-loader.js +7 -7
- package/dist/lib/parsers/parse-basis.js +2 -2
- package/dist/lib/texture-api/deep-load.d.ts.map +1 -1
- package/dist/lib/texture-api/deep-load.js +0 -1
- package/dist/npy-worker.js +1 -1
- package/package.json +7 -7
- package/src/lib/parsers/basis-module-loader.ts +5 -5
- package/src/lib/parsers/parse-basis.ts +3 -3
- package/src/lib/texture-api/deep-load.ts +0 -1
|
@@ -62939,48 +62939,12 @@ var Response = class {
|
|
|
62939
62939
|
// ../polyfills/src/node/fetch/fetch.node.ts
|
|
62940
62940
|
var import_http = __toModule(require("http"));
|
|
62941
62941
|
var import_https = __toModule(require("https"));
|
|
62942
|
-
|
|
62943
|
-
// ../polyfills/src/node/fetch/fetch-file.node.ts
|
|
62944
|
-
var import_fs = __toModule(require("fs"));
|
|
62945
|
-
async function fetchFileNode(url, options) {
|
|
62946
|
-
const noqueryUrl = url.split("?")[0];
|
|
62947
|
-
try {
|
|
62948
|
-
const body = await new Promise((resolve, reject) => {
|
|
62949
|
-
const stream = import_fs.default.createReadStream(noqueryUrl, { encoding: null });
|
|
62950
|
-
stream.once("readable", () => resolve(stream));
|
|
62951
|
-
stream.on("error", (error) => reject(error));
|
|
62952
|
-
});
|
|
62953
|
-
const status = 200;
|
|
62954
|
-
const statusText = "OK";
|
|
62955
|
-
const headers = getHeadersForFile(noqueryUrl);
|
|
62956
|
-
return new Response(body, { headers, status, statusText, url });
|
|
62957
|
-
} catch (error) {
|
|
62958
|
-
const status = 400;
|
|
62959
|
-
const statusText = error.message;
|
|
62960
|
-
const headers = {};
|
|
62961
|
-
return new Response(error.message, { headers, status, statusText, url });
|
|
62962
|
-
}
|
|
62963
|
-
}
|
|
62964
|
-
function getHeadersForFile(noqueryUrl) {
|
|
62965
|
-
const headers = {};
|
|
62966
|
-
if (!headers["content-length"]) {
|
|
62967
|
-
const stats = import_fs.default.statSync(noqueryUrl);
|
|
62968
|
-
headers["content-length"] = stats.size;
|
|
62969
|
-
}
|
|
62970
|
-
if (noqueryUrl.endsWith(".gz")) {
|
|
62971
|
-
noqueryUrl = noqueryUrl.slice(0, -3);
|
|
62972
|
-
headers["content-encoding"] = "gzip";
|
|
62973
|
-
}
|
|
62974
|
-
return new Headers(headers);
|
|
62975
|
-
}
|
|
62976
|
-
|
|
62977
|
-
// ../polyfills/src/node/fetch/fetch.node.ts
|
|
62978
62942
|
var isDataURL = (url) => url.startsWith("data:");
|
|
62979
62943
|
var isRequestURL = (url) => url.startsWith("http:") || url.startsWith("https:");
|
|
62980
62944
|
async function fetchNode(url, options) {
|
|
62981
62945
|
try {
|
|
62982
|
-
if (
|
|
62983
|
-
return await
|
|
62946
|
+
if (globalThis.fetch !== fetchNode && (isRequestURL(url) || isDataURL(url))) {
|
|
62947
|
+
return await fetch(url, options);
|
|
62984
62948
|
}
|
|
62985
62949
|
if (isDataURL(url)) {
|
|
62986
62950
|
const { arrayBuffer, mimeType } = decodeDataUri(url);
|
|
@@ -63338,7 +63302,7 @@ if (!("allSettled" in Promise)) {
|
|
|
63338
63302
|
}
|
|
63339
63303
|
|
|
63340
63304
|
// ../worker-utils/src/lib/env-utils/version.ts
|
|
63341
|
-
var VERSION = true ? "4.0.0-alpha.
|
|
63305
|
+
var VERSION = true ? "4.0.0-alpha.18" : DEFAULT_VERSION;
|
|
63342
63306
|
if (false) {
|
|
63343
63307
|
console.error("loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.");
|
|
63344
63308
|
}
|
|
@@ -63479,11 +63443,30 @@ function isKnownMessage(message) {
|
|
|
63479
63443
|
// ../worker-utils/src/lib/node/require-utils.node.ts
|
|
63480
63444
|
var require_utils_node_exports = {};
|
|
63481
63445
|
__export(require_utils_node_exports, {
|
|
63446
|
+
readFileAsArrayBuffer: () => readFileAsArrayBuffer,
|
|
63447
|
+
readFileAsText: () => readFileAsText,
|
|
63482
63448
|
requireFromFile: () => requireFromFile,
|
|
63483
63449
|
requireFromString: () => requireFromString
|
|
63484
63450
|
});
|
|
63485
63451
|
var import_module = __toModule(require("module"));
|
|
63486
63452
|
var import_path = __toModule(require("path"));
|
|
63453
|
+
var import_fs = __toModule(require("fs"));
|
|
63454
|
+
async function readFileAsArrayBuffer(filename) {
|
|
63455
|
+
if (filename.startsWith("http")) {
|
|
63456
|
+
const response = await fetch(filename);
|
|
63457
|
+
return await response.arrayBuffer();
|
|
63458
|
+
}
|
|
63459
|
+
const buffer = import_fs.default.readFileSync(filename);
|
|
63460
|
+
return buffer.buffer;
|
|
63461
|
+
}
|
|
63462
|
+
async function readFileAsText(filename) {
|
|
63463
|
+
if (filename.startsWith("http")) {
|
|
63464
|
+
const response = await fetch(filename);
|
|
63465
|
+
return await response.text();
|
|
63466
|
+
}
|
|
63467
|
+
const text = import_fs.default.readFileSync(filename, "utf8");
|
|
63468
|
+
return text;
|
|
63469
|
+
}
|
|
63487
63470
|
async function requireFromFile(filename) {
|
|
63488
63471
|
if (filename.startsWith("http")) {
|
|
63489
63472
|
const response = await fetch(filename);
|
|
@@ -63548,8 +63531,7 @@ function getLibraryUrl(library, moduleName, options) {
|
|
|
63548
63531
|
}
|
|
63549
63532
|
async function loadLibraryFromFile(libraryUrl) {
|
|
63550
63533
|
if (libraryUrl.endsWith("wasm")) {
|
|
63551
|
-
|
|
63552
|
-
return await response2.arrayBuffer();
|
|
63534
|
+
return await loadAsArrayBuffer(libraryUrl);
|
|
63553
63535
|
}
|
|
63554
63536
|
if (!isBrowser2) {
|
|
63555
63537
|
try {
|
|
@@ -63561,8 +63543,7 @@ async function loadLibraryFromFile(libraryUrl) {
|
|
|
63561
63543
|
if (isWorker) {
|
|
63562
63544
|
return importScripts(libraryUrl);
|
|
63563
63545
|
}
|
|
63564
|
-
const
|
|
63565
|
-
const scriptSource = await response.text();
|
|
63546
|
+
const scriptSource = await loadAsText(libraryUrl);
|
|
63566
63547
|
return loadLibraryFromString(scriptSource, libraryUrl);
|
|
63567
63548
|
}
|
|
63568
63549
|
function loadLibraryFromString(scriptSource, id) {
|
|
@@ -63583,6 +63564,20 @@ function loadLibraryFromString(scriptSource, id) {
|
|
|
63583
63564
|
document.body.appendChild(script);
|
|
63584
63565
|
return null;
|
|
63585
63566
|
}
|
|
63567
|
+
async function loadAsArrayBuffer(url) {
|
|
63568
|
+
if (!readFileAsArrayBuffer || url.startsWith("http")) {
|
|
63569
|
+
const response = await fetch(url);
|
|
63570
|
+
return await response.arrayBuffer();
|
|
63571
|
+
}
|
|
63572
|
+
return await readFileAsArrayBuffer(url);
|
|
63573
|
+
}
|
|
63574
|
+
async function loadAsText(url) {
|
|
63575
|
+
if (!readFileAsText || url.startsWith("http")) {
|
|
63576
|
+
const response = await fetch(url);
|
|
63577
|
+
return await response.text();
|
|
63578
|
+
}
|
|
63579
|
+
return await readFileAsText(url);
|
|
63580
|
+
}
|
|
63586
63581
|
|
|
63587
63582
|
// ../loader-utils/src/lib/worker-loader-utils/create-loader-worker.ts
|
|
63588
63583
|
var requestId = 0;
|
|
@@ -63658,22 +63653,22 @@ async function parseData({ loader, arrayBuffer, options, context }) {
|
|
|
63658
63653
|
}
|
|
63659
63654
|
|
|
63660
63655
|
// src/lib/utils/version.ts
|
|
63661
|
-
var VERSION3 = true ? "4.0.0-alpha.
|
|
63656
|
+
var VERSION3 = true ? "4.0.0-alpha.18" : "beta";
|
|
63662
63657
|
|
|
63663
63658
|
// src/lib/parsers/basis-module-loader.ts
|
|
63664
|
-
var VERSION4 = true ? "4.0.0-alpha.
|
|
63659
|
+
var VERSION4 = true ? "4.0.0-alpha.18" : "beta";
|
|
63665
63660
|
var BASIS_CDN_ENCODER_WASM = `https://unpkg.com/@loaders.gl/textures@${VERSION4}/dist/libs/basis_encoder.wasm`;
|
|
63666
63661
|
var BASIS_CDN_ENCODER_JS = `https://unpkg.com/@loaders.gl/textures@${VERSION4}/dist/libs/basis_encoder.js`;
|
|
63667
63662
|
var loadBasisTranscoderPromise;
|
|
63668
|
-
async function
|
|
63663
|
+
async function loadBasisTranscoderModule(options) {
|
|
63669
63664
|
const modules = options.modules || {};
|
|
63670
63665
|
if (modules.basis) {
|
|
63671
63666
|
return modules.basis;
|
|
63672
63667
|
}
|
|
63673
|
-
loadBasisTranscoderPromise = loadBasisTranscoderPromise ||
|
|
63668
|
+
loadBasisTranscoderPromise = loadBasisTranscoderPromise || loadBasisTranscoder(options);
|
|
63674
63669
|
return await loadBasisTranscoderPromise;
|
|
63675
63670
|
}
|
|
63676
|
-
async function
|
|
63671
|
+
async function loadBasisTranscoder(options) {
|
|
63677
63672
|
let BASIS = null;
|
|
63678
63673
|
let wasmBinary = null;
|
|
63679
63674
|
[BASIS, wasmBinary] = await Promise.all([
|
|
@@ -63681,9 +63676,9 @@ async function loadBasisTrascoder(options) {
|
|
|
63681
63676
|
await loadLibrary("basis_transcoder.wasm", "textures", options)
|
|
63682
63677
|
]);
|
|
63683
63678
|
BASIS = BASIS || globalThis.BASIS;
|
|
63684
|
-
return await
|
|
63679
|
+
return await initializeBasisTranscoderModule(BASIS, wasmBinary);
|
|
63685
63680
|
}
|
|
63686
|
-
function
|
|
63681
|
+
function initializeBasisTranscoderModule(BasisModule, wasmBinary) {
|
|
63687
63682
|
const options = {};
|
|
63688
63683
|
if (wasmBinary) {
|
|
63689
63684
|
options.wasmBinary = wasmBinary;
|
|
@@ -63900,7 +63895,7 @@ async function parseBasis(data, options) {
|
|
|
63900
63895
|
const fileConstructors = await loadBasisEncoderModule(options);
|
|
63901
63896
|
return parseKTX2File(fileConstructors.KTX2File, data, options);
|
|
63902
63897
|
}
|
|
63903
|
-
const { BasisFile } = await
|
|
63898
|
+
const { BasisFile } = await loadBasisTranscoderModule(options);
|
|
63904
63899
|
return parseBasisFile(BasisFile, data, options);
|
|
63905
63900
|
}
|
|
63906
63901
|
switch (options.basis.module) {
|
|
@@ -63915,7 +63910,7 @@ async function parseBasis(data, options) {
|
|
|
63915
63910
|
}
|
|
63916
63911
|
case "transcoder":
|
|
63917
63912
|
default:
|
|
63918
|
-
const { BasisFile } = await
|
|
63913
|
+
const { BasisFile } = await loadBasisTranscoderModule(options);
|
|
63919
63914
|
return parseBasisFile(BasisFile, data, options);
|
|
63920
63915
|
}
|
|
63921
63916
|
}
|
package/dist/basis-worker.js
CHANGED
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
});
|
|
29
29
|
|
|
30
30
|
// ../worker-utils/src/lib/env-utils/version.ts
|
|
31
|
-
var VERSION = true ? "4.0.0-alpha.
|
|
31
|
+
var VERSION = true ? "4.0.0-alpha.18" : DEFAULT_VERSION;
|
|
32
32
|
if (false) {
|
|
33
33
|
console.error("loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.");
|
|
34
34
|
}
|
|
@@ -200,8 +200,7 @@
|
|
|
200
200
|
}
|
|
201
201
|
async function loadLibraryFromFile(libraryUrl) {
|
|
202
202
|
if (libraryUrl.endsWith("wasm")) {
|
|
203
|
-
|
|
204
|
-
return await response2.arrayBuffer();
|
|
203
|
+
return await loadAsArrayBuffer(libraryUrl);
|
|
205
204
|
}
|
|
206
205
|
if (!isBrowser) {
|
|
207
206
|
try {
|
|
@@ -213,8 +212,7 @@
|
|
|
213
212
|
if (isWorker) {
|
|
214
213
|
return importScripts(libraryUrl);
|
|
215
214
|
}
|
|
216
|
-
const
|
|
217
|
-
const scriptSource = await response.text();
|
|
215
|
+
const scriptSource = await loadAsText(libraryUrl);
|
|
218
216
|
return loadLibraryFromString(scriptSource, libraryUrl);
|
|
219
217
|
}
|
|
220
218
|
function loadLibraryFromString(scriptSource, id) {
|
|
@@ -235,6 +233,20 @@
|
|
|
235
233
|
document.body.appendChild(script);
|
|
236
234
|
return null;
|
|
237
235
|
}
|
|
236
|
+
async function loadAsArrayBuffer(url) {
|
|
237
|
+
if (!node.readFileAsArrayBuffer || url.startsWith("http")) {
|
|
238
|
+
const response = await fetch(url);
|
|
239
|
+
return await response.arrayBuffer();
|
|
240
|
+
}
|
|
241
|
+
return await node.readFileAsArrayBuffer(url);
|
|
242
|
+
}
|
|
243
|
+
async function loadAsText(url) {
|
|
244
|
+
if (!node.readFileAsText || url.startsWith("http")) {
|
|
245
|
+
const response = await fetch(url);
|
|
246
|
+
return await response.text();
|
|
247
|
+
}
|
|
248
|
+
return await node.readFileAsText(url);
|
|
249
|
+
}
|
|
238
250
|
|
|
239
251
|
// ../loader-utils/src/lib/worker-loader-utils/create-loader-worker.ts
|
|
240
252
|
var requestId = 0;
|
|
@@ -312,22 +324,22 @@
|
|
|
312
324
|
}
|
|
313
325
|
|
|
314
326
|
// src/lib/utils/version.ts
|
|
315
|
-
var VERSION3 = true ? "4.0.0-alpha.
|
|
327
|
+
var VERSION3 = true ? "4.0.0-alpha.18" : "beta";
|
|
316
328
|
|
|
317
329
|
// src/lib/parsers/basis-module-loader.ts
|
|
318
|
-
var VERSION4 = true ? "4.0.0-alpha.
|
|
330
|
+
var VERSION4 = true ? "4.0.0-alpha.18" : "beta";
|
|
319
331
|
var BASIS_CDN_ENCODER_WASM = `https://unpkg.com/@loaders.gl/textures@${VERSION4}/dist/libs/basis_encoder.wasm`;
|
|
320
332
|
var BASIS_CDN_ENCODER_JS = `https://unpkg.com/@loaders.gl/textures@${VERSION4}/dist/libs/basis_encoder.js`;
|
|
321
333
|
var loadBasisTranscoderPromise;
|
|
322
|
-
async function
|
|
334
|
+
async function loadBasisTranscoderModule(options) {
|
|
323
335
|
const modules = options.modules || {};
|
|
324
336
|
if (modules.basis) {
|
|
325
337
|
return modules.basis;
|
|
326
338
|
}
|
|
327
|
-
loadBasisTranscoderPromise = loadBasisTranscoderPromise ||
|
|
339
|
+
loadBasisTranscoderPromise = loadBasisTranscoderPromise || loadBasisTranscoder(options);
|
|
328
340
|
return await loadBasisTranscoderPromise;
|
|
329
341
|
}
|
|
330
|
-
async function
|
|
342
|
+
async function loadBasisTranscoder(options) {
|
|
331
343
|
let BASIS = null;
|
|
332
344
|
let wasmBinary = null;
|
|
333
345
|
[BASIS, wasmBinary] = await Promise.all([
|
|
@@ -335,9 +347,9 @@
|
|
|
335
347
|
await loadLibrary("basis_transcoder.wasm", "textures", options)
|
|
336
348
|
]);
|
|
337
349
|
BASIS = BASIS || globalThis.BASIS;
|
|
338
|
-
return await
|
|
350
|
+
return await initializeBasisTranscoderModule(BASIS, wasmBinary);
|
|
339
351
|
}
|
|
340
|
-
function
|
|
352
|
+
function initializeBasisTranscoderModule(BasisModule, wasmBinary) {
|
|
341
353
|
const options = {};
|
|
342
354
|
if (wasmBinary) {
|
|
343
355
|
options.wasmBinary = wasmBinary;
|
|
@@ -581,7 +593,7 @@
|
|
|
581
593
|
const fileConstructors = await loadBasisEncoderModule(options);
|
|
582
594
|
return parseKTX2File(fileConstructors.KTX2File, data, options);
|
|
583
595
|
}
|
|
584
|
-
const { BasisFile } = await
|
|
596
|
+
const { BasisFile } = await loadBasisTranscoderModule(options);
|
|
585
597
|
return parseBasisFile(BasisFile, data, options);
|
|
586
598
|
}
|
|
587
599
|
switch (options.basis.module) {
|
|
@@ -596,7 +608,7 @@
|
|
|
596
608
|
}
|
|
597
609
|
case "transcoder":
|
|
598
610
|
default:
|
|
599
|
-
const { BasisFile } = await
|
|
611
|
+
const { BasisFile } = await loadBasisTranscoderModule(options);
|
|
600
612
|
return parseBasisFile(BasisFile, data, options);
|
|
601
613
|
}
|
|
602
614
|
}
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
}
|
|
36
36
|
|
|
37
37
|
// ../worker-utils/src/lib/env-utils/version.ts
|
|
38
|
-
var VERSION = true ? "4.0.0-alpha.
|
|
38
|
+
var VERSION = true ? "4.0.0-alpha.18" : DEFAULT_VERSION;
|
|
39
39
|
if (false) {
|
|
40
40
|
console.error("loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.");
|
|
41
41
|
}
|
|
@@ -207,8 +207,7 @@
|
|
|
207
207
|
}
|
|
208
208
|
async function loadLibraryFromFile(libraryUrl) {
|
|
209
209
|
if (libraryUrl.endsWith("wasm")) {
|
|
210
|
-
|
|
211
|
-
return await response2.arrayBuffer();
|
|
210
|
+
return await loadAsArrayBuffer(libraryUrl);
|
|
212
211
|
}
|
|
213
212
|
if (!isBrowser) {
|
|
214
213
|
try {
|
|
@@ -220,8 +219,7 @@
|
|
|
220
219
|
if (isWorker) {
|
|
221
220
|
return importScripts(libraryUrl);
|
|
222
221
|
}
|
|
223
|
-
const
|
|
224
|
-
const scriptSource = await response.text();
|
|
222
|
+
const scriptSource = await loadAsText(libraryUrl);
|
|
225
223
|
return loadLibraryFromString(scriptSource, libraryUrl);
|
|
226
224
|
}
|
|
227
225
|
function loadLibraryFromString(scriptSource, id) {
|
|
@@ -242,6 +240,20 @@
|
|
|
242
240
|
document.body.appendChild(script);
|
|
243
241
|
return null;
|
|
244
242
|
}
|
|
243
|
+
async function loadAsArrayBuffer(url) {
|
|
244
|
+
if (!node.readFileAsArrayBuffer || url.startsWith("http")) {
|
|
245
|
+
const response = await fetch(url);
|
|
246
|
+
return await response.arrayBuffer();
|
|
247
|
+
}
|
|
248
|
+
return await node.readFileAsArrayBuffer(url);
|
|
249
|
+
}
|
|
250
|
+
async function loadAsText(url) {
|
|
251
|
+
if (!node.readFileAsText || url.startsWith("http")) {
|
|
252
|
+
const response = await fetch(url);
|
|
253
|
+
return await response.text();
|
|
254
|
+
}
|
|
255
|
+
return await node.readFileAsText(url);
|
|
256
|
+
}
|
|
245
257
|
|
|
246
258
|
// ../loader-utils/src/lib/worker-loader-utils/create-loader-worker.ts
|
|
247
259
|
var requestId = 0;
|
|
@@ -319,7 +331,7 @@
|
|
|
319
331
|
}
|
|
320
332
|
|
|
321
333
|
// src/lib/utils/version.ts
|
|
322
|
-
var VERSION3 = true ? "4.0.0-alpha.
|
|
334
|
+
var VERSION3 = true ? "4.0.0-alpha.18" : "beta";
|
|
323
335
|
|
|
324
336
|
// ../../node_modules/ktx-parse/dist/ktx-parse.modern.js
|
|
325
337
|
var t = new Uint8Array([0]);
|
|
@@ -907,19 +919,19 @@
|
|
|
907
919
|
}
|
|
908
920
|
|
|
909
921
|
// src/lib/parsers/basis-module-loader.ts
|
|
910
|
-
var VERSION4 = true ? "4.0.0-alpha.
|
|
922
|
+
var VERSION4 = true ? "4.0.0-alpha.18" : "beta";
|
|
911
923
|
var BASIS_CDN_ENCODER_WASM = `https://unpkg.com/@loaders.gl/textures@${VERSION4}/dist/libs/basis_encoder.wasm`;
|
|
912
924
|
var BASIS_CDN_ENCODER_JS = `https://unpkg.com/@loaders.gl/textures@${VERSION4}/dist/libs/basis_encoder.js`;
|
|
913
925
|
var loadBasisTranscoderPromise;
|
|
914
|
-
async function
|
|
926
|
+
async function loadBasisTranscoderModule(options) {
|
|
915
927
|
const modules = options.modules || {};
|
|
916
928
|
if (modules.basis) {
|
|
917
929
|
return modules.basis;
|
|
918
930
|
}
|
|
919
|
-
loadBasisTranscoderPromise = loadBasisTranscoderPromise ||
|
|
931
|
+
loadBasisTranscoderPromise = loadBasisTranscoderPromise || loadBasisTranscoder(options);
|
|
920
932
|
return await loadBasisTranscoderPromise;
|
|
921
933
|
}
|
|
922
|
-
async function
|
|
934
|
+
async function loadBasisTranscoder(options) {
|
|
923
935
|
let BASIS = null;
|
|
924
936
|
let wasmBinary = null;
|
|
925
937
|
[BASIS, wasmBinary] = await Promise.all([
|
|
@@ -927,9 +939,9 @@
|
|
|
927
939
|
await loadLibrary("basis_transcoder.wasm", "textures", options)
|
|
928
940
|
]);
|
|
929
941
|
BASIS = BASIS || globalThis.BASIS;
|
|
930
|
-
return await
|
|
942
|
+
return await initializeBasisTranscoderModule(BASIS, wasmBinary);
|
|
931
943
|
}
|
|
932
|
-
function
|
|
944
|
+
function initializeBasisTranscoderModule(BasisModule, wasmBinary) {
|
|
933
945
|
const options = {};
|
|
934
946
|
if (wasmBinary) {
|
|
935
947
|
options.wasmBinary = wasmBinary;
|
|
@@ -1062,7 +1074,7 @@
|
|
|
1062
1074
|
const fileConstructors = await loadBasisEncoderModule(options);
|
|
1063
1075
|
return parseKTX2File(fileConstructors.KTX2File, data, options);
|
|
1064
1076
|
}
|
|
1065
|
-
const { BasisFile } = await
|
|
1077
|
+
const { BasisFile } = await loadBasisTranscoderModule(options);
|
|
1066
1078
|
return parseBasisFile(BasisFile, data, options);
|
|
1067
1079
|
}
|
|
1068
1080
|
switch (options.basis.module) {
|
|
@@ -1077,7 +1089,7 @@
|
|
|
1077
1089
|
}
|
|
1078
1090
|
case "transcoder":
|
|
1079
1091
|
default:
|
|
1080
|
-
const { BasisFile } = await
|
|
1092
|
+
const { BasisFile } = await loadBasisTranscoderModule(options);
|
|
1081
1093
|
return parseBasisFile(BasisFile, data, options);
|
|
1082
1094
|
}
|
|
1083
1095
|
}
|
package/dist/crunch-worker.js
CHANGED
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
}
|
|
36
36
|
|
|
37
37
|
// ../worker-utils/src/lib/env-utils/version.ts
|
|
38
|
-
var VERSION = true ? "4.0.0-alpha.
|
|
38
|
+
var VERSION = true ? "4.0.0-alpha.18" : DEFAULT_VERSION;
|
|
39
39
|
if (false) {
|
|
40
40
|
console.error("loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.");
|
|
41
41
|
}
|
|
@@ -207,8 +207,7 @@
|
|
|
207
207
|
}
|
|
208
208
|
async function loadLibraryFromFile(libraryUrl) {
|
|
209
209
|
if (libraryUrl.endsWith("wasm")) {
|
|
210
|
-
|
|
211
|
-
return await response2.arrayBuffer();
|
|
210
|
+
return await loadAsArrayBuffer(libraryUrl);
|
|
212
211
|
}
|
|
213
212
|
if (!isBrowser) {
|
|
214
213
|
try {
|
|
@@ -220,8 +219,7 @@
|
|
|
220
219
|
if (isWorker) {
|
|
221
220
|
return importScripts(libraryUrl);
|
|
222
221
|
}
|
|
223
|
-
const
|
|
224
|
-
const scriptSource = await response.text();
|
|
222
|
+
const scriptSource = await loadAsText(libraryUrl);
|
|
225
223
|
return loadLibraryFromString(scriptSource, libraryUrl);
|
|
226
224
|
}
|
|
227
225
|
function loadLibraryFromString(scriptSource, id) {
|
|
@@ -242,6 +240,20 @@
|
|
|
242
240
|
document.body.appendChild(script);
|
|
243
241
|
return null;
|
|
244
242
|
}
|
|
243
|
+
async function loadAsArrayBuffer(url) {
|
|
244
|
+
if (!node.readFileAsArrayBuffer || url.startsWith("http")) {
|
|
245
|
+
const response = await fetch(url);
|
|
246
|
+
return await response.arrayBuffer();
|
|
247
|
+
}
|
|
248
|
+
return await node.readFileAsArrayBuffer(url);
|
|
249
|
+
}
|
|
250
|
+
async function loadAsText(url) {
|
|
251
|
+
if (!node.readFileAsText || url.startsWith("http")) {
|
|
252
|
+
const response = await fetch(url);
|
|
253
|
+
return await response.text();
|
|
254
|
+
}
|
|
255
|
+
return await node.readFileAsText(url);
|
|
256
|
+
}
|
|
245
257
|
|
|
246
258
|
// ../loader-utils/src/lib/worker-loader-utils/create-loader-worker.ts
|
|
247
259
|
var requestId = 0;
|
|
@@ -319,7 +331,7 @@
|
|
|
319
331
|
}
|
|
320
332
|
|
|
321
333
|
// src/lib/utils/version.ts
|
|
322
|
-
var VERSION3 = true ? "4.0.0-alpha.
|
|
334
|
+
var VERSION3 = true ? "4.0.0-alpha.18" : "beta";
|
|
323
335
|
|
|
324
336
|
// src/crunch-loader.ts
|
|
325
337
|
var CrunchLoader = {
|
package/dist/dist.min.js
CHANGED
|
@@ -118,8 +118,7 @@
|
|
|
118
118
|
}
|
|
119
119
|
async function loadLibraryFromFile(libraryUrl) {
|
|
120
120
|
if (libraryUrl.endsWith("wasm")) {
|
|
121
|
-
|
|
122
|
-
return await response2.arrayBuffer();
|
|
121
|
+
return await loadAsArrayBuffer(libraryUrl);
|
|
123
122
|
}
|
|
124
123
|
if (!isBrowser) {
|
|
125
124
|
try {
|
|
@@ -131,8 +130,7 @@
|
|
|
131
130
|
if (isWorker) {
|
|
132
131
|
return importScripts(libraryUrl);
|
|
133
132
|
}
|
|
134
|
-
const
|
|
135
|
-
const scriptSource = await response.text();
|
|
133
|
+
const scriptSource = await loadAsText(libraryUrl);
|
|
136
134
|
return loadLibraryFromString(scriptSource, libraryUrl);
|
|
137
135
|
}
|
|
138
136
|
function loadLibraryFromString(scriptSource, id) {
|
|
@@ -153,6 +151,20 @@
|
|
|
153
151
|
document.body.appendChild(script);
|
|
154
152
|
return null;
|
|
155
153
|
}
|
|
154
|
+
async function loadAsArrayBuffer(url) {
|
|
155
|
+
if (!node.readFileAsArrayBuffer || url.startsWith("http")) {
|
|
156
|
+
const response = await fetch(url);
|
|
157
|
+
return await response.arrayBuffer();
|
|
158
|
+
}
|
|
159
|
+
return await node.readFileAsArrayBuffer(url);
|
|
160
|
+
}
|
|
161
|
+
async function loadAsText(url) {
|
|
162
|
+
if (!node.readFileAsText || url.startsWith("http")) {
|
|
163
|
+
const response = await fetch(url);
|
|
164
|
+
return await response.text();
|
|
165
|
+
}
|
|
166
|
+
return await node.readFileAsText(url);
|
|
167
|
+
}
|
|
156
168
|
var node, LATEST, VERSION3, loadLibraryPromises;
|
|
157
169
|
var init_library_utils = __esm({
|
|
158
170
|
"../worker-utils/src/lib/library-utils/library-utils.ts"() {
|
|
@@ -181,15 +193,15 @@
|
|
|
181
193
|
});
|
|
182
194
|
|
|
183
195
|
// src/lib/parsers/basis-module-loader.ts
|
|
184
|
-
async function
|
|
196
|
+
async function loadBasisTranscoderModule(options) {
|
|
185
197
|
const modules = options.modules || {};
|
|
186
198
|
if (modules.basis) {
|
|
187
199
|
return modules.basis;
|
|
188
200
|
}
|
|
189
|
-
loadBasisTranscoderPromise = loadBasisTranscoderPromise ||
|
|
201
|
+
loadBasisTranscoderPromise = loadBasisTranscoderPromise || loadBasisTranscoder(options);
|
|
190
202
|
return await loadBasisTranscoderPromise;
|
|
191
203
|
}
|
|
192
|
-
async function
|
|
204
|
+
async function loadBasisTranscoder(options) {
|
|
193
205
|
let BASIS = null;
|
|
194
206
|
let wasmBinary = null;
|
|
195
207
|
[BASIS, wasmBinary] = await Promise.all([
|
|
@@ -197,9 +209,9 @@
|
|
|
197
209
|
await loadLibrary("basis_transcoder.wasm", "textures", options)
|
|
198
210
|
]);
|
|
199
211
|
BASIS = BASIS || globalThis.BASIS;
|
|
200
|
-
return await
|
|
212
|
+
return await initializeBasisTranscoderModule(BASIS, wasmBinary);
|
|
201
213
|
}
|
|
202
|
-
function
|
|
214
|
+
function initializeBasisTranscoderModule(BasisModule, wasmBinary) {
|
|
203
215
|
const options = {};
|
|
204
216
|
if (wasmBinary) {
|
|
205
217
|
options.wasmBinary = wasmBinary;
|
|
@@ -625,7 +637,7 @@
|
|
|
625
637
|
const fileConstructors = await loadBasisEncoderModule(options);
|
|
626
638
|
return parseKTX2File(fileConstructors.KTX2File, data, options);
|
|
627
639
|
}
|
|
628
|
-
const { BasisFile } = await
|
|
640
|
+
const { BasisFile } = await loadBasisTranscoderModule(options);
|
|
629
641
|
return parseBasisFile(BasisFile, data, options);
|
|
630
642
|
}
|
|
631
643
|
switch (options.basis.module) {
|
|
@@ -640,7 +652,7 @@
|
|
|
640
652
|
}
|
|
641
653
|
case "transcoder":
|
|
642
654
|
default:
|
|
643
|
-
const { BasisFile } = await
|
|
655
|
+
const { BasisFile } = await loadBasisTranscoderModule(options);
|
|
644
656
|
return parseBasisFile(BasisFile, data, options);
|
|
645
657
|
}
|
|
646
658
|
}
|
|
@@ -5,20 +5,20 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
7
|
exports.loadBasisEncoderModule = loadBasisEncoderModule;
|
|
8
|
-
exports.
|
|
8
|
+
exports.loadBasisTranscoderModule = loadBasisTranscoderModule;
|
|
9
9
|
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
10
10
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
11
11
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
12
12
|
var _workerUtils = require("@loaders.gl/worker-utils");
|
|
13
|
-
var VERSION = typeof "4.0.0-alpha.
|
|
13
|
+
var VERSION = typeof "4.0.0-alpha.18" !== 'undefined' ? "4.0.0-alpha.18" : 'beta';
|
|
14
14
|
var BASIS_CDN_ENCODER_WASM = "https://unpkg.com/@loaders.gl/textures@".concat(VERSION, "/dist/libs/basis_encoder.wasm");
|
|
15
15
|
var BASIS_CDN_ENCODER_JS = "https://unpkg.com/@loaders.gl/textures@".concat(VERSION, "/dist/libs/basis_encoder.js");
|
|
16
16
|
var loadBasisTranscoderPromise;
|
|
17
|
-
function
|
|
18
|
-
return
|
|
17
|
+
function loadBasisTranscoderModule(_x) {
|
|
18
|
+
return _loadBasisTranscoderModule.apply(this, arguments);
|
|
19
19
|
}
|
|
20
|
-
function
|
|
21
|
-
|
|
20
|
+
function _loadBasisTranscoderModule() {
|
|
21
|
+
_loadBasisTranscoderModule = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(options) {
|
|
22
22
|
var modules;
|
|
23
23
|
return _regenerator.default.wrap(function _callee$(_context) {
|
|
24
24
|
while (1) switch (_context.prev = _context.next) {
|
|
@@ -30,7 +30,7 @@ function _loadBasisTrascoderModule() {
|
|
|
30
30
|
}
|
|
31
31
|
return _context.abrupt("return", modules.basis);
|
|
32
32
|
case 3:
|
|
33
|
-
loadBasisTranscoderPromise = loadBasisTranscoderPromise ||
|
|
33
|
+
loadBasisTranscoderPromise = loadBasisTranscoderPromise || loadBasisTranscoder(options);
|
|
34
34
|
_context.next = 6;
|
|
35
35
|
return loadBasisTranscoderPromise;
|
|
36
36
|
case 6:
|
|
@@ -41,13 +41,13 @@ function _loadBasisTrascoderModule() {
|
|
|
41
41
|
}
|
|
42
42
|
}, _callee);
|
|
43
43
|
}));
|
|
44
|
-
return
|
|
44
|
+
return _loadBasisTranscoderModule.apply(this, arguments);
|
|
45
45
|
}
|
|
46
|
-
function
|
|
47
|
-
return
|
|
46
|
+
function loadBasisTranscoder(_x2) {
|
|
47
|
+
return _loadBasisTranscoder.apply(this, arguments);
|
|
48
48
|
}
|
|
49
|
-
function
|
|
50
|
-
|
|
49
|
+
function _loadBasisTranscoder() {
|
|
50
|
+
_loadBasisTranscoder = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2(options) {
|
|
51
51
|
var BASIS, wasmBinary, _yield$Promise$all, _yield$Promise$all2;
|
|
52
52
|
return _regenerator.default.wrap(function _callee2$(_context2) {
|
|
53
53
|
while (1) switch (_context2.prev = _context2.next) {
|
|
@@ -73,7 +73,7 @@ function _loadBasisTrascoder() {
|
|
|
73
73
|
wasmBinary = _yield$Promise$all2[1];
|
|
74
74
|
BASIS = BASIS || globalThis.BASIS;
|
|
75
75
|
_context2.next = 19;
|
|
76
|
-
return
|
|
76
|
+
return initializeBasisTranscoderModule(BASIS, wasmBinary);
|
|
77
77
|
case 19:
|
|
78
78
|
return _context2.abrupt("return", _context2.sent);
|
|
79
79
|
case 20:
|
|
@@ -82,9 +82,9 @@ function _loadBasisTrascoder() {
|
|
|
82
82
|
}
|
|
83
83
|
}, _callee2);
|
|
84
84
|
}));
|
|
85
|
-
return
|
|
85
|
+
return _loadBasisTranscoder.apply(this, arguments);
|
|
86
86
|
}
|
|
87
|
-
function
|
|
87
|
+
function initializeBasisTranscoderModule(BasisModule, wasmBinary) {
|
|
88
88
|
var options = {};
|
|
89
89
|
if (wasmBinary) {
|
|
90
90
|
options.wasmBinary = wasmBinary;
|