@loaders.gl/textures 4.4.0-alpha.17 → 4.4.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-loader.d.ts +0 -4
- package/dist/basis-loader.d.ts.map +1 -1
- package/dist/basis-loader.js +0 -1
- package/dist/basis-loader.js.map +1 -1
- package/dist/basis-worker-node.js +18 -7
- package/dist/basis-worker.js +17 -7
- package/dist/compressed-texture-loader.d.ts +0 -4
- package/dist/compressed-texture-loader.d.ts.map +1 -1
- package/dist/compressed-texture-loader.js +0 -1
- package/dist/compressed-texture-loader.js.map +1 -1
- package/dist/compressed-texture-worker.js +18 -8
- package/dist/crunch-loader.d.ts +1 -5
- package/dist/crunch-loader.d.ts.map +1 -1
- package/dist/crunch-loader.js +1 -3
- package/dist/crunch-loader.js.map +1 -1
- package/dist/crunch-worker.js +14 -6
- package/dist/dist.dev.js +222 -215
- package/dist/dist.min.js +1 -1
- package/dist/index.cjs +15 -14
- package/dist/index.cjs.map +4 -4
- package/dist/ktx2-basis-writer-worker-node.js +14 -3
- package/dist/ktx2-basis-writer-worker.js +13 -3
- package/dist/lib/encoders/encode-ktx2-basis-texture.d.ts.map +1 -1
- package/dist/lib/encoders/encode-ktx2-basis-texture.js +2 -1
- package/dist/lib/encoders/encode-ktx2-basis-texture.js.map +1 -1
- package/dist/lib/parsers/crunch-module-loader.d.ts +2 -2
- package/dist/lib/parsers/crunch-module-loader.d.ts.map +1 -1
- package/dist/lib/parsers/crunch-module-loader.js.map +1 -1
- package/dist/lib/parsers/parse-basis.d.ts +0 -1
- package/dist/lib/parsers/parse-basis.d.ts.map +1 -1
- package/dist/lib/parsers/parse-basis.js +6 -4
- package/dist/lib/parsers/parse-basis.js.map +1 -1
- package/dist/lib/parsers/parse-crunch.d.ts.map +1 -1
- package/dist/lib/parsers/parse-crunch.js +2 -1
- package/dist/lib/parsers/parse-crunch.js.map +1 -1
- package/dist/lib/utils/version.js +1 -1
- package/dist/npy-worker.js +1 -1
- package/dist/workers/crunch-worker.d.ts +1 -3
- package/dist/workers/crunch-worker.d.ts.map +1 -1
- package/package.json +6 -6
- package/src/basis-loader.ts +0 -3
- package/src/compressed-texture-loader.ts +0 -3
- package/src/crunch-loader.ts +1 -5
- package/src/lib/encoders/encode-ktx2-basis-texture.ts +2 -1
- package/src/lib/parsers/crunch-module-loader.ts +4 -4
- package/src/lib/parsers/parse-basis.ts +7 -5
- package/src/lib/parsers/parse-crunch.ts +2 -1
package/dist/basis-loader.d.ts
CHANGED
|
@@ -21,8 +21,6 @@ export type BasisLoaderOptions = LoaderOptions & {
|
|
|
21
21
|
format?: BasisTargetFormat;
|
|
22
22
|
/** What module to use for transcoding? */
|
|
23
23
|
module?: 'transcoder' | 'encoder';
|
|
24
|
-
/** @deprecated specify path of basis library */
|
|
25
|
-
libraryPath?: string;
|
|
26
24
|
};
|
|
27
25
|
};
|
|
28
26
|
/**
|
|
@@ -43,7 +41,6 @@ export declare const BasisWorkerLoader: {
|
|
|
43
41
|
readonly options: {
|
|
44
42
|
readonly basis: {
|
|
45
43
|
readonly format: "auto";
|
|
46
|
-
readonly libraryPath: "libs/";
|
|
47
44
|
readonly containerFormat: "auto";
|
|
48
45
|
readonly module: "transcoder";
|
|
49
46
|
};
|
|
@@ -68,7 +65,6 @@ export declare const BasisLoader: {
|
|
|
68
65
|
readonly options: {
|
|
69
66
|
readonly basis: {
|
|
70
67
|
readonly format: "auto";
|
|
71
|
-
readonly libraryPath: "libs/";
|
|
72
68
|
readonly containerFormat: "auto";
|
|
73
69
|
readonly module: "transcoder";
|
|
74
70
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"basis-loader.d.ts","sourceRoot":"","sources":["../src/basis-loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAS,aAAa,EAAmB,MAAM,0BAA0B,CAAC;AACtF,OAAO,KAAK,EAAC,aAAa,EAAE,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAEpE,OAAO,EAAC,UAAU,EAAC,qCAAkC;AACrD,OAAO,KAAK,EAAC,WAAW,EAAC,qCAAkC;AAE3D,KAAK,iBAAiB,GAAG,WAAW,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC;AAC9D,KAAK,iBAAiB,GAClB,MAAM,GACN,iBAAiB,GACjB;IACE,KAAK,EAAE,iBAAiB,CAAC;IACzB,OAAO,EAAE,iBAAiB,CAAC;CAC5B,CAAC;AAEN,kCAAkC;AAClC,MAAM,MAAM,kBAAkB,GAAG,aAAa,GAAG;IAC/C,kCAAkC;IAClC,KAAK,CAAC,EAAE;QACN,qIAAqI;QACrI,uBAAuB,CAAC,EAAE,aAAa,EAAE,CAAC;QAC1C,8EAA8E;QAC9E,SAAS,CAAC,EAAE,MAAM,CAAC;QAEnB,qCAAqC;QACrC,eAAe,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;QAC5C,qHAAqH;QACrH,MAAM,CAAC,EAAE,iBAAiB,CAAC;QAC3B,0CAA0C;QAC1C,MAAM,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"basis-loader.d.ts","sourceRoot":"","sources":["../src/basis-loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAS,aAAa,EAAmB,MAAM,0BAA0B,CAAC;AACtF,OAAO,KAAK,EAAC,aAAa,EAAE,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAEpE,OAAO,EAAC,UAAU,EAAC,qCAAkC;AACrD,OAAO,KAAK,EAAC,WAAW,EAAC,qCAAkC;AAE3D,KAAK,iBAAiB,GAAG,WAAW,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC;AAC9D,KAAK,iBAAiB,GAClB,MAAM,GACN,iBAAiB,GACjB;IACE,KAAK,EAAE,iBAAiB,CAAC;IACzB,OAAO,EAAE,iBAAiB,CAAC;CAC5B,CAAC;AAEN,kCAAkC;AAClC,MAAM,MAAM,kBAAkB,GAAG,aAAa,GAAG;IAC/C,kCAAkC;IAClC,KAAK,CAAC,EAAE;QACN,qIAAqI;QACrI,uBAAuB,CAAC,EAAE,aAAa,EAAE,CAAC;QAC1C,8EAA8E;QAC9E,SAAS,CAAC,EAAE,MAAM,CAAC;QAEnB,qCAAqC;QACrC,eAAe,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;QAC5C,qHAAqH;QACrH,MAAM,CAAC,EAAE,iBAAiB,CAAC;QAC3B,0CAA0C;QAC1C,MAAM,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;KACnC,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iBAAiB;uBACC,YAAY,EAAE,EAAE;wBAC1B,KAAK;;;;;;;;;;;;;;;;;CAkB8C,CAAC;AAEzE;;GAEG;AACH,eAAO,MAAM,WAAW;;uBAxBO,YAAY,EAAE,EAAE;wBAC1B,KAAK;;;;;;;;;;;;;;;;;CA0BmD,CAAC"}
|
package/dist/basis-loader.js
CHANGED
package/dist/basis-loader.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"basis-loader.js","sourceRoot":"","sources":["../src/basis-loader.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;AAIpC,OAAO,EAAC,OAAO,EAAC,+BAA4B;AAC5C,OAAO,EAAC,UAAU,EAAC,qCAAkC;
|
|
1
|
+
{"version":3,"file":"basis-loader.js","sourceRoot":"","sources":["../src/basis-loader.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;AAIpC,OAAO,EAAC,OAAO,EAAC,+BAA4B;AAC5C,OAAO,EAAC,UAAU,EAAC,qCAAkC;AA8BrD;;GAEG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,QAAQ,EAAE,IAAmC;IAC7C,SAAS,EAAE,IAAa;IAExB,IAAI,EAAE,OAAO;IACb,EAAE,EAAE,OAAO;IACX,MAAM,EAAE,UAAU;IAClB,OAAO,EAAE,OAAO;IAChB,MAAM,EAAE,IAAI;IACZ,UAAU,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC;IAC7B,SAAS,EAAE,CAAC,0BAA0B,EAAE,YAAY,CAAC;IACrD,KAAK,EAAE,CAAC,IAAI,CAAC;IACb,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE;QACP,KAAK,EAAE;YACL,MAAM,EAAE,MAAM;YACd,eAAe,EAAE,MAAM;YACvB,MAAM,EAAE,YAAY;SACrB;KACF;CACqE,CAAC;AAEzE;;GAEG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,GAAG,iBAAiB;IACpB,KAAK,EAAE,UAAU;CAC0D,CAAC"}
|
|
@@ -50494,7 +50494,7 @@ function getVersion() {
|
|
|
50494
50494
|
globalThis._loadersgl_.version = NPM_TAG;
|
|
50495
50495
|
warningIssued = true;
|
|
50496
50496
|
} else {
|
|
50497
|
-
globalThis._loadersgl_.version = "4.4.0-alpha.
|
|
50497
|
+
globalThis._loadersgl_.version = "4.4.0-alpha.18";
|
|
50498
50498
|
}
|
|
50499
50499
|
}
|
|
50500
50500
|
return globalThis._loadersgl_.version;
|
|
@@ -50656,6 +50656,17 @@ function isKnownMessage(message) {
|
|
|
50656
50656
|
|
|
50657
50657
|
// ../worker-utils/src/lib/library-utils/library-utils.ts
|
|
50658
50658
|
var loadLibraryPromises = {};
|
|
50659
|
+
function extractLoadLibraryOptions(options = {}) {
|
|
50660
|
+
var _a, _b;
|
|
50661
|
+
const useLocalLibraries = options.useLocalLibraries ?? ((_a = options.core) == null ? void 0 : _a.useLocalLibraries);
|
|
50662
|
+
const CDN = options.CDN ?? ((_b = options.core) == null ? void 0 : _b.CDN);
|
|
50663
|
+
const modules = options.modules;
|
|
50664
|
+
return {
|
|
50665
|
+
...useLocalLibraries !== void 0 ? { useLocalLibraries } : {},
|
|
50666
|
+
...CDN !== void 0 ? { CDN } : {},
|
|
50667
|
+
...modules !== void 0 ? { modules } : {}
|
|
50668
|
+
};
|
|
50669
|
+
}
|
|
50659
50670
|
async function loadLibrary(libraryUrl, moduleName = null, options = {}, libraryName = null) {
|
|
50660
50671
|
if (moduleName) {
|
|
50661
50672
|
libraryUrl = getLibraryUrl(libraryUrl, moduleName, options, libraryName);
|
|
@@ -54228,7 +54239,7 @@ if (nodeVersion2 < 18) {
|
|
|
54228
54239
|
}
|
|
54229
54240
|
|
|
54230
54241
|
// src/lib/utils/version.ts
|
|
54231
|
-
var VERSION2 = true ? "4.4.0-alpha.
|
|
54242
|
+
var VERSION2 = true ? "4.4.0-alpha.18" : "latest";
|
|
54232
54243
|
|
|
54233
54244
|
// src/lib/parsers/basis-module-loader.ts
|
|
54234
54245
|
var BASIS_EXTERNAL_LIBRARIES = {
|
|
@@ -54572,17 +54583,18 @@ var BASIS_FORMATS = Object.freeze(
|
|
|
54572
54583
|
);
|
|
54573
54584
|
async function parseBasis(data, options = {}) {
|
|
54574
54585
|
var _a;
|
|
54586
|
+
const loadLibraryOptions = extractLoadLibraryOptions(options);
|
|
54575
54587
|
if (!((_a = options.basis) == null ? void 0 : _a.containerFormat) || options.basis.containerFormat === "auto") {
|
|
54576
54588
|
if (isKTX(data)) {
|
|
54577
|
-
const fileConstructors = await loadBasisEncoderModule(
|
|
54589
|
+
const fileConstructors = await loadBasisEncoderModule(loadLibraryOptions);
|
|
54578
54590
|
return parseKTX2File(fileConstructors.KTX2File, data, options);
|
|
54579
54591
|
}
|
|
54580
|
-
const { BasisFile } = await loadBasisTranscoderModule(
|
|
54592
|
+
const { BasisFile } = await loadBasisTranscoderModule(loadLibraryOptions);
|
|
54581
54593
|
return parseBasisFile(BasisFile, data, options);
|
|
54582
54594
|
}
|
|
54583
54595
|
switch (options.basis.module) {
|
|
54584
54596
|
case "encoder":
|
|
54585
|
-
const fileConstructors = await loadBasisEncoderModule(
|
|
54597
|
+
const fileConstructors = await loadBasisEncoderModule(loadLibraryOptions);
|
|
54586
54598
|
switch (options.basis.containerFormat) {
|
|
54587
54599
|
case "ktx2":
|
|
54588
54600
|
return parseKTX2File(fileConstructors.KTX2File, data, options);
|
|
@@ -54592,7 +54604,7 @@ async function parseBasis(data, options = {}) {
|
|
|
54592
54604
|
}
|
|
54593
54605
|
case "transcoder":
|
|
54594
54606
|
default:
|
|
54595
|
-
const { BasisFile } = await loadBasisTranscoderModule(
|
|
54607
|
+
const { BasisFile } = await loadBasisTranscoderModule(loadLibraryOptions);
|
|
54596
54608
|
return parseBasisFile(BasisFile, data, options);
|
|
54597
54609
|
}
|
|
54598
54610
|
}
|
|
@@ -54796,7 +54808,6 @@ var BasisWorkerLoader = {
|
|
|
54796
54808
|
options: {
|
|
54797
54809
|
basis: {
|
|
54798
54810
|
format: "auto",
|
|
54799
|
-
libraryPath: "libs/",
|
|
54800
54811
|
containerFormat: "auto",
|
|
54801
54812
|
module: "transcoder"
|
|
54802
54813
|
}
|
package/dist/basis-worker.js
CHANGED
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
globalThis._loadersgl_.version = NPM_TAG;
|
|
23
23
|
warningIssued = true;
|
|
24
24
|
} else {
|
|
25
|
-
globalThis._loadersgl_.version = "4.4.0-alpha.
|
|
25
|
+
globalThis._loadersgl_.version = "4.4.0-alpha.18";
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
28
|
return globalThis._loadersgl_.version;
|
|
@@ -176,6 +176,16 @@
|
|
|
176
176
|
|
|
177
177
|
// ../worker-utils/src/lib/library-utils/library-utils.ts
|
|
178
178
|
var loadLibraryPromises = {};
|
|
179
|
+
function extractLoadLibraryOptions(options = {}) {
|
|
180
|
+
const useLocalLibraries = options.useLocalLibraries ?? options.core?.useLocalLibraries;
|
|
181
|
+
const CDN = options.CDN ?? options.core?.CDN;
|
|
182
|
+
const modules = options.modules;
|
|
183
|
+
return {
|
|
184
|
+
...useLocalLibraries !== void 0 ? { useLocalLibraries } : {},
|
|
185
|
+
...CDN !== void 0 ? { CDN } : {},
|
|
186
|
+
...modules !== void 0 ? { modules } : {}
|
|
187
|
+
};
|
|
188
|
+
}
|
|
179
189
|
async function loadLibrary(libraryUrl, moduleName = null, options = {}, libraryName = null) {
|
|
180
190
|
if (moduleName) {
|
|
181
191
|
libraryUrl = getLibraryUrl(libraryUrl, moduleName, options, libraryName);
|
|
@@ -372,7 +382,7 @@
|
|
|
372
382
|
}
|
|
373
383
|
|
|
374
384
|
// src/lib/utils/version.ts
|
|
375
|
-
var VERSION2 = true ? "4.4.0-alpha.
|
|
385
|
+
var VERSION2 = true ? "4.4.0-alpha.18" : "latest";
|
|
376
386
|
|
|
377
387
|
// src/lib/parsers/basis-module-loader.ts
|
|
378
388
|
var BASIS_EXTERNAL_LIBRARIES = {
|
|
@@ -715,17 +725,18 @@
|
|
|
715
725
|
Object.keys(BASIS_FORMAT_TO_OUTPUT_OPTIONS)
|
|
716
726
|
);
|
|
717
727
|
async function parseBasis(data, options = {}) {
|
|
728
|
+
const loadLibraryOptions = extractLoadLibraryOptions(options);
|
|
718
729
|
if (!options.basis?.containerFormat || options.basis.containerFormat === "auto") {
|
|
719
730
|
if (isKTX(data)) {
|
|
720
|
-
const fileConstructors = await loadBasisEncoderModule(
|
|
731
|
+
const fileConstructors = await loadBasisEncoderModule(loadLibraryOptions);
|
|
721
732
|
return parseKTX2File(fileConstructors.KTX2File, data, options);
|
|
722
733
|
}
|
|
723
|
-
const { BasisFile } = await loadBasisTranscoderModule(
|
|
734
|
+
const { BasisFile } = await loadBasisTranscoderModule(loadLibraryOptions);
|
|
724
735
|
return parseBasisFile(BasisFile, data, options);
|
|
725
736
|
}
|
|
726
737
|
switch (options.basis.module) {
|
|
727
738
|
case "encoder":
|
|
728
|
-
const fileConstructors = await loadBasisEncoderModule(
|
|
739
|
+
const fileConstructors = await loadBasisEncoderModule(loadLibraryOptions);
|
|
729
740
|
switch (options.basis.containerFormat) {
|
|
730
741
|
case "ktx2":
|
|
731
742
|
return parseKTX2File(fileConstructors.KTX2File, data, options);
|
|
@@ -735,7 +746,7 @@
|
|
|
735
746
|
}
|
|
736
747
|
case "transcoder":
|
|
737
748
|
default:
|
|
738
|
-
const { BasisFile } = await loadBasisTranscoderModule(
|
|
749
|
+
const { BasisFile } = await loadBasisTranscoderModule(loadLibraryOptions);
|
|
739
750
|
return parseBasisFile(BasisFile, data, options);
|
|
740
751
|
}
|
|
741
752
|
}
|
|
@@ -938,7 +949,6 @@
|
|
|
938
949
|
options: {
|
|
939
950
|
basis: {
|
|
940
951
|
format: "auto",
|
|
941
|
-
libraryPath: "libs/",
|
|
942
952
|
containerFormat: "auto",
|
|
943
953
|
module: "transcoder"
|
|
944
954
|
}
|
|
@@ -2,8 +2,6 @@ import type { StrictLoaderOptions } from '@loaders.gl/loader-utils';
|
|
|
2
2
|
/** Options for the CompressedTextureLoader */
|
|
3
3
|
export type CompressedTextureLoaderOptions = StrictLoaderOptions & {
|
|
4
4
|
'compressed-texture'?: {
|
|
5
|
-
/** @deprecated Specify path to libraries */
|
|
6
|
-
libraryPath?: string;
|
|
7
5
|
/** Whether to use Basis decoding */
|
|
8
6
|
useBasis?: boolean;
|
|
9
7
|
/** Override the URL to the worker bundle (by default loads from unpkg.com) */
|
|
@@ -26,7 +24,6 @@ export declare const CompressedTextureWorkerLoader: {
|
|
|
26
24
|
readonly binary: true;
|
|
27
25
|
readonly options: {
|
|
28
26
|
readonly 'compressed-texture': {
|
|
29
|
-
readonly libraryPath: "libs/";
|
|
30
27
|
readonly useBasis: false;
|
|
31
28
|
};
|
|
32
29
|
};
|
|
@@ -48,7 +45,6 @@ export declare const CompressedTextureLoader: {
|
|
|
48
45
|
readonly binary: true;
|
|
49
46
|
readonly options: {
|
|
50
47
|
readonly 'compressed-texture': {
|
|
51
|
-
readonly libraryPath: "libs/";
|
|
52
48
|
readonly useBasis: false;
|
|
53
49
|
};
|
|
54
50
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compressed-texture-loader.d.ts","sourceRoot":"","sources":["../src/compressed-texture-loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAA2B,mBAAmB,EAAC,MAAM,0BAA0B,CAAC;AAK5F,8CAA8C;AAC9C,MAAM,MAAM,8BAA8B,GAAG,mBAAmB,GAAG;IACjE,oBAAoB,CAAC,EAAE;QACrB,
|
|
1
|
+
{"version":3,"file":"compressed-texture-loader.d.ts","sourceRoot":"","sources":["../src/compressed-texture-loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAA2B,mBAAmB,EAAC,MAAM,0BAA0B,CAAC;AAK5F,8CAA8C;AAC9C,MAAM,MAAM,8BAA8B,GAAG,mBAAmB,GAAG;IACjE,oBAAoB,CAAC,EAAE;QACrB,oCAAoC;QACpC,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,8EAA8E;QAC9E,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,6BAA6B;uBACX,GAAG;wBACb,KAAK;;;;;;;;;;;;;;CA0B6C,CAAC;AAExE;;GAEG;AACH,eAAO,MAAM,uBAAuB;kCAEP,WAAW,YAAY,8BAA8B;uBAlCnD,GAAG;wBACb,KAAK;;;;;;;;;;;;;;CAkDuD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compressed-texture-loader.js","sourceRoot":"","sources":["../src/compressed-texture-loader.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;AAGpC,OAAO,EAAC,OAAO,EAAC,+BAA4B;AAC5C,OAAO,EAAC,sBAAsB,EAAC,kDAA+C;AAC9E,OAAO,EAAC,UAAU,EAAC,qCAAkC;
|
|
1
|
+
{"version":3,"file":"compressed-texture-loader.js","sourceRoot":"","sources":["../src/compressed-texture-loader.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;AAGpC,OAAO,EAAC,OAAO,EAAC,+BAA4B;AAC5C,OAAO,EAAC,sBAAsB,EAAC,kDAA+C;AAC9E,OAAO,EAAC,UAAU,EAAC,qCAAkC;AAYrD;;GAEG;AACH,MAAM,CAAC,MAAM,6BAA6B,GAAG;IAC3C,QAAQ,EAAE,IAAsB;IAChC,SAAS,EAAE,IAAa;IAExB,IAAI,EAAE,oBAAoB;IAC1B,EAAE,EAAE,oBAAoB;IACxB,MAAM,EAAE,UAAU;IAClB,OAAO,EAAE,OAAO;IAChB,MAAM,EAAE,IAAI;IACZ,UAAU,EAAE;QACV,KAAK;QACL,MAAM;QACN,KAAK,EAAE,8DAA8D;QACrE,KAAK,CAAC,iCAAiC;KACxC;IACD,SAAS,EAAE;QACT,YAAY;QACZ,WAAW;QACX,kBAAkB;QAClB,aAAa;QACb,0BAA0B;KAC3B;IACD,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE;QACP,oBAAoB,EAAE;YACpB,QAAQ,EAAE,KAAK;SAChB;KACF;CACoE,CAAC;AAExE;;GAEG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACrC,GAAG,6BAA6B;IAChC,KAAK,EAAE,KAAK,EAAE,WAAwB,EAAE,OAAwC,EAAE,EAAE;QAClF,OAAO,GAAG,EAAC,GAAG,OAAO,EAAC,CAAC;QACvB,IAAI,OAAO,EAAE,CAAC,oBAAoB,CAAC,EAAE,QAAQ,EAAE,CAAC;YAC9C,OAAO,CAAC,KAAK,GAAG;gBACd,MAAM,EAAE;oBACN,KAAK,EAAE,KAAK;oBACZ,OAAO,EAAE,KAAK;iBACf;gBACD,GAAG,OAAO,CAAC,KAAK;gBAChB,eAAe,EAAE,MAAM;gBACvB,MAAM,EAAE,SAAS;aAClB,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;YACtD,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;QACnB,CAAC;QACD,OAAO,sBAAsB,CAAC,WAAW,CAAC,CAAC;IAC7C,CAAC;CAC8E,CAAC"}
|
|
@@ -529,7 +529,7 @@
|
|
|
529
529
|
var dist_default = new ProbeLog({ id: "@probe.gl/log" });
|
|
530
530
|
|
|
531
531
|
// ../loader-utils/src/lib/log-utils/log.ts
|
|
532
|
-
var VERSION2 = true ? "4.4.0-alpha.
|
|
532
|
+
var VERSION2 = true ? "4.4.0-alpha.18" : "latest";
|
|
533
533
|
var version = VERSION2[0] >= "0" && VERSION2[0] <= "9" ? `v${VERSION2}` : "";
|
|
534
534
|
function createLog() {
|
|
535
535
|
const log2 = new ProbeLog({ id: "loaders.gl" });
|
|
@@ -564,7 +564,7 @@
|
|
|
564
564
|
globalThis._loadersgl_.version = NPM_TAG;
|
|
565
565
|
warningIssued = true;
|
|
566
566
|
} else {
|
|
567
|
-
globalThis._loadersgl_.version = "4.4.0-alpha.
|
|
567
|
+
globalThis._loadersgl_.version = "4.4.0-alpha.18";
|
|
568
568
|
}
|
|
569
569
|
}
|
|
570
570
|
return globalThis._loadersgl_.version;
|
|
@@ -718,6 +718,16 @@
|
|
|
718
718
|
|
|
719
719
|
// ../worker-utils/src/lib/library-utils/library-utils.ts
|
|
720
720
|
var loadLibraryPromises = {};
|
|
721
|
+
function extractLoadLibraryOptions(options = {}) {
|
|
722
|
+
const useLocalLibraries = options.useLocalLibraries ?? options.core?.useLocalLibraries;
|
|
723
|
+
const CDN = options.CDN ?? options.core?.CDN;
|
|
724
|
+
const modules = options.modules;
|
|
725
|
+
return {
|
|
726
|
+
...useLocalLibraries !== void 0 ? { useLocalLibraries } : {},
|
|
727
|
+
...CDN !== void 0 ? { CDN } : {},
|
|
728
|
+
...modules !== void 0 ? { modules } : {}
|
|
729
|
+
};
|
|
730
|
+
}
|
|
721
731
|
async function loadLibrary(libraryUrl, moduleName = null, options = {}, libraryName = null) {
|
|
722
732
|
if (moduleName) {
|
|
723
733
|
libraryUrl = getLibraryUrl(libraryUrl, moduleName, options, libraryName);
|
|
@@ -914,7 +924,7 @@
|
|
|
914
924
|
}
|
|
915
925
|
|
|
916
926
|
// src/lib/utils/version.ts
|
|
917
|
-
var VERSION4 = true ? "4.4.0-alpha.
|
|
927
|
+
var VERSION4 = true ? "4.4.0-alpha.18" : "latest";
|
|
918
928
|
|
|
919
929
|
// ../../node_modules/ktx-parse/dist/ktx-parse.modern.js
|
|
920
930
|
var KHR_SUPERCOMPRESSION_NONE = 0;
|
|
@@ -2007,17 +2017,18 @@
|
|
|
2007
2017
|
Object.keys(BASIS_FORMAT_TO_OUTPUT_OPTIONS)
|
|
2008
2018
|
);
|
|
2009
2019
|
async function parseBasis(data, options = {}) {
|
|
2020
|
+
const loadLibraryOptions = extractLoadLibraryOptions(options);
|
|
2010
2021
|
if (!options.basis?.containerFormat || options.basis.containerFormat === "auto") {
|
|
2011
2022
|
if (isKTX(data)) {
|
|
2012
|
-
const fileConstructors = await loadBasisEncoderModule(
|
|
2023
|
+
const fileConstructors = await loadBasisEncoderModule(loadLibraryOptions);
|
|
2013
2024
|
return parseKTX2File(fileConstructors.KTX2File, data, options);
|
|
2014
2025
|
}
|
|
2015
|
-
const { BasisFile } = await loadBasisTranscoderModule(
|
|
2026
|
+
const { BasisFile } = await loadBasisTranscoderModule(loadLibraryOptions);
|
|
2016
2027
|
return parseBasisFile(BasisFile, data, options);
|
|
2017
2028
|
}
|
|
2018
2029
|
switch (options.basis.module) {
|
|
2019
2030
|
case "encoder":
|
|
2020
|
-
const fileConstructors = await loadBasisEncoderModule(
|
|
2031
|
+
const fileConstructors = await loadBasisEncoderModule(loadLibraryOptions);
|
|
2021
2032
|
switch (options.basis.containerFormat) {
|
|
2022
2033
|
case "ktx2":
|
|
2023
2034
|
return parseKTX2File(fileConstructors.KTX2File, data, options);
|
|
@@ -2027,7 +2038,7 @@
|
|
|
2027
2038
|
}
|
|
2028
2039
|
case "transcoder":
|
|
2029
2040
|
default:
|
|
2030
|
-
const { BasisFile } = await loadBasisTranscoderModule(
|
|
2041
|
+
const { BasisFile } = await loadBasisTranscoderModule(loadLibraryOptions);
|
|
2031
2042
|
return parseBasisFile(BasisFile, data, options);
|
|
2032
2043
|
}
|
|
2033
2044
|
}
|
|
@@ -2241,7 +2252,6 @@
|
|
|
2241
2252
|
binary: true,
|
|
2242
2253
|
options: {
|
|
2243
2254
|
"compressed-texture": {
|
|
2244
|
-
libraryPath: "libs/",
|
|
2245
2255
|
useBasis: false
|
|
2246
2256
|
}
|
|
2247
2257
|
}
|
package/dist/crunch-loader.d.ts
CHANGED
|
@@ -4,8 +4,6 @@ import type { TextureLevel } from '@loaders.gl/schema';
|
|
|
4
4
|
export type CrunchLoaderOptions = LoaderOptions & {
|
|
5
5
|
/** CrunchLoader options */
|
|
6
6
|
crunch?: {
|
|
7
|
-
/** @deprecated Specify where to load the Crunch decoder library */
|
|
8
|
-
libraryPath?: string;
|
|
9
7
|
/** Override the URL to the worker bundle (by default loads from unpkg.com) */
|
|
10
8
|
workerUrl?: string;
|
|
11
9
|
};
|
|
@@ -26,9 +24,7 @@ export declare const CrunchLoader: {
|
|
|
26
24
|
readonly mimeTypes: ["image/crn", "image/x-crn", "application/octet-stream"];
|
|
27
25
|
readonly binary: true;
|
|
28
26
|
readonly options: {
|
|
29
|
-
readonly crunch: {
|
|
30
|
-
readonly libraryPath: "libs/";
|
|
31
|
-
};
|
|
27
|
+
readonly crunch: {};
|
|
32
28
|
};
|
|
33
29
|
};
|
|
34
30
|
//# sourceMappingURL=crunch-loader.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crunch-loader.d.ts","sourceRoot":"","sources":["../src/crunch-loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAS,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACpE,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAGrD,2BAA2B;AAC3B,MAAM,MAAM,mBAAmB,GAAG,aAAa,GAAG;IAChD,2BAA2B;IAC3B,MAAM,CAAC,EAAE;QACP,
|
|
1
|
+
{"version":3,"file":"crunch-loader.d.ts","sourceRoot":"","sources":["../src/crunch-loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAS,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACpE,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAGrD,2BAA2B;AAC3B,MAAM,MAAM,mBAAmB,GAAG,aAAa,GAAG;IAChD,2BAA2B;IAC3B,MAAM,CAAC,EAAE;QACP,8EAA8E;QAC9E,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;CACH,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,YAAY;uBACM,YAAY,EAAE;wBACxB,KAAK;;;;;;;;;;;;CAa6C,CAAC"}
|
package/dist/crunch-loader.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crunch-loader.js","sourceRoot":"","sources":["../src/crunch-loader.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;AAIpC,OAAO,EAAC,OAAO,EAAC,+BAA4B;
|
|
1
|
+
{"version":3,"file":"crunch-loader.js","sourceRoot":"","sources":["../src/crunch-loader.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;AAIpC,OAAO,EAAC,OAAO,EAAC,+BAA4B;AAW5C;;;GAGG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,QAAQ,EAAE,IAAiC;IAC3C,SAAS,EAAE,IAAa;IAExB,EAAE,EAAE,QAAQ;IACZ,IAAI,EAAE,QAAQ;IACd,MAAM,EAAE,UAAU;IAClB,OAAO,EAAE,OAAO;IAChB,MAAM,EAAE,IAAI;IACZ,UAAU,EAAE,CAAC,KAAK,CAAC;IACnB,SAAS,EAAE,CAAC,WAAW,EAAE,aAAa,EAAE,0BAA0B,CAAC;IACnE,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE;QACP,MAAM,EAAE,EAAE;KACX;CACoE,CAAC"}
|
package/dist/crunch-worker.js
CHANGED
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
globalThis._loadersgl_.version = NPM_TAG;
|
|
30
30
|
warningIssued = true;
|
|
31
31
|
} else {
|
|
32
|
-
globalThis._loadersgl_.version = "4.4.0-alpha.
|
|
32
|
+
globalThis._loadersgl_.version = "4.4.0-alpha.18";
|
|
33
33
|
}
|
|
34
34
|
}
|
|
35
35
|
return globalThis._loadersgl_.version;
|
|
@@ -183,6 +183,16 @@
|
|
|
183
183
|
|
|
184
184
|
// ../worker-utils/src/lib/library-utils/library-utils.ts
|
|
185
185
|
var loadLibraryPromises = {};
|
|
186
|
+
function extractLoadLibraryOptions(options = {}) {
|
|
187
|
+
const useLocalLibraries = options.useLocalLibraries ?? options.core?.useLocalLibraries;
|
|
188
|
+
const CDN = options.CDN ?? options.core?.CDN;
|
|
189
|
+
const modules = options.modules;
|
|
190
|
+
return {
|
|
191
|
+
...useLocalLibraries !== void 0 ? { useLocalLibraries } : {},
|
|
192
|
+
...CDN !== void 0 ? { CDN } : {},
|
|
193
|
+
...modules !== void 0 ? { modules } : {}
|
|
194
|
+
};
|
|
195
|
+
}
|
|
186
196
|
async function loadLibrary(libraryUrl, moduleName = null, options = {}, libraryName = null) {
|
|
187
197
|
if (moduleName) {
|
|
188
198
|
libraryUrl = getLibraryUrl(libraryUrl, moduleName, options, libraryName);
|
|
@@ -379,7 +389,7 @@
|
|
|
379
389
|
}
|
|
380
390
|
|
|
381
391
|
// src/lib/utils/version.ts
|
|
382
|
-
var VERSION2 = true ? "4.4.0-alpha.
|
|
392
|
+
var VERSION2 = true ? "4.4.0-alpha.18" : "latest";
|
|
383
393
|
|
|
384
394
|
// src/crunch-loader.ts
|
|
385
395
|
var CrunchLoader = {
|
|
@@ -394,9 +404,7 @@
|
|
|
394
404
|
mimeTypes: ["image/crn", "image/x-crn", "application/octet-stream"],
|
|
395
405
|
binary: true,
|
|
396
406
|
options: {
|
|
397
|
-
crunch: {
|
|
398
|
-
libraryPath: "libs/"
|
|
399
|
-
}
|
|
407
|
+
crunch: {}
|
|
400
408
|
}
|
|
401
409
|
};
|
|
402
410
|
|
|
@@ -631,7 +639,7 @@
|
|
|
631
639
|
var cachedDstSize = 0;
|
|
632
640
|
var dst;
|
|
633
641
|
async function parseCrunch(data, options) {
|
|
634
|
-
const crunchModule2 = await loadCrunchModule(options);
|
|
642
|
+
const crunchModule2 = await loadCrunchModule(extractLoadLibraryOptions(options));
|
|
635
643
|
const srcSize = data.byteLength;
|
|
636
644
|
const bytes = new Uint8Array(data);
|
|
637
645
|
const src = crunchModule2._malloc(srcSize);
|