@loaders.gl/tile-converter 4.2.0-alpha.4 → 4.2.0-alpha.6

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 (192) hide show
  1. package/dist/3d-tiles-converter/3d-tiles-converter.d.ts +4 -4
  2. package/dist/3d-tiles-converter/3d-tiles-converter.d.ts.map +1 -1
  3. package/dist/3d-tiles-converter/3d-tiles-converter.js +349 -293
  4. package/dist/3d-tiles-converter/helpers/b3dm-converter.d.ts.map +1 -1
  5. package/dist/3d-tiles-converter/helpers/b3dm-converter.js +261 -200
  6. package/dist/3d-tiles-converter/helpers/i3s-obb-to-3d-tiles-obb.js +14 -5
  7. package/dist/3d-tiles-converter/helpers/load-i3s.d.ts.map +1 -1
  8. package/dist/3d-tiles-converter/helpers/load-i3s.js +83 -77
  9. package/dist/3d-tiles-converter/helpers/texture-atlas.js +44 -21
  10. package/dist/3d-tiles-converter/json-templates/tileset.js +32 -33
  11. package/dist/constants.js +0 -1
  12. package/dist/converter-cli.js +257 -234
  13. package/dist/converter.min.cjs +95 -105
  14. package/dist/deps-installer/deps-installer.d.ts.map +1 -1
  15. package/dist/deps-installer/deps-installer.js +78 -59
  16. package/dist/i3s-converter/helpers/attribute-metadata-info.js +210 -153
  17. package/dist/i3s-converter/helpers/batch-ids-extensions.d.ts +1 -1
  18. package/dist/i3s-converter/helpers/batch-ids-extensions.d.ts.map +1 -1
  19. package/dist/i3s-converter/helpers/batch-ids-extensions.js +146 -103
  20. package/dist/i3s-converter/helpers/coordinate-converter.js +100 -65
  21. package/dist/i3s-converter/helpers/create-scene-server-path.js +14 -9
  22. package/dist/i3s-converter/helpers/feature-attributes.d.ts.map +1 -1
  23. package/dist/i3s-converter/helpers/feature-attributes.js +170 -105
  24. package/dist/i3s-converter/helpers/geometry-attributes.d.ts +1 -1
  25. package/dist/i3s-converter/helpers/geometry-attributes.d.ts.map +1 -1
  26. package/dist/i3s-converter/helpers/geometry-attributes.js +205 -212
  27. package/dist/i3s-converter/helpers/geometry-converter.d.ts +17 -3
  28. package/dist/i3s-converter/helpers/geometry-converter.d.ts.map +1 -1
  29. package/dist/i3s-converter/helpers/geometry-converter.js +1189 -830
  30. package/dist/i3s-converter/helpers/gltf-attributes.d.ts +1 -1
  31. package/dist/i3s-converter/helpers/gltf-attributes.d.ts.map +1 -1
  32. package/dist/i3s-converter/helpers/gltf-attributes.js +109 -97
  33. package/dist/i3s-converter/helpers/load-3d-tiles.js +103 -66
  34. package/dist/i3s-converter/helpers/node-debug.js +98 -54
  35. package/dist/i3s-converter/helpers/node-index-document.d.ts +11 -4
  36. package/dist/i3s-converter/helpers/node-index-document.d.ts.map +1 -1
  37. package/dist/i3s-converter/helpers/node-index-document.js +255 -177
  38. package/dist/i3s-converter/helpers/node-pages.d.ts +1 -1
  39. package/dist/i3s-converter/helpers/node-pages.d.ts.map +1 -1
  40. package/dist/i3s-converter/helpers/node-pages.js +299 -193
  41. package/dist/i3s-converter/helpers/preprocess-3d-tiles.d.ts +1 -1
  42. package/dist/i3s-converter/helpers/preprocess-3d-tiles.d.ts.map +1 -1
  43. package/dist/i3s-converter/helpers/preprocess-3d-tiles.js +92 -60
  44. package/dist/i3s-converter/helpers/progress.d.ts.map +1 -1
  45. package/dist/i3s-converter/helpers/progress.js +139 -83
  46. package/dist/i3s-converter/helpers/tileset-traversal.d.ts +9 -2
  47. package/dist/i3s-converter/helpers/tileset-traversal.d.ts.map +1 -1
  48. package/dist/i3s-converter/helpers/tileset-traversal.js +33 -13
  49. package/dist/i3s-converter/i3s-converter.d.ts +7 -7
  50. package/dist/i3s-converter/i3s-converter.d.ts.map +1 -1
  51. package/dist/i3s-converter/i3s-converter.js +1165 -895
  52. package/dist/i3s-converter/json-templates/geometry-definitions.js +70 -79
  53. package/dist/i3s-converter/json-templates/layers.js +120 -121
  54. package/dist/i3s-converter/json-templates/metadata.js +19 -20
  55. package/dist/i3s-converter/json-templates/node.js +73 -71
  56. package/dist/i3s-converter/json-templates/scene-server.js +25 -26
  57. package/dist/i3s-converter/json-templates/shared-resources.js +107 -108
  58. package/dist/i3s-converter/json-templates/store.js +96 -94
  59. package/dist/i3s-converter/types.js +35 -23
  60. package/dist/i3s-server/app.js +15 -12
  61. package/dist/i3s-server/bin/i3s-server.min.cjs +69 -69
  62. package/dist/i3s-server/bin/www.js +16 -7
  63. package/dist/i3s-server/controllers/index-controller.js +18 -15
  64. package/dist/i3s-server/controllers/slpk-controller.d.ts.map +1 -1
  65. package/dist/i3s-server/controllers/slpk-controller.js +24 -11
  66. package/dist/i3s-server/routes/index.js +13 -9
  67. package/dist/i3s-server/routes/slpk-router.d.ts.map +1 -1
  68. package/dist/i3s-server/routes/slpk-router.js +26 -19
  69. package/dist/i3s-server/utils/create-scene-server.js +15 -10
  70. package/dist/i3s-server/utils/server-utils.d.ts.map +1 -1
  71. package/dist/i3s-server/utils/server-utils.js +52 -32
  72. package/dist/index.cjs +616 -967
  73. package/dist/index.cjs.map +7 -0
  74. package/dist/index.d.ts +2 -2
  75. package/dist/index.d.ts.map +1 -1
  76. package/dist/index.js +0 -1
  77. package/dist/lib/json-schemas/conversion-dump-json-schema.js +243 -421
  78. package/dist/lib/utils/cli-utils.d.ts.map +1 -1
  79. package/dist/lib/utils/cli-utils.js +65 -36
  80. package/dist/lib/utils/compress-util.js +20 -15
  81. package/dist/lib/utils/conversion-dump.d.ts +10 -2
  82. package/dist/lib/utils/conversion-dump.d.ts.map +1 -1
  83. package/dist/lib/utils/conversion-dump.js +242 -197
  84. package/dist/lib/utils/file-utils.d.ts +1 -1
  85. package/dist/lib/utils/file-utils.d.ts.map +1 -1
  86. package/dist/lib/utils/file-utils.js +120 -74
  87. package/dist/lib/utils/geometry-utils.js +13 -7
  88. package/dist/lib/utils/lod-conversion-utils.js +65 -33
  89. package/dist/lib/utils/queue.js +12 -13
  90. package/dist/lib/utils/statistic-utills.d.ts +6 -23
  91. package/dist/lib/utils/statistic-utills.d.ts.map +1 -1
  92. package/dist/lib/utils/statistic-utills.js +58 -55
  93. package/dist/lib/utils/write-queue.d.ts +2 -2
  94. package/dist/lib/utils/write-queue.d.ts.map +1 -1
  95. package/dist/lib/utils/write-queue.js +72 -86
  96. package/dist/pgm-loader.js +17 -13
  97. package/dist/slpk-extractor/slpk-extractor.d.ts.map +1 -1
  98. package/dist/slpk-extractor/slpk-extractor.js +60 -50
  99. package/dist/slpk-extractor-cli.d.ts.map +1 -1
  100. package/dist/slpk-extractor-cli.js +90 -59
  101. package/dist/slpk-extractor.min.cjs +1 -1
  102. package/package.json +27 -26
  103. package/src/3d-tiles-converter/3d-tiles-converter.ts +21 -10
  104. package/src/3d-tiles-converter/helpers/b3dm-converter.ts +1 -0
  105. package/src/3d-tiles-converter/helpers/load-i3s.ts +3 -27
  106. package/src/converter-cli.ts +4 -2
  107. package/src/deps-installer/deps-installer.ts +7 -0
  108. package/src/i3s-converter/helpers/attribute-metadata-info.ts +1 -1
  109. package/src/i3s-converter/helpers/batch-ids-extensions.ts +3 -1
  110. package/src/i3s-converter/helpers/coordinate-converter.ts +2 -2
  111. package/src/i3s-converter/helpers/feature-attributes.ts +5 -2
  112. package/src/i3s-converter/helpers/geometry-attributes.ts +6 -5
  113. package/src/i3s-converter/helpers/geometry-converter.ts +118 -72
  114. package/src/i3s-converter/helpers/gltf-attributes.ts +12 -13
  115. package/src/i3s-converter/helpers/node-index-document.ts +18 -10
  116. package/src/i3s-converter/helpers/node-pages.ts +27 -29
  117. package/src/i3s-converter/helpers/preprocess-3d-tiles.ts +1 -0
  118. package/src/i3s-converter/helpers/progress.ts +1 -0
  119. package/src/i3s-converter/helpers/tileset-traversal.ts +22 -13
  120. package/src/i3s-converter/i3s-converter.ts +173 -114
  121. package/src/i3s-converter/json-templates/node.ts +1 -1
  122. package/src/i3s-server/bin/www.ts +6 -4
  123. package/src/i3s-server/controllers/slpk-controller.ts +4 -2
  124. package/src/i3s-server/routes/index.ts +10 -7
  125. package/src/i3s-server/routes/slpk-router.ts +22 -16
  126. package/src/i3s-server/utils/server-utils.ts +6 -4
  127. package/src/lib/utils/cli-utils.ts +2 -0
  128. package/src/lib/utils/conversion-dump.ts +35 -20
  129. package/src/lib/utils/file-utils.ts +11 -11
  130. package/src/lib/utils/statistic-utills.ts +5 -6
  131. package/src/lib/utils/write-queue.ts +2 -2
  132. package/src/slpk-extractor/slpk-extractor.ts +2 -1
  133. package/src/slpk-extractor-cli.ts +16 -8
  134. package/dist/3d-tiles-converter/3d-tiles-converter.js.map +0 -1
  135. package/dist/3d-tiles-converter/helpers/b3dm-converter.js.map +0 -1
  136. package/dist/3d-tiles-converter/helpers/i3s-obb-to-3d-tiles-obb.js.map +0 -1
  137. package/dist/3d-tiles-converter/helpers/load-i3s.js.map +0 -1
  138. package/dist/3d-tiles-converter/helpers/texture-atlas.js.map +0 -1
  139. package/dist/3d-tiles-converter/json-templates/tileset.js.map +0 -1
  140. package/dist/constants.js.map +0 -1
  141. package/dist/converter-cli.js.map +0 -1
  142. package/dist/deps-installer/deps-installer.js.map +0 -1
  143. package/dist/i3s-converter/helpers/attribute-metadata-info.js.map +0 -1
  144. package/dist/i3s-converter/helpers/batch-ids-extensions.js.map +0 -1
  145. package/dist/i3s-converter/helpers/coordinate-converter.js.map +0 -1
  146. package/dist/i3s-converter/helpers/create-scene-server-path.js.map +0 -1
  147. package/dist/i3s-converter/helpers/feature-attributes.js.map +0 -1
  148. package/dist/i3s-converter/helpers/geometry-attributes.js.map +0 -1
  149. package/dist/i3s-converter/helpers/geometry-converter.js.map +0 -1
  150. package/dist/i3s-converter/helpers/gltf-attributes.js.map +0 -1
  151. package/dist/i3s-converter/helpers/load-3d-tiles.js.map +0 -1
  152. package/dist/i3s-converter/helpers/node-debug.js.map +0 -1
  153. package/dist/i3s-converter/helpers/node-index-document.js.map +0 -1
  154. package/dist/i3s-converter/helpers/node-pages.js.map +0 -1
  155. package/dist/i3s-converter/helpers/preprocess-3d-tiles.js.map +0 -1
  156. package/dist/i3s-converter/helpers/progress.js.map +0 -1
  157. package/dist/i3s-converter/helpers/tileset-traversal.js.map +0 -1
  158. package/dist/i3s-converter/i3s-converter.js.map +0 -1
  159. package/dist/i3s-converter/json-templates/geometry-definitions.js.map +0 -1
  160. package/dist/i3s-converter/json-templates/layers.js.map +0 -1
  161. package/dist/i3s-converter/json-templates/metadata.js.map +0 -1
  162. package/dist/i3s-converter/json-templates/node.js.map +0 -1
  163. package/dist/i3s-converter/json-templates/scene-server.js.map +0 -1
  164. package/dist/i3s-converter/json-templates/shared-resources.js.map +0 -1
  165. package/dist/i3s-converter/json-templates/store.js.map +0 -1
  166. package/dist/i3s-converter/types.js.map +0 -1
  167. package/dist/i3s-server/README.md +0 -63
  168. package/dist/i3s-server/app.js.map +0 -1
  169. package/dist/i3s-server/bin/www.js.map +0 -1
  170. package/dist/i3s-server/certs/cert.pem +0 -19
  171. package/dist/i3s-server/certs/key.pem +0 -27
  172. package/dist/i3s-server/controllers/index-controller.js.map +0 -1
  173. package/dist/i3s-server/controllers/slpk-controller.js.map +0 -1
  174. package/dist/i3s-server/routes/index.js.map +0 -1
  175. package/dist/i3s-server/routes/slpk-router.js.map +0 -1
  176. package/dist/i3s-server/utils/create-scene-server.js.map +0 -1
  177. package/dist/i3s-server/utils/server-utils.js.map +0 -1
  178. package/dist/index.js.map +0 -1
  179. package/dist/lib/json-schemas/conversion-dump-json-schema.js.map +0 -1
  180. package/dist/lib/utils/cli-utils.js.map +0 -1
  181. package/dist/lib/utils/compress-util.js.map +0 -1
  182. package/dist/lib/utils/conversion-dump.js.map +0 -1
  183. package/dist/lib/utils/file-utils.js.map +0 -1
  184. package/dist/lib/utils/geometry-utils.js.map +0 -1
  185. package/dist/lib/utils/lod-conversion-utils.js.map +0 -1
  186. package/dist/lib/utils/queue.js.map +0 -1
  187. package/dist/lib/utils/statistic-utills.js.map +0 -1
  188. package/dist/lib/utils/write-queue.js.map +0 -1
  189. package/dist/pgm-loader.js.map +0 -1
  190. package/dist/slpk-extractor/slpk-extractor.js.map +0 -1
  191. package/dist/slpk-extractor-cli.js.map +0 -1
  192. package/src/lib/utils/statistic-utills.d.ts +0 -25
@@ -1 +1 @@
1
- {"version":3,"file":"b3dm-converter.d.ts","sourceRoot":"","sources":["../../../src/3d-tiles-converter/helpers/b3dm-converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,iBAAiB,CAAC;AAIpD,OAAO,EAAC,OAAO,EAAU,MAAM,eAAe,CAAC;AAW/C,MAAM,MAAM,iBAAiB,GAAG;IAC9B,WAAW,EAAE,cAAc,CAAC;IAC5B,GAAG,EAAE,MAAM,EAAE,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,aAAa;IAEhC,SAAS,EAAE,YAAY,CAAC;IACxB,OAAO,EAAE,GAAG,CAAC;IAEb;;;;OAIG;IACG,OAAO,CACX,iBAAiB,EAAE,iBAAiB,EACpC,iBAAiB,GAAE,GAAU,GAC5B,OAAO,CAAC,WAAW,CAAC;IAcvB;;;;OAIG;IACG,SAAS,CACb,iBAAiB,EAAE,iBAAiB,EACpC,iBAAiB,EAAE,GAAG,GACrB,OAAO,CAAC,WAAW,CAAC;IAuEvB;;;;;OAKG;IACG,oBAAoB,CAAC,WAAW,KAAA,EAAE,aAAa,KAAA,EAAE,WAAW,KAAA;IAmBlE;;;;;;;OAOG;IACH,mBAAmB,CAAC,cAAc,KAAA,EAAE,eAAe,KAAA,EAAE,kBAAkB,KAAA,EAAE,WAAW,KAAA;IAepF;;;;;;;OAOG;IACH,wBAAwB,CAAC,eAAe,KAAA;IAMxC;;;;OAIG;IACH,eAAe,CAAC,UAAU,KAAA,EAAE,iBAAiB,KAAA;IAoB7C;;;;;OAKG;IACH,yBAAyB,CAAC,MAAM,KAAA;IAchC;;;;;OAKG;IACH,iCAAiC,CAAC,QAAQ,KAAA,EAAE,YAAY,KAAA;IAgCxD;;;;;OAKG;IACH,eAAe,CAAC,kBAAkB,KAAA,EAAE,YAAY,KAAA;IA+ChD,kBAAkB,CAAC,UAAU,KAAA;IAY7B,aAAa,CAAC,OAAO,KAAA;CAItB"}
1
+ {"version":3,"file":"b3dm-converter.d.ts","sourceRoot":"","sources":["../../../src/3d-tiles-converter/helpers/b3dm-converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,iBAAiB,CAAC;AAIpD,OAAO,EAAC,OAAO,EAAU,MAAM,eAAe,CAAC;AAW/C,MAAM,MAAM,iBAAiB,GAAG;IAC9B,WAAW,EAAE,cAAc,CAAC;IAC5B,GAAG,EAAE,MAAM,EAAE,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,aAAa;IAEhC,SAAS,EAAE,YAAY,CAAC;IACxB,OAAO,EAAE,GAAG,CAAC;IAEb;;;;OAIG;IACG,OAAO,CACX,iBAAiB,EAAE,iBAAiB,EACpC,iBAAiB,GAAE,GAAU,GAC5B,OAAO,CAAC,WAAW,CAAC;IAcvB;;;;OAIG;IAEG,SAAS,CACb,iBAAiB,EAAE,iBAAiB,EACpC,iBAAiB,EAAE,GAAG,GACrB,OAAO,CAAC,WAAW,CAAC;IAuEvB;;;;;OAKG;IACG,oBAAoB,CAAC,WAAW,KAAA,EAAE,aAAa,KAAA,EAAE,WAAW,KAAA;IAmBlE;;;;;;;OAOG;IACH,mBAAmB,CAAC,cAAc,KAAA,EAAE,eAAe,KAAA,EAAE,kBAAkB,KAAA,EAAE,WAAW,KAAA;IAepF;;;;;;;OAOG;IACH,wBAAwB,CAAC,eAAe,KAAA;IAMxC;;;;OAIG;IACH,eAAe,CAAC,UAAU,KAAA,EAAE,iBAAiB,KAAA;IAoB7C;;;;;OAKG;IACH,yBAAyB,CAAC,MAAM,KAAA;IAchC;;;;;OAKG;IACH,iCAAiC,CAAC,QAAQ,KAAA,EAAE,YAAY,KAAA;IAgCxD;;;;;OAKG;IACH,eAAe,CAAC,kBAAkB,KAAA,EAAE,YAAY,KAAA;IA+ChD,kBAAkB,CAAC,UAAU,KAAA;IAY7B,aAAa,CAAC,OAAO,KAAA;CAItB"}
@@ -10,217 +10,278 @@ const scratchVector = new Vector3();
10
10
  const KHR_MATERIALS_UNLIT = 'KHR_materials_unlit';
11
11
  const METALLIC_FACTOR_DEFAULT = 1.0;
12
12
  const ROUGHNESS_FACTOR_DEFAULT = 1.0;
13
+ /**
14
+ * Converts content of an I3S node to *.b3dm's file content
15
+ */
13
16
  export default class B3dmConverter {
14
- constructor() {
15
- this.rtcCenter = void 0;
16
- this.i3sTile = void 0;
17
- }
18
- async convert(i3sAttributesData) {
19
- let featureAttributes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
20
- const gltf = await this.buildGLTF(i3sAttributesData, featureAttributes);
21
- const b3dm = encodeSync({
22
- gltfEncoded: new Uint8Array(gltf),
23
- type: 'b3dm',
24
- featuresLength: this._getFeaturesLength(featureAttributes),
25
- batchTable: featureAttributes
26
- }, Tile3DWriter);
27
- return b3dm;
28
- }
29
- async buildGLTF(i3sAttributesData, featureAttributes) {
30
- const {
31
- tileContent,
32
- textureFormat,
33
- box
34
- } = i3sAttributesData;
35
- const {
36
- material,
37
- attributes,
38
- indices: originalIndices,
39
- modelMatrix
40
- } = tileContent;
41
- const gltfBuilder = new GLTFScenegraph();
42
- const textureIndex = await this._addI3sTextureToGLTF(tileContent, textureFormat, gltfBuilder);
43
- const pbrMetallicRoughness = material === null || material === void 0 ? void 0 : material.pbrMetallicRoughness;
44
- if (pbrMetallicRoughness && (pbrMetallicRoughness.metallicFactor === undefined || pbrMetallicRoughness.metallicFactor === METALLIC_FACTOR_DEFAULT) && (pbrMetallicRoughness.roughnessFactor === undefined || pbrMetallicRoughness.roughnessFactor === ROUGHNESS_FACTOR_DEFAULT)) {
45
- gltfBuilder.addObjectExtension(material, KHR_MATERIALS_UNLIT, {});
46
- gltfBuilder.addExtension(KHR_MATERIALS_UNLIT);
17
+ // @ts-expect-error
18
+ rtcCenter;
19
+ i3sTile;
20
+ /**
21
+ * The starter of content conversion
22
+ * @param i3sTile - Tile3D instance for I3S node
23
+ * @returns - encoded content
24
+ */
25
+ async convert(i3sAttributesData, featureAttributes = null) {
26
+ const gltf = await this.buildGLTF(i3sAttributesData, featureAttributes);
27
+ const b3dm = encodeSync({
28
+ gltfEncoded: new Uint8Array(gltf),
29
+ type: 'b3dm',
30
+ featuresLength: this._getFeaturesLength(featureAttributes),
31
+ batchTable: featureAttributes
32
+ }, Tile3DWriter);
33
+ return b3dm;
47
34
  }
48
- const pbrMaterialInfo = this._convertI3sMaterialToGLTFMaterial(material, textureIndex);
49
- const materialIndex = gltfBuilder.addMaterial(pbrMaterialInfo);
50
- const positions = attributes.positions;
51
- const positionsValue = positions.value;
52
- if (attributes.uvRegions && attributes.texCoords) {
53
- attributes.texCoords.value = convertTextureAtlas(attributes.texCoords.value, attributes.uvRegions.value);
54
- }
55
- const cartesianOrigin = new Vector3(box);
56
- const cartographicOrigin = Ellipsoid.WGS84.cartesianToCartographic(cartesianOrigin, new Vector3());
57
- attributes.positions.value = this._normalizePositions(positionsValue, cartesianOrigin, cartographicOrigin, modelMatrix);
58
- this._createBatchIds(tileContent, featureAttributes);
59
- if (attributes.normals && !this._checkNormals(attributes.normals.value)) {
60
- delete attributes.normals;
35
+ /**
36
+ * Build and encode gltf
37
+ * @param i3sTile - Tile3D instance for I3S node
38
+ * @returns - encoded glb content
39
+ */
40
+ // eslint-disable-next-line max-statements
41
+ async buildGLTF(i3sAttributesData, featureAttributes) {
42
+ const { tileContent, textureFormat, box } = i3sAttributesData;
43
+ const { material, attributes, indices: originalIndices, modelMatrix } = tileContent;
44
+ const gltfBuilder = new GLTFScenegraph();
45
+ const textureIndex = await this._addI3sTextureToGLTF(tileContent, textureFormat, gltfBuilder);
46
+ // Add KHR_MATERIALS_UNLIT extension in the following cases:
47
+ // - metallicFactor or roughnessFactor are set to default values
48
+ // - metallicFactor or roughnessFactor are not set
49
+ const pbrMetallicRoughness = material?.pbrMetallicRoughness;
50
+ if (pbrMetallicRoughness &&
51
+ (pbrMetallicRoughness.metallicFactor === undefined ||
52
+ pbrMetallicRoughness.metallicFactor === METALLIC_FACTOR_DEFAULT) &&
53
+ (pbrMetallicRoughness.roughnessFactor === undefined ||
54
+ pbrMetallicRoughness.roughnessFactor === ROUGHNESS_FACTOR_DEFAULT)) {
55
+ gltfBuilder.addObjectExtension(material, KHR_MATERIALS_UNLIT, {});
56
+ gltfBuilder.addExtension(KHR_MATERIALS_UNLIT);
57
+ }
58
+ const pbrMaterialInfo = this._convertI3sMaterialToGLTFMaterial(material, textureIndex);
59
+ const materialIndex = gltfBuilder.addMaterial(pbrMaterialInfo);
60
+ const positions = attributes.positions;
61
+ const positionsValue = positions.value;
62
+ if (attributes.uvRegions && attributes.texCoords) {
63
+ attributes.texCoords.value = convertTextureAtlas(attributes.texCoords.value, attributes.uvRegions.value);
64
+ }
65
+ const cartesianOrigin = new Vector3(box);
66
+ const cartographicOrigin = Ellipsoid.WGS84.cartesianToCartographic(cartesianOrigin, new Vector3());
67
+ attributes.positions.value = this._normalizePositions(positionsValue, cartesianOrigin, cartographicOrigin, modelMatrix);
68
+ this._createBatchIds(tileContent, featureAttributes);
69
+ if (attributes.normals && !this._checkNormals(attributes.normals.value)) {
70
+ delete attributes.normals;
71
+ }
72
+ const indices = originalIndices || generateSyntheticIndices(positionsValue.length / positions.size);
73
+ const meshIndex = gltfBuilder.addMesh({
74
+ attributes,
75
+ indices,
76
+ material: materialIndex,
77
+ mode: 4
78
+ });
79
+ const transformMatrix = this._generateTransformMatrix(cartesianOrigin);
80
+ const nodeIndex = gltfBuilder.addNode({ meshIndex, matrix: transformMatrix });
81
+ const sceneIndex = gltfBuilder.addScene({ nodeIndices: [nodeIndex] });
82
+ gltfBuilder.setDefaultScene(sceneIndex);
83
+ gltfBuilder.createBinaryChunk();
84
+ const gltfBuffer = encodeSync(gltfBuilder.gltf, GLTFWriter);
85
+ return gltfBuffer;
61
86
  }
62
- const indices = originalIndices || generateSyntheticIndices(positionsValue.length / positions.size);
63
- const meshIndex = gltfBuilder.addMesh({
64
- attributes,
65
- indices,
66
- material: materialIndex,
67
- mode: 4
68
- });
69
- const transformMatrix = this._generateTransformMatrix(cartesianOrigin);
70
- const nodeIndex = gltfBuilder.addNode({
71
- meshIndex,
72
- matrix: transformMatrix
73
- });
74
- const sceneIndex = gltfBuilder.addScene({
75
- nodeIndices: [nodeIndex]
76
- });
77
- gltfBuilder.setDefaultScene(sceneIndex);
78
- gltfBuilder.createBinaryChunk();
79
- const gltfBuffer = encodeSync(gltfBuilder.gltf, GLTFWriter);
80
- return gltfBuffer;
81
- }
82
- async _addI3sTextureToGLTF(tileContent, textureFormat, gltfBuilder) {
83
- const {
84
- texture,
85
- material,
86
- attributes
87
- } = tileContent;
88
- let textureIndex = null;
89
- let selectedTexture = texture;
90
- if (!texture && material) {
91
- selectedTexture = material.pbrMetallicRoughness && material.pbrMetallicRoughness.baseColorTexture && material.pbrMetallicRoughness.baseColorTexture.texture.source.image;
87
+ /**
88
+ * Update gltfBuilder with texture from I3S tile
89
+ * @param {object} i3sTile - Tile3D object
90
+ * @param {GLTFScenegraph} gltfBuilder - gltfScenegraph instance to construct GLTF
91
+ * @returns {Promise<number | null>} - GLTF texture index
92
+ */
93
+ async _addI3sTextureToGLTF(tileContent, textureFormat, gltfBuilder) {
94
+ const { texture, material, attributes } = tileContent;
95
+ let textureIndex = null;
96
+ let selectedTexture = texture;
97
+ if (!texture && material) {
98
+ selectedTexture =
99
+ material.pbrMetallicRoughness &&
100
+ material.pbrMetallicRoughness.baseColorTexture &&
101
+ material.pbrMetallicRoughness.baseColorTexture.texture.source.image;
102
+ }
103
+ if (selectedTexture) {
104
+ const mimeType = this._deduceMimeTypeFromFormat(textureFormat);
105
+ const imageIndex = gltfBuilder.addImage(selectedTexture, mimeType);
106
+ textureIndex = gltfBuilder.addTexture({ imageIndex });
107
+ delete attributes.colors;
108
+ }
109
+ return textureIndex;
92
110
  }
93
- if (selectedTexture) {
94
- const mimeType = this._deduceMimeTypeFromFormat(textureFormat);
95
- const imageIndex = gltfBuilder.addImage(selectedTexture, mimeType);
96
- textureIndex = gltfBuilder.addTexture({
97
- imageIndex
98
- });
99
- delete attributes.colors;
111
+ /**
112
+ * Generate a positions array which is correct for 3DTiles/GLTF format
113
+ * @param {Float64Array} positionsValue - the input geometry positions array
114
+ * @param {number[]} cartesianOrigin - the tile center in the cartesian coordinate system
115
+ * @param {number[]} cartographicOrigin - the tile center in the cartographic coordinate system
116
+ * @param {number[]} modelMatrix - the model matrix of geometry
117
+ * @returns {Float32Array} - the output geometry positions array
118
+ */
119
+ _normalizePositions(positionsValue, cartesianOrigin, cartographicOrigin, modelMatrix) {
120
+ const newPositionsValue = new Float32Array(positionsValue.length);
121
+ for (let index = 0; index < positionsValue.length; index += 3) {
122
+ const vertex = positionsValue.subarray(index, index + 3);
123
+ const cartesianOriginVector = new Vector3(cartesianOrigin);
124
+ let vertexVector = new Vector3(Array.from(vertex))
125
+ .transform(modelMatrix)
126
+ .add(cartographicOrigin);
127
+ Ellipsoid.WGS84.cartographicToCartesian(vertexVector, scratchVector);
128
+ vertexVector = scratchVector.subtract(cartesianOriginVector);
129
+ newPositionsValue.set(vertexVector, index);
130
+ }
131
+ return newPositionsValue;
100
132
  }
101
- return textureIndex;
102
- }
103
- _normalizePositions(positionsValue, cartesianOrigin, cartographicOrigin, modelMatrix) {
104
- const newPositionsValue = new Float32Array(positionsValue.length);
105
- for (let index = 0; index < positionsValue.length; index += 3) {
106
- const vertex = positionsValue.subarray(index, index + 3);
107
- const cartesianOriginVector = new Vector3(cartesianOrigin);
108
- let vertexVector = new Vector3(Array.from(vertex)).transform(modelMatrix).add(cartographicOrigin);
109
- Ellipsoid.WGS84.cartographicToCartesian(vertexVector, scratchVector);
110
- vertexVector = scratchVector.subtract(cartesianOriginVector);
111
- newPositionsValue.set(vertexVector, index);
133
+ /**
134
+ * Generate the transformation matrix for GLTF node:
135
+ * https://github.com/KhronosGroup/glTF/tree/master/specification/2.0#reference-node
136
+ * 1. Create the translate transformation from cartesianOrigin (the positions array stores offsets from this cartesianOrigin)
137
+ * 2. Create the rotation transformation to rotate model from z-up coordinates (I3S specific) to y-up coordinates (GLTF specific)
138
+ * @param {number[]} cartesianOrigin - the tile center in the cartesian coordinate system
139
+ * @returns {Matrix4} - an array of 16 numbers (4x4 matrix)
140
+ */
141
+ _generateTransformMatrix(cartesianOrigin) {
142
+ const translateOriginMatrix = new Matrix4().translate(cartesianOrigin);
143
+ const result = translateOriginMatrix.multiplyLeft(Z_UP_TO_Y_UP_MATRIX);
144
+ return result;
112
145
  }
113
- return newPositionsValue;
114
- }
115
- _generateTransformMatrix(cartesianOrigin) {
116
- const translateOriginMatrix = new Matrix4().translate(cartesianOrigin);
117
- const result = translateOriginMatrix.multiplyLeft(Z_UP_TO_Y_UP_MATRIX);
118
- return result;
119
- }
120
- _createBatchIds(i3sContent, featureAttributes) {
121
- const {
122
- featureIds
123
- } = i3sContent;
124
- const {
125
- OBJECTID: objectIds
126
- } = featureAttributes || {};
127
- if (!featureIds || !objectIds) {
128
- return;
146
+ /**
147
+ * Create _BATCHID attribute
148
+ * @param {Object} i3sContent - the source object
149
+ * @returns {void}
150
+ */
151
+ _createBatchIds(i3sContent, featureAttributes) {
152
+ const { featureIds } = i3sContent;
153
+ const { OBJECTID: objectIds } = featureAttributes || {};
154
+ if (!featureIds || !objectIds) {
155
+ return;
156
+ }
157
+ for (let i = 0; i < featureIds.length; i++) {
158
+ const featureId = featureIds[i];
159
+ const batchId = objectIds.indexOf(featureId);
160
+ featureIds[i] = batchId;
161
+ }
162
+ i3sContent.attributes._BATCHID = {
163
+ size: 1,
164
+ byteOffset: 0,
165
+ value: featureIds
166
+ };
129
167
  }
130
- for (let i = 0; i < featureIds.length; i++) {
131
- const featureId = featureIds[i];
132
- const batchId = objectIds.indexOf(featureId);
133
- featureIds[i] = batchId;
168
+ /**
169
+ * Deduce mime type by format from `textureSetDefinition.formats[0].format`
170
+ * https://github.com/Esri/i3s-spec/blob/master/docs/1.7/textureSetDefinitionFormat.cmn.md
171
+ * @param {string} format - format name
172
+ * @returns {string} mime type.
173
+ */
174
+ _deduceMimeTypeFromFormat(format) {
175
+ switch (format) {
176
+ case 'jpg':
177
+ return 'image/jpeg';
178
+ case 'png':
179
+ return 'image/png';
180
+ case 'ktx2':
181
+ return 'image/ktx2';
182
+ default:
183
+ console.warn(`Unexpected texture format in I3S: ${format}`); // eslint-disable-line no-console, no-undef
184
+ return 'image/jpeg';
185
+ }
134
186
  }
135
- i3sContent.attributes._BATCHID = {
136
- size: 1,
137
- byteOffset: 0,
138
- value: featureIds
139
- };
140
- }
141
- _deduceMimeTypeFromFormat(format) {
142
- switch (format) {
143
- case 'jpg':
144
- return 'image/jpeg';
145
- case 'png':
146
- return 'image/png';
147
- case 'ktx2':
148
- return 'image/ktx2';
149
- default:
150
- console.warn(`Unexpected texture format in I3S: ${format}`);
151
- return 'image/jpeg';
187
+ /**
188
+ * Convert i3s material to GLTF compatible material
189
+ * @param {object} material - i3s material definition
190
+ * @param {number | null} textureIndex - texture index in GLTF
191
+ * @returns {object} GLTF material
192
+ */
193
+ _convertI3sMaterialToGLTFMaterial(material, textureIndex) {
194
+ const isTextureIndexExists = textureIndex !== null;
195
+ if (!material) {
196
+ material = {
197
+ alphaMode: 'OPAQUE',
198
+ doubleSided: false,
199
+ pbrMetallicRoughness: {
200
+ metallicFactor: 0,
201
+ roughnessFactor: 1
202
+ }
203
+ };
204
+ if (isTextureIndexExists) {
205
+ material.pbrMetallicRoughness.baseColorTexture = {
206
+ index: textureIndex,
207
+ texCoord: 0
208
+ };
209
+ }
210
+ else {
211
+ material.pbrMetallicRoughness.baseColorFactor = [1, 1, 1, 1];
212
+ }
213
+ return material;
214
+ }
215
+ if (textureIndex !== null) {
216
+ material = this._setGLTFTexture(material, textureIndex);
217
+ }
218
+ return material;
152
219
  }
153
- }
154
- _convertI3sMaterialToGLTFMaterial(material, textureIndex) {
155
- const isTextureIndexExists = textureIndex !== null;
156
- if (!material) {
157
- material = {
158
- alphaMode: 'OPAQUE',
159
- doubleSided: false,
160
- pbrMetallicRoughness: {
161
- metallicFactor: 0,
162
- roughnessFactor: 1
163
- }
164
- };
165
- if (isTextureIndexExists) {
166
- material.pbrMetallicRoughness.baseColorTexture = {
167
- index: textureIndex,
168
- texCoord: 0
220
+ /**
221
+ * Set texture properties in material with GLTF textureIndex
222
+ * @param {object} materialDefinition - i3s material definition
223
+ * @param {number} textureIndex - texture index in GLTF
224
+ * @returns {void}
225
+ */
226
+ _setGLTFTexture(materialDefinition, textureIndex) {
227
+ const material = {
228
+ ...materialDefinition,
229
+ pbrMetallicRoughness: { ...materialDefinition.pbrMetallicRoughness }
169
230
  };
170
- } else {
171
- material.pbrMetallicRoughness.baseColorFactor = [1, 1, 1, 1];
172
- }
173
- return material;
174
- }
175
- if (textureIndex !== null) {
176
- material = this._setGLTFTexture(material, textureIndex);
231
+ // I3SLoader now support loading only one texture. This elseif sequence will assign this texture to one of
232
+ // properties defined in materialDefinition
233
+ if (materialDefinition.pbrMetallicRoughness &&
234
+ materialDefinition.pbrMetallicRoughness.baseColorTexture) {
235
+ material.pbrMetallicRoughness.baseColorTexture = {
236
+ index: textureIndex,
237
+ texCoord: 0
238
+ };
239
+ }
240
+ else if (materialDefinition.emissiveTexture) {
241
+ material.emissiveTexture = {
242
+ index: textureIndex,
243
+ texCoord: 0
244
+ };
245
+ }
246
+ else if (materialDefinition.pbrMetallicRoughness &&
247
+ materialDefinition.pbrMetallicRoughness.metallicRoughnessTexture) {
248
+ material.pbrMetallicRoughness.metallicRoughnessTexture = {
249
+ index: textureIndex,
250
+ texCoord: 0
251
+ };
252
+ }
253
+ else if (materialDefinition.normalTexture) {
254
+ material.normalTexture = {
255
+ index: textureIndex,
256
+ texCoord: 0
257
+ };
258
+ }
259
+ else if (materialDefinition.occlusionTexture) {
260
+ material.occlusionTexture = {
261
+ index: textureIndex,
262
+ texCoord: 0
263
+ };
264
+ }
265
+ return material;
177
266
  }
178
- return material;
179
- }
180
- _setGLTFTexture(materialDefinition, textureIndex) {
181
- const material = {
182
- ...materialDefinition,
183
- pbrMetallicRoughness: {
184
- ...materialDefinition.pbrMetallicRoughness
185
- }
186
- };
187
- if (materialDefinition.pbrMetallicRoughness && materialDefinition.pbrMetallicRoughness.baseColorTexture) {
188
- material.pbrMetallicRoughness.baseColorTexture = {
189
- index: textureIndex,
190
- texCoord: 0
191
- };
192
- } else if (materialDefinition.emissiveTexture) {
193
- material.emissiveTexture = {
194
- index: textureIndex,
195
- texCoord: 0
196
- };
197
- } else if (materialDefinition.pbrMetallicRoughness && materialDefinition.pbrMetallicRoughness.metallicRoughnessTexture) {
198
- material.pbrMetallicRoughness.metallicRoughnessTexture = {
199
- index: textureIndex,
200
- texCoord: 0
201
- };
202
- } else if (materialDefinition.normalTexture) {
203
- material.normalTexture = {
204
- index: textureIndex,
205
- texCoord: 0
206
- };
207
- } else if (materialDefinition.occlusionTexture) {
208
- material.occlusionTexture = {
209
- index: textureIndex,
210
- texCoord: 0
211
- };
267
+ /*
268
+ * Returns Features length based on attribute array in attribute object.
269
+ * @param {Object} attributes
270
+ * @returns {Number} Features length .
271
+ */
272
+ _getFeaturesLength(attributes) {
273
+ if (!attributes) {
274
+ return 0;
275
+ }
276
+ const firstKey = Object.keys(attributes)[0];
277
+ return firstKey ? attributes[firstKey].length : 0;
212
278
  }
213
- return material;
214
- }
215
- _getFeaturesLength(attributes) {
216
- if (!attributes) {
217
- return 0;
279
+ /* Checks that normals buffer is correct
280
+ * @param {TypedArray} normals
281
+ * @returns {boolean} true - normals are correct; false - normals are incorrect
282
+ */
283
+ _checkNormals(normals) {
284
+ // If all normals === 0, the resulting tileset is all in black colors on Cesium
285
+ return normals.find((value) => value);
218
286
  }
219
- const firstKey = Object.keys(attributes)[0];
220
- return firstKey ? attributes[firstKey].length : 0;
221
- }
222
- _checkNormals(normals) {
223
- return normals.find(value => value);
224
- }
225
287
  }
226
- //# sourceMappingURL=b3dm-converter.js.map
@@ -1,10 +1,19 @@
1
1
  import { Vector3 } from '@math.gl/core';
2
2
  import { Ellipsoid } from '@math.gl/geospatial';
3
3
  import { OrientedBoundingBox } from '@math.gl/culling';
4
+ /**
5
+ * Convert quaternion-based OBB to half-axes-based OBB
6
+ * @param i3SObb quaternion based OBB
7
+ * @param geoidHeightModel the Earth Gravity Model instance
8
+ * @returns number[12] 3DTiles OBB https://github.com/CesiumGS/3d-tiles/tree/master/specification#box
9
+ */
4
10
  export function i3sObbTo3dTilesObb(i3SObb, geoidHeightModel) {
5
- const tiles3DCenter = [i3SObb.center[0], i3SObb.center[1], i3SObb.center[2] + geoidHeightModel.getHeight(i3SObb.center[1], i3SObb.center[0])];
6
- const cartesianCenter = Ellipsoid.WGS84.cartographicToCartesian(tiles3DCenter, new Vector3());
7
- const tiles3DObb = new OrientedBoundingBox().fromCenterHalfSizeQuaternion(cartesianCenter, i3SObb.halfSize, i3SObb.quaternion);
8
- return [...tiles3DObb.center, ...tiles3DObb.halfAxes.toArray()];
11
+ const tiles3DCenter = [
12
+ i3SObb.center[0],
13
+ i3SObb.center[1],
14
+ i3SObb.center[2] + geoidHeightModel.getHeight(i3SObb.center[1], i3SObb.center[0])
15
+ ];
16
+ const cartesianCenter = Ellipsoid.WGS84.cartographicToCartesian(tiles3DCenter, new Vector3());
17
+ const tiles3DObb = new OrientedBoundingBox().fromCenterHalfSizeQuaternion(cartesianCenter, i3SObb.halfSize, i3SObb.quaternion);
18
+ return [...tiles3DObb.center, ...tiles3DObb.halfAxes.toArray()];
9
19
  }
10
- //# sourceMappingURL=i3s-obb-to-3d-tiles-obb.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"load-i3s.d.ts","sourceRoot":"","sources":["../../../src/3d-tiles-converter/helpers/load-i3s.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAO,MAAM,kBAAkB,CAAC;AACxD,OAAO,EACL,cAAc,EACd,aAAa,EACb,gBAAgB,EAEhB,gBAAgB,EAEjB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAC,aAAa,EAA0B,MAAM,iBAAiB,CAAC;AAEvE,MAAM,MAAM,YAAY,GAAG;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,gBAAgB,EAAE,MAAM,CAAA;CAAC,CAAC;AAE5E;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc,kBACV,gBAAgB,GAAG,IAAI,cAC1B,aAAa,sBACL,gBAAgB,kBACpB,aAAa,GAAG,IAAI,KACnC,QAAQ,cAAc,GAAG,IAAI,CAuC/B,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAWzE;AAED;;;;;;GAMG;AACH,wBAAsB,eAAe,CACnC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,gBAAgB,EACxB,WAAW,EAAE,gBAAgB,EAC7B,UAAU,EAAE,aAAa,GAAG,IAAI,gBAYjC;AAuBD;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,UAAU,EAAE,aAAa,GAAG,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAapF"}
1
+ {"version":3,"file":"load-i3s.d.ts","sourceRoot":"","sources":["../../../src/3d-tiles-converter/helpers/load-i3s.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAO,MAAM,kBAAkB,CAAC;AACxD,OAAO,EACL,cAAc,EACd,aAAa,EACb,gBAAgB,EAEhB,gBAAgB,EAEjB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAC,aAAa,EAA0B,MAAM,iBAAiB,CAAC;AAEvE,MAAM,MAAM,YAAY,GAAG;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,gBAAgB,EAAE,MAAM,CAAA;CAAC,CAAC;AAE5E;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc,kBACV,gBAAgB,GAAG,IAAI,cAC1B,aAAa,sBACL,gBAAgB,kBACpB,aAAa,GAAG,IAAI,KACnC,QAAQ,cAAc,GAAG,IAAI,CAuC/B,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAUzE;AAED;;;;;;GAMG;AACH,wBAAsB,eAAe,CACnC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,gBAAgB,EACxB,WAAW,EAAE,gBAAgB,EAC7B,UAAU,EAAE,aAAa,GAAG,IAAI,gBAUjC;AAED;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,UAAU,EAAE,aAAa,GAAG,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAapF"}