@loaders.gl/textures 4.0.0-alpha.22 → 4.0.0-alpha.23
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 +2 -2
- package/dist/basis-worker.js +2 -2
- package/dist/compressed-texture-loader.d.ts +2 -35
- package/dist/compressed-texture-loader.d.ts.map +1 -1
- package/dist/compressed-texture-loader.js +12 -13
- package/dist/compressed-texture-worker.js +11 -11
- package/dist/crunch-loader.d.ts +1 -16
- package/dist/crunch-loader.d.ts.map +1 -1
- package/dist/crunch-loader.js +1 -3
- package/dist/crunch-worker.js +2 -2
- package/dist/dist.min.js +10 -10
- package/dist/es5/compressed-texture-loader.js +15 -17
- package/dist/es5/compressed-texture-loader.js.map +1 -1
- package/dist/es5/crunch-loader.js +1 -3
- package/dist/es5/crunch-loader.js.map +1 -1
- package/dist/es5/lib/utils/version.js +1 -1
- package/dist/es5/workers/compressed-texture-worker.js.map +1 -1
- package/dist/esm/compressed-texture-loader.js +10 -11
- package/dist/esm/compressed-texture-loader.js.map +1 -1
- package/dist/esm/crunch-loader.js +0 -1
- package/dist/esm/crunch-loader.js.map +1 -1
- package/dist/esm/lib/utils/version.js +1 -1
- package/dist/esm/workers/compressed-texture-worker.js.map +1 -1
- package/dist/ktx2-basis-writer-worker-node.js +2 -2
- package/dist/ktx2-basis-writer-worker.js +2 -2
- package/dist/npy-worker.js +1 -1
- package/dist/workers/compressed-texture-worker.js +1 -0
- package/dist/workers/crunch-worker.d.ts +13 -9
- package/dist/workers/crunch-worker.d.ts.map +1 -1
- package/package.json +7 -7
- package/src/compressed-texture-loader.ts +14 -17
- package/src/crunch-loader.ts +1 -4
- package/src/workers/compressed-texture-worker.ts +1 -0
|
@@ -63302,7 +63302,7 @@ if (!("allSettled" in Promise)) {
|
|
|
63302
63302
|
}
|
|
63303
63303
|
|
|
63304
63304
|
// ../worker-utils/src/lib/env-utils/version.ts
|
|
63305
|
-
var VERSION = true ? "4.0.0-alpha.
|
|
63305
|
+
var VERSION = true ? "4.0.0-alpha.23" : DEFAULT_VERSION;
|
|
63306
63306
|
if (false) {
|
|
63307
63307
|
console.error("loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.");
|
|
63308
63308
|
}
|
|
@@ -63659,7 +63659,7 @@ async function parseData({
|
|
|
63659
63659
|
}
|
|
63660
63660
|
|
|
63661
63661
|
// src/lib/utils/version.ts
|
|
63662
|
-
var VERSION3 = true ? "4.0.0-alpha.
|
|
63662
|
+
var VERSION3 = true ? "4.0.0-alpha.23" : "beta";
|
|
63663
63663
|
|
|
63664
63664
|
// src/lib/parsers/basis-module-loader.ts
|
|
63665
63665
|
var BASIS_EXTERNAL_LIBRARIES = {
|
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.23" : 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
|
}
|
|
@@ -330,7 +330,7 @@
|
|
|
330
330
|
}
|
|
331
331
|
|
|
332
332
|
// src/lib/utils/version.ts
|
|
333
|
-
var VERSION3 = true ? "4.0.0-alpha.
|
|
333
|
+
var VERSION3 = true ? "4.0.0-alpha.23" : "beta";
|
|
334
334
|
|
|
335
335
|
// src/lib/parsers/basis-module-loader.ts
|
|
336
336
|
var BASIS_EXTERNAL_LIBRARIES = {
|
|
@@ -8,42 +8,9 @@ export type TextureLoaderOptions = {
|
|
|
8
8
|
/**
|
|
9
9
|
* Worker Loader for KTX, DDS, and PVR texture container formats
|
|
10
10
|
*/
|
|
11
|
-
export declare const CompressedTextureWorkerLoader:
|
|
12
|
-
name: string;
|
|
13
|
-
id: string;
|
|
14
|
-
module: string;
|
|
15
|
-
version: any;
|
|
16
|
-
worker: boolean;
|
|
17
|
-
extensions: string[];
|
|
18
|
-
mimeTypes: string[];
|
|
19
|
-
binary: boolean;
|
|
20
|
-
options: {
|
|
21
|
-
'compressed-texture': {
|
|
22
|
-
libraryPath: string;
|
|
23
|
-
useBasis: boolean;
|
|
24
|
-
};
|
|
25
|
-
};
|
|
26
|
-
};
|
|
11
|
+
export declare const CompressedTextureWorkerLoader: Loader<any, never, TextureLoaderOptions>;
|
|
27
12
|
/**
|
|
28
13
|
* Loader for KTX, DDS, and PVR texture container formats
|
|
29
14
|
*/
|
|
30
|
-
export declare const CompressedTextureLoader:
|
|
31
|
-
parse: (arrayBuffer: any, options: any) => Promise<import("@loaders.gl/schema").TextureLevel[]>;
|
|
32
|
-
name: string;
|
|
33
|
-
id: string;
|
|
34
|
-
module: string;
|
|
35
|
-
version: any;
|
|
36
|
-
worker: boolean;
|
|
37
|
-
extensions: string[];
|
|
38
|
-
mimeTypes: string[];
|
|
39
|
-
binary: boolean;
|
|
40
|
-
options: {
|
|
41
|
-
'compressed-texture': {
|
|
42
|
-
libraryPath: string;
|
|
43
|
-
useBasis: boolean;
|
|
44
|
-
};
|
|
45
|
-
};
|
|
46
|
-
};
|
|
47
|
-
export declare const _TypecheckCompressedTextureWorkerLoader: Loader;
|
|
48
|
-
export declare const _TypecheckCompressedTextureLoader: LoaderWithParser;
|
|
15
|
+
export declare const CompressedTextureLoader: LoaderWithParser<any, never, TextureLoaderOptions>;
|
|
49
16
|
//# sourceMappingURL=compressed-texture-loader.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compressed-texture-loader.d.ts","sourceRoot":"","sources":["../src/compressed-texture-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAKvE,MAAM,MAAM,oBAAoB,GAAG;IACjC,oBAAoB,CAAC,EAAE;QACrB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,CAAC;CACH,CAAC;
|
|
1
|
+
{"version":3,"file":"compressed-texture-loader.d.ts","sourceRoot":"","sources":["../src/compressed-texture-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAKvE,MAAM,MAAM,oBAAoB,GAAG;IACjC,oBAAoB,CAAC,EAAE;QACrB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,6BAA6B,EAAE,MAAM,CAAC,GAAG,EAAE,KAAK,EAAE,oBAAoB,CA0BlF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,uBAAuB,EAAE,gBAAgB,CAAC,GAAG,EAAE,KAAK,EAAE,oBAAoB,CAoBtF,CAAC"}
|
|
@@ -3,16 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.
|
|
6
|
+
exports.CompressedTextureLoader = exports.CompressedTextureWorkerLoader = void 0;
|
|
7
7
|
const version_1 = require("./lib/utils/version");
|
|
8
8
|
const parse_compressed_texture_1 = require("./lib/parsers/parse-compressed-texture");
|
|
9
9
|
const parse_basis_1 = __importDefault(require("./lib/parsers/parse-basis"));
|
|
10
|
-
const DEFAULT_TEXTURE_LOADER_OPTIONS = {
|
|
11
|
-
'compressed-texture': {
|
|
12
|
-
libraryPath: 'libs/',
|
|
13
|
-
useBasis: false
|
|
14
|
-
}
|
|
15
|
-
};
|
|
16
10
|
/**
|
|
17
11
|
* Worker Loader for KTX, DDS, and PVR texture container formats
|
|
18
12
|
*/
|
|
@@ -36,7 +30,12 @@ exports.CompressedTextureWorkerLoader = {
|
|
|
36
30
|
'application/octet-stream'
|
|
37
31
|
],
|
|
38
32
|
binary: true,
|
|
39
|
-
options:
|
|
33
|
+
options: {
|
|
34
|
+
'compressed-texture': {
|
|
35
|
+
libraryPath: 'libs/',
|
|
36
|
+
useBasis: false
|
|
37
|
+
}
|
|
38
|
+
}
|
|
40
39
|
};
|
|
41
40
|
/**
|
|
42
41
|
* Loader for KTX, DDS, and PVR texture container formats
|
|
@@ -44,21 +43,21 @@ exports.CompressedTextureWorkerLoader = {
|
|
|
44
43
|
exports.CompressedTextureLoader = {
|
|
45
44
|
...exports.CompressedTextureWorkerLoader,
|
|
46
45
|
parse: async (arrayBuffer, options) => {
|
|
47
|
-
if (options['compressed-texture']
|
|
46
|
+
if (options?.['compressed-texture']?.useBasis) {
|
|
47
|
+
// @ts-expect-error TODO not allowed to modify inputs
|
|
48
48
|
options.basis = {
|
|
49
49
|
format: {
|
|
50
50
|
alpha: 'BC3',
|
|
51
51
|
noAlpha: 'BC1'
|
|
52
52
|
},
|
|
53
|
+
// @ts-expect-error TODO not allowed to modify inputs
|
|
53
54
|
...options.basis,
|
|
54
55
|
containerFormat: 'ktx2',
|
|
55
56
|
module: 'encoder'
|
|
56
57
|
};
|
|
57
|
-
|
|
58
|
+
const result = await (0, parse_basis_1.default)(arrayBuffer, options);
|
|
59
|
+
return result[0];
|
|
58
60
|
}
|
|
59
61
|
return (0, parse_compressed_texture_1.parseCompressedTexture)(arrayBuffer);
|
|
60
62
|
}
|
|
61
63
|
};
|
|
62
|
-
// TYPE TESTS - TODO find a better way than exporting junk
|
|
63
|
-
exports._TypecheckCompressedTextureWorkerLoader = exports.CompressedTextureWorkerLoader;
|
|
64
|
-
exports._TypecheckCompressedTextureLoader = exports.CompressedTextureLoader;
|
|
@@ -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.23" : 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
|
}
|
|
@@ -337,7 +337,7 @@
|
|
|
337
337
|
}
|
|
338
338
|
|
|
339
339
|
// src/lib/utils/version.ts
|
|
340
|
-
var VERSION3 = true ? "4.0.0-alpha.
|
|
340
|
+
var VERSION3 = true ? "4.0.0-alpha.23" : "beta";
|
|
341
341
|
|
|
342
342
|
// ../../node_modules/ktx-parse/dist/ktx-parse.modern.js
|
|
343
343
|
var t = new Uint8Array([0]);
|
|
@@ -1213,12 +1213,6 @@
|
|
|
1213
1213
|
}
|
|
1214
1214
|
|
|
1215
1215
|
// src/compressed-texture-loader.ts
|
|
1216
|
-
var DEFAULT_TEXTURE_LOADER_OPTIONS = {
|
|
1217
|
-
"compressed-texture": {
|
|
1218
|
-
libraryPath: "libs/",
|
|
1219
|
-
useBasis: false
|
|
1220
|
-
}
|
|
1221
|
-
};
|
|
1222
1216
|
var CompressedTextureWorkerLoader = {
|
|
1223
1217
|
name: "Texture Containers",
|
|
1224
1218
|
id: "compressed-texture",
|
|
@@ -1239,12 +1233,17 @@
|
|
|
1239
1233
|
"application/octet-stream"
|
|
1240
1234
|
],
|
|
1241
1235
|
binary: true,
|
|
1242
|
-
options:
|
|
1236
|
+
options: {
|
|
1237
|
+
"compressed-texture": {
|
|
1238
|
+
libraryPath: "libs/",
|
|
1239
|
+
useBasis: false
|
|
1240
|
+
}
|
|
1241
|
+
}
|
|
1243
1242
|
};
|
|
1244
1243
|
var CompressedTextureLoader = {
|
|
1245
1244
|
...CompressedTextureWorkerLoader,
|
|
1246
1245
|
parse: async (arrayBuffer, options) => {
|
|
1247
|
-
if (options["compressed-texture"]
|
|
1246
|
+
if (options?.["compressed-texture"]?.useBasis) {
|
|
1248
1247
|
options.basis = {
|
|
1249
1248
|
format: {
|
|
1250
1249
|
alpha: "BC3",
|
|
@@ -1254,7 +1253,8 @@
|
|
|
1254
1253
|
containerFormat: "ktx2",
|
|
1255
1254
|
module: "encoder"
|
|
1256
1255
|
};
|
|
1257
|
-
|
|
1256
|
+
const result = await parseBasis(arrayBuffer, options);
|
|
1257
|
+
return result[0];
|
|
1258
1258
|
}
|
|
1259
1259
|
return parseCompressedTexture(arrayBuffer);
|
|
1260
1260
|
}
|
package/dist/crunch-loader.d.ts
CHANGED
|
@@ -2,20 +2,5 @@ import type { Loader } from '@loaders.gl/loader-utils';
|
|
|
2
2
|
/**
|
|
3
3
|
* Worker loader for the Crunch compressed texture container format
|
|
4
4
|
*/
|
|
5
|
-
export declare const CrunchLoader:
|
|
6
|
-
id: string;
|
|
7
|
-
name: string;
|
|
8
|
-
module: string;
|
|
9
|
-
version: any;
|
|
10
|
-
worker: boolean;
|
|
11
|
-
extensions: string[];
|
|
12
|
-
mimeTypes: string[];
|
|
13
|
-
binary: boolean;
|
|
14
|
-
options: {
|
|
15
|
-
crunch: {
|
|
16
|
-
libraryPath: string;
|
|
17
|
-
};
|
|
18
|
-
};
|
|
19
|
-
};
|
|
20
|
-
export declare const _TypecheckCrunchLoader: Loader;
|
|
5
|
+
export declare const CrunchLoader: Loader;
|
|
21
6
|
//# sourceMappingURL=crunch-loader.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crunch-loader.d.ts","sourceRoot":"","sources":["../src/crunch-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAGrD;;GAEG;AACH,eAAO,MAAM,YAAY
|
|
1
|
+
{"version":3,"file":"crunch-loader.d.ts","sourceRoot":"","sources":["../src/crunch-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAGrD;;GAEG;AACH,eAAO,MAAM,YAAY,EAAE,MAc1B,CAAC"}
|
package/dist/crunch-loader.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.CrunchLoader = void 0;
|
|
4
4
|
const version_1 = require("./lib/utils/version");
|
|
5
5
|
/**
|
|
6
6
|
* Worker loader for the Crunch compressed texture container format
|
|
@@ -21,5 +21,3 @@ exports.CrunchLoader = {
|
|
|
21
21
|
}
|
|
22
22
|
};
|
|
23
23
|
// We avoid bundling crunch - rare format, only offer worker loader
|
|
24
|
-
// TYPE TESTS - TODO find a better way than exporting junk
|
|
25
|
-
exports._TypecheckCrunchLoader = exports.CrunchLoader;
|
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.23" : 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
|
}
|
|
@@ -337,7 +337,7 @@
|
|
|
337
337
|
}
|
|
338
338
|
|
|
339
339
|
// src/lib/utils/version.ts
|
|
340
|
-
var VERSION3 = true ? "4.0.0-alpha.
|
|
340
|
+
var VERSION3 = true ? "4.0.0-alpha.23" : "beta";
|
|
341
341
|
|
|
342
342
|
// src/crunch-loader.ts
|
|
343
343
|
var CrunchLoader = {
|
package/dist/dist.min.js
CHANGED
|
@@ -1220,18 +1220,12 @@
|
|
|
1220
1220
|
});
|
|
1221
1221
|
|
|
1222
1222
|
// src/compressed-texture-loader.ts
|
|
1223
|
-
var
|
|
1223
|
+
var CompressedTextureWorkerLoader, CompressedTextureLoader;
|
|
1224
1224
|
var init_compressed_texture_loader = __esm({
|
|
1225
1225
|
"src/compressed-texture-loader.ts"() {
|
|
1226
1226
|
init_version();
|
|
1227
1227
|
init_parse_compressed_texture();
|
|
1228
1228
|
init_parse_basis();
|
|
1229
|
-
DEFAULT_TEXTURE_LOADER_OPTIONS = {
|
|
1230
|
-
"compressed-texture": {
|
|
1231
|
-
libraryPath: "libs/",
|
|
1232
|
-
useBasis: false
|
|
1233
|
-
}
|
|
1234
|
-
};
|
|
1235
1229
|
CompressedTextureWorkerLoader = {
|
|
1236
1230
|
name: "Texture Containers",
|
|
1237
1231
|
id: "compressed-texture",
|
|
@@ -1252,12 +1246,17 @@
|
|
|
1252
1246
|
"application/octet-stream"
|
|
1253
1247
|
],
|
|
1254
1248
|
binary: true,
|
|
1255
|
-
options:
|
|
1249
|
+
options: {
|
|
1250
|
+
"compressed-texture": {
|
|
1251
|
+
libraryPath: "libs/",
|
|
1252
|
+
useBasis: false
|
|
1253
|
+
}
|
|
1254
|
+
}
|
|
1256
1255
|
};
|
|
1257
1256
|
CompressedTextureLoader = {
|
|
1258
1257
|
...CompressedTextureWorkerLoader,
|
|
1259
1258
|
parse: async (arrayBuffer, options) => {
|
|
1260
|
-
if (options["compressed-texture"]
|
|
1259
|
+
if (options?.["compressed-texture"]?.useBasis) {
|
|
1261
1260
|
options.basis = {
|
|
1262
1261
|
format: {
|
|
1263
1262
|
alpha: "BC3",
|
|
@@ -1267,7 +1266,8 @@
|
|
|
1267
1266
|
containerFormat: "ktx2",
|
|
1268
1267
|
module: "encoder"
|
|
1269
1268
|
};
|
|
1270
|
-
|
|
1269
|
+
const result = await parseBasis(arrayBuffer, options);
|
|
1270
|
+
return result[0];
|
|
1271
1271
|
}
|
|
1272
1272
|
return parseCompressedTexture(arrayBuffer);
|
|
1273
1273
|
}
|
|
@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
|
-
exports.
|
|
7
|
+
exports.CompressedTextureWorkerLoader = exports.CompressedTextureLoader = void 0;
|
|
8
8
|
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
9
9
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
10
10
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
@@ -13,12 +13,6 @@ var _parseCompressedTexture = require("./lib/parsers/parse-compressed-texture");
|
|
|
13
13
|
var _parseBasis = _interopRequireDefault(require("./lib/parsers/parse-basis"));
|
|
14
14
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
15
15
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
16
|
-
var DEFAULT_TEXTURE_LOADER_OPTIONS = {
|
|
17
|
-
'compressed-texture': {
|
|
18
|
-
libraryPath: 'libs/',
|
|
19
|
-
useBasis: false
|
|
20
|
-
}
|
|
21
|
-
};
|
|
22
16
|
var CompressedTextureWorkerLoader = {
|
|
23
17
|
name: 'Texture Containers',
|
|
24
18
|
id: 'compressed-texture',
|
|
@@ -28,17 +22,24 @@ var CompressedTextureWorkerLoader = {
|
|
|
28
22
|
extensions: ['ktx', 'ktx2', 'dds', 'pvr'],
|
|
29
23
|
mimeTypes: ['image/ktx2', 'image/ktx', 'image/vnd-ms.dds', 'image/x-dds', 'application/octet-stream'],
|
|
30
24
|
binary: true,
|
|
31
|
-
options:
|
|
25
|
+
options: {
|
|
26
|
+
'compressed-texture': {
|
|
27
|
+
libraryPath: 'libs/',
|
|
28
|
+
useBasis: false
|
|
29
|
+
}
|
|
30
|
+
}
|
|
32
31
|
};
|
|
33
32
|
exports.CompressedTextureWorkerLoader = CompressedTextureWorkerLoader;
|
|
34
33
|
var CompressedTextureLoader = _objectSpread(_objectSpread({}, CompressedTextureWorkerLoader), {}, {
|
|
35
34
|
parse: function () {
|
|
36
35
|
var _parse = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(arrayBuffer, options) {
|
|
36
|
+
var _options$compressedT;
|
|
37
|
+
var result;
|
|
37
38
|
return _regenerator.default.wrap(function _callee$(_context) {
|
|
38
39
|
while (1) switch (_context.prev = _context.next) {
|
|
39
40
|
case 0:
|
|
40
|
-
if (!options['compressed-texture'].useBasis) {
|
|
41
|
-
_context.next =
|
|
41
|
+
if (!(options !== null && options !== void 0 && (_options$compressedT = options['compressed-texture']) !== null && _options$compressedT !== void 0 && _options$compressedT.useBasis)) {
|
|
42
|
+
_context.next = 6;
|
|
42
43
|
break;
|
|
43
44
|
}
|
|
44
45
|
options.basis = _objectSpread(_objectSpread({
|
|
@@ -53,10 +54,11 @@ var CompressedTextureLoader = _objectSpread(_objectSpread({}, CompressedTextureW
|
|
|
53
54
|
_context.next = 4;
|
|
54
55
|
return (0, _parseBasis.default)(arrayBuffer, options);
|
|
55
56
|
case 4:
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
return _context.abrupt("return", (0, _parseCompressedTexture.parseCompressedTexture)(arrayBuffer));
|
|
57
|
+
result = _context.sent;
|
|
58
|
+
return _context.abrupt("return", result[0]);
|
|
59
59
|
case 6:
|
|
60
|
+
return _context.abrupt("return", (0, _parseCompressedTexture.parseCompressedTexture)(arrayBuffer));
|
|
61
|
+
case 7:
|
|
60
62
|
case "end":
|
|
61
63
|
return _context.stop();
|
|
62
64
|
}
|
|
@@ -69,8 +71,4 @@ var CompressedTextureLoader = _objectSpread(_objectSpread({}, CompressedTextureW
|
|
|
69
71
|
}()
|
|
70
72
|
});
|
|
71
73
|
exports.CompressedTextureLoader = CompressedTextureLoader;
|
|
72
|
-
var _TypecheckCompressedTextureWorkerLoader = CompressedTextureWorkerLoader;
|
|
73
|
-
exports._TypecheckCompressedTextureWorkerLoader = _TypecheckCompressedTextureWorkerLoader;
|
|
74
|
-
var _TypecheckCompressedTextureLoader = CompressedTextureLoader;
|
|
75
|
-
exports._TypecheckCompressedTextureLoader = _TypecheckCompressedTextureLoader;
|
|
76
74
|
//# sourceMappingURL=compressed-texture-loader.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compressed-texture-loader.js","names":["_version","require","_parseCompressedTexture","_parseBasis","_interopRequireDefault","ownKeys","object","enumerableOnly","keys","Object","getOwnPropertySymbols","symbols","filter","sym","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","key","_defineProperty2","default","getOwnPropertyDescriptors","defineProperties","defineProperty","
|
|
1
|
+
{"version":3,"file":"compressed-texture-loader.js","names":["_version","require","_parseCompressedTexture","_parseBasis","_interopRequireDefault","ownKeys","object","enumerableOnly","keys","Object","getOwnPropertySymbols","symbols","filter","sym","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","key","_defineProperty2","default","getOwnPropertyDescriptors","defineProperties","defineProperty","CompressedTextureWorkerLoader","name","id","module","version","VERSION","worker","extensions","mimeTypes","binary","options","libraryPath","useBasis","exports","CompressedTextureLoader","parse","_parse","_asyncToGenerator2","_regenerator","mark","_callee","arrayBuffer","_options$compressedT","result","wrap","_callee$","_context","prev","next","basis","format","alpha","noAlpha","containerFormat","parseBasis","sent","abrupt","parseCompressedTexture","stop","_x","_x2"],"sources":["../../src/compressed-texture-loader.ts"],"sourcesContent":["import type {Loader, LoaderWithParser} from '@loaders.gl/loader-utils';\nimport {VERSION} from './lib/utils/version';\nimport {parseCompressedTexture} from './lib/parsers/parse-compressed-texture';\nimport parseBasis from './lib/parsers/parse-basis';\n\nexport type TextureLoaderOptions = {\n 'compressed-texture'?: {\n libraryPath?: string;\n useBasis?: boolean;\n };\n};\n\n/**\n * Worker Loader for KTX, DDS, and PVR texture container formats\n */\nexport const CompressedTextureWorkerLoader: Loader<any, never, TextureLoaderOptions> = {\n name: 'Texture Containers',\n id: 'compressed-texture',\n module: 'textures',\n version: VERSION,\n worker: true,\n extensions: [\n 'ktx',\n 'ktx2',\n 'dds', // WEBGL_compressed_texture_s3tc, WEBGL_compressed_texture_atc\n 'pvr' // WEBGL_compressed_texture_pvrtc\n ],\n mimeTypes: [\n 'image/ktx2',\n 'image/ktx',\n 'image/vnd-ms.dds',\n 'image/x-dds',\n 'application/octet-stream'\n ],\n binary: true,\n options: {\n 'compressed-texture': {\n libraryPath: 'libs/',\n useBasis: false\n }\n }\n};\n\n/**\n * Loader for KTX, DDS, and PVR texture container formats\n */\nexport const CompressedTextureLoader: LoaderWithParser<any, never, TextureLoaderOptions> = {\n ...CompressedTextureWorkerLoader,\n parse: async (arrayBuffer: ArrayBuffer, options?: TextureLoaderOptions) => {\n if (options?.['compressed-texture']?.useBasis) {\n // @ts-expect-error TODO not allowed to modify inputs\n options.basis = {\n format: {\n alpha: 'BC3',\n noAlpha: 'BC1'\n },\n // @ts-expect-error TODO not allowed to modify inputs\n ...options.basis,\n containerFormat: 'ktx2',\n module: 'encoder'\n };\n const result = await parseBasis(arrayBuffer, options);\n return result[0];\n }\n return parseCompressedTexture(arrayBuffer);\n }\n};\n"],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.
|
|
6
|
+
exports.CrunchLoader = void 0;
|
|
7
7
|
var _version = require("./lib/utils/version");
|
|
8
8
|
var CrunchLoader = {
|
|
9
9
|
id: 'crunch',
|
|
@@ -21,6 +21,4 @@ var CrunchLoader = {
|
|
|
21
21
|
}
|
|
22
22
|
};
|
|
23
23
|
exports.CrunchLoader = CrunchLoader;
|
|
24
|
-
var _TypecheckCrunchLoader = CrunchLoader;
|
|
25
|
-
exports._TypecheckCrunchLoader = _TypecheckCrunchLoader;
|
|
26
24
|
//# sourceMappingURL=crunch-loader.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crunch-loader.js","names":["_version","require","CrunchLoader","id","name","module","version","VERSION","worker","extensions","mimeTypes","binary","options","crunch","libraryPath","exports"
|
|
1
|
+
{"version":3,"file":"crunch-loader.js","names":["_version","require","CrunchLoader","id","name","module","version","VERSION","worker","extensions","mimeTypes","binary","options","crunch","libraryPath","exports"],"sources":["../../src/crunch-loader.ts"],"sourcesContent":["import type {Loader} from '@loaders.gl/loader-utils';\nimport {VERSION} from './lib/utils/version';\n\n/**\n * Worker loader for the Crunch compressed texture container format\n */\nexport const CrunchLoader: Loader = {\n id: 'crunch',\n name: 'Crunch',\n module: 'textures',\n version: VERSION,\n worker: true,\n extensions: ['crn'],\n mimeTypes: ['image/crn', 'image/x-crn', 'application/octet-stream'],\n binary: true,\n options: {\n crunch: {\n libraryPath: 'libs/'\n }\n }\n};\n\n// We avoid bundling crunch - rare format, only offer worker loader\n"],"mappings":";;;;;;AACA,IAAAA,QAAA,GAAAC,OAAA;AAKO,IAAMC,YAAoB,GAAG;EAClCC,EAAE,EAAE,QAAQ;EACZC,IAAI,EAAE,QAAQ;EACdC,MAAM,EAAE,UAAU;EAClBC,OAAO,EAAEC,gBAAO;EAChBC,MAAM,EAAE,IAAI;EACZC,UAAU,EAAE,CAAC,KAAK,CAAC;EACnBC,SAAS,EAAE,CAAC,WAAW,EAAE,aAAa,EAAE,0BAA0B,CAAC;EACnEC,MAAM,EAAE,IAAI;EACZC,OAAO,EAAE;IACPC,MAAM,EAAE;MACNC,WAAW,EAAE;IACf;EACF;AACF,CAAC;AAACC,OAAA,CAAAb,YAAA,GAAAA,YAAA"}
|
|
@@ -4,6 +4,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.VERSION = void 0;
|
|
7
|
-
var VERSION = typeof "4.0.0-alpha.
|
|
7
|
+
var VERSION = typeof "4.0.0-alpha.23" !== 'undefined' ? "4.0.0-alpha.23" : 'beta';
|
|
8
8
|
exports.VERSION = VERSION;
|
|
9
9
|
//# sourceMappingURL=version.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compressed-texture-worker.js","names":["_loaderUtils","require","_compressedTextureLoader","createLoaderWorker","CompressedTextureLoader"],"sources":["../../../src/workers/compressed-texture-worker.ts"],"sourcesContent":["import {createLoaderWorker} from '@loaders.gl/loader-utils';\nimport {CompressedTextureLoader} from '../compressed-texture-loader';\n\ncreateLoaderWorker(CompressedTextureLoader);\n"],"mappings":";;AAAA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,wBAAA,GAAAD,OAAA;
|
|
1
|
+
{"version":3,"file":"compressed-texture-worker.js","names":["_loaderUtils","require","_compressedTextureLoader","createLoaderWorker","CompressedTextureLoader"],"sources":["../../../src/workers/compressed-texture-worker.ts"],"sourcesContent":["import {createLoaderWorker} from '@loaders.gl/loader-utils';\nimport {CompressedTextureLoader} from '../compressed-texture-loader';\n\n// @ts-expect-error\ncreateLoaderWorker(CompressedTextureLoader);\n"],"mappings":";;AAAA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,wBAAA,GAAAD,OAAA;AAGA,IAAAE,+BAAkB,EAACC,gDAAuB,CAAC"}
|
|
@@ -1,12 +1,6 @@
|
|
|
1
1
|
import { VERSION } from './lib/utils/version';
|
|
2
2
|
import { parseCompressedTexture } from './lib/parsers/parse-compressed-texture';
|
|
3
3
|
import parseBasis from './lib/parsers/parse-basis';
|
|
4
|
-
const DEFAULT_TEXTURE_LOADER_OPTIONS = {
|
|
5
|
-
'compressed-texture': {
|
|
6
|
-
libraryPath: 'libs/',
|
|
7
|
-
useBasis: false
|
|
8
|
-
}
|
|
9
|
-
};
|
|
10
4
|
export const CompressedTextureWorkerLoader = {
|
|
11
5
|
name: 'Texture Containers',
|
|
12
6
|
id: 'compressed-texture',
|
|
@@ -16,12 +10,18 @@ export const CompressedTextureWorkerLoader = {
|
|
|
16
10
|
extensions: ['ktx', 'ktx2', 'dds', 'pvr'],
|
|
17
11
|
mimeTypes: ['image/ktx2', 'image/ktx', 'image/vnd-ms.dds', 'image/x-dds', 'application/octet-stream'],
|
|
18
12
|
binary: true,
|
|
19
|
-
options:
|
|
13
|
+
options: {
|
|
14
|
+
'compressed-texture': {
|
|
15
|
+
libraryPath: 'libs/',
|
|
16
|
+
useBasis: false
|
|
17
|
+
}
|
|
18
|
+
}
|
|
20
19
|
};
|
|
21
20
|
export const CompressedTextureLoader = {
|
|
22
21
|
...CompressedTextureWorkerLoader,
|
|
23
22
|
parse: async (arrayBuffer, options) => {
|
|
24
|
-
|
|
23
|
+
var _options$compressedT;
|
|
24
|
+
if (options !== null && options !== void 0 && (_options$compressedT = options['compressed-texture']) !== null && _options$compressedT !== void 0 && _options$compressedT.useBasis) {
|
|
25
25
|
options.basis = {
|
|
26
26
|
format: {
|
|
27
27
|
alpha: 'BC3',
|
|
@@ -31,11 +31,10 @@ export const CompressedTextureLoader = {
|
|
|
31
31
|
containerFormat: 'ktx2',
|
|
32
32
|
module: 'encoder'
|
|
33
33
|
};
|
|
34
|
-
|
|
34
|
+
const result = await parseBasis(arrayBuffer, options);
|
|
35
|
+
return result[0];
|
|
35
36
|
}
|
|
36
37
|
return parseCompressedTexture(arrayBuffer);
|
|
37
38
|
}
|
|
38
39
|
};
|
|
39
|
-
export const _TypecheckCompressedTextureWorkerLoader = CompressedTextureWorkerLoader;
|
|
40
|
-
export const _TypecheckCompressedTextureLoader = CompressedTextureLoader;
|
|
41
40
|
//# sourceMappingURL=compressed-texture-loader.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compressed-texture-loader.js","names":["VERSION","parseCompressedTexture","parseBasis","
|
|
1
|
+
{"version":3,"file":"compressed-texture-loader.js","names":["VERSION","parseCompressedTexture","parseBasis","CompressedTextureWorkerLoader","name","id","module","version","worker","extensions","mimeTypes","binary","options","libraryPath","useBasis","CompressedTextureLoader","parse","arrayBuffer","_options$compressedT","basis","format","alpha","noAlpha","containerFormat","result"],"sources":["../../src/compressed-texture-loader.ts"],"sourcesContent":["import type {Loader, LoaderWithParser} from '@loaders.gl/loader-utils';\nimport {VERSION} from './lib/utils/version';\nimport {parseCompressedTexture} from './lib/parsers/parse-compressed-texture';\nimport parseBasis from './lib/parsers/parse-basis';\n\nexport type TextureLoaderOptions = {\n 'compressed-texture'?: {\n libraryPath?: string;\n useBasis?: boolean;\n };\n};\n\n/**\n * Worker Loader for KTX, DDS, and PVR texture container formats\n */\nexport const CompressedTextureWorkerLoader: Loader<any, never, TextureLoaderOptions> = {\n name: 'Texture Containers',\n id: 'compressed-texture',\n module: 'textures',\n version: VERSION,\n worker: true,\n extensions: [\n 'ktx',\n 'ktx2',\n 'dds', // WEBGL_compressed_texture_s3tc, WEBGL_compressed_texture_atc\n 'pvr' // WEBGL_compressed_texture_pvrtc\n ],\n mimeTypes: [\n 'image/ktx2',\n 'image/ktx',\n 'image/vnd-ms.dds',\n 'image/x-dds',\n 'application/octet-stream'\n ],\n binary: true,\n options: {\n 'compressed-texture': {\n libraryPath: 'libs/',\n useBasis: false\n }\n }\n};\n\n/**\n * Loader for KTX, DDS, and PVR texture container formats\n */\nexport const CompressedTextureLoader: LoaderWithParser<any, never, TextureLoaderOptions> = {\n ...CompressedTextureWorkerLoader,\n parse: async (arrayBuffer: ArrayBuffer, options?: TextureLoaderOptions) => {\n if (options?.['compressed-texture']?.useBasis) {\n // @ts-expect-error TODO not allowed to modify inputs\n options.basis = {\n format: {\n alpha: 'BC3',\n noAlpha: 'BC1'\n },\n // @ts-expect-error TODO not allowed to modify inputs\n ...options.basis,\n containerFormat: 'ktx2',\n module: 'encoder'\n };\n const result = await parseBasis(arrayBuffer, options);\n return result[0];\n }\n return parseCompressedTexture(arrayBuffer);\n }\n};\n"],"mappings":"AACA,SAAQA,OAAO,QAAO,qBAAqB;AAC3C,SAAQC,sBAAsB,QAAO,wCAAwC;AAC7E,OAAOC,UAAU,MAAM,2BAA2B;AAYlD,OAAO,MAAMC,6BAAuE,GAAG;EACrFC,IAAI,EAAE,oBAAoB;EAC1BC,EAAE,EAAE,oBAAoB;EACxBC,MAAM,EAAE,UAAU;EAClBC,OAAO,EAAEP,OAAO;EAChBQ,MAAM,EAAE,IAAI;EACZC,UAAU,EAAE,CACV,KAAK,EACL,MAAM,EACN,KAAK,EACL,KAAK,CACN;EACDC,SAAS,EAAE,CACT,YAAY,EACZ,WAAW,EACX,kBAAkB,EAClB,aAAa,EACb,0BAA0B,CAC3B;EACDC,MAAM,EAAE,IAAI;EACZC,OAAO,EAAE;IACP,oBAAoB,EAAE;MACpBC,WAAW,EAAE,OAAO;MACpBC,QAAQ,EAAE;IACZ;EACF;AACF,CAAC;AAKD,OAAO,MAAMC,uBAA2E,GAAG;EACzF,GAAGZ,6BAA6B;EAChCa,KAAK,EAAE,MAAAA,CAAOC,WAAwB,EAAEL,OAA8B,KAAK;IAAA,IAAAM,oBAAA;IACzE,IAAIN,OAAO,aAAPA,OAAO,gBAAAM,oBAAA,GAAPN,OAAO,CAAG,oBAAoB,CAAC,cAAAM,oBAAA,eAA/BA,oBAAA,CAAiCJ,QAAQ,EAAE;MAE7CF,OAAO,CAACO,KAAK,GAAG;QACdC,MAAM,EAAE;UACNC,KAAK,EAAE,KAAK;UACZC,OAAO,EAAE;QACX,CAAC;QAED,GAAGV,OAAO,CAACO,KAAK;QAChBI,eAAe,EAAE,MAAM;QACvBjB,MAAM,EAAE;MACV,CAAC;MACD,MAAMkB,MAAM,GAAG,MAAMtB,UAAU,CAACe,WAAW,EAAEL,OAAO,CAAC;MACrD,OAAOY,MAAM,CAAC,CAAC,CAAC;IAClB;IACA,OAAOvB,sBAAsB,CAACgB,WAAW,CAAC;EAC5C;AACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crunch-loader.js","names":["VERSION","CrunchLoader","id","name","module","version","worker","extensions","mimeTypes","binary","options","crunch","libraryPath"
|
|
1
|
+
{"version":3,"file":"crunch-loader.js","names":["VERSION","CrunchLoader","id","name","module","version","worker","extensions","mimeTypes","binary","options","crunch","libraryPath"],"sources":["../../src/crunch-loader.ts"],"sourcesContent":["import type {Loader} from '@loaders.gl/loader-utils';\nimport {VERSION} from './lib/utils/version';\n\n/**\n * Worker loader for the Crunch compressed texture container format\n */\nexport const CrunchLoader: Loader = {\n id: 'crunch',\n name: 'Crunch',\n module: 'textures',\n version: VERSION,\n worker: true,\n extensions: ['crn'],\n mimeTypes: ['image/crn', 'image/x-crn', 'application/octet-stream'],\n binary: true,\n options: {\n crunch: {\n libraryPath: 'libs/'\n }\n }\n};\n\n// We avoid bundling crunch - rare format, only offer worker loader\n"],"mappings":"AACA,SAAQA,OAAO,QAAO,qBAAqB;AAK3C,OAAO,MAAMC,YAAoB,GAAG;EAClCC,EAAE,EAAE,QAAQ;EACZC,IAAI,EAAE,QAAQ;EACdC,MAAM,EAAE,UAAU;EAClBC,OAAO,EAAEL,OAAO;EAChBM,MAAM,EAAE,IAAI;EACZC,UAAU,EAAE,CAAC,KAAK,CAAC;EACnBC,SAAS,EAAE,CAAC,WAAW,EAAE,aAAa,EAAE,0BAA0B,CAAC;EACnEC,MAAM,EAAE,IAAI;EACZC,OAAO,EAAE;IACPC,MAAM,EAAE;MACNC,WAAW,EAAE;IACf;EACF;AACF,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const VERSION = typeof "4.0.0-alpha.
|
|
1
|
+
export const VERSION = typeof "4.0.0-alpha.23" !== 'undefined' ? "4.0.0-alpha.23" : 'beta';
|
|
2
2
|
//# sourceMappingURL=version.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compressed-texture-worker.js","names":["createLoaderWorker","CompressedTextureLoader"],"sources":["../../../src/workers/compressed-texture-worker.ts"],"sourcesContent":["import {createLoaderWorker} from '@loaders.gl/loader-utils';\nimport {CompressedTextureLoader} from '../compressed-texture-loader';\n\ncreateLoaderWorker(CompressedTextureLoader);\n"],"mappings":"AAAA,SAAQA,kBAAkB,QAAO,0BAA0B;AAC3D,SAAQC,uBAAuB,QAAO,8BAA8B;
|
|
1
|
+
{"version":3,"file":"compressed-texture-worker.js","names":["createLoaderWorker","CompressedTextureLoader"],"sources":["../../../src/workers/compressed-texture-worker.ts"],"sourcesContent":["import {createLoaderWorker} from '@loaders.gl/loader-utils';\nimport {CompressedTextureLoader} from '../compressed-texture-loader';\n\n// @ts-expect-error\ncreateLoaderWorker(CompressedTextureLoader);\n"],"mappings":"AAAA,SAAQA,kBAAkB,QAAO,0BAA0B;AAC3D,SAAQC,uBAAuB,QAAO,8BAA8B;AAGpED,kBAAkB,CAACC,uBAAuB,CAAC"}
|
|
@@ -63127,7 +63127,7 @@ if (!("allSettled" in Promise)) {
|
|
|
63127
63127
|
}
|
|
63128
63128
|
|
|
63129
63129
|
// ../worker-utils/src/lib/env-utils/version.ts
|
|
63130
|
-
var VERSION = true ? "4.0.0-alpha.
|
|
63130
|
+
var VERSION = true ? "4.0.0-alpha.23" : DEFAULT_VERSION;
|
|
63131
63131
|
if (false) {
|
|
63132
63132
|
console.error("loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.");
|
|
63133
63133
|
}
|
|
@@ -63406,7 +63406,7 @@ async function loadAsText(url) {
|
|
|
63406
63406
|
}
|
|
63407
63407
|
|
|
63408
63408
|
// src/lib/utils/version.ts
|
|
63409
|
-
var VERSION3 = true ? "4.0.0-alpha.
|
|
63409
|
+
var VERSION3 = true ? "4.0.0-alpha.23" : "beta";
|
|
63410
63410
|
|
|
63411
63411
|
// src/lib/parsers/basis-module-loader.ts
|
|
63412
63412
|
var BASIS_EXTERNAL_LIBRARIES = {
|
|
@@ -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.23" : 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
|
}
|
|
@@ -250,7 +250,7 @@
|
|
|
250
250
|
}
|
|
251
251
|
|
|
252
252
|
// src/lib/utils/version.ts
|
|
253
|
-
var VERSION3 = true ? "4.0.0-alpha.
|
|
253
|
+
var VERSION3 = true ? "4.0.0-alpha.23" : "beta";
|
|
254
254
|
|
|
255
255
|
// src/lib/parsers/basis-module-loader.ts
|
|
256
256
|
var BASIS_EXTERNAL_LIBRARIES = {
|
package/dist/npy-worker.js
CHANGED
|
@@ -2,4 +2,5 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const loader_utils_1 = require("@loaders.gl/loader-utils");
|
|
4
4
|
const compressed_texture_loader_1 = require("../compressed-texture-loader");
|
|
5
|
+
// @ts-expect-error
|
|
5
6
|
(0, loader_utils_1.createLoaderWorker)(compressed_texture_loader_1.CompressedTextureLoader);
|
|
@@ -4,18 +4,22 @@ import { parseCrunch } from '../lib/parsers/parse-crunch';
|
|
|
4
4
|
*/
|
|
5
5
|
export declare const CrunchLoaderWithParser: {
|
|
6
6
|
parse: typeof parseCrunch;
|
|
7
|
-
|
|
7
|
+
dataType?: any;
|
|
8
|
+
batchType?: any;
|
|
9
|
+
options: import("@loaders.gl/loader-utils").LoaderOptions;
|
|
10
|
+
deprecatedOptions?: Record<string, string | Record<string, string>> | undefined;
|
|
8
11
|
name: string;
|
|
12
|
+
id: string;
|
|
9
13
|
module: string;
|
|
10
|
-
version:
|
|
11
|
-
worker
|
|
14
|
+
version: string;
|
|
15
|
+
worker?: string | boolean | undefined;
|
|
16
|
+
category?: string | undefined;
|
|
12
17
|
extensions: string[];
|
|
13
18
|
mimeTypes: string[];
|
|
14
|
-
binary
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
};
|
|
19
|
+
binary?: boolean | undefined;
|
|
20
|
+
text?: boolean | undefined;
|
|
21
|
+
tests?: (string | ArrayBuffer | ((ArrayBuffer: ArrayBuffer) => boolean))[] | undefined;
|
|
22
|
+
supported?: boolean | undefined;
|
|
23
|
+
testText?: ((string: string) => boolean) | undefined;
|
|
20
24
|
};
|
|
21
25
|
//# sourceMappingURL=crunch-worker.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crunch-worker.d.ts","sourceRoot":"","sources":["../../src/workers/crunch-worker.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,6BAA6B,CAAC;AAExD;;GAEG;AACH,eAAO,MAAM,sBAAsB
|
|
1
|
+
{"version":3,"file":"crunch-worker.d.ts","sourceRoot":"","sources":["../../src/workers/crunch-worker.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,6BAA6B,CAAC;AAExD;;GAEG;AACH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;CAGlC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@loaders.gl/textures",
|
|
3
|
-
"version": "4.0.0-alpha.
|
|
3
|
+
"version": "4.0.0-alpha.23",
|
|
4
4
|
"description": "Framework-independent loaders for compressed and super compressed (basis) textures ",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"publishConfig": {
|
|
@@ -45,15 +45,15 @@
|
|
|
45
45
|
"build-crunch-worker": "esbuild src/workers/crunch-worker.ts --outfile=dist/crunch-worker.js --target=esnext --bundle --define:__VERSION__=\\\"$npm_package_version\\\""
|
|
46
46
|
},
|
|
47
47
|
"dependencies": {
|
|
48
|
-
"@loaders.gl/images": "4.0.0-alpha.
|
|
49
|
-
"@loaders.gl/loader-utils": "4.0.0-alpha.
|
|
50
|
-
"@loaders.gl/schema": "4.0.0-alpha.
|
|
51
|
-
"@loaders.gl/worker-utils": "4.0.0-alpha.
|
|
48
|
+
"@loaders.gl/images": "4.0.0-alpha.23",
|
|
49
|
+
"@loaders.gl/loader-utils": "4.0.0-alpha.23",
|
|
50
|
+
"@loaders.gl/schema": "4.0.0-alpha.23",
|
|
51
|
+
"@loaders.gl/worker-utils": "4.0.0-alpha.23",
|
|
52
52
|
"ktx-parse": "^0.0.4",
|
|
53
53
|
"texture-compressor": "^1.0.2"
|
|
54
54
|
},
|
|
55
55
|
"devDependencies": {
|
|
56
|
-
"@loaders.gl/polyfills": "4.0.0-alpha.
|
|
56
|
+
"@loaders.gl/polyfills": "4.0.0-alpha.23"
|
|
57
57
|
},
|
|
58
|
-
"gitHead": "
|
|
58
|
+
"gitHead": "e212f2a0c0e342f7cb65ce84fa2ff39f64b7d94b"
|
|
59
59
|
}
|
|
@@ -10,17 +10,10 @@ export type TextureLoaderOptions = {
|
|
|
10
10
|
};
|
|
11
11
|
};
|
|
12
12
|
|
|
13
|
-
const DEFAULT_TEXTURE_LOADER_OPTIONS = {
|
|
14
|
-
'compressed-texture': {
|
|
15
|
-
libraryPath: 'libs/',
|
|
16
|
-
useBasis: false
|
|
17
|
-
}
|
|
18
|
-
};
|
|
19
|
-
|
|
20
13
|
/**
|
|
21
14
|
* Worker Loader for KTX, DDS, and PVR texture container formats
|
|
22
15
|
*/
|
|
23
|
-
export const CompressedTextureWorkerLoader = {
|
|
16
|
+
export const CompressedTextureWorkerLoader: Loader<any, never, TextureLoaderOptions> = {
|
|
24
17
|
name: 'Texture Containers',
|
|
25
18
|
id: 'compressed-texture',
|
|
26
19
|
module: 'textures',
|
|
@@ -40,31 +33,35 @@ export const CompressedTextureWorkerLoader = {
|
|
|
40
33
|
'application/octet-stream'
|
|
41
34
|
],
|
|
42
35
|
binary: true,
|
|
43
|
-
options:
|
|
36
|
+
options: {
|
|
37
|
+
'compressed-texture': {
|
|
38
|
+
libraryPath: 'libs/',
|
|
39
|
+
useBasis: false
|
|
40
|
+
}
|
|
41
|
+
}
|
|
44
42
|
};
|
|
45
43
|
|
|
46
44
|
/**
|
|
47
45
|
* Loader for KTX, DDS, and PVR texture container formats
|
|
48
46
|
*/
|
|
49
|
-
export const CompressedTextureLoader = {
|
|
47
|
+
export const CompressedTextureLoader: LoaderWithParser<any, never, TextureLoaderOptions> = {
|
|
50
48
|
...CompressedTextureWorkerLoader,
|
|
51
|
-
parse: async (arrayBuffer, options) => {
|
|
52
|
-
if (options['compressed-texture']
|
|
49
|
+
parse: async (arrayBuffer: ArrayBuffer, options?: TextureLoaderOptions) => {
|
|
50
|
+
if (options?.['compressed-texture']?.useBasis) {
|
|
51
|
+
// @ts-expect-error TODO not allowed to modify inputs
|
|
53
52
|
options.basis = {
|
|
54
53
|
format: {
|
|
55
54
|
alpha: 'BC3',
|
|
56
55
|
noAlpha: 'BC1'
|
|
57
56
|
},
|
|
57
|
+
// @ts-expect-error TODO not allowed to modify inputs
|
|
58
58
|
...options.basis,
|
|
59
59
|
containerFormat: 'ktx2',
|
|
60
60
|
module: 'encoder'
|
|
61
61
|
};
|
|
62
|
-
|
|
62
|
+
const result = await parseBasis(arrayBuffer, options);
|
|
63
|
+
return result[0];
|
|
63
64
|
}
|
|
64
65
|
return parseCompressedTexture(arrayBuffer);
|
|
65
66
|
}
|
|
66
67
|
};
|
|
67
|
-
|
|
68
|
-
// TYPE TESTS - TODO find a better way than exporting junk
|
|
69
|
-
export const _TypecheckCompressedTextureWorkerLoader: Loader = CompressedTextureWorkerLoader;
|
|
70
|
-
export const _TypecheckCompressedTextureLoader: LoaderWithParser = CompressedTextureLoader;
|
package/src/crunch-loader.ts
CHANGED
|
@@ -4,7 +4,7 @@ import {VERSION} from './lib/utils/version';
|
|
|
4
4
|
/**
|
|
5
5
|
* Worker loader for the Crunch compressed texture container format
|
|
6
6
|
*/
|
|
7
|
-
export const CrunchLoader = {
|
|
7
|
+
export const CrunchLoader: Loader = {
|
|
8
8
|
id: 'crunch',
|
|
9
9
|
name: 'Crunch',
|
|
10
10
|
module: 'textures',
|
|
@@ -21,6 +21,3 @@ export const CrunchLoader = {
|
|
|
21
21
|
};
|
|
22
22
|
|
|
23
23
|
// We avoid bundling crunch - rare format, only offer worker loader
|
|
24
|
-
|
|
25
|
-
// TYPE TESTS - TODO find a better way than exporting junk
|
|
26
|
-
export const _TypecheckCrunchLoader: Loader = CrunchLoader;
|