@loaders.gl/tile-converter 3.3.0-alpha.5 → 3.3.0-alpha.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/3d-tiles-attributes-worker.js +2 -3
- package/dist/3d-tiles-attributes-worker.js.map +3 -3
- package/dist/converter-cli.js +15 -2
- package/dist/converter.min.js +23 -20
- package/dist/dist.min.js +38236 -46911
- package/dist/es5/3d-tiles-attributes-worker.js +3 -6
- package/dist/es5/3d-tiles-attributes-worker.js.map +1 -1
- package/dist/es5/3d-tiles-converter/3d-tiles-converter.js +12 -111
- package/dist/es5/3d-tiles-converter/3d-tiles-converter.js.map +1 -1
- package/dist/es5/3d-tiles-converter/helpers/b3dm-converter.js +32 -72
- package/dist/es5/3d-tiles-converter/helpers/b3dm-converter.js.map +1 -1
- package/dist/es5/3d-tiles-converter/helpers/i3s-obb-to-3d-tiles-obb.js +0 -8
- package/dist/es5/3d-tiles-converter/helpers/i3s-obb-to-3d-tiles-obb.js.map +1 -1
- package/dist/es5/3d-tiles-converter/helpers/texture-atlas.js +0 -5
- package/dist/es5/3d-tiles-converter/helpers/texture-atlas.js.map +1 -1
- package/dist/es5/3d-tiles-converter/json-templates/tileset.js +0 -6
- package/dist/es5/3d-tiles-converter/json-templates/tileset.js.map +1 -1
- package/dist/es5/bundle.js +0 -1
- package/dist/es5/bundle.js.map +1 -1
- package/dist/es5/constants.js.map +1 -1
- package/dist/es5/converter-cli.js +11 -56
- package/dist/es5/converter-cli.js.map +1 -1
- package/dist/es5/deps-installer/deps-installer.js +5 -35
- package/dist/es5/deps-installer/deps-installer.js.map +1 -1
- package/dist/es5/i3s-attributes-worker.js +3 -6
- package/dist/es5/i3s-attributes-worker.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/batch-ids-extensions.js +2 -28
- package/dist/es5/i3s-converter/helpers/batch-ids-extensions.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/coordinate-converter.js +8 -25
- package/dist/es5/i3s-converter/helpers/coordinate-converter.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/create-scene-server-path.js +0 -11
- package/dist/es5/i3s-converter/helpers/create-scene-server-path.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/feature-attributes.js +5 -34
- package/dist/es5/i3s-converter/helpers/feature-attributes.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/geometry-attributes.js +13 -45
- package/dist/es5/i3s-converter/helpers/geometry-attributes.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/geometry-converter.js +26 -221
- package/dist/es5/i3s-converter/helpers/geometry-converter.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/gltf-attributes.js +2 -16
- package/dist/es5/i3s-converter/helpers/gltf-attributes.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/node-debug.js +4 -23
- package/dist/es5/i3s-converter/helpers/node-debug.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/node-pages.js +50 -86
- package/dist/es5/i3s-converter/helpers/node-pages.js.map +1 -1
- package/dist/es5/i3s-converter/i3s-converter.js +69 -384
- package/dist/es5/i3s-converter/i3s-converter.js.map +1 -1
- package/dist/es5/i3s-converter/json-templates/layers.js +1 -15
- package/dist/es5/i3s-converter/json-templates/layers.js.map +1 -1
- package/dist/es5/i3s-converter/json-templates/metadata.js +0 -2
- package/dist/es5/i3s-converter/json-templates/metadata.js.map +1 -1
- package/dist/es5/i3s-converter/json-templates/node.js +2 -12
- package/dist/es5/i3s-converter/json-templates/node.js.map +1 -1
- package/dist/es5/i3s-converter/json-templates/scene-server.js +0 -2
- package/dist/es5/i3s-converter/json-templates/scene-server.js.map +1 -1
- package/dist/es5/i3s-converter/json-templates/shared-resources.js +6 -29
- package/dist/es5/i3s-converter/json-templates/shared-resources.js.map +1 -1
- package/dist/es5/i3s-converter/json-templates/store.js.map +1 -1
- package/dist/es5/i3s-converter/types.js.map +1 -1
- package/dist/es5/i3s-server/app.js +0 -5
- package/dist/es5/i3s-server/app.js.map +1 -1
- package/dist/es5/i3s-server/controllers/index-controller.js +0 -16
- package/dist/es5/i3s-server/controllers/index-controller.js.map +1 -1
- package/dist/es5/i3s-server/routes/index.js +1 -10
- package/dist/es5/i3s-server/routes/index.js.map +1 -1
- package/dist/es5/index.js +0 -3
- package/dist/es5/index.js.map +1 -1
- package/dist/es5/lib/utils/compress-util.js +19 -74
- package/dist/es5/lib/utils/compress-util.js.map +1 -1
- package/dist/es5/lib/utils/file-utils.js +10 -38
- package/dist/es5/lib/utils/file-utils.js.map +1 -1
- package/dist/es5/lib/utils/lod-conversion-utils.js +0 -7
- package/dist/es5/lib/utils/lod-conversion-utils.js.map +1 -1
- package/dist/es5/lib/utils/queue.js +0 -14
- package/dist/es5/lib/utils/queue.js.map +1 -1
- package/dist/es5/lib/utils/statistic-utills.js +1 -46
- package/dist/es5/lib/utils/statistic-utills.js.map +1 -1
- package/dist/es5/lib/utils/write-queue.js +0 -52
- package/dist/es5/lib/utils/write-queue.js.map +1 -1
- package/dist/es5/pgm-loader.js +1 -8
- package/dist/es5/pgm-loader.js.map +1 -1
- package/dist/es5/workers/3d-tiles-attributes-worker.js +1 -8
- package/dist/es5/workers/3d-tiles-attributes-worker.js.map +1 -1
- package/dist/es5/workers/i3s-attributes-worker.js +1 -9
- package/dist/es5/workers/i3s-attributes-worker.js.map +1 -1
- package/dist/esm/3d-tiles-attributes-worker.js +3 -1
- package/dist/esm/3d-tiles-attributes-worker.js.map +1 -1
- package/dist/esm/3d-tiles-converter/3d-tiles-converter.js +8 -40
- package/dist/esm/3d-tiles-converter/3d-tiles-converter.js.map +1 -1
- package/dist/esm/3d-tiles-converter/helpers/b3dm-converter.js +7 -38
- package/dist/esm/3d-tiles-converter/helpers/b3dm-converter.js.map +1 -1
- package/dist/esm/3d-tiles-converter/helpers/i3s-obb-to-3d-tiles-obb.js +1 -0
- package/dist/esm/3d-tiles-converter/helpers/i3s-obb-to-3d-tiles-obb.js.map +1 -1
- package/dist/esm/3d-tiles-converter/helpers/texture-atlas.js +1 -4
- package/dist/esm/3d-tiles-converter/helpers/texture-atlas.js.map +1 -1
- package/dist/esm/3d-tiles-converter/json-templates/tileset.js +0 -3
- package/dist/esm/3d-tiles-converter/json-templates/tileset.js.map +1 -1
- package/dist/esm/bundle.js +1 -1
- package/dist/esm/bundle.js.map +1 -1
- package/dist/esm/constants.js.map +1 -1
- package/dist/esm/converter-cli.js +12 -41
- package/dist/esm/converter-cli.js.map +1 -1
- package/dist/esm/deps-installer/deps-installer.js +6 -7
- package/dist/esm/deps-installer/deps-installer.js.map +1 -1
- package/dist/esm/i3s-attributes-worker.js +3 -1
- package/dist/esm/i3s-attributes-worker.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/batch-ids-extensions.js +4 -23
- package/dist/esm/i3s-converter/helpers/batch-ids-extensions.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/coordinate-converter.js +11 -12
- package/dist/esm/i3s-converter/helpers/coordinate-converter.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/create-scene-server-path.js +1 -0
- package/dist/esm/i3s-converter/helpers/create-scene-server-path.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/feature-attributes.js +6 -20
- package/dist/esm/i3s-converter/helpers/feature-attributes.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/geometry-attributes.js +3 -22
- package/dist/esm/i3s-converter/helpers/geometry-attributes.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/geometry-converter.js +28 -139
- package/dist/esm/i3s-converter/helpers/geometry-converter.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/gltf-attributes.js +7 -12
- package/dist/esm/i3s-converter/helpers/gltf-attributes.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/node-debug.js +3 -13
- package/dist/esm/i3s-converter/helpers/node-debug.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/node-pages.js +2 -21
- package/dist/esm/i3s-converter/helpers/node-pages.js.map +1 -1
- package/dist/esm/i3s-converter/i3s-converter.js +59 -144
- package/dist/esm/i3s-converter/i3s-converter.js.map +1 -1
- package/dist/esm/i3s-converter/json-templates/layers.js +1 -11
- package/dist/esm/i3s-converter/json-templates/layers.js.map +1 -1
- package/dist/esm/i3s-converter/json-templates/metadata.js.map +1 -1
- package/dist/esm/i3s-converter/json-templates/node.js +0 -4
- package/dist/esm/i3s-converter/json-templates/node.js.map +1 -1
- package/dist/esm/i3s-converter/json-templates/scene-server.js.map +1 -1
- package/dist/esm/i3s-converter/json-templates/shared-resources.js +0 -12
- package/dist/esm/i3s-converter/json-templates/shared-resources.js.map +1 -1
- package/dist/esm/i3s-converter/json-templates/store.js.map +1 -1
- package/dist/esm/i3s-converter/types.js.map +1 -1
- package/dist/esm/i3s-server/app.js +0 -5
- package/dist/esm/i3s-server/app.js.map +1 -1
- package/dist/esm/i3s-server/controllers/index-controller.js +0 -5
- package/dist/esm/i3s-server/controllers/index-controller.js.map +1 -1
- package/dist/esm/i3s-server/routes/index.js +0 -3
- package/dist/esm/i3s-server/routes/index.js.map +1 -1
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/lib/utils/compress-util.js +19 -12
- package/dist/esm/lib/utils/compress-util.js.map +1 -1
- package/dist/esm/lib/utils/file-utils.js +10 -8
- package/dist/esm/lib/utils/file-utils.js.map +1 -1
- package/dist/esm/lib/utils/lod-conversion-utils.js +2 -6
- package/dist/esm/lib/utils/lod-conversion-utils.js.map +1 -1
- package/dist/esm/lib/utils/queue.js +0 -4
- package/dist/esm/lib/utils/queue.js.map +1 -1
- package/dist/esm/lib/utils/statistic-utills.js +0 -11
- package/dist/esm/lib/utils/statistic-utills.js.map +1 -1
- package/dist/esm/lib/utils/write-queue.js +5 -23
- package/dist/esm/lib/utils/write-queue.js.map +1 -1
- package/dist/esm/pgm-loader.js +3 -1
- package/dist/esm/pgm-loader.js.map +1 -1
- package/dist/esm/workers/3d-tiles-attributes-worker.js +4 -1
- package/dist/esm/workers/3d-tiles-attributes-worker.js.map +1 -1
- package/dist/esm/workers/i3s-attributes-worker.js +4 -1
- package/dist/esm/workers/i3s-attributes-worker.js.map +1 -1
- package/dist/i3s-attributes-worker.js +2 -3
- package/dist/i3s-attributes-worker.js.map +3 -3
- package/dist/i3s-converter/helpers/coordinate-converter.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/coordinate-converter.js +8 -6
- package/dist/i3s-converter/helpers/geometry-converter.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/geometry-converter.js +2 -0
- package/dist/i3s-converter/i3s-converter.d.ts.map +1 -1
- package/dist/i3s-converter/i3s-converter.js +14 -8
- package/dist/pgm-loader.d.ts.map +1 -1
- package/dist/pgm-loader.js +2 -1
- package/package.json +15 -15
- package/src/converter-cli.ts +16 -2
- package/src/i3s-converter/helpers/coordinate-converter.ts +8 -6
- package/src/i3s-converter/helpers/geometry-converter.ts +2 -0
- package/src/i3s-converter/i3s-converter.ts +17 -7
- package/src/pgm-loader.ts +2 -2
|
@@ -1,103 +1,57 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
|
|
5
4
|
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
6
|
-
|
|
7
5
|
Object.defineProperty(exports, "__esModule", {
|
|
8
6
|
value: true
|
|
9
7
|
});
|
|
10
8
|
exports.default = void 0;
|
|
11
|
-
|
|
12
9
|
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
13
|
-
|
|
14
10
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
|
15
|
-
|
|
16
11
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
17
|
-
|
|
18
12
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
19
|
-
|
|
20
13
|
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
21
|
-
|
|
22
14
|
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
23
|
-
|
|
24
15
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
25
|
-
|
|
26
16
|
var _core = require("@loaders.gl/core");
|
|
27
|
-
|
|
28
17
|
var _tiles = require("@loaders.gl/tiles");
|
|
29
|
-
|
|
30
18
|
var _dTiles = require("@loaders.gl/3d-tiles");
|
|
31
|
-
|
|
32
19
|
var _path = require("path");
|
|
33
|
-
|
|
34
20
|
var _uuid = require("uuid");
|
|
35
|
-
|
|
36
21
|
var _process = _interopRequireDefault(require("process"));
|
|
37
|
-
|
|
38
22
|
var _jsonMapTransform = _interopRequireDefault(require("json-map-transform"));
|
|
39
|
-
|
|
40
23
|
var _md = _interopRequireDefault(require("md5"));
|
|
41
|
-
|
|
42
24
|
var _nodePages = _interopRequireDefault(require("./helpers/node-pages"));
|
|
43
|
-
|
|
44
25
|
var _fileUtils = require("../lib/utils/file-utils");
|
|
45
|
-
|
|
46
26
|
var _compressUtil = require("../lib/utils/compress-util");
|
|
47
|
-
|
|
48
27
|
var _statisticUtills = require("../lib/utils/statistic-utills");
|
|
49
|
-
|
|
50
28
|
var _geometryConverter = _interopRequireWildcard(require("./helpers/geometry-converter"));
|
|
51
|
-
|
|
52
29
|
var _coordinateConverter = require("./helpers/coordinate-converter");
|
|
53
|
-
|
|
54
30
|
var _createSceneServerPath = require("./helpers/create-scene-server-path");
|
|
55
|
-
|
|
56
31
|
var _lodConversionUtils = require("../lib/utils/lod-conversion-utils");
|
|
57
|
-
|
|
58
32
|
var _pgmLoader = require("../pgm-loader");
|
|
59
|
-
|
|
60
33
|
var _layers = require("./json-templates/layers");
|
|
61
|
-
|
|
62
34
|
var _node = require("./json-templates/node");
|
|
63
|
-
|
|
64
35
|
var _sharedResources = require("./json-templates/shared-resources");
|
|
65
|
-
|
|
66
36
|
var _nodeDebug = require("./helpers/node-debug");
|
|
67
|
-
|
|
68
37
|
var _textures = require("@loaders.gl/textures");
|
|
69
|
-
|
|
70
38
|
var _images = require("@loaders.gl/images");
|
|
71
|
-
|
|
72
39
|
var _workerUtils = require("@loaders.gl/worker-utils");
|
|
73
|
-
|
|
74
40
|
var _draco = require("@loaders.gl/draco");
|
|
75
|
-
|
|
76
41
|
var _writeQueue = _interopRequireDefault(require("../lib/utils/write-queue"));
|
|
77
|
-
|
|
78
42
|
var _i3sAttributesWorker = require("../i3s-attributes-worker");
|
|
79
|
-
|
|
80
43
|
var _constants = require("../constants");
|
|
81
|
-
|
|
82
44
|
var _featureAttributes = require("./helpers/feature-attributes");
|
|
83
|
-
|
|
84
45
|
var _process$env;
|
|
85
|
-
|
|
86
46
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
87
|
-
|
|
88
47
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
89
|
-
|
|
90
48
|
function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
|
|
91
|
-
|
|
92
49
|
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
93
|
-
|
|
94
50
|
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
|
|
95
|
-
|
|
96
|
-
function
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
var ION_DEFAULT_TOKEN = ((_process$env = _process.default.env) === null || _process$env === void 0 ? void 0 : _process$env.IonToken) || 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJlYWMxMzcyYy0zZjJkLTQwODctODNlNi01MDRkZmMzMjIxOWIiLCJpZCI6OTYyMCwic2NvcGVzIjpbImFzbCIsImFzciIsImdjIl0sImlhdCI6MTU2Mjg2NjI3M30.1FNiClUyk00YH_nWfSGpiQAjR5V2OvREDq1PJ5QMjWQ';
|
|
51
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
52
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
53
|
+
var ION_DEFAULT_TOKEN = ((_process$env = _process.default.env) === null || _process$env === void 0 ? void 0 : _process$env.IonToken) ||
|
|
54
|
+
'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJlYWMxMzcyYy0zZjJkLTQwODctODNlNi01MDRkZmMzMjIxOWIiLCJpZCI6OTYyMCwic2NvcGVzIjpbImFzbCIsImFzciIsImdjIl0sImlhdCI6MTU2Mjg2NjI3M30.1FNiClUyk00YH_nWfSGpiQAjR5V2OvREDq1PJ5QMjWQ';
|
|
101
55
|
var HARDCODED_NODES_PER_PAGE = 64;
|
|
102
56
|
var _3D_TILES = '3DTILES';
|
|
103
57
|
var _3D_OBJECT_LAYER_TYPE = '3DObject';
|
|
@@ -150,7 +104,7 @@ var I3SConverter = function () {
|
|
|
150
104
|
key: "convert",
|
|
151
105
|
value: function () {
|
|
152
106
|
var _convert = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(options) {
|
|
153
|
-
var tilesetName, slpk, egmFilePath, inputUrl, validate, outputPath, draco, sevenZipExe, maxDepth, token, generateTextures, generateBoundingVolumes, preloadOptions, tilesetOptions, sourceTilesetJson, workerFarm;
|
|
107
|
+
var tilesetName, slpk, egmFilePath, inputUrl, validate, outputPath, draco, sevenZipExe, maxDepth, token, generateTextures, generateBoundingVolumes, _sourceTilesetJson$ro, _sourceTilesetJson$ro2, preloadOptions, tilesetOptions, sourceTilesetJson, workerFarm;
|
|
154
108
|
return _regenerator.default.wrap(function _callee$(_context) {
|
|
155
109
|
while (1) {
|
|
156
110
|
switch (_context.prev = _context.next) {
|
|
@@ -159,10 +113,8 @@ var I3SConverter = function () {
|
|
|
159
113
|
_context.next = 3;
|
|
160
114
|
break;
|
|
161
115
|
}
|
|
162
|
-
|
|
163
116
|
console.log(_constants.BROWSER_ERROR_MESSAGE);
|
|
164
117
|
return _context.abrupt("return", _constants.BROWSER_ERROR_MESSAGE);
|
|
165
|
-
|
|
166
118
|
case 3:
|
|
167
119
|
this.conversionStartTime = _process.default.hrtime();
|
|
168
120
|
tilesetName = options.tilesetName, slpk = options.slpk, egmFilePath = options.egmFilePath, inputUrl = options.inputUrl, validate = options.validate, outputPath = options.outputPath, draco = options.draco, sevenZipExe = options.sevenZipExe, maxDepth = options.maxDepth, token = options.token, generateTextures = options.generateTextures, generateBoundingVolumes = options.generateBoundingVolumes;
|
|
@@ -184,7 +136,6 @@ var I3SConverter = function () {
|
|
|
184
136
|
console.log('Loading egm file...');
|
|
185
137
|
_context.next = 15;
|
|
186
138
|
return (0, _core.load)(egmFilePath, _pgmLoader.PGMLoader);
|
|
187
|
-
|
|
188
139
|
case 15:
|
|
189
140
|
this.geoidHeightModel = _context.sent;
|
|
190
141
|
console.log('Loading egm file completed!');
|
|
@@ -192,15 +143,12 @@ var I3SConverter = function () {
|
|
|
192
143
|
if (slpk) {
|
|
193
144
|
this.nodePages.useWriteFunction(_fileUtils.writeFileForSlpk);
|
|
194
145
|
}
|
|
195
|
-
|
|
196
146
|
_context.next = 20;
|
|
197
147
|
return this.loadWorkers();
|
|
198
|
-
|
|
199
148
|
case 20:
|
|
200
149
|
_context.prev = 20;
|
|
201
150
|
_context.next = 23;
|
|
202
151
|
return this._fetchPreloadOptions();
|
|
203
|
-
|
|
204
152
|
case 23:
|
|
205
153
|
preloadOptions = _context.sent;
|
|
206
154
|
tilesetOptions = {
|
|
@@ -219,23 +167,19 @@ var I3SConverter = function () {
|
|
|
219
167
|
}
|
|
220
168
|
}
|
|
221
169
|
};
|
|
222
|
-
|
|
223
170
|
if (preloadOptions.headers) {
|
|
224
171
|
tilesetOptions.loadOptions.fetch = {
|
|
225
172
|
headers: preloadOptions.headers
|
|
226
173
|
};
|
|
227
174
|
}
|
|
228
|
-
|
|
229
175
|
Object.assign(tilesetOptions, preloadOptions);
|
|
230
176
|
_context.next = 29;
|
|
231
177
|
return (0, _core.load)(inputUrl, this.Loader, tilesetOptions.loadOptions);
|
|
232
|
-
|
|
233
178
|
case 29:
|
|
234
179
|
sourceTilesetJson = _context.sent;
|
|
235
180
|
this.sourceTileset = new _tiles.Tileset3D(sourceTilesetJson, tilesetOptions);
|
|
236
181
|
_context.next = 33;
|
|
237
|
-
return this._createAndSaveTileset(outputPath, tilesetName);
|
|
238
|
-
|
|
182
|
+
return this._createAndSaveTileset(outputPath, tilesetName, sourceTilesetJson === null || sourceTilesetJson === void 0 ? void 0 : (_sourceTilesetJson$ro = sourceTilesetJson.root) === null || _sourceTilesetJson$ro === void 0 ? void 0 : (_sourceTilesetJson$ro2 = _sourceTilesetJson$ro.boundingVolume) === null || _sourceTilesetJson$ro2 === void 0 ? void 0 : _sourceTilesetJson$ro2.region);
|
|
239
183
|
case 33:
|
|
240
184
|
_context.next = 35;
|
|
241
185
|
return this._finishConversion({
|
|
@@ -243,21 +187,17 @@ var I3SConverter = function () {
|
|
|
243
187
|
outputPath: outputPath,
|
|
244
188
|
tilesetName: tilesetName
|
|
245
189
|
});
|
|
246
|
-
|
|
247
190
|
case 35:
|
|
248
191
|
return _context.abrupt("return", sourceTilesetJson);
|
|
249
|
-
|
|
250
192
|
case 38:
|
|
251
193
|
_context.prev = 38;
|
|
252
194
|
_context.t0 = _context["catch"](20);
|
|
253
195
|
throw _context.t0;
|
|
254
|
-
|
|
255
196
|
case 41:
|
|
256
197
|
_context.prev = 41;
|
|
257
198
|
workerFarm = _workerUtils.WorkerFarm.getWorkerFarm({});
|
|
258
199
|
workerFarm.destroy();
|
|
259
200
|
return _context.finish(41);
|
|
260
|
-
|
|
261
201
|
case 45:
|
|
262
202
|
case "end":
|
|
263
203
|
return _context.stop();
|
|
@@ -265,17 +205,15 @@ var I3SConverter = function () {
|
|
|
265
205
|
}
|
|
266
206
|
}, _callee, this, [[20, 38, 41, 45]]);
|
|
267
207
|
}));
|
|
268
|
-
|
|
269
208
|
function convert(_x) {
|
|
270
209
|
return _convert.apply(this, arguments);
|
|
271
210
|
}
|
|
272
|
-
|
|
273
211
|
return convert;
|
|
274
212
|
}()
|
|
275
213
|
}, {
|
|
276
214
|
key: "_createAndSaveTileset",
|
|
277
215
|
value: function () {
|
|
278
|
-
var _createAndSaveTileset2 = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2(outputPath, tilesetName) {
|
|
216
|
+
var _createAndSaveTileset2 = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2(outputPath, tilesetName, boundingVolumeRegion) {
|
|
279
217
|
var tilesetPath, sourceRootTile, boundingVolumes, parentId, isCreateSlpk, root0;
|
|
280
218
|
return _regenerator.default.wrap(function _callee2$(_context2) {
|
|
281
219
|
while (1) {
|
|
@@ -285,20 +223,15 @@ var I3SConverter = function () {
|
|
|
285
223
|
_context2.prev = 1;
|
|
286
224
|
_context2.next = 4;
|
|
287
225
|
return (0, _fileUtils.removeDir)(tilesetPath);
|
|
288
|
-
|
|
289
226
|
case 4:
|
|
290
227
|
_context2.next = 8;
|
|
291
228
|
break;
|
|
292
|
-
|
|
293
229
|
case 6:
|
|
294
230
|
_context2.prev = 6;
|
|
295
231
|
_context2.t0 = _context2["catch"](1);
|
|
296
|
-
|
|
297
232
|
case 8:
|
|
298
233
|
this.layers0Path = (0, _path.join)(tilesetPath, 'SceneServer', 'layers', '0');
|
|
299
|
-
|
|
300
|
-
this._formLayers0(tilesetName);
|
|
301
|
-
|
|
234
|
+
this._formLayers0(tilesetName, boundingVolumeRegion);
|
|
302
235
|
this.materialDefinitions = [];
|
|
303
236
|
this.materialMap = new Map();
|
|
304
237
|
sourceRootTile = this.sourceTileset.root;
|
|
@@ -313,36 +246,28 @@ var I3SConverter = function () {
|
|
|
313
246
|
root0 = this._formRootNodeIndexDocument(boundingVolumes);
|
|
314
247
|
_context2.next = 19;
|
|
315
248
|
return this._convertNodesTree(root0, sourceRootTile, parentId, boundingVolumes);
|
|
316
|
-
|
|
317
249
|
case 19:
|
|
318
250
|
this.layers0.materialDefinitions = this.materialDefinitions;
|
|
319
|
-
|
|
320
251
|
if (this.layersHasTexture === false) {
|
|
321
252
|
this.layers0.store.defaultGeometrySchema.ordering = this.layers0.store.defaultGeometrySchema.ordering.filter(function (attribute) {
|
|
322
253
|
return attribute !== 'uv0';
|
|
323
254
|
});
|
|
324
255
|
}
|
|
325
|
-
|
|
326
256
|
_context2.next = 23;
|
|
327
257
|
return this._writeLayers0();
|
|
328
|
-
|
|
329
258
|
case 23:
|
|
330
259
|
(0, _createSceneServerPath.createSceneServerPath)(tilesetName, this.layers0, tilesetPath);
|
|
331
260
|
_context2.next = 26;
|
|
332
261
|
return this._writeNodeIndexDocument(root0, 'root', (0, _path.join)(this.layers0Path, 'nodes', 'root'));
|
|
333
|
-
|
|
334
262
|
case 26:
|
|
335
263
|
_context2.next = 28;
|
|
336
264
|
return this.nodePages.save(this.layers0Path, this.writeQueue, isCreateSlpk);
|
|
337
|
-
|
|
338
265
|
case 28:
|
|
339
266
|
_context2.next = 30;
|
|
340
267
|
return this.writeQueue.finalize();
|
|
341
|
-
|
|
342
268
|
case 30:
|
|
343
269
|
_context2.next = 32;
|
|
344
270
|
return this._createSlpk(tilesetPath);
|
|
345
|
-
|
|
346
271
|
case 32:
|
|
347
272
|
case "end":
|
|
348
273
|
return _context2.stop();
|
|
@@ -350,19 +275,21 @@ var I3SConverter = function () {
|
|
|
350
275
|
}
|
|
351
276
|
}, _callee2, this, [[1, 6]]);
|
|
352
277
|
}));
|
|
353
|
-
|
|
354
|
-
function _createAndSaveTileset(_x2, _x3) {
|
|
278
|
+
function _createAndSaveTileset(_x2, _x3, _x4) {
|
|
355
279
|
return _createAndSaveTileset2.apply(this, arguments);
|
|
356
280
|
}
|
|
357
|
-
|
|
358
281
|
return _createAndSaveTileset;
|
|
359
282
|
}()
|
|
360
283
|
}, {
|
|
361
284
|
key: "_formLayers0",
|
|
362
|
-
value:
|
|
285
|
+
value:
|
|
286
|
+
function _formLayers0(tilesetName, boundingVolumeRegion) {
|
|
363
287
|
var _this$sourceTileset, _this$sourceTileset2, _this$sourceTileset2$;
|
|
364
|
-
|
|
365
288
|
var fullExtent = (0, _coordinateConverter.convertBoundingVolumeToI3SFullExtent)(((_this$sourceTileset = this.sourceTileset) === null || _this$sourceTileset === void 0 ? void 0 : _this$sourceTileset.boundingVolume) || ((_this$sourceTileset2 = this.sourceTileset) === null || _this$sourceTileset2 === void 0 ? void 0 : (_this$sourceTileset2$ = _this$sourceTileset2.root) === null || _this$sourceTileset2$ === void 0 ? void 0 : _this$sourceTileset2$.boundingVolume));
|
|
289
|
+
if (boundingVolumeRegion) {
|
|
290
|
+
fullExtent.zmin = boundingVolumeRegion[4];
|
|
291
|
+
fullExtent.zmax = boundingVolumeRegion[5];
|
|
292
|
+
}
|
|
366
293
|
var extent = [fullExtent.xmin, fullExtent.ymin, fullExtent.xmax, fullExtent.ymax];
|
|
367
294
|
var layers0data = {
|
|
368
295
|
version: "{".concat((0, _uuid.v4)().toUpperCase(), "}"),
|
|
@@ -381,9 +308,11 @@ var I3SConverter = function () {
|
|
|
381
308
|
};
|
|
382
309
|
this.layers0 = (0, _jsonMapTransform.default)(layers0data, (0, _layers.LAYERS)());
|
|
383
310
|
}
|
|
311
|
+
|
|
384
312
|
}, {
|
|
385
313
|
key: "_formRootNodeIndexDocument",
|
|
386
|
-
value:
|
|
314
|
+
value:
|
|
315
|
+
function _formRootNodeIndexDocument(boundingVolumes) {
|
|
387
316
|
var root0data = _objectSpread(_objectSpread({
|
|
388
317
|
version: "{".concat((0, _uuid.v4)().toUpperCase(), "}"),
|
|
389
318
|
id: 'root',
|
|
@@ -398,28 +327,25 @@ var I3SConverter = function () {
|
|
|
398
327
|
}, boundingVolumes), {}, {
|
|
399
328
|
children: []
|
|
400
329
|
});
|
|
401
|
-
|
|
402
330
|
return (0, _jsonMapTransform.default)(root0data, (0, _node.NODE)());
|
|
403
331
|
}
|
|
332
|
+
|
|
404
333
|
}, {
|
|
405
334
|
key: "_convertNodesTree",
|
|
406
335
|
value: function () {
|
|
407
336
|
var _convertNodesTree2 = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee3(root0, sourceRootTile, parentId, boundingVolumes) {
|
|
408
337
|
var _yield$this$_createNo, _yield$this$_createNo2, child, childPath;
|
|
409
|
-
|
|
410
338
|
return _regenerator.default.wrap(function _callee3$(_context3) {
|
|
411
339
|
while (1) {
|
|
412
340
|
switch (_context3.prev = _context3.next) {
|
|
413
341
|
case 0:
|
|
414
342
|
_context3.next = 2;
|
|
415
343
|
return this.sourceTileset._loadTile(sourceRootTile);
|
|
416
|
-
|
|
417
344
|
case 2:
|
|
418
345
|
if (!this.isContentSupported(sourceRootTile)) {
|
|
419
346
|
_context3.next = 20;
|
|
420
347
|
break;
|
|
421
348
|
}
|
|
422
|
-
|
|
423
349
|
root0.children = root0.children || [];
|
|
424
350
|
root0.children.push(_objectSpread({
|
|
425
351
|
id: '1',
|
|
@@ -427,38 +353,31 @@ var I3SConverter = function () {
|
|
|
427
353
|
}, boundingVolumes));
|
|
428
354
|
_context3.next = 7;
|
|
429
355
|
return this._createNode(root0, sourceRootTile, parentId, 0);
|
|
430
|
-
|
|
431
356
|
case 7:
|
|
432
357
|
_yield$this$_createNo = _context3.sent;
|
|
433
358
|
_yield$this$_createNo2 = (0, _slicedToArray2.default)(_yield$this$_createNo, 1);
|
|
434
359
|
child = _yield$this$_createNo2[0];
|
|
435
360
|
childPath = (0, _path.join)(this.layers0Path, 'nodes', child.path);
|
|
436
|
-
|
|
437
361
|
if (!this.options.slpk) {
|
|
438
362
|
_context3.next = 16;
|
|
439
363
|
break;
|
|
440
364
|
}
|
|
441
|
-
|
|
442
365
|
_context3.next = 14;
|
|
443
366
|
return this.writeQueue.enqueue({
|
|
444
367
|
archiveKey: 'nodes/1/3dNodeIndexDocument.json.gz',
|
|
445
368
|
writePromise: (0, _fileUtils.writeFileForSlpk)(childPath, JSON.stringify(child), '3dNodeIndexDocument.json')
|
|
446
369
|
});
|
|
447
|
-
|
|
448
370
|
case 14:
|
|
449
371
|
_context3.next = 18;
|
|
450
372
|
break;
|
|
451
|
-
|
|
452
373
|
case 16:
|
|
453
374
|
_context3.next = 18;
|
|
454
375
|
return this.writeQueue.enqueue({
|
|
455
376
|
writePromise: (0, _fileUtils.writeFile)(childPath, JSON.stringify(child))
|
|
456
377
|
});
|
|
457
|
-
|
|
458
378
|
case 18:
|
|
459
379
|
_context3.next = 22;
|
|
460
380
|
break;
|
|
461
|
-
|
|
462
381
|
case 20:
|
|
463
382
|
_context3.next = 22;
|
|
464
383
|
return this._addChildrenWithNeighborsAndWriteFile({
|
|
@@ -467,11 +386,9 @@ var I3SConverter = function () {
|
|
|
467
386
|
parentId: parentId,
|
|
468
387
|
level: 1
|
|
469
388
|
});
|
|
470
|
-
|
|
471
389
|
case 22:
|
|
472
390
|
_context3.next = 24;
|
|
473
391
|
return sourceRootTile.unloadContent();
|
|
474
|
-
|
|
475
392
|
case 24:
|
|
476
393
|
case "end":
|
|
477
394
|
return _context3.stop();
|
|
@@ -479,11 +396,9 @@ var I3SConverter = function () {
|
|
|
479
396
|
}
|
|
480
397
|
}, _callee3, this);
|
|
481
398
|
}));
|
|
482
|
-
|
|
483
|
-
function _convertNodesTree(_x4, _x5, _x6, _x7) {
|
|
399
|
+
function _convertNodesTree(_x5, _x6, _x7, _x8) {
|
|
484
400
|
return _convertNodesTree2.apply(this, arguments);
|
|
485
401
|
}
|
|
486
|
-
|
|
487
402
|
return _convertNodesTree;
|
|
488
403
|
}()
|
|
489
404
|
}, {
|
|
@@ -498,23 +413,19 @@ var I3SConverter = function () {
|
|
|
498
413
|
_context4.next = 5;
|
|
499
414
|
break;
|
|
500
415
|
}
|
|
501
|
-
|
|
502
416
|
_context4.next = 3;
|
|
503
417
|
return this.writeQueue.enqueue({
|
|
504
418
|
archiveKey: '3dSceneLayer.json.gz',
|
|
505
419
|
writePromise: (0, _fileUtils.writeFileForSlpk)(this.layers0Path, JSON.stringify(this.layers0), '3dSceneLayer.json')
|
|
506
420
|
});
|
|
507
|
-
|
|
508
421
|
case 3:
|
|
509
422
|
_context4.next = 7;
|
|
510
423
|
break;
|
|
511
|
-
|
|
512
424
|
case 5:
|
|
513
425
|
_context4.next = 7;
|
|
514
426
|
return this.writeQueue.enqueue({
|
|
515
427
|
writePromise: (0, _fileUtils.writeFile)(this.layers0Path, JSON.stringify(this.layers0))
|
|
516
428
|
});
|
|
517
|
-
|
|
518
429
|
case 7:
|
|
519
430
|
case "end":
|
|
520
431
|
return _context4.stop();
|
|
@@ -522,11 +433,9 @@ var I3SConverter = function () {
|
|
|
522
433
|
}
|
|
523
434
|
}, _callee4, this);
|
|
524
435
|
}));
|
|
525
|
-
|
|
526
436
|
function _writeLayers0() {
|
|
527
437
|
return _writeLayers.apply(this, arguments);
|
|
528
438
|
}
|
|
529
|
-
|
|
530
439
|
return _writeLayers0;
|
|
531
440
|
}()
|
|
532
441
|
}, {
|
|
@@ -541,23 +450,19 @@ var I3SConverter = function () {
|
|
|
541
450
|
_context5.next = 5;
|
|
542
451
|
break;
|
|
543
452
|
}
|
|
544
|
-
|
|
545
453
|
_context5.next = 3;
|
|
546
454
|
return this.writeQueue.enqueue({
|
|
547
455
|
archiveKey: "nodes/".concat(nodePath, "/3dNodeIndexDocument.json.gz"),
|
|
548
456
|
writePromise: (0, _fileUtils.writeFileForSlpk)(rootPath, JSON.stringify(root0), '3dNodeIndexDocument.json')
|
|
549
457
|
});
|
|
550
|
-
|
|
551
458
|
case 3:
|
|
552
459
|
_context5.next = 7;
|
|
553
460
|
break;
|
|
554
|
-
|
|
555
461
|
case 5:
|
|
556
462
|
_context5.next = 7;
|
|
557
463
|
return this.writeQueue.enqueue({
|
|
558
464
|
writePromise: (0, _fileUtils.writeFile)(rootPath, JSON.stringify(root0))
|
|
559
465
|
});
|
|
560
|
-
|
|
561
466
|
case 7:
|
|
562
467
|
case "end":
|
|
563
468
|
return _context5.stop();
|
|
@@ -565,11 +470,9 @@ var I3SConverter = function () {
|
|
|
565
470
|
}
|
|
566
471
|
}, _callee5, this);
|
|
567
472
|
}));
|
|
568
|
-
|
|
569
|
-
function _writeNodeIndexDocument(_x8, _x9, _x10) {
|
|
473
|
+
function _writeNodeIndexDocument(_x9, _x10, _x11) {
|
|
570
474
|
return _writeNodeIndexDocument2.apply(this, arguments);
|
|
571
475
|
}
|
|
572
|
-
|
|
573
476
|
return _writeNodeIndexDocument;
|
|
574
477
|
}()
|
|
575
478
|
}, {
|
|
@@ -585,25 +488,20 @@ var I3SConverter = function () {
|
|
|
585
488
|
_context6.next = 12;
|
|
586
489
|
break;
|
|
587
490
|
}
|
|
588
|
-
|
|
589
491
|
slpkTilesetPath = (0, _path.join)(tilesetPath, 'SceneServer', 'layers', '0');
|
|
590
492
|
slpkFileName = "".concat(tilesetPath, ".slpk");
|
|
591
493
|
_context6.next = 5;
|
|
592
494
|
return (0, _compressUtil.compressWithChildProcess)(slpkTilesetPath, slpkFileName, 0, '.', this.options.sevenZipExe);
|
|
593
|
-
|
|
594
495
|
case 5:
|
|
595
496
|
_context6.prev = 5;
|
|
596
497
|
_context6.next = 8;
|
|
597
498
|
return (0, _fileUtils.removeDir)(tilesetPath);
|
|
598
|
-
|
|
599
499
|
case 8:
|
|
600
500
|
_context6.next = 12;
|
|
601
501
|
break;
|
|
602
|
-
|
|
603
502
|
case 10:
|
|
604
503
|
_context6.prev = 10;
|
|
605
504
|
_context6.t0 = _context6["catch"](5);
|
|
606
|
-
|
|
607
505
|
case 12:
|
|
608
506
|
case "end":
|
|
609
507
|
return _context6.stop();
|
|
@@ -611,11 +509,9 @@ var I3SConverter = function () {
|
|
|
611
509
|
}
|
|
612
510
|
}, _callee6, this, [[5, 10]]);
|
|
613
511
|
}));
|
|
614
|
-
|
|
615
|
-
function _createSlpk(_x11) {
|
|
512
|
+
function _createSlpk(_x12) {
|
|
616
513
|
return _createSlpk2.apply(this, arguments);
|
|
617
514
|
}
|
|
618
|
-
|
|
619
515
|
return _createSlpk;
|
|
620
516
|
}()
|
|
621
517
|
}, {
|
|
@@ -632,11 +528,9 @@ var I3SConverter = function () {
|
|
|
632
528
|
return this._addChildren(_objectSpread(_objectSpread({}, data), {}, {
|
|
633
529
|
childNodes: childNodes
|
|
634
530
|
}));
|
|
635
|
-
|
|
636
531
|
case 3:
|
|
637
532
|
_context7.next = 5;
|
|
638
533
|
return this._addNeighborsAndWriteFile(data.parentNode, childNodes);
|
|
639
|
-
|
|
640
534
|
case 5:
|
|
641
535
|
case "end":
|
|
642
536
|
return _context7.stop();
|
|
@@ -644,11 +538,9 @@ var I3SConverter = function () {
|
|
|
644
538
|
}
|
|
645
539
|
}, _callee7, this);
|
|
646
540
|
}));
|
|
647
|
-
|
|
648
|
-
function _addChildrenWithNeighborsAndWriteFile(_x12) {
|
|
541
|
+
function _addChildrenWithNeighborsAndWriteFile(_x13) {
|
|
649
542
|
return _addChildrenWithNeighborsAndWriteFile2.apply(this, arguments);
|
|
650
543
|
}
|
|
651
|
-
|
|
652
544
|
return _addChildrenWithNeighborsAndWriteFile;
|
|
653
545
|
}()
|
|
654
546
|
}, {
|
|
@@ -663,7 +555,6 @@ var I3SConverter = function () {
|
|
|
663
555
|
sourceTile = _ref.sourceTile, parentNode = _ref.parentNode, childNodes = _ref.childNodes, parentId = _ref.parentId, level = _ref.level;
|
|
664
556
|
_context8.next = 3;
|
|
665
557
|
return this.sourceTileset._loadTile(sourceTile);
|
|
666
|
-
|
|
667
558
|
case 3:
|
|
668
559
|
_context8.next = 5;
|
|
669
560
|
return this._addChildren({
|
|
@@ -673,11 +564,9 @@ var I3SConverter = function () {
|
|
|
673
564
|
parentId: parentId,
|
|
674
565
|
level: level + 1
|
|
675
566
|
});
|
|
676
|
-
|
|
677
567
|
case 5:
|
|
678
568
|
_context8.next = 7;
|
|
679
569
|
return sourceTile.unloadContent();
|
|
680
|
-
|
|
681
570
|
case 7:
|
|
682
571
|
case "end":
|
|
683
572
|
return _context8.stop();
|
|
@@ -685,11 +574,9 @@ var I3SConverter = function () {
|
|
|
685
574
|
}
|
|
686
575
|
}, _callee8, this);
|
|
687
576
|
}));
|
|
688
|
-
|
|
689
|
-
function convertNestedTileset(_x13) {
|
|
577
|
+
function convertNestedTileset(_x14) {
|
|
690
578
|
return _convertNestedTileset.apply(this, arguments);
|
|
691
579
|
}
|
|
692
|
-
|
|
693
580
|
return convertNestedTileset;
|
|
694
581
|
}()
|
|
695
582
|
}, {
|
|
@@ -697,7 +584,6 @@ var I3SConverter = function () {
|
|
|
697
584
|
value: function () {
|
|
698
585
|
var _convertNode = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee9(_ref2) {
|
|
699
586
|
var sourceTile, parentNode, childNodes, parentId, level, children, _iterator, _step, child;
|
|
700
|
-
|
|
701
587
|
return _regenerator.default.wrap(function _callee9$(_context9) {
|
|
702
588
|
while (1) {
|
|
703
589
|
switch (_context9.prev = _context9.next) {
|
|
@@ -705,12 +591,10 @@ var I3SConverter = function () {
|
|
|
705
591
|
sourceTile = _ref2.sourceTile, parentNode = _ref2.parentNode, childNodes = _ref2.childNodes, parentId = _ref2.parentId, level = _ref2.level;
|
|
706
592
|
_context9.next = 3;
|
|
707
593
|
return this._createNode(parentNode, sourceTile, parentId, level);
|
|
708
|
-
|
|
709
594
|
case 3:
|
|
710
595
|
children = _context9.sent;
|
|
711
596
|
parentNode.children = parentNode.children || [];
|
|
712
597
|
_iterator = _createForOfIteratorHelper(children);
|
|
713
|
-
|
|
714
598
|
try {
|
|
715
599
|
for (_iterator.s(); !(_step = _iterator.n()).done;) {
|
|
716
600
|
child = _step.value;
|
|
@@ -727,7 +611,6 @@ var I3SConverter = function () {
|
|
|
727
611
|
} finally {
|
|
728
612
|
_iterator.f();
|
|
729
613
|
}
|
|
730
|
-
|
|
731
614
|
case 7:
|
|
732
615
|
case "end":
|
|
733
616
|
return _context9.stop();
|
|
@@ -735,11 +618,9 @@ var I3SConverter = function () {
|
|
|
735
618
|
}
|
|
736
619
|
}, _callee9, this);
|
|
737
620
|
}));
|
|
738
|
-
|
|
739
|
-
function convertNode(_x14) {
|
|
621
|
+
function convertNode(_x15) {
|
|
740
622
|
return _convertNode.apply(this, arguments);
|
|
741
623
|
}
|
|
742
|
-
|
|
743
624
|
return convertNode;
|
|
744
625
|
}()
|
|
745
626
|
}, {
|
|
@@ -747,35 +628,27 @@ var I3SConverter = function () {
|
|
|
747
628
|
value: function () {
|
|
748
629
|
var _addChildren2 = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee10(data) {
|
|
749
630
|
var childNodes, sourceTiles, parentNode, parentId, level, promises, _iterator2, _step2, sourceTile;
|
|
750
|
-
|
|
751
631
|
return _regenerator.default.wrap(function _callee10$(_context10) {
|
|
752
632
|
while (1) {
|
|
753
633
|
switch (_context10.prev = _context10.next) {
|
|
754
634
|
case 0:
|
|
755
635
|
childNodes = data.childNodes, sourceTiles = data.sourceTiles, parentNode = data.parentNode, parentId = data.parentId, level = data.level;
|
|
756
|
-
|
|
757
636
|
if (!(this.options.maxDepth && level > this.options.maxDepth)) {
|
|
758
637
|
_context10.next = 3;
|
|
759
638
|
break;
|
|
760
639
|
}
|
|
761
|
-
|
|
762
640
|
return _context10.abrupt("return");
|
|
763
|
-
|
|
764
641
|
case 3:
|
|
765
642
|
promises = [];
|
|
766
643
|
_iterator2 = _createForOfIteratorHelper(sourceTiles);
|
|
767
644
|
_context10.prev = 5;
|
|
768
|
-
|
|
769
645
|
_iterator2.s();
|
|
770
|
-
|
|
771
646
|
case 7:
|
|
772
647
|
if ((_step2 = _iterator2.n()).done) {
|
|
773
648
|
_context10.next = 15;
|
|
774
649
|
break;
|
|
775
650
|
}
|
|
776
|
-
|
|
777
651
|
sourceTile = _step2.value;
|
|
778
|
-
|
|
779
652
|
if (sourceTile.type === 'json') {
|
|
780
653
|
promises.push(this.convertNestedTileset({
|
|
781
654
|
sourceTile: sourceTile,
|
|
@@ -793,36 +666,26 @@ var I3SConverter = function () {
|
|
|
793
666
|
level: level
|
|
794
667
|
}));
|
|
795
668
|
}
|
|
796
|
-
|
|
797
669
|
_context10.next = 12;
|
|
798
670
|
return Promise.all(promises);
|
|
799
|
-
|
|
800
671
|
case 12:
|
|
801
672
|
if (sourceTile.id) {
|
|
802
673
|
console.log(sourceTile.id);
|
|
803
674
|
}
|
|
804
|
-
|
|
805
675
|
case 13:
|
|
806
676
|
_context10.next = 7;
|
|
807
677
|
break;
|
|
808
|
-
|
|
809
678
|
case 15:
|
|
810
679
|
_context10.next = 20;
|
|
811
680
|
break;
|
|
812
|
-
|
|
813
681
|
case 17:
|
|
814
682
|
_context10.prev = 17;
|
|
815
683
|
_context10.t0 = _context10["catch"](5);
|
|
816
|
-
|
|
817
684
|
_iterator2.e(_context10.t0);
|
|
818
|
-
|
|
819
685
|
case 20:
|
|
820
686
|
_context10.prev = 20;
|
|
821
|
-
|
|
822
687
|
_iterator2.f();
|
|
823
|
-
|
|
824
688
|
return _context10.finish(20);
|
|
825
|
-
|
|
826
689
|
case 23:
|
|
827
690
|
case "end":
|
|
828
691
|
return _context10.stop();
|
|
@@ -830,11 +693,9 @@ var I3SConverter = function () {
|
|
|
830
693
|
}
|
|
831
694
|
}, _callee10, this, [[5, 17, 20, 23]]);
|
|
832
695
|
}));
|
|
833
|
-
|
|
834
|
-
function _addChildren(_x15) {
|
|
696
|
+
function _addChildren(_x16) {
|
|
835
697
|
return _addChildren2.apply(this, arguments);
|
|
836
698
|
}
|
|
837
|
-
|
|
838
699
|
return _addChildren;
|
|
839
700
|
}()
|
|
840
701
|
}, {
|
|
@@ -842,22 +703,18 @@ var I3SConverter = function () {
|
|
|
842
703
|
value: function () {
|
|
843
704
|
var _addNeighborsAndWriteFile2 = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee11(parentNode, childNodes) {
|
|
844
705
|
var _iterator3, _step3, _parentNode$children, node, childPath, nodePath, _iterator4, _step4, neighbor;
|
|
845
|
-
|
|
846
706
|
return _regenerator.default.wrap(function _callee11$(_context11) {
|
|
847
707
|
while (1) {
|
|
848
708
|
switch (_context11.prev = _context11.next) {
|
|
849
709
|
case 0:
|
|
850
710
|
_iterator3 = _createForOfIteratorHelper(childNodes);
|
|
851
711
|
_context11.prev = 1;
|
|
852
|
-
|
|
853
712
|
_iterator3.s();
|
|
854
|
-
|
|
855
713
|
case 3:
|
|
856
714
|
if ((_step3 = _iterator3.n()).done) {
|
|
857
715
|
_context11.next = 36;
|
|
858
716
|
break;
|
|
859
717
|
}
|
|
860
|
-
|
|
861
718
|
node = _step3.value;
|
|
862
719
|
childPath = (0, _path.join)(this.layers0Path, 'nodes', node.path);
|
|
863
720
|
nodePath = node.path;
|
|
@@ -867,89 +724,63 @@ var I3SConverter = function () {
|
|
|
867
724
|
_context11.next = 29;
|
|
868
725
|
break;
|
|
869
726
|
}
|
|
870
|
-
|
|
871
727
|
_iterator4 = _createForOfIteratorHelper(parentNode.children || []);
|
|
872
728
|
_context11.prev = 10;
|
|
873
|
-
|
|
874
729
|
_iterator4.s();
|
|
875
|
-
|
|
876
730
|
case 12:
|
|
877
731
|
if ((_step4 = _iterator4.n()).done) {
|
|
878
732
|
_context11.next = 19;
|
|
879
733
|
break;
|
|
880
734
|
}
|
|
881
|
-
|
|
882
735
|
neighbor = _step4.value;
|
|
883
|
-
|
|
884
736
|
if (!(node.id === neighbor.id)) {
|
|
885
737
|
_context11.next = 16;
|
|
886
738
|
break;
|
|
887
739
|
}
|
|
888
|
-
|
|
889
740
|
return _context11.abrupt("continue", 17);
|
|
890
|
-
|
|
891
741
|
case 16:
|
|
892
742
|
if (node.neighbors) {
|
|
893
743
|
node.neighbors.push(_objectSpread({}, neighbor));
|
|
894
744
|
}
|
|
895
|
-
|
|
896
745
|
case 17:
|
|
897
746
|
_context11.next = 12;
|
|
898
747
|
break;
|
|
899
|
-
|
|
900
748
|
case 19:
|
|
901
749
|
_context11.next = 24;
|
|
902
750
|
break;
|
|
903
|
-
|
|
904
751
|
case 21:
|
|
905
752
|
_context11.prev = 21;
|
|
906
753
|
_context11.t0 = _context11["catch"](10);
|
|
907
|
-
|
|
908
754
|
_iterator4.e(_context11.t0);
|
|
909
|
-
|
|
910
755
|
case 24:
|
|
911
756
|
_context11.prev = 24;
|
|
912
|
-
|
|
913
757
|
_iterator4.f();
|
|
914
|
-
|
|
915
758
|
return _context11.finish(24);
|
|
916
|
-
|
|
917
759
|
case 27:
|
|
918
760
|
_context11.next = 31;
|
|
919
761
|
break;
|
|
920
|
-
|
|
921
762
|
case 29:
|
|
922
763
|
console.warn("Node ".concat(node.id, ": neighbors attribute is omited because of large number of neigbors"));
|
|
923
764
|
delete node.neighbors;
|
|
924
|
-
|
|
925
765
|
case 31:
|
|
926
766
|
_context11.next = 33;
|
|
927
767
|
return this._writeNodeIndexDocument(node, nodePath, childPath);
|
|
928
|
-
|
|
929
768
|
case 33:
|
|
930
769
|
node.neighbors = [];
|
|
931
|
-
|
|
932
770
|
case 34:
|
|
933
771
|
_context11.next = 3;
|
|
934
772
|
break;
|
|
935
|
-
|
|
936
773
|
case 36:
|
|
937
774
|
_context11.next = 41;
|
|
938
775
|
break;
|
|
939
|
-
|
|
940
776
|
case 38:
|
|
941
777
|
_context11.prev = 38;
|
|
942
778
|
_context11.t1 = _context11["catch"](1);
|
|
943
|
-
|
|
944
779
|
_iterator3.e(_context11.t1);
|
|
945
|
-
|
|
946
780
|
case 41:
|
|
947
781
|
_context11.prev = 41;
|
|
948
|
-
|
|
949
782
|
_iterator3.f();
|
|
950
|
-
|
|
951
783
|
return _context11.finish(41);
|
|
952
|
-
|
|
953
784
|
case 44:
|
|
954
785
|
case "end":
|
|
955
786
|
return _context11.stop();
|
|
@@ -957,11 +788,9 @@ var I3SConverter = function () {
|
|
|
957
788
|
}
|
|
958
789
|
}, _callee11, this, [[1, 38, 41, 44], [10, 21, 24, 27]]);
|
|
959
790
|
}));
|
|
960
|
-
|
|
961
|
-
function _addNeighborsAndWriteFile(_x16, _x17) {
|
|
791
|
+
function _addNeighborsAndWriteFile(_x17, _x18) {
|
|
962
792
|
return _addNeighborsAndWriteFile2.apply(this, arguments);
|
|
963
793
|
}
|
|
964
|
-
|
|
965
794
|
return _addNeighborsAndWriteFile;
|
|
966
795
|
}()
|
|
967
796
|
}, {
|
|
@@ -969,35 +798,25 @@ var I3SConverter = function () {
|
|
|
969
798
|
value: function () {
|
|
970
799
|
var _createNode2 = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee12(parentTile, sourceTile, parentId, level) {
|
|
971
800
|
var _this$layers, _this$layers$attribut;
|
|
972
|
-
|
|
973
801
|
var boundingVolumes, propertyTable, resourcesData, nodes, nodesInPage, emptyResources, _iterator5, _step5, resources, lodSelection, maxScreenThresholdSQ, nodeInPage, node, _console;
|
|
974
|
-
|
|
975
802
|
return _regenerator.default.wrap(function _callee12$(_context12) {
|
|
976
803
|
while (1) {
|
|
977
804
|
switch (_context12.prev = _context12.next) {
|
|
978
805
|
case 0:
|
|
979
|
-
|
|
980
|
-
this._checkAddRefinementTypeForTile(sourceTile);
|
|
981
|
-
}
|
|
982
|
-
|
|
806
|
+
this._checkAddRefinementTypeForTile(sourceTile);
|
|
983
807
|
_context12.next = 3;
|
|
984
808
|
return this._updateTilesetOptions();
|
|
985
|
-
|
|
986
809
|
case 3:
|
|
987
810
|
_context12.next = 5;
|
|
988
811
|
return this.sourceTileset._loadTile(sourceTile);
|
|
989
|
-
|
|
990
812
|
case 5:
|
|
991
813
|
boundingVolumes = (0, _coordinateConverter.createBoundingVolumes)(sourceTile, this.geoidHeightModel);
|
|
992
814
|
propertyTable = (0, _geometryConverter.getPropertyTable)(sourceTile.content);
|
|
993
|
-
|
|
994
815
|
if (propertyTable && !((_this$layers = this.layers0) !== null && _this$layers !== void 0 && (_this$layers$attribut = _this$layers.attributeStorageInfo) !== null && _this$layers$attribut !== void 0 && _this$layers$attribut.length)) {
|
|
995
816
|
this._convertPropertyTableToNodeAttributes(propertyTable);
|
|
996
817
|
}
|
|
997
|
-
|
|
998
818
|
_context12.next = 10;
|
|
999
819
|
return this._convertResources(sourceTile, parentId, propertyTable);
|
|
1000
|
-
|
|
1001
820
|
case 10:
|
|
1002
821
|
resourcesData = _context12.sent;
|
|
1003
822
|
nodes = [];
|
|
@@ -1015,22 +834,17 @@ var I3SConverter = function () {
|
|
|
1015
834
|
};
|
|
1016
835
|
_iterator5 = _createForOfIteratorHelper(resourcesData || [emptyResources]);
|
|
1017
836
|
_context12.prev = 15;
|
|
1018
|
-
|
|
1019
837
|
_iterator5.s();
|
|
1020
|
-
|
|
1021
838
|
case 17:
|
|
1022
839
|
if ((_step5 = _iterator5.n()).done) {
|
|
1023
840
|
_context12.next = 33;
|
|
1024
841
|
break;
|
|
1025
842
|
}
|
|
1026
|
-
|
|
1027
843
|
resources = _step5.value;
|
|
1028
844
|
this.layersHasTexture = this.layersHasTexture || Boolean(resources.texture);
|
|
1029
|
-
|
|
1030
845
|
if (this.generateBoundingVolumes && resources.boundingVolumes) {
|
|
1031
846
|
boundingVolumes = resources.boundingVolumes;
|
|
1032
847
|
}
|
|
1033
|
-
|
|
1034
848
|
lodSelection = (0, _lodConversionUtils.convertGeometricErrorToScreenThreshold)(sourceTile, boundingVolumes);
|
|
1035
849
|
maxScreenThresholdSQ = lodSelection.find(function (val) {
|
|
1036
850
|
return val.metricType === 'maxScreenThresholdSQ';
|
|
@@ -1039,19 +853,15 @@ var I3SConverter = function () {
|
|
|
1039
853
|
};
|
|
1040
854
|
nodeInPage = this._updateNodeInNodePages(maxScreenThresholdSQ, boundingVolumes, sourceTile, parentId, resources);
|
|
1041
855
|
node = this._createNodeIndexDocument(parentTile, boundingVolumes, lodSelection, nodeInPage, resources);
|
|
1042
|
-
|
|
1043
856
|
if (!nodeInPage.mesh) {
|
|
1044
857
|
_context12.next = 28;
|
|
1045
858
|
break;
|
|
1046
859
|
}
|
|
1047
|
-
|
|
1048
860
|
_context12.next = 28;
|
|
1049
861
|
return this._writeResources(resources, node.path);
|
|
1050
|
-
|
|
1051
862
|
case 28:
|
|
1052
863
|
if (this.validate) {
|
|
1053
864
|
this.boundingVolumeWarnings = (0, _nodeDebug.validateNodeBoundingVolumes)(node);
|
|
1054
|
-
|
|
1055
865
|
if (this.boundingVolumeWarnings && this.boundingVolumeWarnings.length) {
|
|
1056
866
|
(_console = console).warn.apply(_console, ['Bounding Volume Warnings: '].concat((0, _toConsumableArray2.default)(this.boundingVolumeWarnings)));
|
|
1057
867
|
}
|
|
@@ -1059,28 +869,20 @@ var I3SConverter = function () {
|
|
|
1059
869
|
|
|
1060
870
|
nodes.push(node);
|
|
1061
871
|
nodesInPage.push(nodeInPage);
|
|
1062
|
-
|
|
1063
872
|
case 31:
|
|
1064
873
|
_context12.next = 17;
|
|
1065
874
|
break;
|
|
1066
|
-
|
|
1067
875
|
case 33:
|
|
1068
876
|
_context12.next = 38;
|
|
1069
877
|
break;
|
|
1070
|
-
|
|
1071
878
|
case 35:
|
|
1072
879
|
_context12.prev = 35;
|
|
1073
880
|
_context12.t0 = _context12["catch"](15);
|
|
1074
|
-
|
|
1075
881
|
_iterator5.e(_context12.t0);
|
|
1076
|
-
|
|
1077
882
|
case 38:
|
|
1078
883
|
_context12.prev = 38;
|
|
1079
|
-
|
|
1080
884
|
_iterator5.f();
|
|
1081
|
-
|
|
1082
885
|
return _context12.finish(38);
|
|
1083
|
-
|
|
1084
886
|
case 41:
|
|
1085
887
|
sourceTile.unloadContent();
|
|
1086
888
|
_context12.next = 44;
|
|
@@ -1090,10 +892,8 @@ var I3SConverter = function () {
|
|
|
1090
892
|
parentId: nodesInPage[0].index,
|
|
1091
893
|
level: level + 1
|
|
1092
894
|
});
|
|
1093
|
-
|
|
1094
895
|
case 44:
|
|
1095
896
|
return _context12.abrupt("return", nodes);
|
|
1096
|
-
|
|
1097
897
|
case 45:
|
|
1098
898
|
case "end":
|
|
1099
899
|
return _context12.stop();
|
|
@@ -1101,11 +901,9 @@ var I3SConverter = function () {
|
|
|
1101
901
|
}
|
|
1102
902
|
}, _callee12, this, [[15, 35, 38, 41]]);
|
|
1103
903
|
}));
|
|
1104
|
-
|
|
1105
|
-
function _createNode(_x18, _x19, _x20, _x21) {
|
|
904
|
+
function _createNode(_x19, _x20, _x21, _x22) {
|
|
1106
905
|
return _createNode2.apply(this, arguments);
|
|
1107
906
|
}
|
|
1108
|
-
|
|
1109
907
|
return _createNode;
|
|
1110
908
|
}()
|
|
1111
909
|
}, {
|
|
@@ -1113,8 +911,7 @@ var I3SConverter = function () {
|
|
|
1113
911
|
value: function () {
|
|
1114
912
|
var _convertResources2 = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee13(sourceTile, parentId, propertyTable) {
|
|
1115
913
|
var _this = this,
|
|
1116
|
-
|
|
1117
|
-
|
|
914
|
+
_this$layers2;
|
|
1118
915
|
var draftObb, resourcesData;
|
|
1119
916
|
return _regenerator.default.wrap(function _callee13$(_context13) {
|
|
1120
917
|
while (1) {
|
|
@@ -1124,9 +921,7 @@ var I3SConverter = function () {
|
|
|
1124
921
|
_context13.next = 2;
|
|
1125
922
|
break;
|
|
1126
923
|
}
|
|
1127
|
-
|
|
1128
924
|
return _context13.abrupt("return", null);
|
|
1129
|
-
|
|
1130
925
|
case 2:
|
|
1131
926
|
draftObb = {
|
|
1132
927
|
center: [],
|
|
@@ -1140,11 +935,9 @@ var I3SConverter = function () {
|
|
|
1140
935
|
obb: draftObb
|
|
1141
936
|
}, parentId);
|
|
1142
937
|
}, propertyTable, this.featuresHashArray, (_this$layers2 = this.layers0) === null || _this$layers2 === void 0 ? void 0 : _this$layers2.attributeStorageInfo, this.options.draco, this.generateBoundingVolumes, this.geoidHeightModel, this.workerSource);
|
|
1143
|
-
|
|
1144
938
|
case 5:
|
|
1145
939
|
resourcesData = _context13.sent;
|
|
1146
940
|
return _context13.abrupt("return", resourcesData);
|
|
1147
|
-
|
|
1148
941
|
case 7:
|
|
1149
942
|
case "end":
|
|
1150
943
|
return _context13.stop();
|
|
@@ -1152,28 +945,26 @@ var I3SConverter = function () {
|
|
|
1152
945
|
}
|
|
1153
946
|
}, _callee13, this);
|
|
1154
947
|
}));
|
|
1155
|
-
|
|
1156
|
-
function _convertResources(_x22, _x23, _x24) {
|
|
948
|
+
function _convertResources(_x23, _x24, _x25) {
|
|
1157
949
|
return _convertResources2.apply(this, arguments);
|
|
1158
950
|
}
|
|
1159
|
-
|
|
1160
951
|
return _convertResources;
|
|
1161
952
|
}()
|
|
1162
953
|
}, {
|
|
1163
954
|
key: "_updateNodeInNodePages",
|
|
1164
|
-
value:
|
|
955
|
+
value:
|
|
956
|
+
function _updateNodeInNodePages(maxScreenThresholdSQ, boundingVolumes, sourceTile, parentId, resources) {
|
|
1165
957
|
var meshMaterial = resources.meshMaterial,
|
|
1166
|
-
|
|
1167
|
-
|
|
1168
|
-
|
|
1169
|
-
|
|
958
|
+
texture = resources.texture,
|
|
959
|
+
vertexCount = resources.vertexCount,
|
|
960
|
+
featureCount = resources.featureCount,
|
|
961
|
+
geometry = resources.geometry;
|
|
1170
962
|
var nodeInPage = {
|
|
1171
963
|
index: 0,
|
|
1172
964
|
lodThreshold: maxScreenThresholdSQ.maxError,
|
|
1173
965
|
obb: boundingVolumes.obb,
|
|
1174
966
|
children: []
|
|
1175
967
|
};
|
|
1176
|
-
|
|
1177
968
|
if (geometry && this.isContentSupported(sourceTile)) {
|
|
1178
969
|
nodeInPage.mesh = {
|
|
1179
970
|
geometry: {
|
|
@@ -1188,9 +979,7 @@ var I3SConverter = function () {
|
|
|
1188
979
|
}
|
|
1189
980
|
};
|
|
1190
981
|
}
|
|
1191
|
-
|
|
1192
982
|
var nodeId = resources.nodeId;
|
|
1193
|
-
|
|
1194
983
|
if (nodeId) {
|
|
1195
984
|
this.nodePages.updateAll(nodeId, nodeInPage);
|
|
1196
985
|
var node = this.nodePages.getNodeById(nodeId);
|
|
@@ -1198,36 +987,31 @@ var I3SConverter = function () {
|
|
|
1198
987
|
} else {
|
|
1199
988
|
nodeId = this.nodePages.push(nodeInPage, parentId);
|
|
1200
989
|
}
|
|
1201
|
-
|
|
1202
990
|
if (meshMaterial) {
|
|
1203
991
|
this.nodePages.updateMaterialByNodeId(nodeId, this._findOrCreateMaterial(meshMaterial));
|
|
1204
992
|
}
|
|
1205
|
-
|
|
1206
993
|
if (texture) {
|
|
1207
994
|
var texelCountHint = texture.image.height * texture.image.width;
|
|
1208
995
|
this.nodePages.updateTexelCountHintByNodeId(nodeId, texelCountHint);
|
|
1209
996
|
}
|
|
1210
|
-
|
|
1211
997
|
if (vertexCount) {
|
|
1212
998
|
this.vertexCounter += vertexCount;
|
|
1213
999
|
this.nodePages.updateVertexCountByNodeId(nodeId, vertexCount);
|
|
1214
1000
|
}
|
|
1215
|
-
|
|
1216
1001
|
this.nodePages.updateNodeAttributeByNodeId(nodeId);
|
|
1217
|
-
|
|
1218
1002
|
if (featureCount) {
|
|
1219
1003
|
this.nodePages.updateFeatureCountByNodeId(nodeId, featureCount);
|
|
1220
1004
|
}
|
|
1221
|
-
|
|
1222
1005
|
return this.nodePages.getNodeById(nodeId);
|
|
1223
1006
|
}
|
|
1007
|
+
|
|
1224
1008
|
}, {
|
|
1225
1009
|
key: "_createNodeIndexDocument",
|
|
1226
|
-
value:
|
|
1010
|
+
value:
|
|
1011
|
+
function _createNodeIndexDocument(parentNode, boundingVolumes, lodSelection, nodeInPage, resources) {
|
|
1227
1012
|
var texture = resources.texture,
|
|
1228
|
-
|
|
1013
|
+
attributes = resources.attributes;
|
|
1229
1014
|
var nodeId = nodeInPage.index;
|
|
1230
|
-
|
|
1231
1015
|
var nodeData = _objectSpread(_objectSpread({
|
|
1232
1016
|
version: parentNode.version,
|
|
1233
1017
|
id: nodeId.toString(),
|
|
@@ -1244,19 +1028,15 @@ var I3SConverter = function () {
|
|
|
1244
1028
|
children: [],
|
|
1245
1029
|
neighbors: []
|
|
1246
1030
|
});
|
|
1247
|
-
|
|
1248
1031
|
var node = (0, _jsonMapTransform.default)(nodeData, (0, _node.NODE)());
|
|
1249
|
-
|
|
1250
1032
|
if (nodeInPage.mesh) {
|
|
1251
1033
|
var _this$layers3, _this$layers3$attribu;
|
|
1252
|
-
|
|
1253
1034
|
node.geometryData = [{
|
|
1254
1035
|
href: './geometries/0'
|
|
1255
1036
|
}];
|
|
1256
1037
|
node.sharedResource = {
|
|
1257
1038
|
href: './shared'
|
|
1258
1039
|
};
|
|
1259
|
-
|
|
1260
1040
|
if (texture) {
|
|
1261
1041
|
node.textureData = [{
|
|
1262
1042
|
href: './textures/0'
|
|
@@ -1264,10 +1044,8 @@ var I3SConverter = function () {
|
|
|
1264
1044
|
href: './textures/1'
|
|
1265
1045
|
}];
|
|
1266
1046
|
}
|
|
1267
|
-
|
|
1268
1047
|
if (attributes && attributes.length && (_this$layers3 = this.layers0) !== null && _this$layers3 !== void 0 && (_this$layers3$attribu = _this$layers3.attributeStorageInfo) !== null && _this$layers3$attribu !== void 0 && _this$layers3$attribu.length) {
|
|
1269
1048
|
node.attributeData = [];
|
|
1270
|
-
|
|
1271
1049
|
for (var index = 0; index < attributes.length; index++) {
|
|
1272
1050
|
var folderName = this.layers0.attributeStorageInfo[index].key;
|
|
1273
1051
|
node.attributeData.push({
|
|
@@ -1276,9 +1054,9 @@ var I3SConverter = function () {
|
|
|
1276
1054
|
}
|
|
1277
1055
|
}
|
|
1278
1056
|
}
|
|
1279
|
-
|
|
1280
1057
|
return node;
|
|
1281
1058
|
}
|
|
1059
|
+
|
|
1282
1060
|
}, {
|
|
1283
1061
|
key: "_writeResources",
|
|
1284
1062
|
value: function () {
|
|
@@ -1293,19 +1071,15 @@ var I3SConverter = function () {
|
|
|
1293
1071
|
slpkChildPath = (0, _path.join)('nodes', nodePath);
|
|
1294
1072
|
_context14.next = 5;
|
|
1295
1073
|
return this._writeGeometries(geometryBuffer, compressedGeometry, childPath, slpkChildPath);
|
|
1296
|
-
|
|
1297
1074
|
case 5:
|
|
1298
1075
|
_context14.next = 7;
|
|
1299
1076
|
return this._writeShared(sharedResources, childPath, slpkChildPath, nodePath);
|
|
1300
|
-
|
|
1301
1077
|
case 7:
|
|
1302
1078
|
_context14.next = 9;
|
|
1303
1079
|
return this._writeTexture(texture, childPath, slpkChildPath);
|
|
1304
|
-
|
|
1305
1080
|
case 9:
|
|
1306
1081
|
_context14.next = 11;
|
|
1307
1082
|
return this._writeAttributes(attributes, childPath, slpkChildPath);
|
|
1308
|
-
|
|
1309
1083
|
case 11:
|
|
1310
1084
|
case "end":
|
|
1311
1085
|
return _context14.stop();
|
|
@@ -1313,11 +1087,9 @@ var I3SConverter = function () {
|
|
|
1313
1087
|
}
|
|
1314
1088
|
}, _callee14, this);
|
|
1315
1089
|
}));
|
|
1316
|
-
|
|
1317
|
-
function _writeResources(_x25, _x26) {
|
|
1090
|
+
function _writeResources(_x26, _x27) {
|
|
1318
1091
|
return _writeResources2.apply(this, arguments);
|
|
1319
1092
|
}
|
|
1320
|
-
|
|
1321
1093
|
return _writeResources;
|
|
1322
1094
|
}()
|
|
1323
1095
|
}, {
|
|
@@ -1333,54 +1105,45 @@ var I3SConverter = function () {
|
|
|
1333
1105
|
_context15.next = 6;
|
|
1334
1106
|
break;
|
|
1335
1107
|
}
|
|
1336
|
-
|
|
1337
1108
|
slpkGeometryPath = (0, _path.join)(childPath, 'geometries');
|
|
1338
1109
|
_context15.next = 4;
|
|
1339
1110
|
return this.writeQueue.enqueue({
|
|
1340
1111
|
archiveKey: "".concat(slpkChildPath, "/geometries/0.bin.gz"),
|
|
1341
1112
|
writePromise: (0, _fileUtils.writeFileForSlpk)(slpkGeometryPath, geometryBuffer, '0.bin')
|
|
1342
1113
|
});
|
|
1343
|
-
|
|
1344
1114
|
case 4:
|
|
1345
1115
|
_context15.next = 9;
|
|
1346
1116
|
break;
|
|
1347
|
-
|
|
1348
1117
|
case 6:
|
|
1349
1118
|
geometryPath = (0, _path.join)(childPath, 'geometries/0/');
|
|
1350
1119
|
_context15.next = 9;
|
|
1351
1120
|
return this.writeQueue.enqueue({
|
|
1352
1121
|
writePromise: (0, _fileUtils.writeFile)(geometryPath, geometryBuffer, 'index.bin')
|
|
1353
1122
|
});
|
|
1354
|
-
|
|
1355
1123
|
case 9:
|
|
1356
1124
|
if (!this.options.draco) {
|
|
1357
1125
|
_context15.next = 19;
|
|
1358
1126
|
break;
|
|
1359
1127
|
}
|
|
1360
|
-
|
|
1361
1128
|
if (!this.options.slpk) {
|
|
1362
1129
|
_context15.next = 16;
|
|
1363
1130
|
break;
|
|
1364
1131
|
}
|
|
1365
|
-
|
|
1366
1132
|
slpkCompressedGeometryPath = (0, _path.join)(childPath, 'geometries');
|
|
1367
1133
|
_context15.next = 14;
|
|
1368
1134
|
return this.writeQueue.enqueue({
|
|
1369
1135
|
archiveKey: "".concat(slpkChildPath, "/geometries/1.bin.gz"),
|
|
1370
1136
|
writePromise: (0, _fileUtils.writeFileForSlpk)(slpkCompressedGeometryPath, compressedGeometry, '1.bin')
|
|
1371
1137
|
});
|
|
1372
|
-
|
|
1373
1138
|
case 14:
|
|
1374
1139
|
_context15.next = 19;
|
|
1375
1140
|
break;
|
|
1376
|
-
|
|
1377
1141
|
case 16:
|
|
1378
1142
|
compressedGeometryPath = (0, _path.join)(childPath, 'geometries/1/');
|
|
1379
1143
|
_context15.next = 19;
|
|
1380
1144
|
return this.writeQueue.enqueue({
|
|
1381
1145
|
writePromise: (0, _fileUtils.writeFile)(compressedGeometryPath, compressedGeometry, 'index.bin')
|
|
1382
1146
|
});
|
|
1383
|
-
|
|
1384
1147
|
case 19:
|
|
1385
1148
|
case "end":
|
|
1386
1149
|
return _context15.stop();
|
|
@@ -1388,11 +1151,9 @@ var I3SConverter = function () {
|
|
|
1388
1151
|
}
|
|
1389
1152
|
}, _callee15, this);
|
|
1390
1153
|
}));
|
|
1391
|
-
|
|
1392
|
-
function _writeGeometries(_x27, _x28, _x29, _x30) {
|
|
1154
|
+
function _writeGeometries(_x28, _x29, _x30, _x31) {
|
|
1393
1155
|
return _writeGeometries2.apply(this, arguments);
|
|
1394
1156
|
}
|
|
1395
|
-
|
|
1396
1157
|
return _writeGeometries;
|
|
1397
1158
|
}()
|
|
1398
1159
|
}, {
|
|
@@ -1408,37 +1169,30 @@ var I3SConverter = function () {
|
|
|
1408
1169
|
_context16.next = 2;
|
|
1409
1170
|
break;
|
|
1410
1171
|
}
|
|
1411
|
-
|
|
1412
1172
|
return _context16.abrupt("return");
|
|
1413
|
-
|
|
1414
1173
|
case 2:
|
|
1415
1174
|
sharedResources.nodePath = nodePath;
|
|
1416
1175
|
sharedData = (0, _jsonMapTransform.default)(sharedResources, (0, _sharedResources.SHARED_RESOURCES)());
|
|
1417
1176
|
sharedDataStr = JSON.stringify(sharedData);
|
|
1418
|
-
|
|
1419
1177
|
if (!this.options.slpk) {
|
|
1420
1178
|
_context16.next = 11;
|
|
1421
1179
|
break;
|
|
1422
1180
|
}
|
|
1423
|
-
|
|
1424
1181
|
slpkSharedPath = (0, _path.join)(childPath, 'shared');
|
|
1425
1182
|
_context16.next = 9;
|
|
1426
1183
|
return this.writeQueue.enqueue({
|
|
1427
1184
|
archiveKey: "".concat(slpkChildPath, "/shared/sharedResource.json.gz"),
|
|
1428
1185
|
writePromise: (0, _fileUtils.writeFileForSlpk)(slpkSharedPath, sharedDataStr, 'sharedResource.json')
|
|
1429
1186
|
});
|
|
1430
|
-
|
|
1431
1187
|
case 9:
|
|
1432
1188
|
_context16.next = 14;
|
|
1433
1189
|
break;
|
|
1434
|
-
|
|
1435
1190
|
case 11:
|
|
1436
1191
|
sharedPath = (0, _path.join)(childPath, 'shared/');
|
|
1437
1192
|
_context16.next = 14;
|
|
1438
1193
|
return this.writeQueue.enqueue({
|
|
1439
1194
|
writePromise: (0, _fileUtils.writeFile)(sharedPath, sharedDataStr)
|
|
1440
1195
|
});
|
|
1441
|
-
|
|
1442
1196
|
case 14:
|
|
1443
1197
|
case "end":
|
|
1444
1198
|
return _context16.stop();
|
|
@@ -1446,11 +1200,9 @@ var I3SConverter = function () {
|
|
|
1446
1200
|
}
|
|
1447
1201
|
}, _callee16, this);
|
|
1448
1202
|
}));
|
|
1449
|
-
|
|
1450
|
-
function _writeShared(_x31, _x32, _x33, _x34) {
|
|
1203
|
+
function _writeShared(_x32, _x33, _x34, _x35) {
|
|
1451
1204
|
return _writeShared2.apply(this, arguments);
|
|
1452
1205
|
}
|
|
1453
|
-
|
|
1454
1206
|
return _writeShared;
|
|
1455
1207
|
}()
|
|
1456
1208
|
}, {
|
|
@@ -1466,14 +1218,12 @@ var I3SConverter = function () {
|
|
|
1466
1218
|
_context17.next = 27;
|
|
1467
1219
|
break;
|
|
1468
1220
|
}
|
|
1469
|
-
|
|
1470
1221
|
format = this._getFormatByMimeType(texture === null || texture === void 0 ? void 0 : texture.mimeType);
|
|
1471
1222
|
formats = [];
|
|
1472
1223
|
textureData = texture.bufferView.data;
|
|
1473
1224
|
_context17.t0 = format;
|
|
1474
1225
|
_context17.next = _context17.t0 === 'jpg' ? 7 : _context17.t0 === 'png' ? 7 : _context17.t0 === 'ktx2' ? 18 : 26;
|
|
1475
1226
|
break;
|
|
1476
|
-
|
|
1477
1227
|
case 7:
|
|
1478
1228
|
formats.push({
|
|
1479
1229
|
name: '0',
|
|
@@ -1481,13 +1231,11 @@ var I3SConverter = function () {
|
|
|
1481
1231
|
});
|
|
1482
1232
|
_context17.next = 10;
|
|
1483
1233
|
return this.writeTextureFile(textureData, '0', format, childPath, slpkChildPath);
|
|
1484
|
-
|
|
1485
1234
|
case 10:
|
|
1486
1235
|
if (!this.generateTextures) {
|
|
1487
1236
|
_context17.next = 17;
|
|
1488
1237
|
break;
|
|
1489
1238
|
}
|
|
1490
|
-
|
|
1491
1239
|
formats.push({
|
|
1492
1240
|
name: '1',
|
|
1493
1241
|
format: 'ktx2'
|
|
@@ -1503,10 +1251,8 @@ var I3SConverter = function () {
|
|
|
1503
1251
|
}));
|
|
1504
1252
|
_context17.next = 17;
|
|
1505
1253
|
return this.writeTextureFile(ktx2TextureData, '1', 'ktx2', childPath, slpkChildPath);
|
|
1506
|
-
|
|
1507
1254
|
case 17:
|
|
1508
1255
|
return _context17.abrupt("break", 26);
|
|
1509
|
-
|
|
1510
1256
|
case 18:
|
|
1511
1257
|
formats.push({
|
|
1512
1258
|
name: '1',
|
|
@@ -1514,13 +1260,11 @@ var I3SConverter = function () {
|
|
|
1514
1260
|
});
|
|
1515
1261
|
_context17.next = 21;
|
|
1516
1262
|
return this.writeTextureFile(textureData, '1', format, childPath, slpkChildPath);
|
|
1517
|
-
|
|
1518
1263
|
case 21:
|
|
1519
1264
|
if (!this.generateTextures) {
|
|
1520
1265
|
_context17.next = 26;
|
|
1521
1266
|
break;
|
|
1522
1267
|
}
|
|
1523
|
-
|
|
1524
1268
|
formats.push({
|
|
1525
1269
|
name: '0',
|
|
1526
1270
|
format: 'jpg'
|
|
@@ -1528,14 +1272,12 @@ var I3SConverter = function () {
|
|
|
1528
1272
|
decodedFromKTX2TextureData = (0, _core.encode)(texture.image.data[0], _images.ImageWriter);
|
|
1529
1273
|
_context17.next = 26;
|
|
1530
1274
|
return this.writeTextureFile(decodedFromKTX2TextureData, '0', 'jpg', childPath, slpkChildPath);
|
|
1531
|
-
|
|
1532
1275
|
case 26:
|
|
1533
1276
|
if (!this.layers0.textureSetDefinitions.length) {
|
|
1534
1277
|
this.layers0.textureSetDefinitions.push({
|
|
1535
1278
|
formats: formats
|
|
1536
1279
|
});
|
|
1537
1280
|
}
|
|
1538
|
-
|
|
1539
1281
|
case 27:
|
|
1540
1282
|
case "end":
|
|
1541
1283
|
return _context17.stop();
|
|
@@ -1543,11 +1285,9 @@ var I3SConverter = function () {
|
|
|
1543
1285
|
}
|
|
1544
1286
|
}, _callee17, this);
|
|
1545
1287
|
}));
|
|
1546
|
-
|
|
1547
|
-
function _writeTexture(_x35, _x36, _x37) {
|
|
1288
|
+
function _writeTexture(_x36, _x37, _x38) {
|
|
1548
1289
|
return _writeTexture2.apply(this, arguments);
|
|
1549
1290
|
}
|
|
1550
|
-
|
|
1551
1291
|
return _writeTexture;
|
|
1552
1292
|
}()
|
|
1553
1293
|
}, {
|
|
@@ -1563,7 +1303,6 @@ var I3SConverter = function () {
|
|
|
1563
1303
|
_context18.next = 7;
|
|
1564
1304
|
break;
|
|
1565
1305
|
}
|
|
1566
|
-
|
|
1567
1306
|
slpkTexturePath = (0, _path.join)(childPath, 'textures');
|
|
1568
1307
|
compress = false;
|
|
1569
1308
|
_context18.next = 5;
|
|
@@ -1571,18 +1310,15 @@ var I3SConverter = function () {
|
|
|
1571
1310
|
archiveKey: "".concat(slpkChildPath, "/textures/").concat(name, ".").concat(format),
|
|
1572
1311
|
writePromise: (0, _fileUtils.writeFileForSlpk)(slpkTexturePath, textureData, "".concat(name, ".").concat(format), compress)
|
|
1573
1312
|
});
|
|
1574
|
-
|
|
1575
1313
|
case 5:
|
|
1576
1314
|
_context18.next = 10;
|
|
1577
1315
|
break;
|
|
1578
|
-
|
|
1579
1316
|
case 7:
|
|
1580
1317
|
texturePath = (0, _path.join)(childPath, "textures/".concat(name, "/"));
|
|
1581
1318
|
_context18.next = 10;
|
|
1582
1319
|
return this.writeQueue.enqueue({
|
|
1583
1320
|
writePromise: (0, _fileUtils.writeFile)(texturePath, textureData, "index.".concat(format))
|
|
1584
1321
|
});
|
|
1585
|
-
|
|
1586
1322
|
case 10:
|
|
1587
1323
|
case "end":
|
|
1588
1324
|
return _context18.stop();
|
|
@@ -1590,11 +1326,9 @@ var I3SConverter = function () {
|
|
|
1590
1326
|
}
|
|
1591
1327
|
}, _callee18, this);
|
|
1592
1328
|
}));
|
|
1593
|
-
|
|
1594
|
-
function writeTextureFile(_x38, _x39, _x40, _x41, _x42) {
|
|
1329
|
+
function writeTextureFile(_x39, _x40, _x41, _x42, _x43) {
|
|
1595
1330
|
return _writeTextureFile.apply(this, arguments);
|
|
1596
1331
|
}
|
|
1597
|
-
|
|
1598
1332
|
return writeTextureFile;
|
|
1599
1333
|
}()
|
|
1600
1334
|
}, {
|
|
@@ -1602,16 +1336,15 @@ var I3SConverter = function () {
|
|
|
1602
1336
|
value: function () {
|
|
1603
1337
|
var _writeAttributes2 = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee19() {
|
|
1604
1338
|
var _this$layers4, _this$layers4$attribu;
|
|
1605
|
-
|
|
1606
1339
|
var attributes,
|
|
1607
|
-
|
|
1608
|
-
|
|
1609
|
-
|
|
1610
|
-
|
|
1611
|
-
|
|
1612
|
-
|
|
1613
|
-
|
|
1614
|
-
|
|
1340
|
+
childPath,
|
|
1341
|
+
slpkChildPath,
|
|
1342
|
+
index,
|
|
1343
|
+
folderName,
|
|
1344
|
+
fileBuffer,
|
|
1345
|
+
slpkAttributesPath,
|
|
1346
|
+
attributesPath,
|
|
1347
|
+
_args19 = arguments;
|
|
1615
1348
|
return _regenerator.default.wrap(function _callee19$(_context19) {
|
|
1616
1349
|
while (1) {
|
|
1617
1350
|
switch (_context19.prev = _context19.next) {
|
|
@@ -1619,51 +1352,41 @@ var I3SConverter = function () {
|
|
|
1619
1352
|
attributes = _args19.length > 0 && _args19[0] !== undefined ? _args19[0] : [];
|
|
1620
1353
|
childPath = _args19.length > 1 ? _args19[1] : undefined;
|
|
1621
1354
|
slpkChildPath = _args19.length > 2 ? _args19[2] : undefined;
|
|
1622
|
-
|
|
1623
1355
|
if (!(attributes !== null && attributes !== void 0 && attributes.length && (_this$layers4 = this.layers0) !== null && _this$layers4 !== void 0 && (_this$layers4$attribu = _this$layers4.attributeStorageInfo) !== null && _this$layers4$attribu !== void 0 && _this$layers4$attribu.length)) {
|
|
1624
1356
|
_context19.next = 20;
|
|
1625
1357
|
break;
|
|
1626
1358
|
}
|
|
1627
|
-
|
|
1628
1359
|
index = 0;
|
|
1629
|
-
|
|
1630
1360
|
case 5:
|
|
1631
1361
|
if (!(index < attributes.length)) {
|
|
1632
1362
|
_context19.next = 20;
|
|
1633
1363
|
break;
|
|
1634
1364
|
}
|
|
1635
|
-
|
|
1636
1365
|
folderName = this.layers0.attributeStorageInfo[index].key;
|
|
1637
1366
|
fileBuffer = new Uint8Array(attributes[index]);
|
|
1638
|
-
|
|
1639
1367
|
if (!this.options.slpk) {
|
|
1640
1368
|
_context19.next = 14;
|
|
1641
1369
|
break;
|
|
1642
1370
|
}
|
|
1643
|
-
|
|
1644
1371
|
slpkAttributesPath = (0, _path.join)(childPath, 'attributes', folderName);
|
|
1645
1372
|
_context19.next = 12;
|
|
1646
1373
|
return this.writeQueue.enqueue({
|
|
1647
1374
|
archiveKey: "".concat(slpkChildPath, "/attributes/").concat(folderName, ".bin.gz"),
|
|
1648
1375
|
writePromise: (0, _fileUtils.writeFileForSlpk)(slpkAttributesPath, fileBuffer, '0.bin')
|
|
1649
1376
|
});
|
|
1650
|
-
|
|
1651
1377
|
case 12:
|
|
1652
1378
|
_context19.next = 17;
|
|
1653
1379
|
break;
|
|
1654
|
-
|
|
1655
1380
|
case 14:
|
|
1656
1381
|
attributesPath = (0, _path.join)(childPath, "attributes/".concat(folderName, "/0"));
|
|
1657
1382
|
_context19.next = 17;
|
|
1658
1383
|
return this.writeQueue.enqueue({
|
|
1659
1384
|
writePromise: (0, _fileUtils.writeFile)(attributesPath, fileBuffer, 'index.bin')
|
|
1660
1385
|
});
|
|
1661
|
-
|
|
1662
1386
|
case 17:
|
|
1663
1387
|
index++;
|
|
1664
1388
|
_context19.next = 5;
|
|
1665
1389
|
break;
|
|
1666
|
-
|
|
1667
1390
|
case 20:
|
|
1668
1391
|
case "end":
|
|
1669
1392
|
return _context19.stop();
|
|
@@ -1671,52 +1394,48 @@ var I3SConverter = function () {
|
|
|
1671
1394
|
}
|
|
1672
1395
|
}, _callee19, this);
|
|
1673
1396
|
}));
|
|
1674
|
-
|
|
1675
1397
|
function _writeAttributes() {
|
|
1676
1398
|
return _writeAttributes2.apply(this, arguments);
|
|
1677
1399
|
}
|
|
1678
|
-
|
|
1679
1400
|
return _writeAttributes;
|
|
1680
1401
|
}()
|
|
1681
1402
|
}, {
|
|
1682
1403
|
key: "_getFormatByMimeType",
|
|
1683
|
-
value:
|
|
1404
|
+
value:
|
|
1405
|
+
function _getFormatByMimeType(mimeType) {
|
|
1684
1406
|
switch (mimeType) {
|
|
1685
1407
|
case 'image/jpeg':
|
|
1686
1408
|
return 'jpg';
|
|
1687
|
-
|
|
1688
1409
|
case 'image/png':
|
|
1689
1410
|
return 'png';
|
|
1690
|
-
|
|
1691
1411
|
case 'image/ktx2':
|
|
1692
1412
|
return 'ktx2';
|
|
1693
|
-
|
|
1694
1413
|
default:
|
|
1695
1414
|
return 'jpg';
|
|
1696
1415
|
}
|
|
1697
1416
|
}
|
|
1417
|
+
|
|
1698
1418
|
}, {
|
|
1699
1419
|
key: "_findOrCreateMaterial",
|
|
1700
|
-
value:
|
|
1420
|
+
value:
|
|
1421
|
+
function _findOrCreateMaterial(material) {
|
|
1701
1422
|
var hash = (0, _md.default)(JSON.stringify(material));
|
|
1702
|
-
|
|
1703
1423
|
if (this.materialMap.has(hash)) {
|
|
1704
1424
|
return this.materialMap.get(hash);
|
|
1705
1425
|
}
|
|
1706
|
-
|
|
1707
1426
|
var newMaterialId = this.materialDefinitions.push(material) - 1;
|
|
1708
1427
|
this.materialMap.set(hash, newMaterialId);
|
|
1709
1428
|
return newMaterialId;
|
|
1710
1429
|
}
|
|
1430
|
+
|
|
1711
1431
|
}, {
|
|
1712
1432
|
key: "_convertPropertyTableToNodeAttributes",
|
|
1713
|
-
value:
|
|
1433
|
+
value:
|
|
1434
|
+
function _convertPropertyTableToNodeAttributes(propertyTable) {
|
|
1714
1435
|
var attributeIndex = 0;
|
|
1715
|
-
|
|
1716
1436
|
var propertyTableWithObjectId = _objectSpread({
|
|
1717
1437
|
OBJECTID: [0]
|
|
1718
1438
|
}, propertyTable);
|
|
1719
|
-
|
|
1720
1439
|
for (var _key in propertyTableWithObjectId) {
|
|
1721
1440
|
var firstAttribute = propertyTableWithObjectId[_key][0];
|
|
1722
1441
|
var attributeType = (0, _featureAttributes.getAttributeType)(_key, firstAttribute);
|
|
@@ -1731,12 +1450,12 @@ var I3SConverter = function () {
|
|
|
1731
1450
|
attributeIndex += 1;
|
|
1732
1451
|
}
|
|
1733
1452
|
}
|
|
1453
|
+
|
|
1734
1454
|
}, {
|
|
1735
1455
|
key: "_finishConversion",
|
|
1736
1456
|
value: function () {
|
|
1737
1457
|
var _finishConversion2 = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee20(params) {
|
|
1738
1458
|
var _this$refinementCount, tilesCount, tilesWithAddRefineCount, addRefinementPercentage, filesSize, diff, conversionTime;
|
|
1739
|
-
|
|
1740
1459
|
return _regenerator.default.wrap(function _callee20$(_context20) {
|
|
1741
1460
|
while (1) {
|
|
1742
1461
|
switch (_context20.prev = _context20.next) {
|
|
@@ -1745,7 +1464,6 @@ var I3SConverter = function () {
|
|
|
1745
1464
|
addRefinementPercentage = tilesWithAddRefineCount ? tilesWithAddRefineCount / tilesCount * 100 : 0;
|
|
1746
1465
|
_context20.next = 4;
|
|
1747
1466
|
return (0, _statisticUtills.calculateFilesSize)(params);
|
|
1748
|
-
|
|
1749
1467
|
case 4:
|
|
1750
1468
|
filesSize = _context20.sent;
|
|
1751
1469
|
diff = _process.default.hrtime(this.conversionStartTime);
|
|
@@ -1757,7 +1475,6 @@ var I3SConverter = function () {
|
|
|
1757
1475
|
console.log("File(s) size: ", filesSize, ' bytes');
|
|
1758
1476
|
console.log("Percentage of tiles with \"ADD\" refinement type:", addRefinementPercentage, '%');
|
|
1759
1477
|
console.log("------------------------------------------------");
|
|
1760
|
-
|
|
1761
1478
|
case 14:
|
|
1762
1479
|
case "end":
|
|
1763
1480
|
return _context20.stop();
|
|
@@ -1765,11 +1482,9 @@ var I3SConverter = function () {
|
|
|
1765
1482
|
}
|
|
1766
1483
|
}, _callee20, this);
|
|
1767
1484
|
}));
|
|
1768
|
-
|
|
1769
|
-
function _finishConversion(_x43) {
|
|
1485
|
+
function _finishConversion(_x44) {
|
|
1770
1486
|
return _finishConversion2.apply(this, arguments);
|
|
1771
1487
|
}
|
|
1772
|
-
|
|
1773
1488
|
return _finishConversion;
|
|
1774
1489
|
}()
|
|
1775
1490
|
}, {
|
|
@@ -1785,9 +1500,7 @@ var I3SConverter = function () {
|
|
|
1785
1500
|
_context21.next = 2;
|
|
1786
1501
|
break;
|
|
1787
1502
|
}
|
|
1788
|
-
|
|
1789
1503
|
return _context21.abrupt("return", {});
|
|
1790
|
-
|
|
1791
1504
|
case 2:
|
|
1792
1505
|
options = {
|
|
1793
1506
|
'cesium-ion': {
|
|
@@ -1796,12 +1509,10 @@ var I3SConverter = function () {
|
|
|
1796
1509
|
};
|
|
1797
1510
|
_context21.next = 5;
|
|
1798
1511
|
return this.Loader.preload(this.options.inputUrl, options);
|
|
1799
|
-
|
|
1800
1512
|
case 5:
|
|
1801
1513
|
preloadOptions = _context21.sent;
|
|
1802
1514
|
this.refreshTokenTime = _process.default.hrtime();
|
|
1803
1515
|
return _context21.abrupt("return", _objectSpread(_objectSpread({}, options), preloadOptions));
|
|
1804
|
-
|
|
1805
1516
|
case 8:
|
|
1806
1517
|
case "end":
|
|
1807
1518
|
return _context21.stop();
|
|
@@ -1809,11 +1520,9 @@ var I3SConverter = function () {
|
|
|
1809
1520
|
}
|
|
1810
1521
|
}, _callee21, this);
|
|
1811
1522
|
}));
|
|
1812
|
-
|
|
1813
1523
|
function _fetchPreloadOptions() {
|
|
1814
1524
|
return _fetchPreloadOptions2.apply(this, arguments);
|
|
1815
1525
|
}
|
|
1816
|
-
|
|
1817
1526
|
return _fetchPreloadOptions;
|
|
1818
1527
|
}()
|
|
1819
1528
|
}, {
|
|
@@ -1826,30 +1535,24 @@ var I3SConverter = function () {
|
|
|
1826
1535
|
switch (_context22.prev = _context22.next) {
|
|
1827
1536
|
case 0:
|
|
1828
1537
|
diff = _process.default.hrtime(this.refreshTokenTime);
|
|
1829
|
-
|
|
1830
1538
|
if (!(diff[0] < REFRESH_TOKEN_TIMEOUT)) {
|
|
1831
1539
|
_context22.next = 3;
|
|
1832
1540
|
break;
|
|
1833
1541
|
}
|
|
1834
|
-
|
|
1835
1542
|
return _context22.abrupt("return");
|
|
1836
|
-
|
|
1837
1543
|
case 3:
|
|
1838
1544
|
this.refreshTokenTime = _process.default.hrtime();
|
|
1839
1545
|
_context22.next = 6;
|
|
1840
1546
|
return this._fetchPreloadOptions();
|
|
1841
|
-
|
|
1842
1547
|
case 6:
|
|
1843
1548
|
preloadOptions = _context22.sent;
|
|
1844
1549
|
this.sourceTileset.options = _objectSpread(_objectSpread({}, this.sourceTileset.options), preloadOptions);
|
|
1845
|
-
|
|
1846
1550
|
if (preloadOptions.headers) {
|
|
1847
1551
|
this.sourceTileset.loadOptions.fetch = _objectSpread(_objectSpread({}, this.sourceTileset.loadOptions.fetch), {}, {
|
|
1848
1552
|
headers: preloadOptions.headers
|
|
1849
1553
|
});
|
|
1850
1554
|
console.log('Authorization Bearer token has been updated');
|
|
1851
1555
|
}
|
|
1852
|
-
|
|
1853
1556
|
case 9:
|
|
1854
1557
|
case "end":
|
|
1855
1558
|
return _context22.stop();
|
|
@@ -1857,18 +1560,16 @@ var I3SConverter = function () {
|
|
|
1857
1560
|
}
|
|
1858
1561
|
}, _callee22, this);
|
|
1859
1562
|
}));
|
|
1860
|
-
|
|
1861
1563
|
function _updateTilesetOptions() {
|
|
1862
1564
|
return _updateTilesetOptions2.apply(this, arguments);
|
|
1863
1565
|
}
|
|
1864
|
-
|
|
1865
1566
|
return _updateTilesetOptions;
|
|
1866
1567
|
}()
|
|
1867
1568
|
}, {
|
|
1868
1569
|
key: "_checkAddRefinementTypeForTile",
|
|
1869
|
-
value:
|
|
1570
|
+
value:
|
|
1571
|
+
function _checkAddRefinementTypeForTile(tile) {
|
|
1870
1572
|
var ADD_TILE_REFINEMENT = 1;
|
|
1871
|
-
|
|
1872
1573
|
if (tile.refine === ADD_TILE_REFINEMENT) {
|
|
1873
1574
|
this.refinementCounter.tilesWithAddRefineCount += 1;
|
|
1874
1575
|
console.warn('This tile uses "ADD" type of refinement');
|
|
@@ -1878,9 +1579,9 @@ var I3SConverter = function () {
|
|
|
1878
1579
|
}
|
|
1879
1580
|
}, {
|
|
1880
1581
|
key: "isContentSupported",
|
|
1881
|
-
value:
|
|
1582
|
+
value:
|
|
1583
|
+
function isContentSupported(sourceRootTile) {
|
|
1882
1584
|
var _sourceRootTile$conte;
|
|
1883
|
-
|
|
1884
1585
|
return ['b3dm', 'glTF'].includes(sourceRootTile === null || sourceRootTile === void 0 ? void 0 : (_sourceRootTile$conte = sourceRootTile.content) === null || _sourceRootTile$conte === void 0 ? void 0 : _sourceRootTile$conte.type);
|
|
1885
1586
|
}
|
|
1886
1587
|
}, {
|
|
@@ -1888,65 +1589,52 @@ var I3SConverter = function () {
|
|
|
1888
1589
|
value: function () {
|
|
1889
1590
|
var _loadWorkers = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee23() {
|
|
1890
1591
|
var url, _sourceResponse, _source, _url, _sourceResponse2, _source2, i3sAttributesWorkerUrl, sourceResponse, source;
|
|
1891
|
-
|
|
1892
1592
|
return _regenerator.default.wrap(function _callee23$(_context23) {
|
|
1893
1593
|
while (1) {
|
|
1894
1594
|
switch (_context23.prev = _context23.next) {
|
|
1895
1595
|
case 0:
|
|
1896
1596
|
console.log("Loading workers source...");
|
|
1897
|
-
|
|
1898
1597
|
if (!this.options.draco) {
|
|
1899
1598
|
_context23.next = 10;
|
|
1900
1599
|
break;
|
|
1901
1600
|
}
|
|
1902
|
-
|
|
1903
1601
|
url = (0, _workerUtils.getWorkerURL)(_draco.DracoWriterWorker, _objectSpread({}, (0, _core.getLoaderOptions)()));
|
|
1904
1602
|
_context23.next = 5;
|
|
1905
1603
|
return (0, _core.fetchFile)(url);
|
|
1906
|
-
|
|
1907
1604
|
case 5:
|
|
1908
1605
|
_sourceResponse = _context23.sent;
|
|
1909
1606
|
_context23.next = 8;
|
|
1910
1607
|
return _sourceResponse.text();
|
|
1911
|
-
|
|
1912
1608
|
case 8:
|
|
1913
1609
|
_source = _context23.sent;
|
|
1914
1610
|
this.workerSource.draco = _source;
|
|
1915
|
-
|
|
1916
1611
|
case 10:
|
|
1917
1612
|
if (!this.generateTextures) {
|
|
1918
1613
|
_context23.next = 19;
|
|
1919
1614
|
break;
|
|
1920
1615
|
}
|
|
1921
|
-
|
|
1922
1616
|
_url = (0, _workerUtils.getWorkerURL)(_textures.KTX2BasisWriterWorker, _objectSpread({}, (0, _core.getLoaderOptions)()));
|
|
1923
1617
|
_context23.next = 14;
|
|
1924
1618
|
return (0, _core.fetchFile)(_url);
|
|
1925
|
-
|
|
1926
1619
|
case 14:
|
|
1927
1620
|
_sourceResponse2 = _context23.sent;
|
|
1928
1621
|
_context23.next = 17;
|
|
1929
1622
|
return _sourceResponse2.text();
|
|
1930
|
-
|
|
1931
1623
|
case 17:
|
|
1932
1624
|
_source2 = _context23.sent;
|
|
1933
1625
|
this.workerSource.ktx2 = _source2;
|
|
1934
|
-
|
|
1935
1626
|
case 19:
|
|
1936
1627
|
i3sAttributesWorkerUrl = (0, _workerUtils.getWorkerURL)(_i3sAttributesWorker.I3SAttributesWorker, _objectSpread({}, (0, _core.getLoaderOptions)()));
|
|
1937
1628
|
_context23.next = 22;
|
|
1938
1629
|
return (0, _core.fetchFile)(i3sAttributesWorkerUrl);
|
|
1939
|
-
|
|
1940
1630
|
case 22:
|
|
1941
1631
|
sourceResponse = _context23.sent;
|
|
1942
1632
|
_context23.next = 25;
|
|
1943
1633
|
return sourceResponse.text();
|
|
1944
|
-
|
|
1945
1634
|
case 25:
|
|
1946
1635
|
source = _context23.sent;
|
|
1947
1636
|
this.workerSource.I3SAttributes = source;
|
|
1948
1637
|
console.log("Loading workers source completed!");
|
|
1949
|
-
|
|
1950
1638
|
case 28:
|
|
1951
1639
|
case "end":
|
|
1952
1640
|
return _context23.stop();
|
|
@@ -1954,16 +1642,13 @@ var I3SConverter = function () {
|
|
|
1954
1642
|
}
|
|
1955
1643
|
}, _callee23, this);
|
|
1956
1644
|
}));
|
|
1957
|
-
|
|
1958
1645
|
function loadWorkers() {
|
|
1959
1646
|
return _loadWorkers.apply(this, arguments);
|
|
1960
1647
|
}
|
|
1961
|
-
|
|
1962
1648
|
return loadWorkers;
|
|
1963
1649
|
}()
|
|
1964
1650
|
}]);
|
|
1965
1651
|
return I3SConverter;
|
|
1966
1652
|
}();
|
|
1967
|
-
|
|
1968
1653
|
exports.default = I3SConverter;
|
|
1969
1654
|
//# sourceMappingURL=i3s-converter.js.map
|