@loaders.gl/3d-tiles 3.0.13 → 3.0.14

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 (67) hide show
  1. package/dist/dist.es5.min.js +1 -1
  2. package/dist/dist.es5.min.js.map +1 -1
  3. package/dist/dist.min.js +1 -1
  4. package/dist/dist.min.js.map +1 -1
  5. package/dist/es5/bundle.js +2 -2
  6. package/dist/es5/bundle.js.map +1 -1
  7. package/dist/es5/cesium-ion-loader.js +78 -23
  8. package/dist/es5/cesium-ion-loader.js.map +1 -1
  9. package/dist/es5/index.js +7 -7
  10. package/dist/es5/lib/classes/helpers/tile-3d-accessor-utils.js +42 -30
  11. package/dist/es5/lib/classes/helpers/tile-3d-accessor-utils.js.map +1 -1
  12. package/dist/es5/lib/classes/tile-3d-batch-table-hierarchy.js +59 -57
  13. package/dist/es5/lib/classes/tile-3d-batch-table-hierarchy.js.map +1 -1
  14. package/dist/es5/lib/classes/tile-3d-batch-table.js +240 -201
  15. package/dist/es5/lib/classes/tile-3d-batch-table.js.map +1 -1
  16. package/dist/es5/lib/classes/tile-3d-feature-table.js +80 -62
  17. package/dist/es5/lib/classes/tile-3d-feature-table.js.map +1 -1
  18. package/dist/es5/lib/constants.js +4 -4
  19. package/dist/es5/lib/constants.js.map +1 -1
  20. package/dist/es5/lib/encoders/encode-3d-tile-batched-model.js +22 -15
  21. package/dist/es5/lib/encoders/encode-3d-tile-batched-model.js.map +1 -1
  22. package/dist/es5/lib/encoders/encode-3d-tile-composite.js +13 -6
  23. package/dist/es5/lib/encoders/encode-3d-tile-composite.js.map +1 -1
  24. package/dist/es5/lib/encoders/encode-3d-tile-instanced-model.js +23 -14
  25. package/dist/es5/lib/encoders/encode-3d-tile-instanced-model.js.map +1 -1
  26. package/dist/es5/lib/encoders/encode-3d-tile-point-cloud.js +22 -15
  27. package/dist/es5/lib/encoders/encode-3d-tile-point-cloud.js.map +1 -1
  28. package/dist/es5/lib/encoders/encode-3d-tile.js +3 -3
  29. package/dist/es5/lib/encoders/encode-3d-tile.js.map +1 -1
  30. package/dist/es5/lib/encoders/helpers/encode-3d-tile-header.js +6 -6
  31. package/dist/es5/lib/encoders/helpers/encode-3d-tile-header.js.map +1 -1
  32. package/dist/es5/lib/ion/ion.js +197 -69
  33. package/dist/es5/lib/ion/ion.js.map +1 -1
  34. package/dist/es5/lib/parsers/helpers/normalize-3d-tile-colors.js +18 -17
  35. package/dist/es5/lib/parsers/helpers/normalize-3d-tile-colors.js.map +1 -1
  36. package/dist/es5/lib/parsers/helpers/normalize-3d-tile-normals.js +3 -3
  37. package/dist/es5/lib/parsers/helpers/normalize-3d-tile-normals.js.map +1 -1
  38. package/dist/es5/lib/parsers/helpers/normalize-3d-tile-positions.js +3 -3
  39. package/dist/es5/lib/parsers/helpers/normalize-3d-tile-positions.js.map +1 -1
  40. package/dist/es5/lib/parsers/helpers/parse-3d-tile-gltf-view.js +66 -26
  41. package/dist/es5/lib/parsers/helpers/parse-3d-tile-gltf-view.js.map +1 -1
  42. package/dist/es5/lib/parsers/helpers/parse-3d-tile-header.js +4 -3
  43. package/dist/es5/lib/parsers/helpers/parse-3d-tile-header.js.map +1 -1
  44. package/dist/es5/lib/parsers/helpers/parse-3d-tile-tables.js +17 -19
  45. package/dist/es5/lib/parsers/helpers/parse-3d-tile-tables.js.map +1 -1
  46. package/dist/es5/lib/parsers/helpers/parse-utils.js +8 -7
  47. package/dist/es5/lib/parsers/helpers/parse-utils.js.map +1 -1
  48. package/dist/es5/lib/parsers/parse-3d-tile-batched-model.js +36 -10
  49. package/dist/es5/lib/parsers/parse-3d-tile-batched-model.js.map +1 -1
  50. package/dist/es5/lib/parsers/parse-3d-tile-composite.js +48 -12
  51. package/dist/es5/lib/parsers/parse-3d-tile-composite.js.map +1 -1
  52. package/dist/es5/lib/parsers/parse-3d-tile-header.js +30 -14
  53. package/dist/es5/lib/parsers/parse-3d-tile-header.js.map +1 -1
  54. package/dist/es5/lib/parsers/parse-3d-tile-instanced-model.js +63 -38
  55. package/dist/es5/lib/parsers/parse-3d-tile-instanced-model.js.map +1 -1
  56. package/dist/es5/lib/parsers/parse-3d-tile-point-cloud.js +198 -117
  57. package/dist/es5/lib/parsers/parse-3d-tile-point-cloud.js.map +1 -1
  58. package/dist/es5/lib/parsers/parse-3d-tile.js +65 -15
  59. package/dist/es5/lib/parsers/parse-3d-tile.js.map +1 -1
  60. package/dist/es5/lib/utils/version.js +1 -1
  61. package/dist/es5/lib/utils/version.js.map +1 -1
  62. package/dist/es5/tile-3d-writer.js +5 -5
  63. package/dist/es5/tile-3d-writer.js.map +1 -1
  64. package/dist/es5/tiles-3d-loader.js +115 -35
  65. package/dist/es5/tiles-3d-loader.js.map +1 -1
  66. package/dist/esm/lib/utils/version.js +1 -1
  67. package/package.json +8 -8
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../../src/lib/parsers/helpers/normalize-3d-tile-positions.js"],"names":["normalize3DTilePositionAttribute","tile","positions","options","isQuantized","decodeQuantizedPositions","type","GL","UNSIGNED_SHORT","value","size","normalized","scratchPosition","Vector3","decodedArray","Float32Array","pointCount","i","set","scale","quantizedRange","multiply","quantizedVolumeScale","add","quantizedVolumeOffset","toArray"],"mappings":";;;;;;;AAAA;;AACA;;AAGO,SAASA,gCAAT,CAA0CC,IAA1C,EAAgDC,SAAhD,EAA2DC,OAA3D,EAAoE;AACzE,MAAI,CAACF,IAAI,CAACG,WAAV,EAAuB;AACrB,WAAOF,SAAP;AACD;;AAMD,MAAIC,OAAO,CAAC,UAAD,CAAP,IAAuBA,OAAO,CAAC,UAAD,CAAP,CAAoBE,wBAA/C,EAAyE;AACvEJ,IAAAA,IAAI,CAACG,WAAL,GAAmB,KAAnB;AACA,WAAOC,wBAAwB,CAACJ,IAAD,EAAOC,SAAP,CAA/B;AACD;;AAID,SAAO;AACLI,IAAAA,IAAI,EAAEC,SAAGC,cADJ;AAELC,IAAAA,KAAK,EAAEP,SAFF;AAGLQ,IAAAA,IAAI,EAAE,CAHD;AAILC,IAAAA,UAAU,EAAE;AAJP,GAAP;AAMD;;AAGD,SAASN,wBAAT,CAAkCJ,IAAlC,EAAwCC,SAAxC,EAAmD;AACjD,QAAMU,eAAe,GAAG,IAAIC,aAAJ,EAAxB;AACA,QAAMC,YAAY,GAAG,IAAIC,YAAJ,CAAiBd,IAAI,CAACe,UAAL,GAAkB,CAAnC,CAArB;;AAEA,OAAK,IAAIC,CAAC,GAAG,CAAb,EAAgBA,CAAC,GAAGhB,IAAI,CAACe,UAAzB,EAAqCC,CAAC,EAAtC,EAA0C;AAExCL,IAAAA,eAAe,CACZM,GADH,CACOhB,SAAS,CAACe,CAAC,GAAG,CAAL,CADhB,EACyBf,SAAS,CAACe,CAAC,GAAG,CAAJ,GAAQ,CAAT,CADlC,EAC+Cf,SAAS,CAACe,CAAC,GAAG,CAAJ,GAAQ,CAAT,CADxD,EAEGE,KAFH,CAES,IAAIlB,IAAI,CAACmB,cAFlB,EAGGC,QAHH,CAGYpB,IAAI,CAACqB,oBAHjB,EAIGC,GAJH,CAIOtB,IAAI,CAACuB,qBAJZ,EAKGC,OALH,CAKWX,YALX,EAKyBG,CAAC,GAAG,CAL7B;AAMD;;AAED,SAAOH,YAAP;AACD","sourcesContent":["import {Vector3} from '@math.gl/core';\nimport {GL} from '@loaders.gl/math';\n\n// Prepare attribute for positions\nexport function normalize3DTilePositionAttribute(tile, positions, options) {\n if (!tile.isQuantized) {\n return positions;\n }\n\n // For quantized posititions, either expand to Float32Array or return custom accessor\n // https://github.com/AnalyticalGraphicsInc/3d-tiles/blob/master/specification/TileFormats/Instanced3DModel/README.md#quantized-positions\n\n // Optionally decodes quantized positions on GPU, for simpler renderers that don't accept normalized attributes\n if (options['3d-tiles'] && options['3d-tiles'].decodeQuantizedPositions) {\n tile.isQuantized = false;\n return decodeQuantizedPositions(tile, positions);\n }\n\n // Default: Use normalized shorts directly, no copying/processing.\n // NOTE: The \"missing\" offset/scaling operations are automatically added to modelMatrix if `tile.isQuantized === true`\n return {\n type: GL.UNSIGNED_SHORT,\n value: positions,\n size: 3,\n normalized: true\n };\n}\n\n// Pre-scale quantized positions on CPU\nfunction decodeQuantizedPositions(tile, positions) {\n const scratchPosition = new Vector3();\n const decodedArray = new Float32Array(tile.pointCount * 3);\n\n for (let i = 0; i < tile.pointCount; i++) {\n // POSITION = POSITION_QUANTIZED / 65535.0 * QUANTIZED_VOLUME_SCALE + QUANTIZED_VOLUME_OFFSET\n scratchPosition\n .set(positions[i * 3], positions[i * 3 + 1], positions[i * 3 + 2])\n .scale(1 / tile.quantizedRange)\n .multiply(tile.quantizedVolumeScale)\n .add(tile.quantizedVolumeOffset)\n .toArray(decodedArray, i * 3);\n }\n\n return decodedArray;\n}\n"],"file":"normalize-3d-tile-positions.js"}
1
+ {"version":3,"sources":["../../../../../src/lib/parsers/helpers/normalize-3d-tile-positions.js"],"names":["normalize3DTilePositionAttribute","tile","positions","options","isQuantized","decodeQuantizedPositions","type","GL","UNSIGNED_SHORT","value","size","normalized","scratchPosition","Vector3","decodedArray","Float32Array","pointCount","i","set","scale","quantizedRange","multiply","quantizedVolumeScale","add","quantizedVolumeOffset","toArray"],"mappings":";;;;;;;AAAA;;AACA;;AAGO,SAASA,gCAAT,CAA0CC,IAA1C,EAAgDC,SAAhD,EAA2DC,OAA3D,EAAoE;AACzE,MAAI,CAACF,IAAI,CAACG,WAAV,EAAuB;AACrB,WAAOF,SAAP;AACD;;AAMD,MAAIC,OAAO,CAAC,UAAD,CAAP,IAAuBA,OAAO,CAAC,UAAD,CAAP,CAAoBE,wBAA/C,EAAyE;AACvEJ,IAAAA,IAAI,CAACG,WAAL,GAAmB,KAAnB;AACA,WAAOC,wBAAwB,CAACJ,IAAD,EAAOC,SAAP,CAA/B;AACD;;AAID,SAAO;AACLI,IAAAA,IAAI,EAAEC,SAAGC,cADJ;AAELC,IAAAA,KAAK,EAAEP,SAFF;AAGLQ,IAAAA,IAAI,EAAE,CAHD;AAILC,IAAAA,UAAU,EAAE;AAJP,GAAP;AAMD;;AAGD,SAASN,wBAAT,CAAkCJ,IAAlC,EAAwCC,SAAxC,EAAmD;AACjD,MAAMU,eAAe,GAAG,IAAIC,aAAJ,EAAxB;AACA,MAAMC,YAAY,GAAG,IAAIC,YAAJ,CAAiBd,IAAI,CAACe,UAAL,GAAkB,CAAnC,CAArB;;AAEA,OAAK,IAAIC,CAAC,GAAG,CAAb,EAAgBA,CAAC,GAAGhB,IAAI,CAACe,UAAzB,EAAqCC,CAAC,EAAtC,EAA0C;AAExCL,IAAAA,eAAe,CACZM,GADH,CACOhB,SAAS,CAACe,CAAC,GAAG,CAAL,CADhB,EACyBf,SAAS,CAACe,CAAC,GAAG,CAAJ,GAAQ,CAAT,CADlC,EAC+Cf,SAAS,CAACe,CAAC,GAAG,CAAJ,GAAQ,CAAT,CADxD,EAEGE,KAFH,CAES,IAAIlB,IAAI,CAACmB,cAFlB,EAGGC,QAHH,CAGYpB,IAAI,CAACqB,oBAHjB,EAIGC,GAJH,CAIOtB,IAAI,CAACuB,qBAJZ,EAKGC,OALH,CAKWX,YALX,EAKyBG,CAAC,GAAG,CAL7B;AAMD;;AAED,SAAOH,YAAP;AACD","sourcesContent":["import {Vector3} from '@math.gl/core';\nimport {GL} from '@loaders.gl/math';\n\n// Prepare attribute for positions\nexport function normalize3DTilePositionAttribute(tile, positions, options) {\n if (!tile.isQuantized) {\n return positions;\n }\n\n // For quantized posititions, either expand to Float32Array or return custom accessor\n // https://github.com/AnalyticalGraphicsInc/3d-tiles/blob/master/specification/TileFormats/Instanced3DModel/README.md#quantized-positions\n\n // Optionally decodes quantized positions on GPU, for simpler renderers that don't accept normalized attributes\n if (options['3d-tiles'] && options['3d-tiles'].decodeQuantizedPositions) {\n tile.isQuantized = false;\n return decodeQuantizedPositions(tile, positions);\n }\n\n // Default: Use normalized shorts directly, no copying/processing.\n // NOTE: The \"missing\" offset/scaling operations are automatically added to modelMatrix if `tile.isQuantized === true`\n return {\n type: GL.UNSIGNED_SHORT,\n value: positions,\n size: 3,\n normalized: true\n };\n}\n\n// Pre-scale quantized positions on CPU\nfunction decodeQuantizedPositions(tile, positions) {\n const scratchPosition = new Vector3();\n const decodedArray = new Float32Array(tile.pointCount * 3);\n\n for (let i = 0; i < tile.pointCount; i++) {\n // POSITION = POSITION_QUANTIZED / 65535.0 * QUANTIZED_VOLUME_SCALE + QUANTIZED_VOLUME_OFFSET\n scratchPosition\n .set(positions[i * 3], positions[i * 3 + 1], positions[i * 3 + 2])\n .scale(1 / tile.quantizedRange)\n .multiply(tile.quantizedVolumeScale)\n .add(tile.quantizedVolumeOffset)\n .toArray(decodedArray, i * 3);\n }\n\n return decodedArray;\n}\n"],"file":"normalize-3d-tile-positions.js"}
@@ -1,5 +1,7 @@
1
1
  "use strict";
2
2
 
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+
3
5
  Object.defineProperty(exports, "__esModule", {
4
6
  value: true
5
7
  });
@@ -7,11 +9,15 @@ exports.parse3DTileGLTFViewSync = parse3DTileGLTFViewSync;
7
9
  exports.extractGLTF = extractGLTF;
8
10
  exports.GLTF_FORMAT = void 0;
9
11
 
12
+ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
13
+
14
+ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
15
+
10
16
  var _gltf = require("@loaders.gl/gltf");
11
17
 
12
18
  var _loaderUtils = require("@loaders.gl/loader-utils");
13
19
 
14
- const GLTF_FORMAT = {
20
+ var GLTF_FORMAT = {
15
21
  URI: 0,
16
22
  EMBEDDED: 1
17
23
  };
@@ -19,7 +25,7 @@ exports.GLTF_FORMAT = GLTF_FORMAT;
19
25
 
20
26
  function parse3DTileGLTFViewSync(tile, arrayBuffer, byteOffset, options) {
21
27
  tile.rotateYtoZ = true;
22
- const gltfByteLength = tile.byteOffset + tile.byteLength - byteOffset;
28
+ var gltfByteLength = tile.byteOffset + tile.byteLength - byteOffset;
23
29
 
24
30
  if (gltfByteLength === 0) {
25
31
  throw new Error('glTF byte length must be greater than 0.');
@@ -37,36 +43,70 @@ function parse3DTileGLTFViewSync(tile, arrayBuffer, byteOffset, options) {
37
43
  return tile.byteOffset + tile.byteLength;
38
44
  }
39
45
 
40
- async function extractGLTF(tile, gltfFormat, options, context) {
41
- const tile3DOptions = options['3d-tiles'] || {};
42
- extractGLTFBufferOrURL(tile, gltfFormat, options);
43
-
44
- if (tile3DOptions.loadGLTF) {
45
- const {
46
- parse,
47
- fetch
48
- } = context;
49
-
50
- if (tile.gltfUrl) {
51
- tile.gltfArrayBuffer = await fetch(tile.gltfUrl, options);
52
- tile.gltfByteOffset = 0;
53
- }
46
+ function extractGLTF(_x, _x2, _x3, _x4) {
47
+ return _extractGLTF.apply(this, arguments);
48
+ }
54
49
 
55
- if (tile.gltfArrayBuffer) {
56
- tile.gltf = await parse(tile.gltfArrayBuffer, _gltf.GLTFLoader, options, context);
57
- delete tile.gltfArrayBuffer;
58
- delete tile.gltfByteOffset;
59
- delete tile.gltfByteLength;
60
- }
61
- }
50
+ function _extractGLTF() {
51
+ _extractGLTF = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(tile, gltfFormat, options, context) {
52
+ var tile3DOptions, parse, fetch;
53
+ return _regenerator.default.wrap(function _callee$(_context) {
54
+ while (1) {
55
+ switch (_context.prev = _context.next) {
56
+ case 0:
57
+ tile3DOptions = options['3d-tiles'] || {};
58
+ extractGLTFBufferOrURL(tile, gltfFormat, options);
59
+
60
+ if (!tile3DOptions.loadGLTF) {
61
+ _context.next = 16;
62
+ break;
63
+ }
64
+
65
+ parse = context.parse, fetch = context.fetch;
66
+
67
+ if (!tile.gltfUrl) {
68
+ _context.next = 9;
69
+ break;
70
+ }
71
+
72
+ _context.next = 7;
73
+ return fetch(tile.gltfUrl, options);
74
+
75
+ case 7:
76
+ tile.gltfArrayBuffer = _context.sent;
77
+ tile.gltfByteOffset = 0;
78
+
79
+ case 9:
80
+ if (!tile.gltfArrayBuffer) {
81
+ _context.next = 16;
82
+ break;
83
+ }
84
+
85
+ _context.next = 12;
86
+ return parse(tile.gltfArrayBuffer, _gltf.GLTFLoader, options, context);
87
+
88
+ case 12:
89
+ tile.gltf = _context.sent;
90
+ delete tile.gltfArrayBuffer;
91
+ delete tile.gltfByteOffset;
92
+ delete tile.gltfByteLength;
93
+
94
+ case 16:
95
+ case "end":
96
+ return _context.stop();
97
+ }
98
+ }
99
+ }, _callee);
100
+ }));
101
+ return _extractGLTF.apply(this, arguments);
62
102
  }
63
103
 
64
104
  function extractGLTFBufferOrURL(tile, gltfFormat, options) {
65
105
  switch (gltfFormat) {
66
106
  case GLTF_FORMAT.URI:
67
- const gltfUrlBytes = new Uint8Array(tile.gltfArrayBuffer, tile.gltfByteOffset);
68
- const textDecoder = new TextDecoder();
69
- const gltfUrl = textDecoder.decode(gltfUrlBytes);
107
+ var gltfUrlBytes = new Uint8Array(tile.gltfArrayBuffer, tile.gltfByteOffset);
108
+ var textDecoder = new TextDecoder();
109
+ var gltfUrl = textDecoder.decode(gltfUrlBytes);
70
110
  tile.gltfUrl = gltfUrl.replace(/[\s\0]+$/, '');
71
111
  delete tile.gltfArrayBuffer;
72
112
  delete tile.gltfByteOffset;
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../../src/lib/parsers/helpers/parse-3d-tile-gltf-view.js"],"names":["GLTF_FORMAT","URI","EMBEDDED","parse3DTileGLTFViewSync","tile","arrayBuffer","byteOffset","options","rotateYtoZ","gltfByteLength","byteLength","Error","gltfUpAxis","assetGltfUpAxis","gltfArrayBuffer","gltfByteOffset","console","warn","type","extractGLTF","gltfFormat","context","tile3DOptions","extractGLTFBufferOrURL","loadGLTF","parse","fetch","gltfUrl","gltf","GLTFLoader","gltfUrlBytes","Uint8Array","textDecoder","TextDecoder","decode","replace"],"mappings":"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","sourcesContent":["// This file is derived from the Cesium code base under Apache 2 license\n// See LICENSE.md and https://github.com/AnalyticalGraphicsInc/cesium/blob/master/LICENSE.md\n\n// TODO - should we automatically parse the embedded glTF or leave it to the app?\n// - I.e. some apps might work directly on a GLB, in that case no need for us to decode...\n// - And if we decode, do we still keep the GLB in case it is needed?\n// - Do we add an option to control this?\n// - Also, should we have hard dependency on gltf module or use injection or auto-discovery for gltf parser?\n\nimport {GLTFLoader} from '@loaders.gl/gltf';\nimport {sliceArrayBuffer} from '@loaders.gl/loader-utils';\n\nexport const GLTF_FORMAT = {\n URI: 0,\n EMBEDDED: 1\n};\n\nexport function parse3DTileGLTFViewSync(tile, arrayBuffer, byteOffset, options) {\n // Set flags\n // glTF models need to be rotated from Y to Z up\n // https://github.com/AnalyticalGraphicsInc/3d-tiles/tree/master/specification#y-up-to-z-up\n tile.rotateYtoZ = true;\n\n // Assume glTF consumes rest of tile\n const gltfByteLength = tile.byteOffset + tile.byteLength - byteOffset;\n if (gltfByteLength === 0) {\n throw new Error('glTF byte length must be greater than 0.');\n }\n\n // Save gltf up axis\n tile.gltfUpAxis =\n options['3d-tiles'] && options['3d-tiles'].assetGltfUpAxis\n ? options['3d-tiles'].assetGltfUpAxis\n : 'Y';\n\n // TODO - We can avoid copy if already 4-byte aligned...\n // However the rest of the code may not be able to accept byteOffsets, so copy anyway\n tile.gltfArrayBuffer = sliceArrayBuffer(arrayBuffer, byteOffset, gltfByteLength);\n tile.gltfByteOffset = 0;\n tile.gltfByteLength = gltfByteLength;\n\n if (byteOffset % 4 === 0) {\n // tile.gltfArrayBuffer = arrayBuffer;\n // tile.gltfByteOffset = byteOffset;\n // tile.gltfByteLength = gltfByteLength;\n } else {\n // Create a copy of the glb so that it is 4-byte aligned\n // eslint-disable-next-line\n console.warn(`${tile.type}: embedded glb is not aligned to a 4-byte boundary.`);\n }\n\n // Entire tile is consumed\n return tile.byteOffset + tile.byteLength;\n}\n\nexport async function extractGLTF(tile, gltfFormat, options, context) {\n const tile3DOptions = options['3d-tiles'] || {};\n\n extractGLTFBufferOrURL(tile, gltfFormat, options);\n\n if (tile3DOptions.loadGLTF) {\n const {parse, fetch} = context;\n if (tile.gltfUrl) {\n tile.gltfArrayBuffer = await fetch(tile.gltfUrl, options);\n tile.gltfByteOffset = 0;\n }\n if (tile.gltfArrayBuffer) {\n // TODO - Should handle byteOffset... However, not used now...\n tile.gltf = await parse(tile.gltfArrayBuffer, GLTFLoader, options, context);\n delete tile.gltfArrayBuffer;\n delete tile.gltfByteOffset;\n delete tile.gltfByteLength;\n }\n }\n}\n\nfunction extractGLTFBufferOrURL(tile, gltfFormat, options) {\n switch (gltfFormat) {\n case GLTF_FORMAT.URI:\n // We need to remove padding from the end of the model URL in case this tile was part of a composite tile.\n // This removes all white space and null characters from the end of the string.\n const gltfUrlBytes = new Uint8Array(tile.gltfArrayBuffer, tile.gltfByteOffset);\n const textDecoder = new TextDecoder();\n const gltfUrl = textDecoder.decode(gltfUrlBytes);\n tile.gltfUrl = gltfUrl.replace(/[\\s\\0]+$/, '');\n delete tile.gltfArrayBuffer;\n delete tile.gltfByteOffset;\n delete tile.gltfByteLength;\n break;\n case GLTF_FORMAT.EMBEDDED:\n break;\n default:\n throw new Error(`b3dm: Illegal glTF format field`);\n }\n}\n"],"file":"parse-3d-tile-gltf-view.js"}
1
+ {"version":3,"sources":["../../../../../src/lib/parsers/helpers/parse-3d-tile-gltf-view.js"],"names":["GLTF_FORMAT","URI","EMBEDDED","parse3DTileGLTFViewSync","tile","arrayBuffer","byteOffset","options","rotateYtoZ","gltfByteLength","byteLength","Error","gltfUpAxis","assetGltfUpAxis","gltfArrayBuffer","gltfByteOffset","console","warn","type","extractGLTF","gltfFormat","context","tile3DOptions","extractGLTFBufferOrURL","loadGLTF","parse","fetch","gltfUrl","GLTFLoader","gltf","gltfUrlBytes","Uint8Array","textDecoder","TextDecoder","decode","replace"],"mappings":"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","sourcesContent":["// This file is derived from the Cesium code base under Apache 2 license\n// See LICENSE.md and https://github.com/AnalyticalGraphicsInc/cesium/blob/master/LICENSE.md\n\n// TODO - should we automatically parse the embedded glTF or leave it to the app?\n// - I.e. some apps might work directly on a GLB, in that case no need for us to decode...\n// - And if we decode, do we still keep the GLB in case it is needed?\n// - Do we add an option to control this?\n// - Also, should we have hard dependency on gltf module or use injection or auto-discovery for gltf parser?\n\nimport {GLTFLoader} from '@loaders.gl/gltf';\nimport {sliceArrayBuffer} from '@loaders.gl/loader-utils';\n\nexport const GLTF_FORMAT = {\n URI: 0,\n EMBEDDED: 1\n};\n\nexport function parse3DTileGLTFViewSync(tile, arrayBuffer, byteOffset, options) {\n // Set flags\n // glTF models need to be rotated from Y to Z up\n // https://github.com/AnalyticalGraphicsInc/3d-tiles/tree/master/specification#y-up-to-z-up\n tile.rotateYtoZ = true;\n\n // Assume glTF consumes rest of tile\n const gltfByteLength = tile.byteOffset + tile.byteLength - byteOffset;\n if (gltfByteLength === 0) {\n throw new Error('glTF byte length must be greater than 0.');\n }\n\n // Save gltf up axis\n tile.gltfUpAxis =\n options['3d-tiles'] && options['3d-tiles'].assetGltfUpAxis\n ? options['3d-tiles'].assetGltfUpAxis\n : 'Y';\n\n // TODO - We can avoid copy if already 4-byte aligned...\n // However the rest of the code may not be able to accept byteOffsets, so copy anyway\n tile.gltfArrayBuffer = sliceArrayBuffer(arrayBuffer, byteOffset, gltfByteLength);\n tile.gltfByteOffset = 0;\n tile.gltfByteLength = gltfByteLength;\n\n if (byteOffset % 4 === 0) {\n // tile.gltfArrayBuffer = arrayBuffer;\n // tile.gltfByteOffset = byteOffset;\n // tile.gltfByteLength = gltfByteLength;\n } else {\n // Create a copy of the glb so that it is 4-byte aligned\n // eslint-disable-next-line\n console.warn(`${tile.type}: embedded glb is not aligned to a 4-byte boundary.`);\n }\n\n // Entire tile is consumed\n return tile.byteOffset + tile.byteLength;\n}\n\nexport async function extractGLTF(tile, gltfFormat, options, context) {\n const tile3DOptions = options['3d-tiles'] || {};\n\n extractGLTFBufferOrURL(tile, gltfFormat, options);\n\n if (tile3DOptions.loadGLTF) {\n const {parse, fetch} = context;\n if (tile.gltfUrl) {\n tile.gltfArrayBuffer = await fetch(tile.gltfUrl, options);\n tile.gltfByteOffset = 0;\n }\n if (tile.gltfArrayBuffer) {\n // TODO - Should handle byteOffset... However, not used now...\n tile.gltf = await parse(tile.gltfArrayBuffer, GLTFLoader, options, context);\n delete tile.gltfArrayBuffer;\n delete tile.gltfByteOffset;\n delete tile.gltfByteLength;\n }\n }\n}\n\nfunction extractGLTFBufferOrURL(tile, gltfFormat, options) {\n switch (gltfFormat) {\n case GLTF_FORMAT.URI:\n // We need to remove padding from the end of the model URL in case this tile was part of a composite tile.\n // This removes all white space and null characters from the end of the string.\n const gltfUrlBytes = new Uint8Array(tile.gltfArrayBuffer, tile.gltfByteOffset);\n const textDecoder = new TextDecoder();\n const gltfUrl = textDecoder.decode(gltfUrlBytes);\n tile.gltfUrl = gltfUrl.replace(/[\\s\\0]+$/, '');\n delete tile.gltfArrayBuffer;\n delete tile.gltfByteOffset;\n delete tile.gltfByteLength;\n break;\n case GLTF_FORMAT.EMBEDDED:\n break;\n default:\n throw new Error(`b3dm: Illegal glTF format field`);\n }\n}\n"],"file":"parse-3d-tile-gltf-view.js"}
@@ -4,10 +4,11 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.parse3DTileHeaderSync = parse3DTileHeaderSync;
7
- const SIZEOF_UINT32 = 4;
7
+ var SIZEOF_UINT32 = 4;
8
8
 
9
- function parse3DTileHeaderSync(tile, arrayBuffer, byteOffset = 0) {
10
- const view = new DataView(arrayBuffer);
9
+ function parse3DTileHeaderSync(tile, arrayBuffer) {
10
+ var byteOffset = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
11
+ var view = new DataView(arrayBuffer);
11
12
  tile.magic = view.getUint32(byteOffset, true);
12
13
  byteOffset += SIZEOF_UINT32;
13
14
  tile.version = view.getUint32(byteOffset, true);
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../../src/lib/parsers/helpers/parse-3d-tile-header.js"],"names":["SIZEOF_UINT32","parse3DTileHeaderSync","tile","arrayBuffer","byteOffset","view","DataView","magic","getUint32","version","byteLength","Error"],"mappings":";;;;;;AAGA,MAAMA,aAAa,GAAG,CAAtB;;AASO,SAASC,qBAAT,CAA+BC,IAA/B,EAAqCC,WAArC,EAAkDC,UAAU,GAAG,CAA/D,EAAkE;AACvE,QAAMC,IAAI,GAAG,IAAIC,QAAJ,CAAaH,WAAb,CAAb;AAEAD,EAAAA,IAAI,CAACK,KAAL,GAAaF,IAAI,CAACG,SAAL,CAAeJ,UAAf,EAA2B,IAA3B,CAAb;AACAA,EAAAA,UAAU,IAAIJ,aAAd;AAEAE,EAAAA,IAAI,CAACO,OAAL,GAAeJ,IAAI,CAACG,SAAL,CAAeJ,UAAf,EAA2B,IAA3B,CAAf;AACAA,EAAAA,UAAU,IAAIJ,aAAd;AAEAE,EAAAA,IAAI,CAACQ,UAAL,GAAkBL,IAAI,CAACG,SAAL,CAAeJ,UAAf,EAA2B,IAA3B,CAAlB;AACAA,EAAAA,UAAU,IAAIJ,aAAd;;AAGA,MAAIE,IAAI,CAACO,OAAL,KAAiB,CAArB,EAAwB;AACtB,UAAM,IAAIE,KAAJ,2BAA6BT,IAAI,CAACO,OAAlC,oBAAN;AACD;;AAED,SAAOL,UAAP;AACD","sourcesContent":["// This file is derived from the Cesium code base under Apache 2 license\n// See LICENSE.md and https://github.com/AnalyticalGraphicsInc/cesium/blob/master/LICENSE.md\n\nconst SIZEOF_UINT32 = 4;\n\n/* PARSE FIXED HEADER:\nPopulates\n magic, // identifies type of tile\n type, // String version of magic\n version,\n byteLength\n */\nexport function parse3DTileHeaderSync(tile, arrayBuffer, byteOffset = 0) {\n const view = new DataView(arrayBuffer);\n\n tile.magic = view.getUint32(byteOffset, true);\n byteOffset += SIZEOF_UINT32;\n\n tile.version = view.getUint32(byteOffset, true);\n byteOffset += SIZEOF_UINT32;\n\n tile.byteLength = view.getUint32(byteOffset, true);\n byteOffset += SIZEOF_UINT32;\n\n // TODO - move version check into each tile parser?\n if (tile.version !== 1) {\n throw new Error(`3D Tile Version ${tile.version} not supported`);\n }\n\n return byteOffset; // Indicates where the parsing ended\n}\n"],"file":"parse-3d-tile-header.js"}
1
+ {"version":3,"sources":["../../../../../src/lib/parsers/helpers/parse-3d-tile-header.js"],"names":["SIZEOF_UINT32","parse3DTileHeaderSync","tile","arrayBuffer","byteOffset","view","DataView","magic","getUint32","version","byteLength","Error"],"mappings":";;;;;;AAGA,IAAMA,aAAa,GAAG,CAAtB;;AASO,SAASC,qBAAT,CAA+BC,IAA/B,EAAqCC,WAArC,EAAkE;AAAA,MAAhBC,UAAgB,uEAAH,CAAG;AACvE,MAAMC,IAAI,GAAG,IAAIC,QAAJ,CAAaH,WAAb,CAAb;AAEAD,EAAAA,IAAI,CAACK,KAAL,GAAaF,IAAI,CAACG,SAAL,CAAeJ,UAAf,EAA2B,IAA3B,CAAb;AACAA,EAAAA,UAAU,IAAIJ,aAAd;AAEAE,EAAAA,IAAI,CAACO,OAAL,GAAeJ,IAAI,CAACG,SAAL,CAAeJ,UAAf,EAA2B,IAA3B,CAAf;AACAA,EAAAA,UAAU,IAAIJ,aAAd;AAEAE,EAAAA,IAAI,CAACQ,UAAL,GAAkBL,IAAI,CAACG,SAAL,CAAeJ,UAAf,EAA2B,IAA3B,CAAlB;AACAA,EAAAA,UAAU,IAAIJ,aAAd;;AAGA,MAAIE,IAAI,CAACO,OAAL,KAAiB,CAArB,EAAwB;AACtB,UAAM,IAAIE,KAAJ,2BAA6BT,IAAI,CAACO,OAAlC,oBAAN;AACD;;AAED,SAAOL,UAAP;AACD","sourcesContent":["// This file is derived from the Cesium code base under Apache 2 license\n// See LICENSE.md and https://github.com/AnalyticalGraphicsInc/cesium/blob/master/LICENSE.md\n\nconst SIZEOF_UINT32 = 4;\n\n/* PARSE FIXED HEADER:\nPopulates\n magic, // identifies type of tile\n type, // String version of magic\n version,\n byteLength\n */\nexport function parse3DTileHeaderSync(tile, arrayBuffer, byteOffset = 0) {\n const view = new DataView(arrayBuffer);\n\n tile.magic = view.getUint32(byteOffset, true);\n byteOffset += SIZEOF_UINT32;\n\n tile.version = view.getUint32(byteOffset, true);\n byteOffset += SIZEOF_UINT32;\n\n tile.byteLength = view.getUint32(byteOffset, true);\n byteOffset += SIZEOF_UINT32;\n\n // TODO - move version check into each tile parser?\n if (tile.version !== 1) {\n throw new Error(`3D Tile Version ${tile.version} not supported`);\n }\n\n return byteOffset; // Indicates where the parsing ended\n}\n"],"file":"parse-3d-tile-header.js"}
@@ -8,20 +8,20 @@ exports.parse3DTileTablesSync = parse3DTileTablesSync;
8
8
 
9
9
  var _parseUtils = require("./parse-utils");
10
10
 
11
- const SIZEOF_UINT32 = 4;
12
- const DEPRECATION_WARNING = "b3dm tile in legacy format.";
11
+ var SIZEOF_UINT32 = 4;
12
+ var DEPRECATION_WARNING = "b3dm tile in legacy format.";
13
13
 
14
14
  function parse3DTileTablesHeaderSync(tile, arrayBuffer, byteOffset) {
15
- const view = new DataView(arrayBuffer);
16
- let batchLength;
15
+ var view = new DataView(arrayBuffer);
16
+ var batchLength;
17
17
  tile.header = tile.header || {};
18
- let featureTableJsonByteLength = view.getUint32(byteOffset, true);
18
+ var featureTableJsonByteLength = view.getUint32(byteOffset, true);
19
19
  byteOffset += SIZEOF_UINT32;
20
- let featureTableBinaryByteLength = view.getUint32(byteOffset, true);
20
+ var featureTableBinaryByteLength = view.getUint32(byteOffset, true);
21
21
  byteOffset += SIZEOF_UINT32;
22
- let batchTableJsonByteLength = view.getUint32(byteOffset, true);
22
+ var batchTableJsonByteLength = view.getUint32(byteOffset, true);
23
23
  byteOffset += SIZEOF_UINT32;
24
- let batchTableBinaryByteLength = view.getUint32(byteOffset, true);
24
+ var batchTableBinaryByteLength = view.getUint32(byteOffset, true);
25
25
  byteOffset += SIZEOF_UINT32;
26
26
 
27
27
  if (batchTableJsonByteLength >= 570425344) {
@@ -57,17 +57,16 @@ function parse3DTileTablesSync(tile, arrayBuffer, byteOffset, options) {
57
57
  }
58
58
 
59
59
  function parse3DTileFeatureTable(tile, arrayBuffer, byteOffset, options) {
60
- const {
61
- featureTableJsonByteLength,
62
- featureTableBinaryByteLength,
63
- batchLength
64
- } = tile.header;
60
+ var _tile$header = tile.header,
61
+ featureTableJsonByteLength = _tile$header.featureTableJsonByteLength,
62
+ featureTableBinaryByteLength = _tile$header.featureTableBinaryByteLength,
63
+ batchLength = _tile$header.batchLength;
65
64
  tile.featureTableJson = {
66
65
  BATCH_LENGTH: batchLength || 0
67
66
  };
68
67
 
69
68
  if (featureTableJsonByteLength > 0) {
70
- const featureTableString = (0, _parseUtils.getStringFromArrayBuffer)(arrayBuffer, byteOffset, featureTableJsonByteLength);
69
+ var featureTableString = (0, _parseUtils.getStringFromArrayBuffer)(arrayBuffer, byteOffset, featureTableJsonByteLength);
71
70
  tile.featureTableJson = JSON.parse(featureTableString);
72
71
  }
73
72
 
@@ -78,13 +77,12 @@ function parse3DTileFeatureTable(tile, arrayBuffer, byteOffset, options) {
78
77
  }
79
78
 
80
79
  function parse3DTileBatchTable(tile, arrayBuffer, byteOffset, options) {
81
- const {
82
- batchTableJsonByteLength,
83
- batchTableBinaryByteLength
84
- } = tile.header;
80
+ var _tile$header2 = tile.header,
81
+ batchTableJsonByteLength = _tile$header2.batchTableJsonByteLength,
82
+ batchTableBinaryByteLength = _tile$header2.batchTableBinaryByteLength;
85
83
 
86
84
  if (batchTableJsonByteLength > 0) {
87
- const batchTableString = (0, _parseUtils.getStringFromArrayBuffer)(arrayBuffer, byteOffset, batchTableJsonByteLength);
85
+ var batchTableString = (0, _parseUtils.getStringFromArrayBuffer)(arrayBuffer, byteOffset, batchTableJsonByteLength);
88
86
  tile.batchTableJson = JSON.parse(batchTableString);
89
87
  byteOffset += batchTableJsonByteLength;
90
88
 
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../../src/lib/parsers/helpers/parse-3d-tile-tables.js"],"names":["SIZEOF_UINT32","DEPRECATION_WARNING","parse3DTileTablesHeaderSync","tile","arrayBuffer","byteOffset","view","DataView","batchLength","header","featureTableJsonByteLength","getUint32","featureTableBinaryByteLength","batchTableJsonByteLength","batchTableBinaryByteLength","console","warn","parse3DTileTablesSync","options","parse3DTileFeatureTable","parse3DTileBatchTable","featureTableJson","BATCH_LENGTH","featureTableString","JSON","parse","featureTableBinary","Uint8Array","batchTableString","batchTableJson","batchTableBinary"],"mappings":"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","sourcesContent":["// This file is derived from the Cesium code base under Apache 2 license\n// See LICENSE.md and https://github.com/AnalyticalGraphicsInc/cesium/blob/master/LICENSE.md\n\nimport {getStringFromArrayBuffer} from './parse-utils';\n\nconst SIZEOF_UINT32 = 4;\nconst DEPRECATION_WARNING = `b3dm tile in legacy format.`;\n\n// eslint-disable-next-line max-statements\nexport function parse3DTileTablesHeaderSync(tile, arrayBuffer, byteOffset) {\n const view = new DataView(arrayBuffer);\n let batchLength;\n\n tile.header = tile.header || {};\n\n let featureTableJsonByteLength = view.getUint32(byteOffset, true);\n byteOffset += SIZEOF_UINT32;\n\n let featureTableBinaryByteLength = view.getUint32(byteOffset, true);\n byteOffset += SIZEOF_UINT32;\n\n let batchTableJsonByteLength = view.getUint32(byteOffset, true);\n byteOffset += SIZEOF_UINT32;\n\n let batchTableBinaryByteLength = view.getUint32(byteOffset, true);\n byteOffset += SIZEOF_UINT32;\n\n // First legacy header format - [batchLength] [batchTableByteLength] ('batchTableJsonByteLength': JSON starts with a quotation mark or the glTF magic)\n // Second legacy format - [batchTableJsonByteLength] [batchTableBinaryByteLength] [batchLength] (Second legacy format is similar as first but here we check 'batchTableBinaryByteLength' instead)\n // Current header format - [featureTableJsonByteLength] [featureTableBinaryByteLength] [batchTableJsonByteLength] [batchTableBinaryByteLength]\n // First byte will be 0x22 or 0x67. The minimum uint32 expected is 0x22000000 = 570425344 = 570MB.\n if (batchTableJsonByteLength >= 570425344) {\n byteOffset -= SIZEOF_UINT32 * 2;\n batchLength = featureTableJsonByteLength;\n batchTableJsonByteLength = featureTableBinaryByteLength;\n batchTableBinaryByteLength = 0;\n featureTableJsonByteLength = 0;\n featureTableBinaryByteLength = 0;\n\n console.warn(DEPRECATION_WARNING); // eslint-disable-line\n } else if (batchTableBinaryByteLength >= 570425344) {\n byteOffset -= SIZEOF_UINT32;\n batchLength = batchTableJsonByteLength;\n batchTableJsonByteLength = featureTableJsonByteLength;\n batchTableBinaryByteLength = featureTableBinaryByteLength;\n featureTableJsonByteLength = 0;\n featureTableBinaryByteLength = 0;\n\n console.warn(DEPRECATION_WARNING); // eslint-disable-line\n }\n\n tile.header.featureTableJsonByteLength = featureTableJsonByteLength;\n tile.header.featureTableBinaryByteLength = featureTableBinaryByteLength;\n tile.header.batchTableJsonByteLength = batchTableJsonByteLength;\n tile.header.batchTableBinaryByteLength = batchTableBinaryByteLength;\n tile.header.batchLength = batchLength;\n\n return byteOffset;\n}\n\nexport function parse3DTileTablesSync(tile, arrayBuffer, byteOffset, options) {\n byteOffset = parse3DTileFeatureTable(tile, arrayBuffer, byteOffset, options);\n byteOffset = parse3DTileBatchTable(tile, arrayBuffer, byteOffset, options);\n return byteOffset;\n}\n\nfunction parse3DTileFeatureTable(tile, arrayBuffer, byteOffset, options) {\n const {featureTableJsonByteLength, featureTableBinaryByteLength, batchLength} = tile.header;\n\n tile.featureTableJson = {\n BATCH_LENGTH: batchLength || 0\n };\n\n if (featureTableJsonByteLength > 0) {\n const featureTableString = getStringFromArrayBuffer(\n arrayBuffer,\n byteOffset,\n featureTableJsonByteLength\n );\n tile.featureTableJson = JSON.parse(featureTableString);\n }\n byteOffset += featureTableJsonByteLength;\n\n tile.featureTableBinary = new Uint8Array(arrayBuffer, byteOffset, featureTableBinaryByteLength);\n byteOffset += featureTableBinaryByteLength;\n\n /*\n const featureTable = parseFeatureTable(featureTableJson, featureTableBinary);\n\n const batchLength = featureTable.getGlobalProperty('BATCH_LENGTH');\n featureTable.featuresLength = batchLength;\n */\n\n return byteOffset;\n}\n\nfunction parse3DTileBatchTable(tile, arrayBuffer, byteOffset, options) {\n const {batchTableJsonByteLength, batchTableBinaryByteLength} = tile.header;\n\n if (batchTableJsonByteLength > 0) {\n const batchTableString = getStringFromArrayBuffer(\n arrayBuffer,\n byteOffset,\n batchTableJsonByteLength\n );\n tile.batchTableJson = JSON.parse(batchTableString);\n byteOffset += batchTableJsonByteLength;\n\n if (batchTableBinaryByteLength > 0) {\n // Has a batch table binary\n tile.batchTableBinary = new Uint8Array(arrayBuffer, byteOffset, batchTableBinaryByteLength);\n // Copy the batchTableBinary section and let the underlying ArrayBuffer be freed\n tile.batchTableBinary = new Uint8Array(tile.batchTableBinary);\n\n byteOffset += batchTableBinaryByteLength;\n }\n }\n\n return byteOffset;\n}\n"],"file":"parse-3d-tile-tables.js"}
1
+ {"version":3,"sources":["../../../../../src/lib/parsers/helpers/parse-3d-tile-tables.js"],"names":["SIZEOF_UINT32","DEPRECATION_WARNING","parse3DTileTablesHeaderSync","tile","arrayBuffer","byteOffset","view","DataView","batchLength","header","featureTableJsonByteLength","getUint32","featureTableBinaryByteLength","batchTableJsonByteLength","batchTableBinaryByteLength","console","warn","parse3DTileTablesSync","options","parse3DTileFeatureTable","parse3DTileBatchTable","featureTableJson","BATCH_LENGTH","featureTableString","JSON","parse","featureTableBinary","Uint8Array","batchTableString","batchTableJson","batchTableBinary"],"mappings":"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","sourcesContent":["// This file is derived from the Cesium code base under Apache 2 license\n// See LICENSE.md and https://github.com/AnalyticalGraphicsInc/cesium/blob/master/LICENSE.md\n\nimport {getStringFromArrayBuffer} from './parse-utils';\n\nconst SIZEOF_UINT32 = 4;\nconst DEPRECATION_WARNING = `b3dm tile in legacy format.`;\n\n// eslint-disable-next-line max-statements\nexport function parse3DTileTablesHeaderSync(tile, arrayBuffer, byteOffset) {\n const view = new DataView(arrayBuffer);\n let batchLength;\n\n tile.header = tile.header || {};\n\n let featureTableJsonByteLength = view.getUint32(byteOffset, true);\n byteOffset += SIZEOF_UINT32;\n\n let featureTableBinaryByteLength = view.getUint32(byteOffset, true);\n byteOffset += SIZEOF_UINT32;\n\n let batchTableJsonByteLength = view.getUint32(byteOffset, true);\n byteOffset += SIZEOF_UINT32;\n\n let batchTableBinaryByteLength = view.getUint32(byteOffset, true);\n byteOffset += SIZEOF_UINT32;\n\n // First legacy header format - [batchLength] [batchTableByteLength] ('batchTableJsonByteLength': JSON starts with a quotation mark or the glTF magic)\n // Second legacy format - [batchTableJsonByteLength] [batchTableBinaryByteLength] [batchLength] (Second legacy format is similar as first but here we check 'batchTableBinaryByteLength' instead)\n // Current header format - [featureTableJsonByteLength] [featureTableBinaryByteLength] [batchTableJsonByteLength] [batchTableBinaryByteLength]\n // First byte will be 0x22 or 0x67. The minimum uint32 expected is 0x22000000 = 570425344 = 570MB.\n if (batchTableJsonByteLength >= 570425344) {\n byteOffset -= SIZEOF_UINT32 * 2;\n batchLength = featureTableJsonByteLength;\n batchTableJsonByteLength = featureTableBinaryByteLength;\n batchTableBinaryByteLength = 0;\n featureTableJsonByteLength = 0;\n featureTableBinaryByteLength = 0;\n\n console.warn(DEPRECATION_WARNING); // eslint-disable-line\n } else if (batchTableBinaryByteLength >= 570425344) {\n byteOffset -= SIZEOF_UINT32;\n batchLength = batchTableJsonByteLength;\n batchTableJsonByteLength = featureTableJsonByteLength;\n batchTableBinaryByteLength = featureTableBinaryByteLength;\n featureTableJsonByteLength = 0;\n featureTableBinaryByteLength = 0;\n\n console.warn(DEPRECATION_WARNING); // eslint-disable-line\n }\n\n tile.header.featureTableJsonByteLength = featureTableJsonByteLength;\n tile.header.featureTableBinaryByteLength = featureTableBinaryByteLength;\n tile.header.batchTableJsonByteLength = batchTableJsonByteLength;\n tile.header.batchTableBinaryByteLength = batchTableBinaryByteLength;\n tile.header.batchLength = batchLength;\n\n return byteOffset;\n}\n\nexport function parse3DTileTablesSync(tile, arrayBuffer, byteOffset, options) {\n byteOffset = parse3DTileFeatureTable(tile, arrayBuffer, byteOffset, options);\n byteOffset = parse3DTileBatchTable(tile, arrayBuffer, byteOffset, options);\n return byteOffset;\n}\n\nfunction parse3DTileFeatureTable(tile, arrayBuffer, byteOffset, options) {\n const {featureTableJsonByteLength, featureTableBinaryByteLength, batchLength} = tile.header;\n\n tile.featureTableJson = {\n BATCH_LENGTH: batchLength || 0\n };\n\n if (featureTableJsonByteLength > 0) {\n const featureTableString = getStringFromArrayBuffer(\n arrayBuffer,\n byteOffset,\n featureTableJsonByteLength\n );\n tile.featureTableJson = JSON.parse(featureTableString);\n }\n byteOffset += featureTableJsonByteLength;\n\n tile.featureTableBinary = new Uint8Array(arrayBuffer, byteOffset, featureTableBinaryByteLength);\n byteOffset += featureTableBinaryByteLength;\n\n /*\n const featureTable = parseFeatureTable(featureTableJson, featureTableBinary);\n\n const batchLength = featureTable.getGlobalProperty('BATCH_LENGTH');\n featureTable.featuresLength = batchLength;\n */\n\n return byteOffset;\n}\n\nfunction parse3DTileBatchTable(tile, arrayBuffer, byteOffset, options) {\n const {batchTableJsonByteLength, batchTableBinaryByteLength} = tile.header;\n\n if (batchTableJsonByteLength > 0) {\n const batchTableString = getStringFromArrayBuffer(\n arrayBuffer,\n byteOffset,\n batchTableJsonByteLength\n );\n tile.batchTableJson = JSON.parse(batchTableString);\n byteOffset += batchTableJsonByteLength;\n\n if (batchTableBinaryByteLength > 0) {\n // Has a batch table binary\n tile.batchTableBinary = new Uint8Array(arrayBuffer, byteOffset, batchTableBinaryByteLength);\n // Copy the batchTableBinary section and let the underlying ArrayBuffer be freed\n tile.batchTableBinary = new Uint8Array(tile.batchTableBinary);\n\n byteOffset += batchTableBinaryByteLength;\n }\n }\n\n return byteOffset;\n}\n"],"file":"parse-3d-tile-tables.js"}
@@ -11,21 +11,22 @@ var _loaderUtils = require("@loaders.gl/loader-utils");
11
11
 
12
12
  function getStringFromArrayBuffer(arrayBuffer, byteOffset, byteLength) {
13
13
  (0, _loaderUtils.assert)(arrayBuffer instanceof ArrayBuffer);
14
- const textDecoder = new TextDecoder('utf8');
15
- const typedArray = new Uint8Array(arrayBuffer, byteOffset, byteLength);
16
- const string = textDecoder.decode(typedArray);
14
+ var textDecoder = new TextDecoder('utf8');
15
+ var typedArray = new Uint8Array(arrayBuffer, byteOffset, byteLength);
16
+ var string = textDecoder.decode(typedArray);
17
17
  return string;
18
18
  }
19
19
 
20
20
  function getStringFromTypedArray(typedArray) {
21
21
  (0, _loaderUtils.assert)(ArrayBuffer.isView(typedArray));
22
- const textDecoder = new TextDecoder('utf8');
23
- const string = textDecoder.decode(typedArray);
22
+ var textDecoder = new TextDecoder('utf8');
23
+ var string = textDecoder.decode(typedArray);
24
24
  return string;
25
25
  }
26
26
 
27
- function getMagicString(arrayBuffer, byteOffset = 0) {
28
- const dataView = new DataView(arrayBuffer);
27
+ function getMagicString(arrayBuffer) {
28
+ var byteOffset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
29
+ var dataView = new DataView(arrayBuffer);
29
30
  return "".concat(String.fromCharCode(dataView.getUint8(byteOffset + 0))).concat(String.fromCharCode(dataView.getUint8(byteOffset + 1))).concat(String.fromCharCode(dataView.getUint8(byteOffset + 2))).concat(String.fromCharCode(dataView.getUint8(byteOffset + 3)));
30
31
  }
31
32
  //# sourceMappingURL=parse-utils.js.map
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../../src/lib/parsers/helpers/parse-utils.js"],"names":["getStringFromArrayBuffer","arrayBuffer","byteOffset","byteLength","ArrayBuffer","textDecoder","TextDecoder","typedArray","Uint8Array","string","decode","getStringFromTypedArray","isView","getMagicString","dataView","DataView","String","fromCharCode","getUint8"],"mappings":";;;;;;;;;AAGA;;AAGO,SAASA,wBAAT,CAAkCC,WAAlC,EAA+CC,UAA/C,EAA2DC,UAA3D,EAAuE;AAC5E,2BAAOF,WAAW,YAAYG,WAA9B;AACA,QAAMC,WAAW,GAAG,IAAIC,WAAJ,CAAgB,MAAhB,CAApB;AACA,QAAMC,UAAU,GAAG,IAAIC,UAAJ,CAAeP,WAAf,EAA4BC,UAA5B,EAAwCC,UAAxC,CAAnB;AACA,QAAMM,MAAM,GAAGJ,WAAW,CAACK,MAAZ,CAAmBH,UAAnB,CAAf;AACA,SAAOE,MAAP;AACD;;AAGM,SAASE,uBAAT,CAAiCJ,UAAjC,EAA6C;AAClD,2BAAOH,WAAW,CAACQ,MAAZ,CAAmBL,UAAnB,CAAP;AACA,QAAMF,WAAW,GAAG,IAAIC,WAAJ,CAAgB,MAAhB,CAApB;AACA,QAAMG,MAAM,GAAGJ,WAAW,CAACK,MAAZ,CAAmBH,UAAnB,CAAf;AACA,SAAOE,MAAP;AACD;;AAEM,SAASI,cAAT,CAAwBZ,WAAxB,EAAqCC,UAAU,GAAG,CAAlD,EAAqD;AAC1D,QAAMY,QAAQ,GAAG,IAAIC,QAAJ,CAAad,WAAb,CAAjB;AACA,mBACAe,MAAM,CAACC,YAAP,CAAoBH,QAAQ,CAACI,QAAT,CAAkBhB,UAAU,GAAG,CAA/B,CAApB,CADA,SAEAc,MAAM,CAACC,YAAP,CAAoBH,QAAQ,CAACI,QAAT,CAAkBhB,UAAU,GAAG,CAA/B,CAApB,CAFA,SAGAc,MAAM,CAACC,YAAP,CAAoBH,QAAQ,CAACI,QAAT,CAAkBhB,UAAU,GAAG,CAA/B,CAApB,CAHA,SAIAc,MAAM,CAACC,YAAP,CAAoBH,QAAQ,CAACI,QAAT,CAAkBhB,UAAU,GAAG,CAA/B,CAApB,CAJA;AAKD","sourcesContent":["// This file is derived from the Cesium code base under Apache 2 license\n// See LICENSE.md and https://github.com/AnalyticalGraphicsInc/cesium/blob/master/LICENSE.md\n\nimport {assert} from '@loaders.gl/loader-utils';\n\n// Decode the JSON binary array into clear text\nexport function getStringFromArrayBuffer(arrayBuffer, byteOffset, byteLength) {\n assert(arrayBuffer instanceof ArrayBuffer);\n const textDecoder = new TextDecoder('utf8');\n const typedArray = new Uint8Array(arrayBuffer, byteOffset, byteLength);\n const string = textDecoder.decode(typedArray);\n return string;\n}\n\n// Decode the JSON binary array into clear text\nexport function getStringFromTypedArray(typedArray) {\n assert(ArrayBuffer.isView(typedArray));\n const textDecoder = new TextDecoder('utf8');\n const string = textDecoder.decode(typedArray);\n return string;\n}\n\nexport function getMagicString(arrayBuffer, byteOffset = 0) {\n const dataView = new DataView(arrayBuffer);\n return `\\\n${String.fromCharCode(dataView.getUint8(byteOffset + 0))}\\\n${String.fromCharCode(dataView.getUint8(byteOffset + 1))}\\\n${String.fromCharCode(dataView.getUint8(byteOffset + 2))}\\\n${String.fromCharCode(dataView.getUint8(byteOffset + 3))}`;\n}\n"],"file":"parse-utils.js"}
1
+ {"version":3,"sources":["../../../../../src/lib/parsers/helpers/parse-utils.js"],"names":["getStringFromArrayBuffer","arrayBuffer","byteOffset","byteLength","ArrayBuffer","textDecoder","TextDecoder","typedArray","Uint8Array","string","decode","getStringFromTypedArray","isView","getMagicString","dataView","DataView","String","fromCharCode","getUint8"],"mappings":";;;;;;;;;AAGA;;AAGO,SAASA,wBAAT,CAAkCC,WAAlC,EAA+CC,UAA/C,EAA2DC,UAA3D,EAAuE;AAC5E,2BAAOF,WAAW,YAAYG,WAA9B;AACA,MAAMC,WAAW,GAAG,IAAIC,WAAJ,CAAgB,MAAhB,CAApB;AACA,MAAMC,UAAU,GAAG,IAAIC,UAAJ,CAAeP,WAAf,EAA4BC,UAA5B,EAAwCC,UAAxC,CAAnB;AACA,MAAMM,MAAM,GAAGJ,WAAW,CAACK,MAAZ,CAAmBH,UAAnB,CAAf;AACA,SAAOE,MAAP;AACD;;AAGM,SAASE,uBAAT,CAAiCJ,UAAjC,EAA6C;AAClD,2BAAOH,WAAW,CAACQ,MAAZ,CAAmBL,UAAnB,CAAP;AACA,MAAMF,WAAW,GAAG,IAAIC,WAAJ,CAAgB,MAAhB,CAApB;AACA,MAAMG,MAAM,GAAGJ,WAAW,CAACK,MAAZ,CAAmBH,UAAnB,CAAf;AACA,SAAOE,MAAP;AACD;;AAEM,SAASI,cAAT,CAAwBZ,WAAxB,EAAqD;AAAA,MAAhBC,UAAgB,uEAAH,CAAG;AAC1D,MAAMY,QAAQ,GAAG,IAAIC,QAAJ,CAAad,WAAb,CAAjB;AACA,mBACAe,MAAM,CAACC,YAAP,CAAoBH,QAAQ,CAACI,QAAT,CAAkBhB,UAAU,GAAG,CAA/B,CAApB,CADA,SAEAc,MAAM,CAACC,YAAP,CAAoBH,QAAQ,CAACI,QAAT,CAAkBhB,UAAU,GAAG,CAA/B,CAApB,CAFA,SAGAc,MAAM,CAACC,YAAP,CAAoBH,QAAQ,CAACI,QAAT,CAAkBhB,UAAU,GAAG,CAA/B,CAApB,CAHA,SAIAc,MAAM,CAACC,YAAP,CAAoBH,QAAQ,CAACI,QAAT,CAAkBhB,UAAU,GAAG,CAA/B,CAApB,CAJA;AAKD","sourcesContent":["// This file is derived from the Cesium code base under Apache 2 license\n// See LICENSE.md and https://github.com/AnalyticalGraphicsInc/cesium/blob/master/LICENSE.md\n\nimport {assert} from '@loaders.gl/loader-utils';\n\n// Decode the JSON binary array into clear text\nexport function getStringFromArrayBuffer(arrayBuffer, byteOffset, byteLength) {\n assert(arrayBuffer instanceof ArrayBuffer);\n const textDecoder = new TextDecoder('utf8');\n const typedArray = new Uint8Array(arrayBuffer, byteOffset, byteLength);\n const string = textDecoder.decode(typedArray);\n return string;\n}\n\n// Decode the JSON binary array into clear text\nexport function getStringFromTypedArray(typedArray) {\n assert(ArrayBuffer.isView(typedArray));\n const textDecoder = new TextDecoder('utf8');\n const string = textDecoder.decode(typedArray);\n return string;\n}\n\nexport function getMagicString(arrayBuffer, byteOffset = 0) {\n const dataView = new DataView(arrayBuffer);\n return `\\\n${String.fromCharCode(dataView.getUint8(byteOffset + 0))}\\\n${String.fromCharCode(dataView.getUint8(byteOffset + 1))}\\\n${String.fromCharCode(dataView.getUint8(byteOffset + 2))}\\\n${String.fromCharCode(dataView.getUint8(byteOffset + 3))}`;\n}\n"],"file":"parse-utils.js"}
@@ -7,6 +7,10 @@ Object.defineProperty(exports, "__esModule", {
7
7
  });
8
8
  exports.parseBatchedModel3DTile = parseBatchedModel3DTile;
9
9
 
10
+ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
11
+
12
+ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
13
+
10
14
  var _math = require("@loaders.gl/math");
11
15
 
12
16
  var _tile3dFeatureTable = _interopRequireDefault(require("../classes/tile-3d-feature-table"));
@@ -17,18 +21,40 @@ var _parse3dTileTables = require("./helpers/parse-3d-tile-tables");
17
21
 
18
22
  var _parse3dTileGltfView = require("./helpers/parse-3d-tile-gltf-view");
19
23
 
20
- async function parseBatchedModel3DTile(tile, arrayBuffer, byteOffset, options, context) {
21
- var _tile$gltf;
24
+ function parseBatchedModel3DTile(_x, _x2, _x3, _x4, _x5) {
25
+ return _parseBatchedModel3DTile.apply(this, arguments);
26
+ }
22
27
 
23
- byteOffset = parseBatchedModel(tile, arrayBuffer, byteOffset, options, context);
24
- await (0, _parse3dTileGltfView.extractGLTF)(tile, _parse3dTileGltfView.GLTF_FORMAT.EMBEDDED, options, context);
25
- const extensions = tile === null || tile === void 0 ? void 0 : (_tile$gltf = tile.gltf) === null || _tile$gltf === void 0 ? void 0 : _tile$gltf.extensions;
28
+ function _parseBatchedModel3DTile() {
29
+ _parseBatchedModel3DTile = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(tile, arrayBuffer, byteOffset, options, context) {
30
+ var _tile$gltf;
26
31
 
27
- if (extensions && extensions.CESIUM_RTC) {
28
- tile.rtcCenter = extensions.CESIUM_RTC.center;
29
- }
32
+ var extensions;
33
+ return _regenerator.default.wrap(function _callee$(_context) {
34
+ while (1) {
35
+ switch (_context.prev = _context.next) {
36
+ case 0:
37
+ byteOffset = parseBatchedModel(tile, arrayBuffer, byteOffset, options, context);
38
+ _context.next = 3;
39
+ return (0, _parse3dTileGltfView.extractGLTF)(tile, _parse3dTileGltfView.GLTF_FORMAT.EMBEDDED, options, context);
30
40
 
31
- return byteOffset;
41
+ case 3:
42
+ extensions = tile === null || tile === void 0 ? void 0 : (_tile$gltf = tile.gltf) === null || _tile$gltf === void 0 ? void 0 : _tile$gltf.extensions;
43
+
44
+ if (extensions && extensions.CESIUM_RTC) {
45
+ tile.rtcCenter = extensions.CESIUM_RTC.center;
46
+ }
47
+
48
+ return _context.abrupt("return", byteOffset);
49
+
50
+ case 6:
51
+ case "end":
52
+ return _context.stop();
53
+ }
54
+ }
55
+ }, _callee);
56
+ }));
57
+ return _parseBatchedModel3DTile.apply(this, arguments);
32
58
  }
33
59
 
34
60
  function parseBatchedModel(tile, arrayBuffer, byteOffset, options, context) {
@@ -36,7 +62,7 @@ function parseBatchedModel(tile, arrayBuffer, byteOffset, options, context) {
36
62
  byteOffset = (0, _parse3dTileTables.parse3DTileTablesHeaderSync)(tile, arrayBuffer, byteOffset);
37
63
  byteOffset = (0, _parse3dTileTables.parse3DTileTablesSync)(tile, arrayBuffer, byteOffset, options);
38
64
  byteOffset = (0, _parse3dTileGltfView.parse3DTileGLTFViewSync)(tile, arrayBuffer, byteOffset, options);
39
- const featureTable = new _tile3dFeatureTable.default(tile.featureTableJson, tile.featureTableBinary);
65
+ var featureTable = new _tile3dFeatureTable.default(tile.featureTableJson, tile.featureTableBinary);
40
66
  tile.rtcCenter = featureTable.getGlobalProperty('RTC_CENTER', _math.GL.FLOAT, 3);
41
67
  return byteOffset;
42
68
  }
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../src/lib/parsers/parse-3d-tile-batched-model.js"],"names":["parseBatchedModel3DTile","tile","arrayBuffer","byteOffset","options","context","parseBatchedModel","GLTF_FORMAT","EMBEDDED","extensions","gltf","CESIUM_RTC","rtcCenter","center","featureTable","Tile3DFeatureTable","featureTableJson","featureTableBinary","getGlobalProperty","GL","FLOAT"],"mappings":";;;;;;;;;AAGA;;AACA;;AAGA;;AACA;;AACA;;AAEO,eAAeA,uBAAf,CAAuCC,IAAvC,EAA6CC,WAA7C,EAA0DC,UAA1D,EAAsEC,OAAtE,EAA+EC,OAA/E,EAAwF;AAAA;;AAC7FF,EAAAA,UAAU,GAAGG,iBAAiB,CAACL,IAAD,EAAOC,WAAP,EAAoBC,UAApB,EAAgCC,OAAhC,EAAyCC,OAAzC,CAA9B;AACA,QAAM,sCAAYJ,IAAZ,EAAkBM,iCAAYC,QAA9B,EAAwCJ,OAAxC,EAAiDC,OAAjD,CAAN;AAEA,QAAMI,UAAU,GAAGR,IAAH,aAAGA,IAAH,qCAAGA,IAAI,CAAES,IAAT,+CAAG,WAAYD,UAA/B;;AACA,MAAIA,UAAU,IAAIA,UAAU,CAACE,UAA7B,EAAyC;AACvCV,IAAAA,IAAI,CAACW,SAAL,GAAiBH,UAAU,CAACE,UAAX,CAAsBE,MAAvC;AACD;;AAED,SAAOV,UAAP;AACD;;AAED,SAASG,iBAAT,CAA2BL,IAA3B,EAAiCC,WAAjC,EAA8CC,UAA9C,EAA0DC,OAA1D,EAAmEC,OAAnE,EAA4E;AAC1EF,EAAAA,UAAU,GAAG,8CAAsBF,IAAtB,EAA4BC,WAA5B,EAAyCC,UAAzC,CAAb;AAEAA,EAAAA,UAAU,GAAG,oDAA4BF,IAA5B,EAAkCC,WAAlC,EAA+CC,UAA/C,CAAb;AACAA,EAAAA,UAAU,GAAG,8CAAsBF,IAAtB,EAA4BC,WAA5B,EAAyCC,UAAzC,EAAqDC,OAArD,CAAb;AAEAD,EAAAA,UAAU,GAAG,kDAAwBF,IAAxB,EAA8BC,WAA9B,EAA2CC,UAA3C,EAAuDC,OAAvD,CAAb;AAEA,QAAMU,YAAY,GAAG,IAAIC,2BAAJ,CAAuBd,IAAI,CAACe,gBAA5B,EAA8Cf,IAAI,CAACgB,kBAAnD,CAArB;AACAhB,EAAAA,IAAI,CAACW,SAAL,GAAiBE,YAAY,CAACI,iBAAb,CAA+B,YAA/B,EAA6CC,SAAGC,KAAhD,EAAuD,CAAvD,CAAjB;AAEA,SAAOjB,UAAP;AACD","sourcesContent":["// This file is derived from the Cesium code base under Apache 2 license\n// See LICENSE.md and https://github.com/AnalyticalGraphicsInc/cesium/blob/master/LICENSE.md\n\nimport {GL} from '@loaders.gl/math'; // math.gl/geometry;\nimport Tile3DFeatureTable from '../classes/tile-3d-feature-table';\n// import Tile3DBatchTable from '../classes/tile-3d-batch-table';\n\nimport {parse3DTileHeaderSync} from './helpers/parse-3d-tile-header';\nimport {parse3DTileTablesHeaderSync, parse3DTileTablesSync} from './helpers/parse-3d-tile-tables';\nimport {parse3DTileGLTFViewSync, extractGLTF, GLTF_FORMAT} from './helpers/parse-3d-tile-gltf-view';\n\nexport async function parseBatchedModel3DTile(tile, arrayBuffer, byteOffset, options, context) {\n byteOffset = parseBatchedModel(tile, arrayBuffer, byteOffset, options, context);\n await extractGLTF(tile, GLTF_FORMAT.EMBEDDED, options, context);\n\n const extensions = tile?.gltf?.extensions;\n if (extensions && extensions.CESIUM_RTC) {\n tile.rtcCenter = extensions.CESIUM_RTC.center;\n }\n\n return byteOffset;\n}\n\nfunction parseBatchedModel(tile, arrayBuffer, byteOffset, options, context) {\n byteOffset = parse3DTileHeaderSync(tile, arrayBuffer, byteOffset);\n\n byteOffset = parse3DTileTablesHeaderSync(tile, arrayBuffer, byteOffset);\n byteOffset = parse3DTileTablesSync(tile, arrayBuffer, byteOffset, options);\n\n byteOffset = parse3DTileGLTFViewSync(tile, arrayBuffer, byteOffset, options);\n\n const featureTable = new Tile3DFeatureTable(tile.featureTableJson, tile.featureTableBinary);\n tile.rtcCenter = featureTable.getGlobalProperty('RTC_CENTER', GL.FLOAT, 3);\n\n return byteOffset;\n}\n"],"file":"parse-3d-tile-batched-model.js"}
1
+ {"version":3,"sources":["../../../../src/lib/parsers/parse-3d-tile-batched-model.js"],"names":["parseBatchedModel3DTile","tile","arrayBuffer","byteOffset","options","context","parseBatchedModel","GLTF_FORMAT","EMBEDDED","extensions","gltf","CESIUM_RTC","rtcCenter","center","featureTable","Tile3DFeatureTable","featureTableJson","featureTableBinary","getGlobalProperty","GL","FLOAT"],"mappings":";;;;;;;;;;;;;AAGA;;AACA;;AAGA;;AACA;;AACA;;SAEsBA,uB;;;;;uFAAf,iBAAuCC,IAAvC,EAA6CC,WAA7C,EAA0DC,UAA1D,EAAsEC,OAAtE,EAA+EC,OAA/E;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA;AACLF,YAAAA,UAAU,GAAGG,iBAAiB,CAACL,IAAD,EAAOC,WAAP,EAAoBC,UAApB,EAAgCC,OAAhC,EAAyCC,OAAzC,CAA9B;AADK;AAAA,mBAEC,sCAAYJ,IAAZ,EAAkBM,iCAAYC,QAA9B,EAAwCJ,OAAxC,EAAiDC,OAAjD,CAFD;;AAAA;AAICI,YAAAA,UAJD,GAIcR,IAJd,aAIcA,IAJd,qCAIcA,IAAI,CAAES,IAJpB,+CAIc,WAAYD,UAJ1B;;AAKL,gBAAIA,UAAU,IAAIA,UAAU,CAACE,UAA7B,EAAyC;AACvCV,cAAAA,IAAI,CAACW,SAAL,GAAiBH,UAAU,CAACE,UAAX,CAAsBE,MAAvC;AACD;;AAPI,6CASEV,UATF;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,G;;;;AAYP,SAASG,iBAAT,CAA2BL,IAA3B,EAAiCC,WAAjC,EAA8CC,UAA9C,EAA0DC,OAA1D,EAAmEC,OAAnE,EAA4E;AAC1EF,EAAAA,UAAU,GAAG,8CAAsBF,IAAtB,EAA4BC,WAA5B,EAAyCC,UAAzC,CAAb;AAEAA,EAAAA,UAAU,GAAG,oDAA4BF,IAA5B,EAAkCC,WAAlC,EAA+CC,UAA/C,CAAb;AACAA,EAAAA,UAAU,GAAG,8CAAsBF,IAAtB,EAA4BC,WAA5B,EAAyCC,UAAzC,EAAqDC,OAArD,CAAb;AAEAD,EAAAA,UAAU,GAAG,kDAAwBF,IAAxB,EAA8BC,WAA9B,EAA2CC,UAA3C,EAAuDC,OAAvD,CAAb;AAEA,MAAMU,YAAY,GAAG,IAAIC,2BAAJ,CAAuBd,IAAI,CAACe,gBAA5B,EAA8Cf,IAAI,CAACgB,kBAAnD,CAArB;AACAhB,EAAAA,IAAI,CAACW,SAAL,GAAiBE,YAAY,CAACI,iBAAb,CAA+B,YAA/B,EAA6CC,SAAGC,KAAhD,EAAuD,CAAvD,CAAjB;AAEA,SAAOjB,UAAP;AACD","sourcesContent":["// This file is derived from the Cesium code base under Apache 2 license\n// See LICENSE.md and https://github.com/AnalyticalGraphicsInc/cesium/blob/master/LICENSE.md\n\nimport {GL} from '@loaders.gl/math'; // math.gl/geometry;\nimport Tile3DFeatureTable from '../classes/tile-3d-feature-table';\n// import Tile3DBatchTable from '../classes/tile-3d-batch-table';\n\nimport {parse3DTileHeaderSync} from './helpers/parse-3d-tile-header';\nimport {parse3DTileTablesHeaderSync, parse3DTileTablesSync} from './helpers/parse-3d-tile-tables';\nimport {parse3DTileGLTFViewSync, extractGLTF, GLTF_FORMAT} from './helpers/parse-3d-tile-gltf-view';\n\nexport async function parseBatchedModel3DTile(tile, arrayBuffer, byteOffset, options, context) {\n byteOffset = parseBatchedModel(tile, arrayBuffer, byteOffset, options, context);\n await extractGLTF(tile, GLTF_FORMAT.EMBEDDED, options, context);\n\n const extensions = tile?.gltf?.extensions;\n if (extensions && extensions.CESIUM_RTC) {\n tile.rtcCenter = extensions.CESIUM_RTC.center;\n }\n\n return byteOffset;\n}\n\nfunction parseBatchedModel(tile, arrayBuffer, byteOffset, options, context) {\n byteOffset = parse3DTileHeaderSync(tile, arrayBuffer, byteOffset);\n\n byteOffset = parse3DTileTablesHeaderSync(tile, arrayBuffer, byteOffset);\n byteOffset = parse3DTileTablesSync(tile, arrayBuffer, byteOffset, options);\n\n byteOffset = parse3DTileGLTFViewSync(tile, arrayBuffer, byteOffset, options);\n\n const featureTable = new Tile3DFeatureTable(tile.featureTableJson, tile.featureTableBinary);\n tile.rtcCenter = featureTable.getGlobalProperty('RTC_CENTER', GL.FLOAT, 3);\n\n return byteOffset;\n}\n"],"file":"parse-3d-tile-batched-model.js"}
@@ -1,25 +1,61 @@
1
1
  "use strict";
2
2
 
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+
3
5
  Object.defineProperty(exports, "__esModule", {
4
6
  value: true
5
7
  });
6
8
  exports.parseComposite3DTile = parseComposite3DTile;
7
9
 
10
+ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
11
+
12
+ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
13
+
8
14
  var _parse3dTileHeader = require("./helpers/parse-3d-tile-header");
9
15
 
10
- async function parseComposite3DTile(tile, arrayBuffer, byteOffset, options, context, parse3DTile) {
11
- byteOffset = (0, _parse3dTileHeader.parse3DTileHeaderSync)(tile, arrayBuffer, byteOffset);
12
- const view = new DataView(arrayBuffer);
13
- tile.tilesLength = view.getUint32(byteOffset, true);
14
- byteOffset += 4;
15
- tile.tiles = [];
16
+ function parseComposite3DTile(_x, _x2, _x3, _x4, _x5, _x6) {
17
+ return _parseComposite3DTile.apply(this, arguments);
18
+ }
19
+
20
+ function _parseComposite3DTile() {
21
+ _parseComposite3DTile = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(tile, arrayBuffer, byteOffset, options, context, parse3DTile) {
22
+ var view, subtile;
23
+ return _regenerator.default.wrap(function _callee$(_context) {
24
+ while (1) {
25
+ switch (_context.prev = _context.next) {
26
+ case 0:
27
+ byteOffset = (0, _parse3dTileHeader.parse3DTileHeaderSync)(tile, arrayBuffer, byteOffset);
28
+ view = new DataView(arrayBuffer);
29
+ tile.tilesLength = view.getUint32(byteOffset, true);
30
+ byteOffset += 4;
31
+ tile.tiles = [];
32
+
33
+ case 5:
34
+ if (!(tile.tiles.length < tile.tilesLength && tile.byteLength - byteOffset > 12)) {
35
+ _context.next = 13;
36
+ break;
37
+ }
38
+
39
+ subtile = {};
40
+ tile.tiles.push(subtile);
41
+ _context.next = 10;
42
+ return parse3DTile(arrayBuffer, byteOffset, options, context, subtile);
43
+
44
+ case 10:
45
+ byteOffset = _context.sent;
46
+ _context.next = 5;
47
+ break;
16
48
 
17
- while (tile.tiles.length < tile.tilesLength && tile.byteLength - byteOffset > 12) {
18
- const subtile = {};
19
- tile.tiles.push(subtile);
20
- byteOffset = await parse3DTile(arrayBuffer, byteOffset, options, context, subtile);
21
- }
49
+ case 13:
50
+ return _context.abrupt("return", byteOffset);
22
51
 
23
- return byteOffset;
52
+ case 14:
53
+ case "end":
54
+ return _context.stop();
55
+ }
56
+ }
57
+ }, _callee);
58
+ }));
59
+ return _parseComposite3DTile.apply(this, arguments);
24
60
  }
25
61
  //# sourceMappingURL=parse-3d-tile-composite.js.map
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../src/lib/parsers/parse-3d-tile-composite.js"],"names":["parseComposite3DTile","tile","arrayBuffer","byteOffset","options","context","parse3DTile","view","DataView","tilesLength","getUint32","tiles","length","byteLength","subtile","push"],"mappings":";;;;;;;AAMA;;AAGO,eAAeA,oBAAf,CACLC,IADK,EAELC,WAFK,EAGLC,UAHK,EAILC,OAJK,EAKLC,OALK,EAMLC,WANK,EAOL;AACAH,EAAAA,UAAU,GAAG,8CAAsBF,IAAtB,EAA4BC,WAA5B,EAAyCC,UAAzC,CAAb;AAEA,QAAMI,IAAI,GAAG,IAAIC,QAAJ,CAAaN,WAAb,CAAb;AAGAD,EAAAA,IAAI,CAACQ,WAAL,GAAmBF,IAAI,CAACG,SAAL,CAAeP,UAAf,EAA2B,IAA3B,CAAnB;AACAA,EAAAA,UAAU,IAAI,CAAd;AAGAF,EAAAA,IAAI,CAACU,KAAL,GAAa,EAAb;;AACA,SAAOV,IAAI,CAACU,KAAL,CAAWC,MAAX,GAAoBX,IAAI,CAACQ,WAAzB,IAAwCR,IAAI,CAACY,UAAL,GAAkBV,UAAlB,GAA+B,EAA9E,EAAkF;AAChF,UAAMW,OAAO,GAAG,EAAhB;AACAb,IAAAA,IAAI,CAACU,KAAL,CAAWI,IAAX,CAAgBD,OAAhB;AACAX,IAAAA,UAAU,GAAG,MAAMG,WAAW,CAACJ,WAAD,EAAcC,UAAd,EAA0BC,OAA1B,EAAmCC,OAAnC,EAA4CS,OAA5C,CAA9B;AAED;;AAED,SAAOX,UAAP;AACD","sourcesContent":["// This file is derived from the Cesium code base under Apache 2 license\n// See LICENSE.md and https://github.com/AnalyticalGraphicsInc/cesium/blob/master/LICENSE.md\n\n// Reference code:\n// https://github.com/AnalyticalGraphicsInc/cesium/blob/master/Source/Scene/Composite3DTileContent.js#L182\n\nimport {parse3DTileHeaderSync} from './helpers/parse-3d-tile-header';\n\n// eslint-disable-next-line max-params\nexport async function parseComposite3DTile(\n tile,\n arrayBuffer,\n byteOffset,\n options,\n context,\n parse3DTile\n) {\n byteOffset = parse3DTileHeaderSync(tile, arrayBuffer, byteOffset);\n\n const view = new DataView(arrayBuffer);\n\n // Extract number of tiles\n tile.tilesLength = view.getUint32(byteOffset, true);\n byteOffset += 4;\n\n // extract each tile from the byte stream\n tile.tiles = [];\n while (tile.tiles.length < tile.tilesLength && tile.byteLength - byteOffset > 12) {\n const subtile = {};\n tile.tiles.push(subtile);\n byteOffset = await parse3DTile(arrayBuffer, byteOffset, options, context, subtile);\n // TODO - do we need to add any padding in between tiles?\n }\n\n return byteOffset;\n}\n"],"file":"parse-3d-tile-composite.js"}
1
+ {"version":3,"sources":["../../../../src/lib/parsers/parse-3d-tile-composite.js"],"names":["parseComposite3DTile","tile","arrayBuffer","byteOffset","options","context","parse3DTile","view","DataView","tilesLength","getUint32","tiles","length","byteLength","subtile","push"],"mappings":";;;;;;;;;;;;;AAMA;;SAGsBA,oB;;;;;oFAAf,iBACLC,IADK,EAELC,WAFK,EAGLC,UAHK,EAILC,OAJK,EAKLC,OALK,EAMLC,WANK;AAAA;AAAA;AAAA;AAAA;AAAA;AAQLH,YAAAA,UAAU,GAAG,8CAAsBF,IAAtB,EAA4BC,WAA5B,EAAyCC,UAAzC,CAAb;AAEMI,YAAAA,IAVD,GAUQ,IAAIC,QAAJ,CAAaN,WAAb,CAVR;AAaLD,YAAAA,IAAI,CAACQ,WAAL,GAAmBF,IAAI,CAACG,SAAL,CAAeP,UAAf,EAA2B,IAA3B,CAAnB;AACAA,YAAAA,UAAU,IAAI,CAAd;AAGAF,YAAAA,IAAI,CAACU,KAAL,GAAa,EAAb;;AAjBK;AAAA,kBAkBEV,IAAI,CAACU,KAAL,CAAWC,MAAX,GAAoBX,IAAI,CAACQ,WAAzB,IAAwCR,IAAI,CAACY,UAAL,GAAkBV,UAAlB,GAA+B,EAlBzE;AAAA;AAAA;AAAA;;AAmBGW,YAAAA,OAnBH,GAmBa,EAnBb;AAoBHb,YAAAA,IAAI,CAACU,KAAL,CAAWI,IAAX,CAAgBD,OAAhB;AApBG;AAAA,mBAqBgBR,WAAW,CAACJ,WAAD,EAAcC,UAAd,EAA0BC,OAA1B,EAAmCC,OAAnC,EAA4CS,OAA5C,CArB3B;;AAAA;AAqBHX,YAAAA,UArBG;AAAA;AAAA;;AAAA;AAAA,6CAyBEA,UAzBF;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,G","sourcesContent":["// This file is derived from the Cesium code base under Apache 2 license\n// See LICENSE.md and https://github.com/AnalyticalGraphicsInc/cesium/blob/master/LICENSE.md\n\n// Reference code:\n// https://github.com/AnalyticalGraphicsInc/cesium/blob/master/Source/Scene/Composite3DTileContent.js#L182\n\nimport {parse3DTileHeaderSync} from './helpers/parse-3d-tile-header';\n\n// eslint-disable-next-line max-params\nexport async function parseComposite3DTile(\n tile,\n arrayBuffer,\n byteOffset,\n options,\n context,\n parse3DTile\n) {\n byteOffset = parse3DTileHeaderSync(tile, arrayBuffer, byteOffset);\n\n const view = new DataView(arrayBuffer);\n\n // Extract number of tiles\n tile.tilesLength = view.getUint32(byteOffset, true);\n byteOffset += 4;\n\n // extract each tile from the byte stream\n tile.tiles = [];\n while (tile.tiles.length < tile.tilesLength && tile.byteLength - byteOffset > 12) {\n const subtile = {};\n tile.tiles.push(subtile);\n byteOffset = await parse3DTile(arrayBuffer, byteOffset, options, context, subtile);\n // TODO - do we need to add any padding in between tiles?\n }\n\n return byteOffset;\n}\n"],"file":"parse-3d-tile-composite.js"}