@loaders.gl/gltf 4.2.0-alpha.4 → 4.2.0-alpha.5
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.dev.js +1049 -517
- package/dist/dist.min.js +9 -0
- package/dist/glb-loader.d.ts +2 -2
- package/dist/glb-loader.d.ts.map +1 -1
- package/dist/glb-loader.js +22 -21
- package/dist/glb-writer.d.ts +2 -2
- package/dist/glb-writer.d.ts.map +1 -1
- package/dist/glb-writer.js +27 -24
- package/dist/gltf-loader.d.ts +3 -3
- package/dist/gltf-loader.d.ts.map +1 -1
- package/dist/gltf-loader.js +31 -36
- package/dist/gltf-writer.js +24 -26
- package/dist/index.cjs +95 -284
- package/dist/index.cjs.map +7 -0
- package/dist/index.d.ts +17 -17
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -1
- package/dist/lib/api/gltf-extensions.d.ts +2 -2
- package/dist/lib/api/gltf-extensions.d.ts.map +1 -1
- package/dist/lib/api/gltf-extensions.js +45 -22
- package/dist/lib/api/gltf-scenegraph.d.ts +2 -2
- package/dist/lib/api/gltf-scenegraph.d.ts.map +1 -1
- package/dist/lib/api/gltf-scenegraph.js +561 -438
- package/dist/lib/api/normalize-gltf-v1.js +250 -181
- package/dist/lib/api/post-process-gltf.d.ts +3 -3
- package/dist/lib/api/post-process-gltf.d.ts.map +1 -1
- package/dist/lib/api/post-process-gltf.js +375 -339
- package/dist/lib/encoders/encode-glb.js +62 -48
- package/dist/lib/encoders/encode-gltf.js +24 -10
- package/dist/lib/extensions/EXT_mesh_features.d.ts +2 -2
- package/dist/lib/extensions/EXT_mesh_features.d.ts.map +1 -1
- package/dist/lib/extensions/EXT_mesh_features.js +55 -33
- package/dist/lib/extensions/EXT_meshopt_compression.d.ts +2 -2
- package/dist/lib/extensions/EXT_meshopt_compression.d.ts.map +1 -1
- package/dist/lib/extensions/EXT_meshopt_compression.js +27 -31
- package/dist/lib/extensions/EXT_structural_metadata.d.ts +2 -2
- package/dist/lib/extensions/EXT_structural_metadata.d.ts.map +1 -1
- package/dist/lib/extensions/EXT_structural_metadata.js +434 -230
- package/dist/lib/extensions/EXT_texture_webp.d.ts +2 -2
- package/dist/lib/extensions/EXT_texture_webp.d.ts.map +1 -1
- package/dist/lib/extensions/EXT_texture_webp.js +24 -17
- 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 +29 -15
- package/dist/lib/extensions/KHR_draco_mesh_compression.d.ts +2 -2
- package/dist/lib/extensions/KHR_draco_mesh_compression.d.ts.map +1 -1
- package/dist/lib/extensions/KHR_draco_mesh_compression.js +110 -87
- package/dist/lib/extensions/KHR_texture_basisu.d.ts +2 -2
- package/dist/lib/extensions/KHR_texture_basisu.d.ts.map +1 -1
- package/dist/lib/extensions/KHR_texture_basisu.js +19 -12
- package/dist/lib/extensions/KHR_texture_transform.d.ts +2 -2
- package/dist/lib/extensions/KHR_texture_transform.d.ts.map +1 -1
- package/dist/lib/extensions/KHR_texture_transform.js +194 -154
- package/dist/lib/extensions/deprecated/EXT_feature_metadata.d.ts +2 -2
- package/dist/lib/extensions/deprecated/EXT_feature_metadata.d.ts.map +1 -1
- package/dist/lib/extensions/deprecated/EXT_feature_metadata.js +263 -143
- 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 +44 -32
- 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 +30 -24
- 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 +65 -52
- package/dist/lib/extensions/utils/3d-tiles-utils.d.ts +2 -2
- package/dist/lib/extensions/utils/3d-tiles-utils.d.ts.map +1 -1
- package/dist/lib/extensions/utils/3d-tiles-utils.js +298 -181
- package/dist/lib/gltf-utils/get-typed-array.d.ts +1 -1
- package/dist/lib/gltf-utils/get-typed-array.d.ts.map +1 -1
- package/dist/lib/gltf-utils/get-typed-array.js +54 -42
- 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-attribute-utils.js +58 -52
- package/dist/lib/gltf-utils/gltf-constants.js +27 -27
- package/dist/lib/gltf-utils/gltf-utils.d.ts +1 -1
- package/dist/lib/gltf-utils/gltf-utils.d.ts.map +1 -1
- package/dist/lib/gltf-utils/gltf-utils.js +67 -60
- package/dist/lib/gltf-utils/resolve-url.js +12 -10
- package/dist/lib/parsers/parse-glb.d.ts +1 -1
- package/dist/lib/parsers/parse-glb.d.ts.map +1 -1
- package/dist/lib/parsers/parse-glb.js +132 -89
- package/dist/lib/parsers/parse-gltf.d.ts +3 -3
- package/dist/lib/parsers/parse-gltf.d.ts.map +1 -1
- package/dist/lib/parsers/parse-gltf.js +155 -126
- package/dist/lib/types/glb-types.js +0 -1
- package/dist/lib/types/gltf-ext-feature-metadata-schema.d.ts +1 -1
- package/dist/lib/types/gltf-ext-feature-metadata-schema.d.ts.map +1 -1
- package/dist/lib/types/gltf-ext-feature-metadata-schema.js +0 -1
- package/dist/lib/types/gltf-ext-mesh-features-schema.d.ts +1 -1
- package/dist/lib/types/gltf-ext-mesh-features-schema.d.ts.map +1 -1
- package/dist/lib/types/gltf-ext-mesh-features-schema.js +0 -1
- package/dist/lib/types/gltf-ext-structural-metadata-schema.d.ts +1 -1
- package/dist/lib/types/gltf-ext-structural-metadata-schema.d.ts.map +1 -1
- package/dist/lib/types/gltf-ext-structural-metadata-schema.js +0 -1
- package/dist/lib/types/gltf-json-schema.js +2 -1
- package/dist/lib/types/gltf-postprocessed-schema.js +2 -1
- package/dist/lib/types/gltf-types.d.ts +3 -3
- package/dist/lib/types/gltf-types.d.ts.map +1 -1
- package/dist/lib/types/gltf-types.js +1 -1
- package/dist/lib/utils/assert.js +6 -4
- package/dist/lib/utils/version.js +3 -1
- package/dist/meshopt/meshopt-decoder.js +86 -67
- package/dist/webp/webp.js +28 -19
- package/package.json +12 -8
- package/dist/glb-loader.js.map +0 -1
- package/dist/glb-writer.js.map +0 -1
- package/dist/gltf-loader.js.map +0 -1
- package/dist/gltf-writer.js.map +0 -1
- package/dist/index.js.map +0 -1
- package/dist/lib/api/gltf-extensions.js.map +0 -1
- package/dist/lib/api/gltf-scenegraph.js.map +0 -1
- package/dist/lib/api/normalize-gltf-v1.js.map +0 -1
- package/dist/lib/api/post-process-gltf.js.map +0 -1
- package/dist/lib/encoders/encode-glb.js.map +0 -1
- package/dist/lib/encoders/encode-gltf.js.map +0 -1
- package/dist/lib/extensions/EXT_mesh_features.js.map +0 -1
- package/dist/lib/extensions/EXT_meshopt_compression.js.map +0 -1
- package/dist/lib/extensions/EXT_structural_metadata.js.map +0 -1
- package/dist/lib/extensions/EXT_texture_webp.js.map +0 -1
- package/dist/lib/extensions/KHR_binary_gltf.js.map +0 -1
- package/dist/lib/extensions/KHR_draco_mesh_compression.js.map +0 -1
- package/dist/lib/extensions/KHR_texture_basisu.js.map +0 -1
- package/dist/lib/extensions/KHR_texture_transform.js.map +0 -1
- package/dist/lib/extensions/deprecated/EXT_feature_metadata.js.map +0 -1
- package/dist/lib/extensions/deprecated/KHR_lights_punctual.js.map +0 -1
- package/dist/lib/extensions/deprecated/KHR_materials_unlit.js.map +0 -1
- package/dist/lib/extensions/deprecated/KHR_techniques_webgl.js.map +0 -1
- package/dist/lib/extensions/utils/3d-tiles-utils.js.map +0 -1
- package/dist/lib/gltf-utils/get-typed-array.js.map +0 -1
- package/dist/lib/gltf-utils/gltf-attribute-utils.js.map +0 -1
- package/dist/lib/gltf-utils/gltf-constants.js.map +0 -1
- package/dist/lib/gltf-utils/gltf-utils.js.map +0 -1
- package/dist/lib/gltf-utils/resolve-url.js.map +0 -1
- package/dist/lib/parsers/parse-glb.js.map +0 -1
- package/dist/lib/parsers/parse-gltf.js.map +0 -1
- package/dist/lib/types/glb-types.js.map +0 -1
- package/dist/lib/types/gltf-ext-feature-metadata-schema.js.map +0 -1
- package/dist/lib/types/gltf-ext-mesh-features-schema.js.map +0 -1
- package/dist/lib/types/gltf-ext-structural-metadata-schema.js.map +0 -1
- package/dist/lib/types/gltf-json-schema.js.map +0 -1
- package/dist/lib/types/gltf-postprocessed-schema.js.map +0 -1
- package/dist/lib/types/gltf-types.js.map +0 -1
- package/dist/lib/utils/assert.js.map +0 -1
- package/dist/lib/utils/version.js.map +0 -1
- package/dist/meshopt/meshopt-decoder.js.map +0 -1
- package/dist/meshopt/meshopt-encoder.ts.disabled +0 -409
- package/dist/webp/webp.js.map +0 -1
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { GLTF } from
|
|
2
|
-
import type { GLTFLoaderOptions } from
|
|
1
|
+
import type { GLTF } from "../types/gltf-json-schema.js";
|
|
2
|
+
import type { GLTFLoaderOptions } from "../../gltf-loader.js";
|
|
3
3
|
/** Extension name */
|
|
4
4
|
export declare const name = "EXT_texture_webp";
|
|
5
5
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EXT_texture_webp.d.ts","sourceRoot":"","sources":["../../../src/lib/extensions/EXT_texture_webp.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,IAAI,EAAwB,
|
|
1
|
+
{"version":3,"file":"EXT_texture_webp.d.ts","sourceRoot":"","sources":["../../../src/lib/extensions/EXT_texture_webp.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,IAAI,EAAwB,qCAAkC;AAC3E,OAAO,KAAK,EAAC,iBAAiB,EAAC,6BAA0B;AAOzD,qBAAqB;AACrB,eAAO,MAAM,IAAI,qBAAmB,CAAC;AAErC;;;GAGG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE;IAAC,IAAI,EAAE,IAAI,CAAA;CAAC,EAAE,OAAO,EAAE,iBAAiB,GAAG,IAAI,CA0BnF"}
|
|
@@ -1,25 +1,32 @@
|
|
|
1
|
+
// GLTF EXTENSION: EXT_TEXTURE_WEBP
|
|
2
|
+
// https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/EXT_TEXTURE_WEBP
|
|
3
|
+
/* eslint-disable camelcase */
|
|
1
4
|
import { isImageFormatSupported } from '@loaders.gl/images';
|
|
2
5
|
import { GLTFScenegraph } from "../api/gltf-scenegraph.js";
|
|
3
6
|
const EXT_TEXTURE_WEBP = 'EXT_texture_webp';
|
|
7
|
+
/** Extension name */
|
|
4
8
|
export const name = EXT_TEXTURE_WEBP;
|
|
9
|
+
/**
|
|
10
|
+
* Replaces a texture source reference with the extension texture
|
|
11
|
+
* Done in preprocess() to prevent load of default image
|
|
12
|
+
*/
|
|
5
13
|
export function preprocess(gltfData, options) {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
14
|
+
const scenegraph = new GLTFScenegraph(gltfData);
|
|
15
|
+
if (!isImageFormatSupported('image/webp')) {
|
|
16
|
+
if (scenegraph.getRequiredExtensions().includes(EXT_TEXTURE_WEBP)) {
|
|
17
|
+
throw new Error(`gltf: Required extension ${EXT_TEXTURE_WEBP} not supported by browser`);
|
|
18
|
+
}
|
|
19
|
+
return;
|
|
10
20
|
}
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
texture.source = extension.source;
|
|
21
|
+
const { json } = scenegraph;
|
|
22
|
+
for (const texture of json.textures || []) {
|
|
23
|
+
const extension = scenegraph.getObjectExtension(texture, EXT_TEXTURE_WEBP);
|
|
24
|
+
if (extension) {
|
|
25
|
+
// TODO - if multiple texture extensions are present which one wins?
|
|
26
|
+
texture.source = extension.source;
|
|
27
|
+
}
|
|
28
|
+
scenegraph.removeObjectExtension(texture, EXT_TEXTURE_WEBP);
|
|
20
29
|
}
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
scenegraph.removeExtension(EXT_TEXTURE_WEBP);
|
|
30
|
+
// Remove the top-level extension
|
|
31
|
+
scenegraph.removeExtension(EXT_TEXTURE_WEBP);
|
|
24
32
|
}
|
|
25
|
-
//# sourceMappingURL=EXT_texture_webp.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KHR_binary_gltf.d.ts","sourceRoot":"","sources":["../../../src/lib/extensions/KHR_binary_gltf.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,IAAI,EAAuB,
|
|
1
|
+
{"version":3,"file":"KHR_binary_gltf.d.ts","sourceRoot":"","sources":["../../../src/lib/extensions/KHR_binary_gltf.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,IAAI,EAAuB,qCAAkC;AAM1E,qBAAqB;AACrB,eAAO,MAAM,IAAI,oBAAkB,CAAC;AAEpC,wBAAgB,UAAU,CAAC,QAAQ,EAAE;IAAC,IAAI,EAAE,IAAI,CAAA;CAAC,GAAG,IAAI,CA+BvD"}
|
|
@@ -1,21 +1,35 @@
|
|
|
1
|
+
// GLTF 1.0 EXTENSION: KHR_binary_glTF
|
|
2
|
+
// https://github.com/KhronosGroup/glTF/tree/master/extensions/1.0/Khronos/KHR_binary_glTF
|
|
3
|
+
/* eslint-disable camelcase */
|
|
1
4
|
import { GLTFScenegraph } from "../api/gltf-scenegraph.js";
|
|
2
5
|
const KHR_BINARY_GLTF = 'KHR_binary_glTF';
|
|
6
|
+
/** Extension name */
|
|
3
7
|
export const name = KHR_BINARY_GLTF;
|
|
4
8
|
export function preprocess(gltfData) {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
json
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
9
|
+
const gltfScenegraph = new GLTFScenegraph(gltfData);
|
|
10
|
+
const { json } = gltfScenegraph;
|
|
11
|
+
// Note: json.buffers.binary_glTF also needs to be replaced
|
|
12
|
+
// This is currently done during gltf normalization
|
|
13
|
+
// Image and shader nodes can have the extension
|
|
14
|
+
// https://github.com/KhronosGroup/glTF/blob/master/extensions/1.0/Khronos/KHR_binary_glTF/schema/image.KHR_binary_glTF.schema.json
|
|
15
|
+
for (const image of json.images || []) {
|
|
16
|
+
const extension = gltfScenegraph.getObjectExtension(image, KHR_BINARY_GLTF);
|
|
17
|
+
// The data in the extension is valid as glTF 2.0 data inside the object, so just copy it in
|
|
18
|
+
if (extension) {
|
|
19
|
+
Object.assign(image, extension);
|
|
20
|
+
}
|
|
21
|
+
gltfScenegraph.removeObjectExtension(image, KHR_BINARY_GLTF);
|
|
13
22
|
}
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
23
|
+
// TODO shaders - At least traverse and throw error if used?
|
|
24
|
+
// https://github.com/KhronosGroup/glTF/blob/master/extensions/1.0/Khronos/KHR_binary_glTF/schema/shader.KHR_binary_glTF.schema.json
|
|
25
|
+
// glTF v1 one files have a partially formed URI field that is not expected in (and causes problems in) 2.0
|
|
26
|
+
if (json.buffers && json.buffers[0]) {
|
|
27
|
+
delete json.buffers[0].uri;
|
|
28
|
+
}
|
|
29
|
+
// Remove the top-level extension as it has now been processed
|
|
30
|
+
gltfScenegraph.removeExtension(KHR_BINARY_GLTF);
|
|
20
31
|
}
|
|
21
|
-
|
|
32
|
+
// KHR_binary_gltf is a 1.0 extension that is supported natively by 2.0
|
|
33
|
+
// export function encode() {
|
|
34
|
+
// throw new Error(KHR_BINARY_GLTF);
|
|
35
|
+
// }
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { LoaderContext } from '@loaders.gl/loader-utils';
|
|
2
|
-
import type { GLTF } from
|
|
3
|
-
import type { GLTFLoaderOptions } from
|
|
2
|
+
import type { GLTF } from "../types/gltf-json-schema.js";
|
|
3
|
+
import type { GLTFLoaderOptions } from "../../gltf-loader.js";
|
|
4
4
|
/** Extension name */
|
|
5
5
|
export declare const name = "KHR_draco_mesh_compression";
|
|
6
6
|
export declare function preprocess(gltfData: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KHR_draco_mesh_compression.d.ts","sourceRoot":"","sources":["../../../src/lib/extensions/KHR_draco_mesh_compression.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAM5D,OAAO,KAAK,EACV,IAAI,EAIL,
|
|
1
|
+
{"version":3,"file":"KHR_draco_mesh_compression.d.ts","sourceRoot":"","sources":["../../../src/lib/extensions/KHR_draco_mesh_compression.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAM5D,OAAO,KAAK,EACV,IAAI,EAIL,qCAAkC;AACnC,OAAO,KAAK,EAAC,iBAAiB,EAAC,6BAA0B;AAOzD,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"}
|
|
@@ -1,108 +1,131 @@
|
|
|
1
|
+
// https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_draco_mesh_compression
|
|
2
|
+
// Only TRIANGLES: 0x0004 and TRIANGLE_STRIP: 0x0005 are supported
|
|
3
|
+
/* eslint-disable camelcase */
|
|
1
4
|
import { sliceArrayBuffer, parseFromContext } from '@loaders.gl/loader-utils';
|
|
2
5
|
import { DracoLoader } from '@loaders.gl/draco';
|
|
3
6
|
import { GLTFScenegraph } from "../api/gltf-scenegraph.js";
|
|
4
7
|
import { getGLTFAccessors, getGLTFAccessor } from "../gltf-utils/gltf-attribute-utils.js";
|
|
5
8
|
const KHR_DRACO_MESH_COMPRESSION = 'KHR_draco_mesh_compression';
|
|
9
|
+
/** Extension name */
|
|
6
10
|
export const name = KHR_DRACO_MESH_COMPRESSION;
|
|
7
11
|
export function preprocess(gltfData, options, context) {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
+
const scenegraph = new GLTFScenegraph(gltfData);
|
|
13
|
+
for (const primitive of makeMeshPrimitiveIterator(scenegraph)) {
|
|
14
|
+
if (scenegraph.getObjectExtension(primitive, KHR_DRACO_MESH_COMPRESSION)) {
|
|
15
|
+
// TODO - Remove fallback accessors to make sure we don't load unnecessary buffers
|
|
16
|
+
}
|
|
17
|
+
}
|
|
12
18
|
}
|
|
13
19
|
export async function decode(gltfData, options, context) {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
20
|
+
if (!options?.gltf?.decompressMeshes) {
|
|
21
|
+
return;
|
|
22
|
+
}
|
|
23
|
+
const scenegraph = new GLTFScenegraph(gltfData);
|
|
24
|
+
const promises = [];
|
|
25
|
+
for (const primitive of makeMeshPrimitiveIterator(scenegraph)) {
|
|
26
|
+
if (scenegraph.getObjectExtension(primitive, KHR_DRACO_MESH_COMPRESSION)) {
|
|
27
|
+
promises.push(decompressPrimitive(scenegraph, primitive, options, context));
|
|
28
|
+
}
|
|
23
29
|
}
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
30
|
+
// Decompress meshes in parallel
|
|
31
|
+
await Promise.all(promises);
|
|
32
|
+
// We have now decompressed all primitives, so remove the top-level extension
|
|
33
|
+
scenegraph.removeExtension(KHR_DRACO_MESH_COMPRESSION);
|
|
27
34
|
}
|
|
28
|
-
export function encode(gltfData) {
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
+
export function encode(gltfData, options = {}) {
|
|
36
|
+
const scenegraph = new GLTFScenegraph(gltfData);
|
|
37
|
+
for (const mesh of scenegraph.json.meshes || []) {
|
|
38
|
+
// eslint-disable-next-line camelcase
|
|
39
|
+
// @ts-ignore
|
|
40
|
+
compressMesh(mesh, options);
|
|
41
|
+
// NOTE: Only add the extension if something was actually compressed
|
|
42
|
+
scenegraph.addRequiredExtension(KHR_DRACO_MESH_COMPRESSION);
|
|
43
|
+
}
|
|
35
44
|
}
|
|
45
|
+
// DECODE
|
|
46
|
+
// Unpacks one mesh primitive and removes the extension from the primitive
|
|
47
|
+
// DracoDecoder needs to be imported and registered by app
|
|
48
|
+
// Returns: Promise that resolves when all pending draco decoder jobs for this mesh complete
|
|
49
|
+
// TODO - Implement fallback behavior per KHR_DRACO_MESH_COMPRESSION spec
|
|
36
50
|
async function decompressPrimitive(scenegraph, primitive, options, context) {
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
}
|
|
41
|
-
const buffer = scenegraph.getTypedArrayForBufferView(dracoExtension.bufferView);
|
|
42
|
-
const bufferCopy = sliceArrayBuffer(buffer.buffer, buffer.byteOffset);
|
|
43
|
-
const dracoOptions = {
|
|
44
|
-
...options
|
|
45
|
-
};
|
|
46
|
-
delete dracoOptions['3d-tiles'];
|
|
47
|
-
const decodedData = await parseFromContext(bufferCopy, DracoLoader, dracoOptions, context);
|
|
48
|
-
const decodedAttributes = getGLTFAccessors(decodedData.attributes);
|
|
49
|
-
for (const [attributeName, decodedAttribute] of Object.entries(decodedAttributes)) {
|
|
50
|
-
if (attributeName in primitive.attributes) {
|
|
51
|
-
const accessorIndex = primitive.attributes[attributeName];
|
|
52
|
-
const accessor = scenegraph.getAccessor(accessorIndex);
|
|
53
|
-
if (accessor !== null && accessor !== void 0 && accessor.min && accessor !== null && accessor !== void 0 && accessor.max) {
|
|
54
|
-
decodedAttribute.min = accessor.min;
|
|
55
|
-
decodedAttribute.max = accessor.max;
|
|
56
|
-
}
|
|
51
|
+
const dracoExtension = scenegraph.getObjectExtension(primitive, KHR_DRACO_MESH_COMPRESSION);
|
|
52
|
+
if (!dracoExtension) {
|
|
53
|
+
return;
|
|
57
54
|
}
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
});
|
|
77
|
-
const decodedData = context === null || context === void 0 ? void 0 : (_context$parseSync = context.parseSync) === null || _context$parseSync === void 0 ? void 0 : _context$parseSync.call(context, {
|
|
78
|
-
attributes
|
|
79
|
-
});
|
|
80
|
-
const fauxAccessors = options._addFauxAttributes(decodedData.attributes);
|
|
81
|
-
const bufferViewIndex = options.addBufferView(compressedData);
|
|
82
|
-
const glTFMesh = {
|
|
83
|
-
primitives: [{
|
|
84
|
-
attributes: fauxAccessors,
|
|
85
|
-
mode,
|
|
86
|
-
extensions: {
|
|
87
|
-
[KHR_DRACO_MESH_COMPRESSION]: {
|
|
88
|
-
bufferView: bufferViewIndex,
|
|
89
|
-
attributes: fauxAccessors
|
|
55
|
+
const buffer = scenegraph.getTypedArrayForBufferView(dracoExtension.bufferView);
|
|
56
|
+
// TODO - parse does not yet deal well with byte offsets embedded in typed arrays. Copy buffer
|
|
57
|
+
// TODO - remove when `parse` is fixed to handle `byteOffset`s
|
|
58
|
+
const bufferCopy = sliceArrayBuffer(buffer.buffer, buffer.byteOffset); // , buffer.byteLength);
|
|
59
|
+
const dracoOptions = { ...options };
|
|
60
|
+
// TODO - remove hack: The entire tileset might be included, too expensive to serialize
|
|
61
|
+
delete dracoOptions['3d-tiles'];
|
|
62
|
+
const decodedData = await parseFromContext(bufferCopy, DracoLoader, dracoOptions, context);
|
|
63
|
+
const decodedAttributes = getGLTFAccessors(decodedData.attributes);
|
|
64
|
+
// Restore min/max values
|
|
65
|
+
for (const [attributeName, decodedAttribute] of Object.entries(decodedAttributes)) {
|
|
66
|
+
if (attributeName in primitive.attributes) {
|
|
67
|
+
const accessorIndex = primitive.attributes[attributeName];
|
|
68
|
+
const accessor = scenegraph.getAccessor(accessorIndex);
|
|
69
|
+
if (accessor?.min && accessor?.max) {
|
|
70
|
+
decodedAttribute.min = accessor.min;
|
|
71
|
+
decodedAttribute.max = accessor.max;
|
|
72
|
+
}
|
|
90
73
|
}
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
74
|
+
}
|
|
75
|
+
// @ts-ignore
|
|
76
|
+
primitive.attributes = decodedAttributes;
|
|
77
|
+
if (decodedData.indices) {
|
|
78
|
+
// @ts-ignore
|
|
79
|
+
primitive.indices = getGLTFAccessor(decodedData.indices);
|
|
80
|
+
}
|
|
81
|
+
// Extension has been processed, delete it
|
|
82
|
+
scenegraph.removeObjectExtension(primitive, KHR_DRACO_MESH_COMPRESSION);
|
|
83
|
+
checkPrimitive(primitive);
|
|
84
|
+
}
|
|
85
|
+
// ENCODE
|
|
86
|
+
// eslint-disable-next-line max-len
|
|
87
|
+
// Only TRIANGLES: 0x0004 and TRIANGLE_STRIP: 0x0005 are supported
|
|
88
|
+
function compressMesh(attributes, indices, mode = 4, options, context) {
|
|
89
|
+
if (!options.DracoWriter) {
|
|
90
|
+
throw new Error('options.gltf.DracoWriter not provided');
|
|
91
|
+
}
|
|
92
|
+
// TODO - use DracoWriter using encode w/ registered DracoWriter...
|
|
93
|
+
const compressedData = options.DracoWriter.encodeSync({ attributes });
|
|
94
|
+
// Draco compression may change the order and number of vertices in a mesh.
|
|
95
|
+
// To satisfy the requirement that accessors properties be correct for both
|
|
96
|
+
// compressed and uncompressed data, generators should create uncompressed
|
|
97
|
+
// attributes and indices using data that has been decompressed from the Draco buffer,
|
|
98
|
+
// rather than the original source data.
|
|
99
|
+
// @ts-ignore TODO this needs to be fixed
|
|
100
|
+
const decodedData = context?.parseSync?.({ attributes });
|
|
101
|
+
const fauxAccessors = options._addFauxAttributes(decodedData.attributes);
|
|
102
|
+
const bufferViewIndex = options.addBufferView(compressedData);
|
|
103
|
+
const glTFMesh = {
|
|
104
|
+
primitives: [
|
|
105
|
+
{
|
|
106
|
+
attributes: fauxAccessors, // TODO - verify with spec
|
|
107
|
+
mode, // GL.POINTS
|
|
108
|
+
extensions: {
|
|
109
|
+
[KHR_DRACO_MESH_COMPRESSION]: {
|
|
110
|
+
bufferView: bufferViewIndex,
|
|
111
|
+
attributes: fauxAccessors // TODO - verify with spec
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
]
|
|
116
|
+
};
|
|
117
|
+
return glTFMesh;
|
|
95
118
|
}
|
|
119
|
+
// UTILS
|
|
96
120
|
function checkPrimitive(primitive) {
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
121
|
+
if (!primitive.attributes && Object.keys(primitive.attributes).length > 0) {
|
|
122
|
+
throw new Error('glTF: Empty primitive detected: Draco decompression failure?');
|
|
123
|
+
}
|
|
100
124
|
}
|
|
101
125
|
function* makeMeshPrimitiveIterator(scenegraph) {
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
126
|
+
for (const mesh of scenegraph.json.meshes || []) {
|
|
127
|
+
for (const primitive of mesh.primitives) {
|
|
128
|
+
yield primitive;
|
|
129
|
+
}
|
|
105
130
|
}
|
|
106
|
-
}
|
|
107
131
|
}
|
|
108
|
-
//# sourceMappingURL=KHR_draco_mesh_compression.js.map
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { GLTF } from
|
|
2
|
-
import type { GLTFLoaderOptions } from
|
|
1
|
+
import type { GLTF } from "../types/gltf-json-schema.js";
|
|
2
|
+
import type { GLTFLoaderOptions } from "../../gltf-loader.js";
|
|
3
3
|
/** Extension name */
|
|
4
4
|
export declare const name = "KHR_texture_basisu";
|
|
5
5
|
/**
|
|
@@ -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,
|
|
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,qCAAkC;AAC7E,OAAO,KAAK,EAAC,iBAAiB,EAAC,6BAA0B;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"}
|
|
@@ -1,18 +1,25 @@
|
|
|
1
|
+
// GLTF EXTENSION: KHR_texture_basisu
|
|
2
|
+
// https://github.com/KhronosGroup/glTF/tree/main/extensions/2.0/Khronos/KHR_texture_basisu
|
|
3
|
+
/* eslint-disable camelcase */
|
|
1
4
|
import { GLTFScenegraph } from "../api/gltf-scenegraph.js";
|
|
2
5
|
const KHR_TEXTURE_BASISU = 'KHR_texture_basisu';
|
|
6
|
+
/** Extension name */
|
|
3
7
|
export const name = KHR_TEXTURE_BASISU;
|
|
8
|
+
/**
|
|
9
|
+
* Replaces a texture source reference with the extension texture
|
|
10
|
+
* Done in preprocess() to prevent load of default image
|
|
11
|
+
*/
|
|
4
12
|
export function preprocess(gltfData, options) {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
json
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
13
|
+
const scene = new GLTFScenegraph(gltfData);
|
|
14
|
+
const { json } = scene;
|
|
15
|
+
for (const texture of json.textures || []) {
|
|
16
|
+
const extension = scene.getObjectExtension(texture, KHR_TEXTURE_BASISU);
|
|
17
|
+
if (extension) {
|
|
18
|
+
// TODO - if multiple texture extensions are present which one wins?
|
|
19
|
+
texture.source = extension.source;
|
|
20
|
+
scene.removeObjectExtension(texture, KHR_TEXTURE_BASISU);
|
|
21
|
+
}
|
|
14
22
|
}
|
|
15
|
-
|
|
16
|
-
|
|
23
|
+
// Remove the top-level extension
|
|
24
|
+
scene.removeExtension(KHR_TEXTURE_BASISU);
|
|
17
25
|
}
|
|
18
|
-
//# sourceMappingURL=KHR_texture_basisu.js.map
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* https://github.com/KhronosGroup/glTF/blob/main/extensions/2.0/Khronos/KHR_texture_transform/README.md
|
|
3
3
|
*/
|
|
4
|
-
import type { GLTFWithBuffers } from
|
|
5
|
-
import type { GLTFLoaderOptions } from
|
|
4
|
+
import type { GLTFWithBuffers } from "../types/gltf-types.js";
|
|
5
|
+
import type { GLTFLoaderOptions } from "../../gltf-loader.js";
|
|
6
6
|
export declare const name = "KHR_texture_transform";
|
|
7
7
|
/**
|
|
8
8
|
* The extension entry to process the transformation
|
|
@@ -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,EAAC,eAAe,EAAC
|
|
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,+BAA4B;AASzD,OAAO,KAAK,EAAC,iBAAiB,EAAC,6BAA0B;AAUzD,eAAO,MAAM,IAAI,0BAAwB,CAAC;AA+B1C;;;;GAIG;AACH,wBAAsB,MAAM,CAAC,QAAQ,EAAE,eAAe,EAAE,OAAO,EAAE,iBAAiB,iBAUjF"}
|