@loaders.gl/gltf 4.2.0-alpha.3 → 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.
Files changed (148) hide show
  1. package/dist/dist.dev.js +1049 -517
  2. package/dist/dist.min.js +9 -0
  3. package/dist/glb-loader.d.ts +2 -2
  4. package/dist/glb-loader.d.ts.map +1 -1
  5. package/dist/glb-loader.js +22 -21
  6. package/dist/glb-writer.d.ts +2 -2
  7. package/dist/glb-writer.d.ts.map +1 -1
  8. package/dist/glb-writer.js +27 -24
  9. package/dist/gltf-loader.d.ts +3 -3
  10. package/dist/gltf-loader.d.ts.map +1 -1
  11. package/dist/gltf-loader.js +31 -36
  12. package/dist/gltf-writer.js +24 -26
  13. package/dist/index.cjs +95 -284
  14. package/dist/index.cjs.map +7 -0
  15. package/dist/index.d.ts +17 -17
  16. package/dist/index.d.ts.map +1 -1
  17. package/dist/index.js +3 -1
  18. package/dist/lib/api/gltf-extensions.d.ts +2 -2
  19. package/dist/lib/api/gltf-extensions.d.ts.map +1 -1
  20. package/dist/lib/api/gltf-extensions.js +45 -22
  21. package/dist/lib/api/gltf-scenegraph.d.ts +2 -2
  22. package/dist/lib/api/gltf-scenegraph.d.ts.map +1 -1
  23. package/dist/lib/api/gltf-scenegraph.js +561 -438
  24. package/dist/lib/api/normalize-gltf-v1.js +250 -181
  25. package/dist/lib/api/post-process-gltf.d.ts +3 -3
  26. package/dist/lib/api/post-process-gltf.d.ts.map +1 -1
  27. package/dist/lib/api/post-process-gltf.js +375 -339
  28. package/dist/lib/encoders/encode-glb.js +62 -48
  29. package/dist/lib/encoders/encode-gltf.js +24 -10
  30. package/dist/lib/extensions/EXT_mesh_features.d.ts +2 -2
  31. package/dist/lib/extensions/EXT_mesh_features.d.ts.map +1 -1
  32. package/dist/lib/extensions/EXT_mesh_features.js +55 -33
  33. package/dist/lib/extensions/EXT_meshopt_compression.d.ts +2 -2
  34. package/dist/lib/extensions/EXT_meshopt_compression.d.ts.map +1 -1
  35. package/dist/lib/extensions/EXT_meshopt_compression.js +27 -31
  36. package/dist/lib/extensions/EXT_structural_metadata.d.ts +2 -2
  37. package/dist/lib/extensions/EXT_structural_metadata.d.ts.map +1 -1
  38. package/dist/lib/extensions/EXT_structural_metadata.js +434 -230
  39. package/dist/lib/extensions/EXT_texture_webp.d.ts +2 -2
  40. package/dist/lib/extensions/EXT_texture_webp.d.ts.map +1 -1
  41. package/dist/lib/extensions/EXT_texture_webp.js +24 -17
  42. package/dist/lib/extensions/KHR_binary_gltf.d.ts +1 -1
  43. package/dist/lib/extensions/KHR_binary_gltf.d.ts.map +1 -1
  44. package/dist/lib/extensions/KHR_binary_gltf.js +29 -15
  45. package/dist/lib/extensions/KHR_draco_mesh_compression.d.ts +2 -2
  46. package/dist/lib/extensions/KHR_draco_mesh_compression.d.ts.map +1 -1
  47. package/dist/lib/extensions/KHR_draco_mesh_compression.js +110 -87
  48. package/dist/lib/extensions/KHR_texture_basisu.d.ts +2 -2
  49. package/dist/lib/extensions/KHR_texture_basisu.d.ts.map +1 -1
  50. package/dist/lib/extensions/KHR_texture_basisu.js +19 -12
  51. package/dist/lib/extensions/KHR_texture_transform.d.ts +2 -2
  52. package/dist/lib/extensions/KHR_texture_transform.d.ts.map +1 -1
  53. package/dist/lib/extensions/KHR_texture_transform.js +194 -154
  54. package/dist/lib/extensions/deprecated/EXT_feature_metadata.d.ts +2 -2
  55. package/dist/lib/extensions/deprecated/EXT_feature_metadata.d.ts.map +1 -1
  56. package/dist/lib/extensions/deprecated/EXT_feature_metadata.js +263 -143
  57. package/dist/lib/extensions/deprecated/KHR_lights_punctual.d.ts +1 -1
  58. package/dist/lib/extensions/deprecated/KHR_lights_punctual.d.ts.map +1 -1
  59. package/dist/lib/extensions/deprecated/KHR_lights_punctual.js +44 -32
  60. package/dist/lib/extensions/deprecated/KHR_materials_unlit.d.ts +1 -1
  61. package/dist/lib/extensions/deprecated/KHR_materials_unlit.d.ts.map +1 -1
  62. package/dist/lib/extensions/deprecated/KHR_materials_unlit.js +30 -24
  63. package/dist/lib/extensions/deprecated/KHR_techniques_webgl.d.ts +1 -1
  64. package/dist/lib/extensions/deprecated/KHR_techniques_webgl.d.ts.map +1 -1
  65. package/dist/lib/extensions/deprecated/KHR_techniques_webgl.js +65 -52
  66. package/dist/lib/extensions/utils/3d-tiles-utils.d.ts +2 -2
  67. package/dist/lib/extensions/utils/3d-tiles-utils.d.ts.map +1 -1
  68. package/dist/lib/extensions/utils/3d-tiles-utils.js +298 -181
  69. package/dist/lib/gltf-utils/get-typed-array.d.ts +1 -1
  70. package/dist/lib/gltf-utils/get-typed-array.d.ts.map +1 -1
  71. package/dist/lib/gltf-utils/get-typed-array.js +54 -42
  72. package/dist/lib/gltf-utils/gltf-attribute-utils.d.ts +1 -1
  73. package/dist/lib/gltf-utils/gltf-attribute-utils.d.ts.map +1 -1
  74. package/dist/lib/gltf-utils/gltf-attribute-utils.js +58 -52
  75. package/dist/lib/gltf-utils/gltf-constants.js +27 -27
  76. package/dist/lib/gltf-utils/gltf-utils.d.ts +1 -1
  77. package/dist/lib/gltf-utils/gltf-utils.d.ts.map +1 -1
  78. package/dist/lib/gltf-utils/gltf-utils.js +67 -60
  79. package/dist/lib/gltf-utils/resolve-url.js +12 -10
  80. package/dist/lib/parsers/parse-glb.d.ts +1 -1
  81. package/dist/lib/parsers/parse-glb.d.ts.map +1 -1
  82. package/dist/lib/parsers/parse-glb.js +132 -89
  83. package/dist/lib/parsers/parse-gltf.d.ts +3 -3
  84. package/dist/lib/parsers/parse-gltf.d.ts.map +1 -1
  85. package/dist/lib/parsers/parse-gltf.js +155 -126
  86. package/dist/lib/types/glb-types.js +0 -1
  87. package/dist/lib/types/gltf-ext-feature-metadata-schema.d.ts +1 -1
  88. package/dist/lib/types/gltf-ext-feature-metadata-schema.d.ts.map +1 -1
  89. package/dist/lib/types/gltf-ext-feature-metadata-schema.js +0 -1
  90. package/dist/lib/types/gltf-ext-mesh-features-schema.d.ts +1 -1
  91. package/dist/lib/types/gltf-ext-mesh-features-schema.d.ts.map +1 -1
  92. package/dist/lib/types/gltf-ext-mesh-features-schema.js +0 -1
  93. package/dist/lib/types/gltf-ext-structural-metadata-schema.d.ts +1 -1
  94. package/dist/lib/types/gltf-ext-structural-metadata-schema.d.ts.map +1 -1
  95. package/dist/lib/types/gltf-ext-structural-metadata-schema.js +0 -1
  96. package/dist/lib/types/gltf-json-schema.js +2 -1
  97. package/dist/lib/types/gltf-postprocessed-schema.js +2 -1
  98. package/dist/lib/types/gltf-types.d.ts +3 -3
  99. package/dist/lib/types/gltf-types.d.ts.map +1 -1
  100. package/dist/lib/types/gltf-types.js +1 -1
  101. package/dist/lib/utils/assert.js +6 -4
  102. package/dist/lib/utils/version.js +4 -2
  103. package/dist/meshopt/meshopt-decoder.js +86 -67
  104. package/dist/webp/webp.js +28 -19
  105. package/package.json +12 -8
  106. package/dist/glb-loader.js.map +0 -1
  107. package/dist/glb-writer.js.map +0 -1
  108. package/dist/gltf-loader.js.map +0 -1
  109. package/dist/gltf-writer.js.map +0 -1
  110. package/dist/index.js.map +0 -1
  111. package/dist/lib/api/gltf-extensions.js.map +0 -1
  112. package/dist/lib/api/gltf-scenegraph.js.map +0 -1
  113. package/dist/lib/api/normalize-gltf-v1.js.map +0 -1
  114. package/dist/lib/api/post-process-gltf.js.map +0 -1
  115. package/dist/lib/encoders/encode-glb.js.map +0 -1
  116. package/dist/lib/encoders/encode-gltf.js.map +0 -1
  117. package/dist/lib/extensions/EXT_mesh_features.js.map +0 -1
  118. package/dist/lib/extensions/EXT_meshopt_compression.js.map +0 -1
  119. package/dist/lib/extensions/EXT_structural_metadata.js.map +0 -1
  120. package/dist/lib/extensions/EXT_texture_webp.js.map +0 -1
  121. package/dist/lib/extensions/KHR_binary_gltf.js.map +0 -1
  122. package/dist/lib/extensions/KHR_draco_mesh_compression.js.map +0 -1
  123. package/dist/lib/extensions/KHR_texture_basisu.js.map +0 -1
  124. package/dist/lib/extensions/KHR_texture_transform.js.map +0 -1
  125. package/dist/lib/extensions/deprecated/EXT_feature_metadata.js.map +0 -1
  126. package/dist/lib/extensions/deprecated/KHR_lights_punctual.js.map +0 -1
  127. package/dist/lib/extensions/deprecated/KHR_materials_unlit.js.map +0 -1
  128. package/dist/lib/extensions/deprecated/KHR_techniques_webgl.js.map +0 -1
  129. package/dist/lib/extensions/utils/3d-tiles-utils.js.map +0 -1
  130. package/dist/lib/gltf-utils/get-typed-array.js.map +0 -1
  131. package/dist/lib/gltf-utils/gltf-attribute-utils.js.map +0 -1
  132. package/dist/lib/gltf-utils/gltf-constants.js.map +0 -1
  133. package/dist/lib/gltf-utils/gltf-utils.js.map +0 -1
  134. package/dist/lib/gltf-utils/resolve-url.js.map +0 -1
  135. package/dist/lib/parsers/parse-glb.js.map +0 -1
  136. package/dist/lib/parsers/parse-gltf.js.map +0 -1
  137. package/dist/lib/types/glb-types.js.map +0 -1
  138. package/dist/lib/types/gltf-ext-feature-metadata-schema.js.map +0 -1
  139. package/dist/lib/types/gltf-ext-mesh-features-schema.js.map +0 -1
  140. package/dist/lib/types/gltf-ext-structural-metadata-schema.js.map +0 -1
  141. package/dist/lib/types/gltf-json-schema.js.map +0 -1
  142. package/dist/lib/types/gltf-postprocessed-schema.js.map +0 -1
  143. package/dist/lib/types/gltf-types.js.map +0 -1
  144. package/dist/lib/utils/assert.js.map +0 -1
  145. package/dist/lib/utils/version.js.map +0 -1
  146. package/dist/meshopt/meshopt-decoder.js.map +0 -1
  147. package/dist/meshopt/meshopt-encoder.ts.disabled +0 -409
  148. package/dist/webp/webp.js.map +0 -1
@@ -1,5 +1,5 @@
1
- import type { GLTF } from '../types/gltf-json-schema';
2
- import type { GLTFLoaderOptions } from '../../gltf-loader';
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,MAAM,2BAA2B,CAAC;AAC3E,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;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
+ {"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
- const scenegraph = new GLTFScenegraph(gltfData);
7
- if (!isImageFormatSupported('image/webp')) {
8
- if (scenegraph.getRequiredExtensions().includes(EXT_TEXTURE_WEBP)) {
9
- throw new Error(`gltf: Required extension ${EXT_TEXTURE_WEBP} not supported by browser`);
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
- return;
12
- }
13
- const {
14
- json
15
- } = scenegraph;
16
- for (const texture of json.textures || []) {
17
- const extension = scenegraph.getObjectExtension(texture, EXT_TEXTURE_WEBP);
18
- if (extension) {
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
- scenegraph.removeObjectExtension(texture, EXT_TEXTURE_WEBP);
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,4 +1,4 @@
1
- import type { GLTF } from '../types/gltf-json-schema';
1
+ import type { GLTF } from "../types/gltf-json-schema.js";
2
2
  /** Extension name */
3
3
  export declare const name = "KHR_binary_glTF";
4
4
  export declare function preprocess(gltfData: {
@@ -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,MAAM,2BAA2B,CAAC;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
+ {"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
- const gltfScenegraph = new GLTFScenegraph(gltfData);
6
- const {
7
- json
8
- } = gltfScenegraph;
9
- for (const image of json.images || []) {
10
- const extension = gltfScenegraph.getObjectExtension(image, KHR_BINARY_GLTF);
11
- if (extension) {
12
- Object.assign(image, extension);
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
- gltfScenegraph.removeObjectExtension(image, KHR_BINARY_GLTF);
15
- }
16
- if (json.buffers && json.buffers[0]) {
17
- delete json.buffers[0].uri;
18
- }
19
- gltfScenegraph.removeExtension(KHR_BINARY_GLTF);
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
- //# sourceMappingURL=KHR_binary_gltf.js.map
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 '../types/gltf-json-schema';
3
- import type { GLTFLoaderOptions } from '../../gltf-loader';
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,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;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
+ {"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
- const scenegraph = new GLTFScenegraph(gltfData);
9
- for (const primitive of makeMeshPrimitiveIterator(scenegraph)) {
10
- if (scenegraph.getObjectExtension(primitive, KHR_DRACO_MESH_COMPRESSION)) {}
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
- var _options$gltf;
15
- if (!(options !== null && options !== void 0 && (_options$gltf = options.gltf) !== null && _options$gltf !== void 0 && _options$gltf.decompressMeshes)) {
16
- return;
17
- }
18
- const scenegraph = new GLTFScenegraph(gltfData);
19
- const promises = [];
20
- for (const primitive of makeMeshPrimitiveIterator(scenegraph)) {
21
- if (scenegraph.getObjectExtension(primitive, KHR_DRACO_MESH_COMPRESSION)) {
22
- promises.push(decompressPrimitive(scenegraph, primitive, options, context));
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
- await Promise.all(promises);
26
- scenegraph.removeExtension(KHR_DRACO_MESH_COMPRESSION);
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
- let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
30
- const scenegraph = new GLTFScenegraph(gltfData);
31
- for (const mesh of scenegraph.json.meshes || []) {
32
- compressMesh(mesh, options);
33
- scenegraph.addRequiredExtension(KHR_DRACO_MESH_COMPRESSION);
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
- const dracoExtension = scenegraph.getObjectExtension(primitive, KHR_DRACO_MESH_COMPRESSION);
38
- if (!dracoExtension) {
39
- return;
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
- primitive.attributes = decodedAttributes;
60
- if (decodedData.indices) {
61
- primitive.indices = getGLTFAccessor(decodedData.indices);
62
- }
63
- scenegraph.removeObjectExtension(primitive, KHR_DRACO_MESH_COMPRESSION);
64
- checkPrimitive(primitive);
65
- }
66
- function compressMesh(attributes, indices) {
67
- var _context$parseSync;
68
- let mode = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 4;
69
- let options = arguments.length > 3 ? arguments[3] : undefined;
70
- let context = arguments.length > 4 ? arguments[4] : undefined;
71
- if (!options.DracoWriter) {
72
- throw new Error('options.gltf.DracoWriter not provided');
73
- }
74
- const compressedData = options.DracoWriter.encodeSync({
75
- attributes
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
- return glTFMesh;
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
- if (!primitive.attributes && Object.keys(primitive.attributes).length > 0) {
98
- throw new Error('glTF: Empty primitive detected: Draco decompression failure?');
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
- for (const mesh of scenegraph.json.meshes || []) {
103
- for (const primitive of mesh.primitives) {
104
- yield primitive;
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 '../types/gltf-json-schema';
2
- import type { GLTFLoaderOptions } from '../../gltf-loader';
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,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"}
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
- const scene = new GLTFScenegraph(gltfData);
6
- const {
7
- json
8
- } = scene;
9
- for (const texture of json.textures || []) {
10
- const extension = scene.getObjectExtension(texture, KHR_TEXTURE_BASISU);
11
- if (extension) {
12
- texture.source = extension.source;
13
- scene.removeObjectExtension(texture, KHR_TEXTURE_BASISU);
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
- scene.removeExtension(KHR_TEXTURE_BASISU);
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 '../types/gltf-types';
5
- import type { GLTFLoaderOptions } from '../../gltf-loader';
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,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"}
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"}