@loaders.gl/gltf 4.0.0-alpha.6 → 4.0.0-alpha.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/dist.min.js +1415 -1339
- package/dist/es5/glb-loader.js +2 -2
- package/dist/es5/glb-loader.js.map +1 -1
- package/dist/es5/glb-writer.js +3 -4
- package/dist/es5/glb-writer.js.map +1 -1
- package/dist/es5/gltf-loader.js +3 -3
- package/dist/es5/gltf-loader.js.map +1 -1
- package/dist/es5/index.js +9 -3
- package/dist/es5/index.js.map +1 -1
- package/dist/es5/lib/api/gltf-extensions.js.map +1 -1
- package/dist/es5/lib/api/gltf-scenegraph.js +47 -30
- package/dist/es5/lib/api/gltf-scenegraph.js.map +1 -1
- package/dist/es5/lib/api/post-process-gltf.js +164 -116
- package/dist/es5/lib/api/post-process-gltf.js.map +1 -1
- package/dist/es5/lib/encoders/encode-glb.js +1 -1
- package/dist/es5/lib/encoders/encode-glb.js.map +1 -1
- package/dist/es5/lib/encoders/encode-gltf.js +2 -3
- package/dist/es5/lib/encoders/encode-gltf.js.map +1 -1
- package/dist/es5/lib/extensions/EXT_meshopt_compression.js +3 -5
- package/dist/es5/lib/extensions/EXT_meshopt_compression.js.map +1 -1
- package/dist/es5/lib/extensions/EXT_texture_webp.js +2 -3
- package/dist/es5/lib/extensions/EXT_texture_webp.js.map +1 -1
- package/dist/es5/lib/extensions/KHR_binary_gltf.js +2 -3
- package/dist/es5/lib/extensions/KHR_binary_gltf.js.map +1 -1
- package/dist/es5/lib/extensions/KHR_draco_mesh_compression.js +6 -5
- package/dist/es5/lib/extensions/KHR_draco_mesh_compression.js.map +1 -1
- package/dist/es5/lib/extensions/KHR_texture_basisu.js +3 -4
- package/dist/es5/lib/extensions/KHR_texture_basisu.js.map +1 -1
- package/dist/es5/lib/extensions/KHR_texture_transform.js +9 -8
- package/dist/es5/lib/extensions/KHR_texture_transform.js.map +1 -1
- package/dist/es5/lib/extensions/deprecated/EXT_feature_metadata.js +2 -2
- package/dist/es5/lib/extensions/deprecated/EXT_feature_metadata.js.map +1 -1
- package/dist/es5/lib/extensions/deprecated/KHR_lights_punctual.js +3 -3
- package/dist/es5/lib/extensions/deprecated/KHR_lights_punctual.js.map +1 -1
- package/dist/es5/lib/extensions/deprecated/KHR_materials_unlit.js +3 -3
- package/dist/es5/lib/extensions/deprecated/KHR_materials_unlit.js.map +1 -1
- package/dist/es5/lib/extensions/deprecated/KHR_techniques_webgl.js +2 -2
- package/dist/es5/lib/extensions/deprecated/KHR_techniques_webgl.js.map +1 -1
- package/dist/es5/lib/gltf-utils/gltf-attribute-utils.js.map +1 -1
- package/dist/es5/lib/gltf-utils/gltf-utils.js +24 -0
- package/dist/es5/lib/gltf-utils/gltf-utils.js.map +1 -1
- package/dist/es5/lib/parsers/parse-glb.js +10 -10
- package/dist/es5/lib/parsers/parse-glb.js.map +1 -1
- package/dist/es5/lib/parsers/parse-gltf.js +6 -10
- package/dist/es5/lib/parsers/parse-gltf.js.map +1 -1
- package/dist/es5/lib/types/gltf-json-schema.js.map +1 -1
- package/dist/es5/lib/types/gltf-postprocessed-schema.js.map +1 -1
- package/dist/es5/lib/types/gltf-types.js.map +1 -1
- package/dist/es5/lib/utils/version.js +1 -1
- package/dist/esm/glb-loader.js +1 -1
- package/dist/esm/glb-loader.js.map +1 -1
- package/dist/esm/glb-writer.js +1 -1
- package/dist/esm/glb-writer.js.map +1 -1
- package/dist/esm/gltf-loader.js +3 -3
- package/dist/esm/gltf-loader.js.map +1 -1
- package/dist/esm/index.js +2 -1
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/lib/api/gltf-extensions.js.map +1 -1
- package/dist/esm/lib/api/gltf-scenegraph.js +40 -29
- package/dist/esm/lib/api/gltf-scenegraph.js.map +1 -1
- package/dist/esm/lib/api/post-process-gltf.js +167 -112
- package/dist/esm/lib/api/post-process-gltf.js.map +1 -1
- package/dist/esm/lib/encoders/encode-glb.js +1 -1
- package/dist/esm/lib/encoders/encode-glb.js.map +1 -1
- package/dist/esm/lib/encoders/encode-gltf.js +1 -1
- package/dist/esm/lib/encoders/encode-gltf.js.map +1 -1
- package/dist/esm/lib/extensions/EXT_meshopt_compression.js +2 -3
- package/dist/esm/lib/extensions/EXT_meshopt_compression.js.map +1 -1
- package/dist/esm/lib/extensions/EXT_texture_webp.js +1 -1
- package/dist/esm/lib/extensions/EXT_texture_webp.js.map +1 -1
- package/dist/esm/lib/extensions/KHR_binary_gltf.js +1 -1
- package/dist/esm/lib/extensions/KHR_binary_gltf.js.map +1 -1
- package/dist/esm/lib/extensions/KHR_draco_mesh_compression.js +5 -4
- package/dist/esm/lib/extensions/KHR_draco_mesh_compression.js.map +1 -1
- package/dist/esm/lib/extensions/KHR_texture_basisu.js +2 -2
- package/dist/esm/lib/extensions/KHR_texture_basisu.js.map +1 -1
- package/dist/esm/lib/extensions/KHR_texture_transform.js +7 -6
- package/dist/esm/lib/extensions/KHR_texture_transform.js.map +1 -1
- package/dist/esm/lib/extensions/deprecated/EXT_feature_metadata.js +1 -1
- package/dist/esm/lib/extensions/deprecated/EXT_feature_metadata.js.map +1 -1
- package/dist/esm/lib/extensions/deprecated/KHR_lights_punctual.js +1 -1
- package/dist/esm/lib/extensions/deprecated/KHR_lights_punctual.js.map +1 -1
- package/dist/esm/lib/extensions/deprecated/KHR_materials_unlit.js +1 -1
- package/dist/esm/lib/extensions/deprecated/KHR_materials_unlit.js.map +1 -1
- package/dist/esm/lib/extensions/deprecated/KHR_techniques_webgl.js +1 -1
- package/dist/esm/lib/extensions/deprecated/KHR_techniques_webgl.js.map +1 -1
- package/dist/esm/lib/gltf-utils/gltf-attribute-utils.js.map +1 -1
- package/dist/esm/lib/gltf-utils/gltf-utils.js +20 -0
- package/dist/esm/lib/gltf-utils/gltf-utils.js.map +1 -1
- package/dist/esm/lib/parsers/parse-glb.js +10 -10
- package/dist/esm/lib/parsers/parse-glb.js.map +1 -1
- package/dist/esm/lib/parsers/parse-gltf.js +5 -6
- package/dist/esm/lib/parsers/parse-gltf.js.map +1 -1
- package/dist/esm/lib/types/gltf-json-schema.js.map +1 -1
- package/dist/esm/lib/types/gltf-postprocessed-schema.js.map +1 -1
- package/dist/esm/lib/types/gltf-types.js.map +1 -1
- package/dist/esm/lib/utils/version.js +1 -1
- package/dist/glb-loader.d.ts +2 -2
- package/dist/glb-loader.js +2 -5
- package/dist/glb-writer.d.ts.map +1 -1
- package/dist/glb-writer.js +4 -6
- package/dist/gltf-loader.d.ts +5 -5
- package/dist/gltf-loader.d.ts.map +1 -1
- package/dist/gltf-loader.js +3 -3
- package/dist/index.d.ts +8 -5
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +12 -5
- package/dist/lib/api/gltf-extensions.d.ts +1 -1
- package/dist/lib/api/gltf-extensions.d.ts.map +1 -1
- package/dist/lib/api/gltf-scenegraph.d.ts +6 -4
- package/dist/lib/api/gltf-scenegraph.d.ts.map +1 -1
- package/dist/lib/api/gltf-scenegraph.js +43 -30
- package/dist/lib/api/post-process-gltf.d.ts +4 -1
- package/dist/lib/api/post-process-gltf.d.ts.map +1 -1
- package/dist/lib/api/post-process-gltf.js +186 -123
- package/dist/lib/encoders/encode-glb.d.ts +13 -1
- package/dist/lib/encoders/encode-glb.d.ts.map +1 -1
- package/dist/lib/encoders/encode-glb.js +15 -4
- package/dist/lib/encoders/encode-gltf.js +2 -5
- package/dist/lib/extensions/EXT_meshopt_compression.d.ts +1 -1
- package/dist/lib/extensions/EXT_meshopt_compression.d.ts.map +1 -1
- package/dist/lib/extensions/EXT_meshopt_compression.js +3 -7
- package/dist/lib/extensions/EXT_texture_webp.d.ts +1 -1
- package/dist/lib/extensions/EXT_texture_webp.d.ts.map +1 -1
- package/dist/lib/extensions/EXT_texture_webp.js +2 -5
- package/dist/lib/extensions/KHR_binary_gltf.d.ts +1 -1
- package/dist/lib/extensions/KHR_binary_gltf.d.ts.map +1 -1
- package/dist/lib/extensions/KHR_binary_gltf.js +2 -5
- package/dist/lib/extensions/KHR_draco_mesh_compression.d.ts +1 -1
- package/dist/lib/extensions/KHR_draco_mesh_compression.d.ts.map +1 -1
- package/dist/lib/extensions/KHR_draco_mesh_compression.js +5 -8
- package/dist/lib/extensions/KHR_texture_basisu.d.ts +1 -1
- package/dist/lib/extensions/KHR_texture_basisu.d.ts.map +1 -1
- package/dist/lib/extensions/KHR_texture_basisu.js +3 -6
- package/dist/lib/extensions/KHR_texture_transform.d.ts.map +1 -1
- package/dist/lib/extensions/KHR_texture_transform.js +7 -10
- package/dist/lib/extensions/deprecated/EXT_feature_metadata.d.ts +1 -1
- package/dist/lib/extensions/deprecated/EXT_feature_metadata.d.ts.map +1 -1
- package/dist/lib/extensions/deprecated/EXT_feature_metadata.js +2 -5
- package/dist/lib/extensions/deprecated/KHR_lights_punctual.d.ts +1 -1
- package/dist/lib/extensions/deprecated/KHR_lights_punctual.d.ts.map +1 -1
- package/dist/lib/extensions/deprecated/KHR_lights_punctual.js +3 -6
- package/dist/lib/extensions/deprecated/KHR_materials_unlit.d.ts +1 -1
- package/dist/lib/extensions/deprecated/KHR_materials_unlit.d.ts.map +1 -1
- package/dist/lib/extensions/deprecated/KHR_materials_unlit.js +3 -6
- package/dist/lib/extensions/deprecated/KHR_techniques_webgl.d.ts +1 -1
- package/dist/lib/extensions/deprecated/KHR_techniques_webgl.d.ts.map +1 -1
- package/dist/lib/extensions/deprecated/KHR_techniques_webgl.js +2 -5
- package/dist/lib/gltf-utils/gltf-attribute-utils.d.ts +1 -1
- package/dist/lib/gltf-utils/gltf-attribute-utils.d.ts.map +1 -1
- package/dist/lib/gltf-utils/gltf-utils.d.ts +7 -0
- package/dist/lib/gltf-utils/gltf-utils.d.ts.map +1 -1
- package/dist/lib/gltf-utils/gltf-utils.js +28 -1
- package/dist/lib/parsers/parse-glb.d.ts +15 -3
- package/dist/lib/parsers/parse-glb.d.ts.map +1 -1
- package/dist/lib/parsers/parse-glb.js +43 -18
- package/dist/lib/parsers/parse-gltf.d.ts +8 -4
- package/dist/lib/parsers/parse-gltf.d.ts.map +1 -1
- package/dist/lib/parsers/parse-gltf.js +13 -34
- package/dist/lib/types/gltf-json-schema.d.ts +151 -138
- package/dist/lib/types/gltf-json-schema.d.ts.map +1 -1
- package/dist/lib/types/gltf-postprocessed-schema.d.ts +174 -209
- package/dist/lib/types/gltf-postprocessed-schema.d.ts.map +1 -1
- package/dist/lib/types/gltf-postprocessed-schema.js +1 -1
- package/dist/lib/types/gltf-types.d.ts +18 -6
- package/dist/lib/types/gltf-types.d.ts.map +1 -1
- package/package.json +6 -6
- package/src/glb-loader.ts +3 -3
- package/src/glb-writer.ts +3 -1
- package/src/gltf-loader.ts +12 -8
- package/src/index.ts +32 -13
- package/src/lib/api/gltf-extensions.ts +1 -1
- package/src/lib/api/gltf-scenegraph.ts +55 -37
- package/src/lib/api/post-process-gltf.ts +275 -150
- package/src/lib/encoders/encode-glb.ts +15 -5
- package/src/lib/encoders/encode-gltf.ts +1 -1
- package/src/lib/extensions/EXT_meshopt_compression.ts +4 -6
- package/src/lib/extensions/EXT_texture_webp.ts +2 -2
- package/src/lib/extensions/KHR_binary_gltf.ts +2 -2
- package/src/lib/extensions/KHR_draco_mesh_compression.ts +7 -7
- package/src/lib/extensions/KHR_texture_basisu.ts +3 -3
- package/src/lib/extensions/KHR_texture_transform.ts +22 -19
- package/src/lib/extensions/deprecated/EXT_feature_metadata.ts +2 -2
- package/src/lib/extensions/deprecated/KHR_lights_punctual.ts +2 -2
- package/src/lib/extensions/deprecated/KHR_materials_unlit.ts +2 -2
- package/src/lib/extensions/deprecated/KHR_techniques_webgl.ts +2 -2
- package/src/lib/gltf-utils/gltf-attribute-utils.ts +1 -1
- package/src/lib/gltf-utils/gltf-utils.ts +31 -0
- package/src/lib/parsers/parse-glb.ts +50 -24
- package/src/lib/parsers/parse-gltf.ts +22 -16
- package/src/lib/types/gltf-json-schema.ts +165 -138
- package/src/lib/types/gltf-postprocessed-schema.ts +289 -212
- package/src/lib/types/gltf-types.ts +35 -59
|
@@ -2,17 +2,14 @@
|
|
|
2
2
|
// GLTF 1.0 EXTENSION: KHR_binary_glTF
|
|
3
3
|
// https://github.com/KhronosGroup/glTF/tree/master/extensions/1.0/Khronos/KHR_binary_glTF
|
|
4
4
|
/* eslint-disable camelcase */
|
|
5
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
6
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
7
|
-
};
|
|
8
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
6
|
exports.preprocess = exports.name = void 0;
|
|
10
|
-
const gltf_scenegraph_1 =
|
|
7
|
+
const gltf_scenegraph_1 = require("../api/gltf-scenegraph");
|
|
11
8
|
const KHR_BINARY_GLTF = 'KHR_binary_glTF';
|
|
12
9
|
/** Extension name */
|
|
13
10
|
exports.name = KHR_BINARY_GLTF;
|
|
14
11
|
function preprocess(gltfData) {
|
|
15
|
-
const gltfScenegraph = new gltf_scenegraph_1.
|
|
12
|
+
const gltfScenegraph = new gltf_scenegraph_1.GLTFScenegraph(gltfData);
|
|
16
13
|
const { json } = gltfScenegraph;
|
|
17
14
|
// Note: json.buffers.binary_glTF also needs to be replaced
|
|
18
15
|
// This is currently done during gltf normalization
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KHR_draco_mesh_compression.d.ts","sourceRoot":"","sources":["../../../src/lib/extensions/KHR_draco_mesh_compression.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,IAAI,EAIL,MAAM,
|
|
1
|
+
{"version":3,"file":"KHR_draco_mesh_compression.d.ts","sourceRoot":"","sources":["../../../src/lib/extensions/KHR_draco_mesh_compression.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,IAAI,EAIL,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AAEzD,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAS5D,qBAAqB;AACrB,eAAO,MAAM,IAAI,+BAA6B,CAAC;AAE/C,wBAAgB,UAAU,CACxB,QAAQ,EAAE;IAAC,IAAI,EAAE,IAAI,CAAA;CAAC,EACtB,OAAO,EAAE,iBAAiB,EAC1B,OAAO,EAAE,aAAa,GACrB,IAAI,CAON;AAED,wBAAsB,MAAM,CAC1B,QAAQ,EAAE;IAAC,IAAI,EAAE,IAAI,CAAA;CAAC,EACtB,OAAO,EAAE,iBAAiB,EAC1B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,IAAI,CAAC,CAkBf;AAED,wBAAgB,MAAM,CAAC,QAAQ,KAAA,EAAE,OAAO,GAAE,iBAAsB,GAAG,IAAI,CAUtE"}
|
|
@@ -2,20 +2,17 @@
|
|
|
2
2
|
// https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_draco_mesh_compression
|
|
3
3
|
// Only TRIANGLES: 0x0004 and TRIANGLE_STRIP: 0x0005 are supported
|
|
4
4
|
/* eslint-disable camelcase */
|
|
5
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
6
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
7
|
-
};
|
|
8
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
6
|
exports.encode = exports.decode = exports.preprocess = exports.name = void 0;
|
|
10
7
|
const draco_1 = require("@loaders.gl/draco");
|
|
11
8
|
const loader_utils_1 = require("@loaders.gl/loader-utils");
|
|
12
|
-
const gltf_scenegraph_1 =
|
|
9
|
+
const gltf_scenegraph_1 = require("../api/gltf-scenegraph");
|
|
13
10
|
const gltf_attribute_utils_1 = require("../gltf-utils/gltf-attribute-utils");
|
|
14
11
|
const KHR_DRACO_MESH_COMPRESSION = 'KHR_draco_mesh_compression';
|
|
15
12
|
/** Extension name */
|
|
16
13
|
exports.name = KHR_DRACO_MESH_COMPRESSION;
|
|
17
14
|
function preprocess(gltfData, options, context) {
|
|
18
|
-
const scenegraph = new gltf_scenegraph_1.
|
|
15
|
+
const scenegraph = new gltf_scenegraph_1.GLTFScenegraph(gltfData);
|
|
19
16
|
for (const primitive of makeMeshPrimitiveIterator(scenegraph)) {
|
|
20
17
|
if (scenegraph.getObjectExtension(primitive, KHR_DRACO_MESH_COMPRESSION)) {
|
|
21
18
|
// TODO - Remove fallback accessors to make sure we don't load unnecessary buffers
|
|
@@ -27,7 +24,7 @@ async function decode(gltfData, options, context) {
|
|
|
27
24
|
if (!options?.gltf?.decompressMeshes) {
|
|
28
25
|
return;
|
|
29
26
|
}
|
|
30
|
-
const scenegraph = new gltf_scenegraph_1.
|
|
27
|
+
const scenegraph = new gltf_scenegraph_1.GLTFScenegraph(gltfData);
|
|
31
28
|
const promises = [];
|
|
32
29
|
for (const primitive of makeMeshPrimitiveIterator(scenegraph)) {
|
|
33
30
|
if (scenegraph.getObjectExtension(primitive, KHR_DRACO_MESH_COMPRESSION)) {
|
|
@@ -41,7 +38,7 @@ async function decode(gltfData, options, context) {
|
|
|
41
38
|
}
|
|
42
39
|
exports.decode = decode;
|
|
43
40
|
function encode(gltfData, options = {}) {
|
|
44
|
-
const scenegraph = new gltf_scenegraph_1.
|
|
41
|
+
const scenegraph = new gltf_scenegraph_1.GLTFScenegraph(gltfData);
|
|
45
42
|
for (const mesh of scenegraph.json.meshes || []) {
|
|
46
43
|
// eslint-disable-next-line camelcase
|
|
47
44
|
// @ts-ignore
|
|
@@ -89,7 +86,7 @@ async function decompressPrimitive(scenegraph, primitive, options, context) {
|
|
|
89
86
|
primitive.indices = (0, gltf_attribute_utils_1.getGLTFAccessor)(decodedData.indices);
|
|
90
87
|
}
|
|
91
88
|
// Extension has been processed, delete it
|
|
92
|
-
|
|
89
|
+
scenegraph.removeObjectExtension(primitive, KHR_DRACO_MESH_COMPRESSION);
|
|
93
90
|
checkPrimitive(primitive);
|
|
94
91
|
}
|
|
95
92
|
// ENCODE
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KHR_texture_basisu.d.ts","sourceRoot":"","sources":["../../../src/lib/extensions/KHR_texture_basisu.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,IAAI,EAA0B,MAAM,
|
|
1
|
+
{"version":3,"file":"KHR_texture_basisu.d.ts","sourceRoot":"","sources":["../../../src/lib/extensions/KHR_texture_basisu.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,IAAI,EAA0B,MAAM,2BAA2B,CAAC;AAC7E,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AAMzD,qBAAqB;AACrB,eAAO,MAAM,IAAI,uBAAqB,CAAC;AAEvC;;;GAGG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE;IAAC,IAAI,EAAE,IAAI,CAAA;CAAC,EAAE,OAAO,EAAE,iBAAiB,GAAG,IAAI,CAkBnF"}
|
|
@@ -2,12 +2,9 @@
|
|
|
2
2
|
// GLTF EXTENSION: KHR_texture_basisu
|
|
3
3
|
// https://github.com/KhronosGroup/glTF/tree/main/extensions/2.0/Khronos/KHR_texture_basisu
|
|
4
4
|
/* eslint-disable camelcase */
|
|
5
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
6
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
7
|
-
};
|
|
8
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
6
|
exports.preprocess = exports.name = void 0;
|
|
10
|
-
const gltf_scenegraph_1 =
|
|
7
|
+
const gltf_scenegraph_1 = require("../api/gltf-scenegraph");
|
|
11
8
|
const KHR_TEXTURE_BASISU = 'KHR_texture_basisu';
|
|
12
9
|
/** Extension name */
|
|
13
10
|
exports.name = KHR_TEXTURE_BASISU;
|
|
@@ -16,15 +13,15 @@ exports.name = KHR_TEXTURE_BASISU;
|
|
|
16
13
|
* Done in preprocess() to prevent load of default image
|
|
17
14
|
*/
|
|
18
15
|
function preprocess(gltfData, options) {
|
|
19
|
-
const scene = new gltf_scenegraph_1.
|
|
16
|
+
const scene = new gltf_scenegraph_1.GLTFScenegraph(gltfData);
|
|
20
17
|
const { json } = scene;
|
|
21
18
|
for (const texture of json.textures || []) {
|
|
22
19
|
const extension = scene.getObjectExtension(texture, KHR_TEXTURE_BASISU);
|
|
23
20
|
if (extension) {
|
|
24
21
|
// TODO - if multiple texture extensions are present which one wins?
|
|
25
22
|
texture.source = extension.source;
|
|
23
|
+
scene.removeObjectExtension(texture, KHR_TEXTURE_BASISU);
|
|
26
24
|
}
|
|
27
|
-
scene.removeObjectExtension(texture, KHR_TEXTURE_BASISU);
|
|
28
25
|
}
|
|
29
26
|
// Remove the top-level extension
|
|
30
27
|
scene.removeExtension(KHR_TEXTURE_BASISU);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KHR_texture_transform.d.ts","sourceRoot":"","sources":["../../../src/lib/extensions/KHR_texture_transform.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"KHR_texture_transform.d.ts","sourceRoot":"","sources":["../../../src/lib/extensions/KHR_texture_transform.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,qBAAqB,CAAC;AASzD,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AAUzD,eAAO,MAAM,IAAI,0BAAwB,CAAC;AA+B1C;;;;GAIG;AACH,wBAAsB,MAAM,CAAC,QAAQ,EAAE,eAAe,EAAE,OAAO,EAAE,iBAAiB,iBAUjF"}
|
|
@@ -2,15 +2,12 @@
|
|
|
2
2
|
/**
|
|
3
3
|
* https://github.com/KhronosGroup/glTF/blob/main/extensions/2.0/Khronos/KHR_texture_transform/README.md
|
|
4
4
|
*/
|
|
5
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
6
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
7
|
-
};
|
|
8
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
6
|
exports.decode = exports.name = void 0;
|
|
10
7
|
const core_1 = require("@math.gl/core");
|
|
11
8
|
const gltf_utils_1 = require("../gltf-utils/gltf-utils");
|
|
12
9
|
const gltf_constants_1 = require("../gltf-utils/gltf-constants");
|
|
13
|
-
const gltf_scenegraph_1 =
|
|
10
|
+
const gltf_scenegraph_1 = require("../api/gltf-scenegraph");
|
|
14
11
|
/** Extension name */
|
|
15
12
|
const EXT_MESHOPT_TRANSFORM = 'KHR_texture_transform';
|
|
16
13
|
exports.name = EXT_MESHOPT_TRANSFORM;
|
|
@@ -23,9 +20,9 @@ const scratchScaleMatrix = new core_1.Matrix3();
|
|
|
23
20
|
* @param options GLTFLoader options
|
|
24
21
|
*/
|
|
25
22
|
async function decode(gltfData, options) {
|
|
26
|
-
const gltfScenegraph = new gltf_scenegraph_1.
|
|
27
|
-
const
|
|
28
|
-
if (!
|
|
23
|
+
const gltfScenegraph = new gltf_scenegraph_1.GLTFScenegraph(gltfData);
|
|
24
|
+
const hasExtension = gltfScenegraph.hasExtension(EXT_MESHOPT_TRANSFORM);
|
|
25
|
+
if (!hasExtension) {
|
|
29
26
|
return;
|
|
30
27
|
}
|
|
31
28
|
const materials = gltfData.json.materials || [];
|
|
@@ -223,8 +220,8 @@ function createAttribute(newTexCoord, originalAccessor, primitive, gltfData, new
|
|
|
223
220
|
*/
|
|
224
221
|
function makeTransformationMatrix(extensionData) {
|
|
225
222
|
const { offset = [0, 0], rotation = 0, scale = [1, 1] } = extensionData;
|
|
226
|
-
const
|
|
227
|
-
const
|
|
223
|
+
const translationMatrix = new core_1.Matrix3().set(1, 0, 0, 0, 1, 0, offset[0], offset[1], 1);
|
|
224
|
+
const rotationMatrix = scratchRotationMatrix.set(Math.cos(rotation), Math.sin(rotation), 0, -Math.sin(rotation), Math.cos(rotation), 0, 0, 0, 1);
|
|
228
225
|
const scaleMatrix = scratchScaleMatrix.set(scale[0], 0, 0, 0, scale[1], 0, 0, 0, 1);
|
|
229
|
-
return
|
|
226
|
+
return translationMatrix.multiplyRight(rotationMatrix).multiplyRight(scaleMatrix);
|
|
230
227
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EXT_feature_metadata.d.ts","sourceRoot":"","sources":["../../../../src/lib/extensions/deprecated/EXT_feature_metadata.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"EXT_feature_metadata.d.ts","sourceRoot":"","sources":["../../../../src/lib/extensions/deprecated/EXT_feature_metadata.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,8BAA8B,CAAC;AAcvD,eAAO,MAAM,IAAI,yBAAuB,CAAC;AAEzC,wBAAsB,MAAM,CAAC,QAAQ,EAAE;IAAC,IAAI,EAAE,IAAI,CAAA;CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAGlE"}
|
|
@@ -1,15 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.decode = exports.name = void 0;
|
|
7
|
-
const gltf_scenegraph_1 =
|
|
4
|
+
const gltf_scenegraph_1 = require("../../api/gltf-scenegraph");
|
|
8
5
|
/** Extension name */
|
|
9
6
|
const EXT_FEATURE_METADATA = 'EXT_feature_metadata';
|
|
10
7
|
exports.name = EXT_FEATURE_METADATA;
|
|
11
8
|
async function decode(gltfData) {
|
|
12
|
-
const scenegraph = new gltf_scenegraph_1.
|
|
9
|
+
const scenegraph = new gltf_scenegraph_1.GLTFScenegraph(gltfData);
|
|
13
10
|
decodeExtFeatureMetadata(scenegraph);
|
|
14
11
|
}
|
|
15
12
|
exports.decode = decode;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KHR_lights_punctual.d.ts","sourceRoot":"","sources":["../../../../src/lib/extensions/deprecated/KHR_lights_punctual.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"KHR_lights_punctual.d.ts","sourceRoot":"","sources":["../../../../src/lib/extensions/deprecated/KHR_lights_punctual.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,8BAA8B,CAAC;AAOvD,eAAO,MAAM,IAAI,wBAAsB,CAAC;AAExC,wBAAsB,MAAM,CAAC,QAAQ,EAAE;IAAC,IAAI,EAAE,IAAI,CAAA;CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAsBlE;AAGD,wBAAsB,MAAM,CAAC,QAAQ,KAAA,GAAG,OAAO,CAAC,IAAI,CAAC,CA2BpD"}
|
|
@@ -1,17 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
// GLTF EXTENSION: KHR_lights_punctual
|
|
3
3
|
// https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_lights_punctual
|
|
4
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
5
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
6
|
-
};
|
|
7
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
8
5
|
exports.encode = exports.decode = exports.name = void 0;
|
|
9
6
|
const assert_1 = require("../../utils/assert");
|
|
10
|
-
const gltf_scenegraph_1 =
|
|
7
|
+
const gltf_scenegraph_1 = require("../../api/gltf-scenegraph");
|
|
11
8
|
const KHR_LIGHTS_PUNCTUAL = 'KHR_lights_punctual';
|
|
12
9
|
exports.name = KHR_LIGHTS_PUNCTUAL;
|
|
13
10
|
async function decode(gltfData) {
|
|
14
|
-
const gltfScenegraph = new gltf_scenegraph_1.
|
|
11
|
+
const gltfScenegraph = new gltf_scenegraph_1.GLTFScenegraph(gltfData);
|
|
15
12
|
const { json } = gltfScenegraph;
|
|
16
13
|
// Move the light array out of the extension and remove the extension
|
|
17
14
|
const extension = gltfScenegraph.getExtension(KHR_LIGHTS_PUNCTUAL);
|
|
@@ -34,7 +31,7 @@ async function decode(gltfData) {
|
|
|
34
31
|
exports.decode = decode;
|
|
35
32
|
// Move the light ar ray out of the extension and remove the extension
|
|
36
33
|
async function encode(gltfData) {
|
|
37
|
-
const gltfScenegraph = new gltf_scenegraph_1.
|
|
34
|
+
const gltfScenegraph = new gltf_scenegraph_1.GLTFScenegraph(gltfData);
|
|
38
35
|
const { json } = gltfScenegraph;
|
|
39
36
|
// @ts-ignore
|
|
40
37
|
if (json.lights) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KHR_materials_unlit.d.ts","sourceRoot":"","sources":["../../../../src/lib/extensions/deprecated/KHR_materials_unlit.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"KHR_materials_unlit.d.ts","sourceRoot":"","sources":["../../../../src/lib/extensions/deprecated/KHR_materials_unlit.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,8BAA8B,CAAC;AAMvD,eAAO,MAAM,IAAI,wBAAsB,CAAC;AAExC,wBAAsB,MAAM,CAAC,QAAQ,EAAE;IAAC,IAAI,EAAE,IAAI,CAAA;CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBlE;AAED,wBAAgB,MAAM,CAAC,QAAQ,KAAA,QAkB9B"}
|
|
@@ -1,16 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
// GLTF EXTENSION: KHR_materials_unlit
|
|
3
3
|
// https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_materials_unlit
|
|
4
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
5
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
6
|
-
};
|
|
7
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
8
5
|
exports.encode = exports.decode = exports.name = void 0;
|
|
9
|
-
const gltf_scenegraph_1 =
|
|
6
|
+
const gltf_scenegraph_1 = require("../../api/gltf-scenegraph");
|
|
10
7
|
const KHR_MATERIALS_UNLIT = 'KHR_materials_unlit';
|
|
11
8
|
exports.name = KHR_MATERIALS_UNLIT;
|
|
12
9
|
async function decode(gltfData) {
|
|
13
|
-
const gltfScenegraph = new gltf_scenegraph_1.
|
|
10
|
+
const gltfScenegraph = new gltf_scenegraph_1.GLTFScenegraph(gltfData);
|
|
14
11
|
const { json } = gltfScenegraph;
|
|
15
12
|
// Any nodes that have the extension, add lights field pointing to light object
|
|
16
13
|
// and remove the extension
|
|
@@ -27,7 +24,7 @@ async function decode(gltfData) {
|
|
|
27
24
|
}
|
|
28
25
|
exports.decode = decode;
|
|
29
26
|
function encode(gltfData) {
|
|
30
|
-
const gltfScenegraph = new gltf_scenegraph_1.
|
|
27
|
+
const gltfScenegraph = new gltf_scenegraph_1.GLTFScenegraph(gltfData);
|
|
31
28
|
const { json } = gltfScenegraph;
|
|
32
29
|
// Any nodes that have lights field pointing to light object
|
|
33
30
|
// add the extension
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KHR_techniques_webgl.d.ts","sourceRoot":"","sources":["../../../../src/lib/extensions/deprecated/KHR_techniques_webgl.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"KHR_techniques_webgl.d.ts","sourceRoot":"","sources":["../../../../src/lib/extensions/deprecated/KHR_techniques_webgl.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,8BAA8B,CAAC;AAMvD,eAAO,MAAM,IAAI,yBAAuB,CAAC;AAEzC,wBAAsB,MAAM,CAAC,QAAQ,EAAE;IAAC,IAAI,EAAE,IAAI,CAAA;CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CA2BlE;AAED,wBAAsB,MAAM,CAAC,QAAQ,KAAA,EAAE,OAAO,KAAA,GAAG,OAAO,CAAC,IAAI,CAAC,CAE7D"}
|
|
@@ -1,16 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
// GLTF EXTENSION: KHR_techniques_webgl
|
|
3
3
|
// https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_techniques_webgl
|
|
4
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
5
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
6
|
-
};
|
|
7
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
8
5
|
exports.encode = exports.decode = exports.name = void 0;
|
|
9
|
-
const gltf_scenegraph_1 =
|
|
6
|
+
const gltf_scenegraph_1 = require("../../api/gltf-scenegraph");
|
|
10
7
|
const KHR_TECHNIQUES_WEBGL = 'KHR_techniques_webgl';
|
|
11
8
|
exports.name = KHR_TECHNIQUES_WEBGL;
|
|
12
9
|
async function decode(gltfData) {
|
|
13
|
-
const gltfScenegraph = new gltf_scenegraph_1.
|
|
10
|
+
const gltfScenegraph = new gltf_scenegraph_1.GLTFScenegraph(gltfData);
|
|
14
11
|
const { json } = gltfScenegraph;
|
|
15
12
|
const extension = gltfScenegraph.getExtension(KHR_TECHNIQUES_WEBGL);
|
|
16
13
|
if (extension) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gltf-attribute-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/gltf-utils/gltf-attribute-utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"gltf-attribute-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/gltf-utils/gltf-attribute-utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,2BAA2B,CAAC;AAO5D,wBAAgB,gBAAgB,CAAC,UAAU,KAAA,GAAG;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAAA;CAAC,CAU1E;AAKD,wBAAgB,eAAe,CAAC,SAAS,KAAA,gBAmBxC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { GLTFPostprocessed } from '../types/gltf-postprocessed-schema';
|
|
1
2
|
export declare function getAccessorTypeFromSize(size: any): string;
|
|
2
3
|
export declare function getComponentTypeFromArray(typedArray: any): number;
|
|
3
4
|
export declare function getAccessorArrayTypeAndLength(accessor: any, bufferView: any): {
|
|
@@ -5,4 +6,10 @@ export declare function getAccessorArrayTypeAndLength(accessor: any, bufferView:
|
|
|
5
6
|
length: number;
|
|
6
7
|
byteLength: number;
|
|
7
8
|
};
|
|
9
|
+
/**
|
|
10
|
+
* Calculate the GPU memory used by a GLTF tile, for both buffer and texture memory
|
|
11
|
+
* @param gltf - the gltf content of a GLTF tile
|
|
12
|
+
* @returns - total memory usage in bytes
|
|
13
|
+
*/
|
|
14
|
+
export declare function getMemoryUsageGLTF(gltf: GLTFPostprocessed): number;
|
|
8
15
|
//# sourceMappingURL=gltf-utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gltf-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/gltf-utils/gltf-utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"gltf-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/gltf-utils/gltf-utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,oCAAoC,CAAC;AA+D1E,wBAAgB,uBAAuB,CAAC,IAAI,KAAA,UAG3C;AAED,wBAAgB,yBAAyB,CAAC,UAAU,KAAA,UAMnD;AAED,wBAAgB,6BAA6B,CAAC,QAAQ,KAAA,EAAE,UAAU,KAAA;;;;EAQjE;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,iBAAiB,GAAG,MAAM,CAiBlE"}
|
|
@@ -1,7 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getAccessorArrayTypeAndLength = exports.getComponentTypeFromArray = exports.getAccessorTypeFromSize = void 0;
|
|
3
|
+
exports.getMemoryUsageGLTF = exports.getAccessorArrayTypeAndLength = exports.getComponentTypeFromArray = exports.getAccessorTypeFromSize = void 0;
|
|
4
4
|
const assert_1 = require("../utils/assert");
|
|
5
|
+
/**
|
|
6
|
+
* Memory needed to store texture and all mipmap levels 1 + 1/4 + 1/16 + 1/64 + ...
|
|
7
|
+
* Minimum 1.33, but due to GPU layout may be 1.5
|
|
8
|
+
*/
|
|
9
|
+
const MIPMAP_FACTOR = 1.33;
|
|
5
10
|
const TYPES = ['SCALAR', 'VEC2', 'VEC3', 'VEC4'];
|
|
6
11
|
const ARRAY_CONSTRUCTOR_TO_WEBGL_CONSTANT = [
|
|
7
12
|
[Int8Array, 5120],
|
|
@@ -61,3 +66,25 @@ function getAccessorArrayTypeAndLength(accessor, bufferView) {
|
|
|
61
66
|
return { ArrayType, length, byteLength };
|
|
62
67
|
}
|
|
63
68
|
exports.getAccessorArrayTypeAndLength = getAccessorArrayTypeAndLength;
|
|
69
|
+
/**
|
|
70
|
+
* Calculate the GPU memory used by a GLTF tile, for both buffer and texture memory
|
|
71
|
+
* @param gltf - the gltf content of a GLTF tile
|
|
72
|
+
* @returns - total memory usage in bytes
|
|
73
|
+
*/
|
|
74
|
+
function getMemoryUsageGLTF(gltf) {
|
|
75
|
+
let { images, bufferViews } = gltf;
|
|
76
|
+
images = images || [];
|
|
77
|
+
bufferViews = bufferViews || [];
|
|
78
|
+
const imageBufferViews = images.map((i) => i.bufferView);
|
|
79
|
+
bufferViews = bufferViews.filter((view) => !imageBufferViews.includes(view));
|
|
80
|
+
const bufferMemory = bufferViews.reduce((acc, view) => acc + view.byteLength, 0);
|
|
81
|
+
// Assume each pixel of the texture is 4 channel with mimmaps (which add 33%)
|
|
82
|
+
// TODO correctly handle compressed textures
|
|
83
|
+
const pixelCount = images.reduce((acc, image) => {
|
|
84
|
+
// @ts-ignore
|
|
85
|
+
const { width, height } = image.image;
|
|
86
|
+
return acc + width * height;
|
|
87
|
+
}, 0);
|
|
88
|
+
return bufferMemory + Math.ceil(4 * pixelCount * MIPMAP_FACTOR);
|
|
89
|
+
}
|
|
90
|
+
exports.getMemoryUsageGLTF = getMemoryUsageGLTF;
|
|
@@ -1,8 +1,20 @@
|
|
|
1
1
|
import type { GLB } from '../types/glb-types';
|
|
2
|
-
|
|
2
|
+
/** Options for parsing a GLB */
|
|
3
|
+
export type ParseGLBOptions = {
|
|
4
|
+
/** @deprecated This option was used by XVIZ protocol to define a non-standard magic number */
|
|
3
5
|
magic?: number;
|
|
6
|
+
/** @deprecated This option was used by XVIZ protocol to embed non-standard chunks */
|
|
4
7
|
strict?: boolean;
|
|
5
8
|
};
|
|
6
|
-
|
|
7
|
-
export
|
|
9
|
+
/** Check if the contents of an array buffer contains GLB byte markers */
|
|
10
|
+
export declare function isGLB(arrayBuffer: ArrayBuffer, byteOffset?: number, options?: ParseGLBOptions): boolean;
|
|
11
|
+
/**
|
|
12
|
+
* Synchronously parse a GLB
|
|
13
|
+
* @param glb - Target, Output is stored there
|
|
14
|
+
* @param arrayBuffer - Input data
|
|
15
|
+
* @param byteOffset - Offset into arrayBuffer to start parsing from (for "embedded" GLBs, e.g. in 3D tiles)
|
|
16
|
+
* @param options
|
|
17
|
+
* @returns
|
|
18
|
+
*/
|
|
19
|
+
export declare function parseGLBSync(glb: GLB, arrayBuffer: ArrayBuffer, byteOffset?: number, options?: ParseGLBOptions): number;
|
|
8
20
|
//# sourceMappingURL=parse-glb.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-glb.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/parse-glb.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,oBAAoB,CAAC;AAG5C,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;
|
|
1
|
+
{"version":3,"file":"parse-glb.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/parse-glb.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,oBAAoB,CAAC;AAG5C,gCAAgC;AAChC,MAAM,MAAM,eAAe,GAAG;IAC5B,8FAA8F;IAC9F,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,qFAAqF;IACrF,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AA0BF,yEAAyE;AACzE,wBAAgB,KAAK,CACnB,WAAW,EAAE,WAAW,EACxB,UAAU,GAAE,MAAU,EACtB,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAMT;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,GAAG,EACR,WAAW,EAAE,WAAW,EACxB,UAAU,GAAE,MAAU,EACtB,OAAO,GAAE,eAAoB,UAmC9B"}
|
|
@@ -1,16 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.isGLB = void 0;
|
|
3
|
+
exports.parseGLBSync = exports.isGLB = void 0;
|
|
4
4
|
const loader_utils_1 = require("@loaders.gl/loader-utils");
|
|
5
|
-
|
|
5
|
+
/** Binary GLTF is little endian. */
|
|
6
|
+
const LITTLE_ENDIAN = true;
|
|
7
|
+
/** 'glTF' in Big-Endian ASCII */
|
|
8
|
+
const MAGIC_glTF = 0x676c5446;
|
|
6
9
|
const GLB_FILE_HEADER_SIZE = 12;
|
|
7
10
|
const GLB_CHUNK_HEADER_SIZE = 8;
|
|
8
11
|
const GLB_CHUNK_TYPE_JSON = 0x4e4f534a;
|
|
9
12
|
const GLB_CHUNK_TYPE_BIN = 0x004e4942;
|
|
10
|
-
const GLB_CHUNK_TYPE_JSON_XVIZ_DEPRECATED = 0; // DEPRECATED - Backward compatibility for old xviz files
|
|
11
|
-
const GLB_CHUNK_TYPE_BIX_XVIZ_DEPRECATED = 1; // DEPRECATED - Backward compatibility for old xviz files
|
|
12
13
|
const GLB_V1_CONTENT_FORMAT_JSON = 0x0;
|
|
13
|
-
|
|
14
|
+
/** @deprecated - Backward compatibility for old xviz files */
|
|
15
|
+
const GLB_CHUNK_TYPE_JSON_XVIZ_DEPRECATED = 0;
|
|
16
|
+
/** @deprecated - Backward compatibility for old xviz files */
|
|
17
|
+
const GLB_CHUNK_TYPE_BIX_XVIZ_DEPRECATED = 1;
|
|
14
18
|
function getMagicString(dataView, byteOffset = 0) {
|
|
15
19
|
return `\
|
|
16
20
|
${String.fromCharCode(dataView.getUint8(byteOffset + 0))}\
|
|
@@ -18,7 +22,7 @@ ${String.fromCharCode(dataView.getUint8(byteOffset + 1))}\
|
|
|
18
22
|
${String.fromCharCode(dataView.getUint8(byteOffset + 2))}\
|
|
19
23
|
${String.fromCharCode(dataView.getUint8(byteOffset + 3))}`;
|
|
20
24
|
}
|
|
21
|
-
|
|
25
|
+
/** Check if the contents of an array buffer contains GLB byte markers */
|
|
22
26
|
function isGLB(arrayBuffer, byteOffset = 0, options = {}) {
|
|
23
27
|
const dataView = new DataView(arrayBuffer);
|
|
24
28
|
// Check that GLB Header starts with the magic number
|
|
@@ -27,13 +31,21 @@ function isGLB(arrayBuffer, byteOffset = 0, options = {}) {
|
|
|
27
31
|
return magic1 === magic || magic1 === MAGIC_glTF;
|
|
28
32
|
}
|
|
29
33
|
exports.isGLB = isGLB;
|
|
34
|
+
/**
|
|
35
|
+
* Synchronously parse a GLB
|
|
36
|
+
* @param glb - Target, Output is stored there
|
|
37
|
+
* @param arrayBuffer - Input data
|
|
38
|
+
* @param byteOffset - Offset into arrayBuffer to start parsing from (for "embedded" GLBs, e.g. in 3D tiles)
|
|
39
|
+
* @param options
|
|
40
|
+
* @returns
|
|
41
|
+
*/
|
|
30
42
|
function parseGLBSync(glb, arrayBuffer, byteOffset = 0, options = {}) {
|
|
31
43
|
// Check that GLB Header starts with the magic number
|
|
32
44
|
const dataView = new DataView(arrayBuffer);
|
|
33
45
|
// Compare format with GLBLoader documentation
|
|
34
46
|
const type = getMagicString(dataView, byteOffset + 0);
|
|
35
|
-
const version = dataView.getUint32(byteOffset + 4,
|
|
36
|
-
const byteLength = dataView.getUint32(byteOffset + 8,
|
|
47
|
+
const version = dataView.getUint32(byteOffset + 4, LITTLE_ENDIAN); // Version 2 of binary glTF container format
|
|
48
|
+
const byteLength = dataView.getUint32(byteOffset + 8, LITTLE_ENDIAN); // Total byte length of binary file
|
|
37
49
|
Object.assign(glb, {
|
|
38
50
|
// Put less important stuff in a header, to avoid clutter
|
|
39
51
|
header: {
|
|
@@ -49,23 +61,28 @@ function parseGLBSync(glb, arrayBuffer, byteOffset = 0, options = {}) {
|
|
|
49
61
|
byteOffset += GLB_FILE_HEADER_SIZE;
|
|
50
62
|
switch (glb.version) {
|
|
51
63
|
case 1:
|
|
52
|
-
// eslint-disable-next-line
|
|
53
64
|
return parseGLBV1(glb, dataView, byteOffset);
|
|
54
65
|
case 2:
|
|
55
|
-
// eslint-disable-next-line
|
|
56
66
|
return parseGLBV2(glb, dataView, byteOffset, (options = {}));
|
|
57
67
|
default:
|
|
58
|
-
throw new Error(`Invalid GLB version ${glb.version}. Only supports
|
|
68
|
+
throw new Error(`Invalid GLB version ${glb.version}. Only supports version 1 and 2.`);
|
|
59
69
|
}
|
|
60
70
|
}
|
|
61
|
-
exports.
|
|
71
|
+
exports.parseGLBSync = parseGLBSync;
|
|
72
|
+
/**
|
|
73
|
+
* Parse a V1 GLB
|
|
74
|
+
* @param glb - target, output is stored in this object
|
|
75
|
+
* @param dataView - Input, memory to be parsed
|
|
76
|
+
* @param byteOffset - Offset of first byte of GLB data in the data view
|
|
77
|
+
* @returns Number of bytes parsed (there could be additional non-GLB data after the GLB)
|
|
78
|
+
*/
|
|
62
79
|
function parseGLBV1(glb, dataView, byteOffset) {
|
|
63
80
|
// Sanity: ensure file is big enough to hold at least the headers
|
|
64
81
|
(0, loader_utils_1.assert)(glb.header.byteLength > GLB_FILE_HEADER_SIZE + GLB_CHUNK_HEADER_SIZE);
|
|
65
82
|
// Explanation of GLB structure:
|
|
66
83
|
// https://cloud.githubusercontent.com/assets/3479527/22600725/36b87122-ea55-11e6-9d40-6fd42819fcab.png
|
|
67
|
-
const contentLength = dataView.getUint32(byteOffset + 0,
|
|
68
|
-
const contentFormat = dataView.getUint32(byteOffset + 4,
|
|
84
|
+
const contentLength = dataView.getUint32(byteOffset + 0, LITTLE_ENDIAN); // Byte length of chunk
|
|
85
|
+
const contentFormat = dataView.getUint32(byteOffset + 4, LITTLE_ENDIAN); // Chunk format as uint32
|
|
69
86
|
byteOffset += GLB_CHUNK_HEADER_SIZE;
|
|
70
87
|
// GLB v1 only supports a single chunk type
|
|
71
88
|
(0, loader_utils_1.assert)(contentFormat === GLB_V1_CONTENT_FORMAT_JSON);
|
|
@@ -75,18 +92,26 @@ function parseGLBV1(glb, dataView, byteOffset) {
|
|
|
75
92
|
byteOffset += parseBINChunk(glb, dataView, byteOffset, glb.header.byteLength);
|
|
76
93
|
return byteOffset;
|
|
77
94
|
}
|
|
95
|
+
/**
|
|
96
|
+
* Parse a V2 GLB
|
|
97
|
+
* @param glb - target, output is stored in this object
|
|
98
|
+
* @param dataView - Input, memory to be parsed
|
|
99
|
+
* @param byteOffset - Offset of first byte of GLB data in the data view
|
|
100
|
+
* @returns Number of bytes parsed (there could be additional non-GLB data after the GLB)
|
|
101
|
+
*/
|
|
78
102
|
function parseGLBV2(glb, dataView, byteOffset, options) {
|
|
79
103
|
// Sanity: ensure file is big enough to hold at least the first chunk header
|
|
80
104
|
(0, loader_utils_1.assert)(glb.header.byteLength > GLB_FILE_HEADER_SIZE + GLB_CHUNK_HEADER_SIZE);
|
|
81
105
|
parseGLBChunksSync(glb, dataView, byteOffset, options);
|
|
82
106
|
return byteOffset + glb.header.byteLength;
|
|
83
107
|
}
|
|
108
|
+
/** Iterate over GLB chunks and parse them */
|
|
84
109
|
function parseGLBChunksSync(glb, dataView, byteOffset, options) {
|
|
85
110
|
// Per spec we must iterate over chunks, ignoring all except JSON and BIN
|
|
86
111
|
// Iterate as long as there is space left for another chunk header
|
|
87
112
|
while (byteOffset + 8 <= glb.header.byteLength) {
|
|
88
|
-
const chunkLength = dataView.getUint32(byteOffset + 0,
|
|
89
|
-
const chunkFormat = dataView.getUint32(byteOffset + 4,
|
|
113
|
+
const chunkLength = dataView.getUint32(byteOffset + 0, LITTLE_ENDIAN); // Byte length of chunk
|
|
114
|
+
const chunkFormat = dataView.getUint32(byteOffset + 4, LITTLE_ENDIAN); // Chunk format as uint32
|
|
90
115
|
byteOffset += GLB_CHUNK_HEADER_SIZE;
|
|
91
116
|
// Per spec we must iterate over chunks, ignoring all except JSON and BIN
|
|
92
117
|
switch (chunkFormat) {
|
|
@@ -116,7 +141,7 @@ function parseGLBChunksSync(glb, dataView, byteOffset, options) {
|
|
|
116
141
|
}
|
|
117
142
|
return byteOffset;
|
|
118
143
|
}
|
|
119
|
-
|
|
144
|
+
/* Parse a GLB JSON chunk */
|
|
120
145
|
function parseJSONChunk(glb, dataView, byteOffset, chunkLength) {
|
|
121
146
|
// 1. Create a "view" of the binary encoded JSON data inside the GLB
|
|
122
147
|
const jsonChunk = new Uint8Array(dataView.buffer, byteOffset, chunkLength);
|
|
@@ -127,7 +152,7 @@ function parseJSONChunk(glb, dataView, byteOffset, chunkLength) {
|
|
|
127
152
|
glb.json = JSON.parse(jsonText);
|
|
128
153
|
return (0, loader_utils_1.padToNBytes)(chunkLength, 4);
|
|
129
154
|
}
|
|
130
|
-
|
|
155
|
+
/** Parse a GLB BIN chunk */
|
|
131
156
|
function parseBINChunk(glb, dataView, byteOffset, chunkLength) {
|
|
132
157
|
// Note: BIN chunk can be optional
|
|
133
158
|
glb.header.hasBinChunk = true;
|
|
@@ -1,14 +1,18 @@
|
|
|
1
1
|
import type { LoaderContext } from '@loaders.gl/loader-utils';
|
|
2
2
|
import type { GLTFLoaderOptions } from '../../gltf-loader';
|
|
3
3
|
import type { GLTFWithBuffers } from '../types/gltf-types';
|
|
4
|
-
|
|
4
|
+
import type { ParseGLBOptions } from './parse-glb';
|
|
5
|
+
/** */
|
|
6
|
+
export type ParseGLTFOptions = ParseGLBOptions & {
|
|
5
7
|
normalize?: boolean;
|
|
6
8
|
loadImages?: boolean;
|
|
7
9
|
loadBuffers?: boolean;
|
|
8
10
|
decompressMeshes?: boolean;
|
|
9
|
-
postProcess?: boolean;
|
|
10
11
|
excludeExtensions?: string[];
|
|
12
|
+
/** @deprecated not supported in v4. `postProcessGLTF()` must be called by the application */
|
|
13
|
+
postProcess?: false;
|
|
11
14
|
};
|
|
12
|
-
|
|
13
|
-
export declare function
|
|
15
|
+
/** Check if an array buffer appears to contain GLTF data */
|
|
16
|
+
export declare function isGLTF(arrayBuffer: ArrayBuffer, options?: ParseGLTFOptions): boolean;
|
|
17
|
+
export declare function parseGLTF(gltf: GLTFWithBuffers, arrayBufferOrString: any, byteOffset: number | undefined, options: GLTFLoaderOptions, context: LoaderContext): Promise<GLTFWithBuffers>;
|
|
14
18
|
//# sourceMappingURL=parse-gltf.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-gltf.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/parse-gltf.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"parse-gltf.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/parse-gltf.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAC5D,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AACzD,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,qBAAqB,CAAC;AAEzD,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,aAAa,CAAC;AAajD,OAAO;AACP,MAAM,MAAM,gBAAgB,GAAG,eAAe,GAAG;IAC/C,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAE7B,6FAA6F;IAC7F,WAAW,CAAC,EAAE,KAAK,CAAC;CACrB,CAAC;AAEF,4DAA4D;AAC5D,wBAAgB,MAAM,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAGpF;AAED,wBAAsB,SAAS,CAC7B,IAAI,EAAE,eAAe,EACrB,mBAAmB,KAAA,EACnB,UAAU,oBAAI,EACd,OAAO,EAAE,iBAAiB,EAC1B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,eAAe,CAAC,CA0B1B"}
|