@loaders.gl/tile-converter 4.0.0-alpha.17 → 4.0.0-alpha.19

package/dist/es5/i3s-converter/i3s-converter.js

@@ -36,7 +36,6 @@ var _textures = require("@loaders.gl/textures");
 var _images = require("@loaders.gl/images");
 var _types = require("./types");
 var _workerUtils = require("@loaders.gl/worker-utils");
-var _draco = require("@loaders.gl/draco");
 var _writeQueue = _interopRequireDefault(require("../lib/utils/write-queue"));
 var _constants = require("../constants");
 var _featureAttributes = require("./helpers/feature-attributes");
@@ -82,6 +81,7 @@ var I3SConverter = function () {
     (0, _defineProperty2.default)(this, "loadOptions", {
       _nodeWorkers: true,
       reuseWorkers: true,
+      useLocalLibraries: true,
       basis: {
         format: 'rgba32',
         workerUrl: './modules/textures/dist/basis-worker-node.js'
@@ -89,7 +89,8 @@ var I3SConverter = function () {
       draco: {
         workerUrl: './modules/draco/dist/draco-worker-node.js'
       },
-      fetch: {}
+      fetch: {},
+      modules: {}
     });
     (0, _defineProperty2.default)(this, "geoidHeightModel", null);
     (0, _defineProperty2.default)(this, "Loader", _dTiles.Tiles3DLoader);
@@ -166,13 +167,10 @@ var I3SConverter = function () {
               if (slpk) {
                 this.nodePages.useWriteFunction(_fileUtils.writeFileForSlpk);
               }
-              _context.next = 21;
-              return this.loadWorkers();
-            case 21:
-              _context.prev = 21;
-              _context.next = 24;
+              _context.prev = 19;
+              _context.next = 22;
               return this._fetchPreloadOptions();
-            case 24:
+            case 22:
               preloadOptions = _context.sent;
               tilesetUrl = inputUrl;
               if (preloadOptions.url) {
@@ -183,49 +181,49 @@ var I3SConverter = function () {
                   headers: preloadOptions.headers
                 };
               }
-              _context.next = 30;
+              _context.next = 28;
               return (0, _core.load)(tilesetUrl, this.Loader, this.loadOptions);
-            case 30:
+            case 28:
               this.sourceTileset = _context.sent;
-              _context.next = 33;
+              _context.next = 31;
               return this.preprocessConversion();
-            case 33:
+            case 31:
               preprocessResult = _context.sent;
               if (!preprocessResult) {
-                _context.next = 39;
+                _context.next = 37;
                 break;
               }
-              _context.next = 37;
+              _context.next = 35;
               return this._createAndSaveTileset(outputPath, tilesetName);
-            case 37:
-              _context.next = 39;
+            case 35:
+              _context.next = 37;
               return this._finishConversion({
                 slpk: Boolean(slpk),
                 outputPath: outputPath,
                 tilesetName: tilesetName
               });
-            case 39:
-              _context.next = 44;
+            case 37:
+              _context.next = 42;
               break;
-            case 41:
-              _context.prev = 41;
-              _context.t0 = _context["catch"](21);
+            case 39:
+              _context.prev = 39;
+              _context.t0 = _context["catch"](19);
               throw _context.t0;
-            case 44:
-              _context.prev = 44;
-              _context.next = 47;
+            case 42:
+              _context.prev = 42;
+              _context.next = 45;
               return this.writeQueue.finalize();
-            case 47:
+            case 45:
               workerFarm = _workerUtils.WorkerFarm.getWorkerFarm({});
               workerFarm.destroy();
-              return _context.finish(44);
-            case 50:
+              return _context.finish(42);
+            case 48:
               return _context.abrupt("return", 'success');
-            case 51:
+            case 49:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[21, 41, 44, 50]]);
+        }, _callee, this, [[19, 39, 42, 48]]);
       }));
       function convert(_x) {
         return _convert.apply(this, arguments);
@@ -856,7 +854,7 @@ var I3SConverter = function () {
                       return _context10.stop();
                   }
                 }, _callee10);
-              })), propertyTable, this.featuresHashArray, (_this$layers2 = this.layers0) === null || _this$layers2 === void 0 ? void 0 : _this$layers2.attributeStorageInfo, this.options.draco, this.generateBoundingVolumes, this.options.mergeMaterials, this.geoidHeightModel, this.workerSource);
+              })), propertyTable, this.featuresHashArray, (_this$layers2 = this.layers0) === null || _this$layers2 === void 0 ? void 0 : _this$layers2.attributeStorageInfo, this.options.draco, this.generateBoundingVolumes, this.options.mergeMaterials, this.geoidHeightModel, this.loadOptions.modules);
             case 5:
               resourcesData = _context11.sent;
               return _context11.abrupt("return", resourcesData);
@@ -1107,7 +1105,7 @@ var I3SConverter = function () {
     key: "_writeTexture",
     value: function () {
       var _writeTexture2 = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee16(texture, childPath, slpkChildPath) {
-        var format, formats, textureData, copyArrayBuffer, arrayToEncode, ktx2TextureData, decodedFromKTX2TextureData;
+        var format, formats, textureData, _objectSpread2, copyArrayBuffer, arrayToEncode, ktx2TextureData, decodedFromKTX2TextureData;
         return _regenerator.default.wrap(function _callee16$(_context16) {
           while (1) switch (_context16.prev = _context16.next) {
             case 0:
@@ -1141,11 +1139,9 @@ var I3SConverter = function () {
               arrayToEncode = new Uint8Array(copyArrayBuffer);
               ktx2TextureData = (0, _core.encode)(_objectSpread(_objectSpread({}, texture.image), {}, {
                 data: arrayToEncode
-              }), _textures.KTX2BasisWriterWorker, _objectSpread(_objectSpread({}, _textures.KTX2BasisWriterWorker.options), {}, {
-                source: this.workerSource.ktx2,
-                reuseWorkers: true,
-                _nodeWorkers: true
-              }));
+              }), _textures.KTX2BasisWriterWorker, _objectSpread(_objectSpread({}, _textures.KTX2BasisWriterWorker.options), {}, (_objectSpread2 = {}, (0, _defineProperty2.default)(_objectSpread2, 'ktx2-basis-writer', {
+                workerUrl: './modules/textures/dist/ktx2-basis-writer-worker-node.js'
+              }), (0, _defineProperty2.default)(_objectSpread2, "reuseWorkers", true), (0, _defineProperty2.default)(_objectSpread2, "_nodeWorkers", true), (0, _defineProperty2.default)(_objectSpread2, "useLocalLibraries", true), _objectSpread2)));
               _context16.next = 17;
               return this.writeTextureFile(ktx2TextureData, '1', 'ktx2', childPath, slpkChildPath);
             case 17:
@@ -1497,57 +1493,6 @@ var I3SConverter = function () {
     value: function isContentSupported(sourceTile) {
       return ['b3dm', 'glTF', 'scenegraph'].includes(sourceTile.type || '');
     }
-  }, {
-    key: "loadWorkers",
-    value: function () {
-      var _loadWorkers = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee22() {
-        var url, sourceResponse, source, _url, _sourceResponse, _source;
-        return _regenerator.default.wrap(function _callee22$(_context23) {
-          while (1) switch (_context23.prev = _context23.next) {
-            case 0:
-              console.log("Loading workers source...");
-              if (!this.options.draco) {
-                _context23.next = 10;
-                break;
-              }
-              url = (0, _workerUtils.getWorkerURL)(_draco.DracoWriterWorker, _objectSpread({}, (0, _core.getLoaderOptions)()));
-              _context23.next = 5;
-              return (0, _core.fetchFile)(url);
-            case 5:
-              sourceResponse = _context23.sent;
-              _context23.next = 8;
-              return sourceResponse.text();
-            case 8:
-              source = _context23.sent;
-              this.workerSource.draco = source;
-            case 10:
-              if (!this.generateTextures) {
-                _context23.next = 19;
-                break;
-              }
-              _url = (0, _workerUtils.getWorkerURL)(_textures.KTX2BasisWriterWorker, _objectSpread({}, (0, _core.getLoaderOptions)()));
-              _context23.next = 14;
-              return (0, _core.fetchFile)(_url);
-            case 14:
-              _sourceResponse = _context23.sent;
-              _context23.next = 17;
-              return _sourceResponse.text();
-            case 17:
-              _source = _context23.sent;
-              this.workerSource.ktx2 = _source;
-            case 19:
-              console.log("Loading workers source completed!");
-            case 20:
-            case "end":
-              return _context23.stop();
-          }
-        }, _callee22, this);
-      }));
-      function loadWorkers() {
-        return _loadWorkers.apply(this, arguments);
-      }
-      return loadWorkers;
-    }()
   }]);
   return I3SConverter;
 }();