redhotmagma-visualization 1.44.9 → 1.45.0

package/Constants.js

@@ -14,6 +14,7 @@ var EventTypes = exports.EventTypes = {
   LoadStart: "Visualization/LoadStart",
   LoadFinished: "Visualization/LoadFinished",
   LoadError: "Visualization/LoadError",
+  EmptySceneError: "Visualization/EmptySceneError",
   Zoomed: "Visualization/Zoomed",
   HoverIn: "Visualization/HoverIn",
   HoverOut: "Visualization/HoverOut"

package/DevApp.js

@@ -357,6 +357,20 @@ var modelData = {
           }]
         }
       }
+    },
+    BrokenModel: {
+      designAreaList: [],
+      configuration: {
+        visualizationData: {
+          sceneData: [{
+            model: "models/3d/BrokenModel/MissingBuffer.gltf"
+          }, {
+            model: "models/3d/BrokenModel/MissingImages.gltf"
+          }, {
+            model: "models/3d/BrokenModel/WorkingPart.gltf"
+          }]
+        }
+      }
     }
   }
 };

package/Three/Three2D.js

@@ -236,6 +236,7 @@ var Three2D = exports.Three2D = /*#__PURE__*/function (_ThreeBase) {
       });
 
       renderer.setPixelRatio(window.devicePixelRatio ? window.devicePixelRatio : 1);
+      renderer.outputColorSpace = _three.LinearSRGBColorSpace;
       return renderer;
     }
   }, {
@@ -1202,13 +1203,33 @@ var Three2D = exports.Three2D = /*#__PURE__*/function (_ThreeBase) {
   }, {
     key: "getScreenshots",
     value: function () {
-      var _getScreenshots = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(callback, _ref10) {
+      var _getScreenshots = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(callback) {
         var _this9 = this;
-        var designViewList, areaList, variantList, size, removeTempOverlay, origDesignView, designAreaList, variants, screenshots, origVariantPath, origSize, origPixelRatio, restoreOriginalValues, camera, views, _iterator, _step, _loop, _ret;
+        var _ref10,
+          designViewList,
+          areaList,
+          variantList,
+          size,
+          removeTempOverlay,
+          origDesignView,
+          designAreaList,
+          variants,
+          screenshots,
+          origVariantPath,
+          origSize,
+          origPixelRatio,
+          restoreOriginalValues,
+          camera,
+          views,
+          _iterator,
+          _step,
+          _loop,
+          _ret,
+          _args18 = arguments;
         return _regeneratorRuntime().wrap(function _callee16$(_context18) {
           while (1) switch (_context18.prev = _context18.next) {
             case 0:
-              designViewList = _ref10.designViewList, areaList = _ref10.areaList, variantList = _ref10.variantList, size = _ref10.size;
+              _ref10 = _args18.length > 1 && _args18[1] !== undefined ? _args18[1] : {}, designViewList = _ref10.designViewList, areaList = _ref10.areaList, variantList = _ref10.variantList, size = _ref10.size;
               if (this.renderer) {
                 _context18.next = 3;
                 break;
@@ -1428,7 +1449,7 @@ var Three2D = exports.Three2D = /*#__PURE__*/function (_ThreeBase) {
           }
         }, _callee16, this, [[23, 35, 38, 41]]);
       }));
-      function getScreenshots(_x8, _x9) {
+      function getScreenshots(_x8) {
         return _getScreenshots.apply(this, arguments);
       }
       return getScreenshots;

package/Three/Three3D.js

@@ -9,9 +9,6 @@ var _tween = _interopRequireDefault(require("@tweenjs/tween.js"));
 var _first = _interopRequireDefault(require("lodash/first"));
 var _findIndex = _interopRequireDefault(require("lodash/findIndex"));
 var _ThreeBase2 = require("./ThreeBase");
-var _MTLLoader = _interopRequireDefault(require("./Loaders/MTLLoader"));
-var _OBJLoader = _interopRequireDefault(require("./Loaders/OBJLoader"));
-var _ColladaLoader = _interopRequireDefault(require("./Loaders/ColladaLoader"));
 var _initTextureCanvas = require("../Utils/initTextureCanvas");
 var _createCanvas = require("../Utils/createCanvas");
 var _createAlphaMapFromAlphaChannel = require("../Utils/createAlphaMapFromAlphaChannel");
@@ -21,9 +18,12 @@ var _disposeMaterial = require("../Utils/disposeMaterial");
 var _rememberCameraViewOffset = require("../Utils/rememberCameraViewOffset");
 var _restrictCameraMovement = require("../Utils/restrictCameraMovement");
 var _isMobileDevice = require("../Utils/isMobileDevice");
-var _OrbitControls = _interopRequireDefault(require("./Controls/OrbitControls"));
 var _pointerEvent = require("../CommonUtils/pointerEvent");
 var _createTextureBuilder = require("../Utils/TextureBuilder/createTextureBuilder");
+var _OrbitControls = require("three/examples/jsm/controls/OrbitControls");
+var _ColladaLoader = require("three/examples/jsm/loaders/ColladaLoader");
+var _OBJLoader = require("three/examples/jsm/loaders/OBJLoader");
+var _MTLLoader = require("three/examples/jsm/loaders/MTLLoader");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -88,7 +88,7 @@ var Three3D = exports.Three3D = /*#__PURE__*/function (_ThreeBase) {
           var _this$getPathAndFileN = _this.getPathAndFileName(src),
             path = _this$getPathAndFileN.path,
             fileName = _this$getPathAndFileN.fileName;
-          new _MTLLoader["default"](_this._loadingManager).setPath(path).load(fileName, function (materialCreator) {
+          new _MTLLoader.MTLLoader(_this._loadingManager).setPath(path).load(fileName, function (materialCreator) {
             var textureLoadingManager = new _three.LoadingManager(function () {
               // eslint-disable-next-line no-console
               console.log("All textures have been lodaed.");
@@ -176,7 +176,7 @@ var Three3D = exports.Three3D = /*#__PURE__*/function (_ThreeBase) {
 
       // register OrbitControls as the default camera movement handler
 
-      var controls = new _OrbitControls["default"](this.camera, element);
+      var controls = new _OrbitControls.OrbitControls(this.camera, element);
       controls.addEventListener("change", function () {
         if (!_this2._isAnimating) {
           window.cancelAnimationFrame(_this2._renderFrame);
@@ -381,7 +381,7 @@ var Three3D = exports.Three3D = /*#__PURE__*/function (_ThreeBase) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               setDefault = _args4.length > 1 && _args4[1] !== undefined ? _args4[1] : true;
-              loader = new _ColladaLoader["default"](this._loadingManager);
+              loader = new _ColladaLoader.ColladaLoader(this._loadingManager);
               _this$getPathAndFileN2 = this.getPathAndFileName(src), path = _this$getPathAndFileN2.path, fileName = _this$getPathAndFileN2.fileName;
               _context4.next = 5;
               return new Promise(function (resolve, reject) {
@@ -449,7 +449,7 @@ var Three3D = exports.Three3D = /*#__PURE__*/function (_ThreeBase) {
     function loadObject(src) {
       var _this3 = this;
       var addToScene = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-      var objLoader = new _OBJLoader["default"](this._loadingManager);
+      var objLoader = new _OBJLoader.OBJLoader(this._loadingManager);
       var _this$getPathAndFileN3 = this.getPathAndFileName(src),
         path = _this$getPathAndFileN3.path,
         fileName = _this$getPathAndFileN3.fileName;
@@ -805,27 +805,61 @@ var Three3D = exports.Three3D = /*#__PURE__*/function (_ThreeBase) {
   }, {
     key: "getScreenshots",
     value: function () {
-      var _getScreenshots = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(callback, _ref3) {
+      var _getScreenshots = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(callback) {
         var _this5 = this;
-        var viewList, variantList, size, removeTempOverlay, restoreCameraViewOffset, origVariantPath, origPosition, origOrientation, origTarget, origSize, origPixelRatio, restoreOriginalValues, restoreScreenshotSetup, width, height, screenshots, views, viewKeyList, _iterator3, _step3, variant, data, _iterator4, _step4, viewKey, view, position, orientation, target, fov;
+        var _ref3,
+          viewList,
+          variantList,
+          size,
+          removeTempOverlay,
+          restoreCameraViewOffset,
+          origVariantPath,
+          origPosition,
+          origOrientation,
+          origTarget,
+          origSize,
+          origPixelRatio,
+          restoreOriginalValues,
+          restoreScreenshotSetup,
+          width,
+          height,
+          screenshots,
+          views,
+          viewKeyList,
+          _iterator3,
+          _step3,
+          variant,
+          data,
+          _iterator4,
+          _step4,
+          viewKey,
+          view,
+          position,
+          orientation,
+          target,
+          fov,
+          _args9 = arguments;
         return _regeneratorRuntime().wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              viewList = _ref3.viewList, variantList = _ref3.variantList, size = _ref3.size;
+              _ref3 = _args9.length > 1 && _args9[1] !== undefined ? _args9[1] : {}, viewList = _ref3.viewList, variantList = _ref3.variantList, size = _ref3.size;
               if (this.renderer) {
                 _context9.next = 3;
                 break;
               }
               return _context9.abrupt("return", callback({}));
             case 3:
+              if (!variantList) {
+                variantList = ["default"];
+              }
               this._screenshottingInProgress = true;
               this.endAnimation();
-              _context9.next = 7;
+              _context9.next = 8;
               return this.animationRunning();
-            case 7:
-              _context9.next = 9;
+            case 8:
+              _context9.next = 10;
               return this.createTempOverlay();
-            case 9:
+            case 10:
               removeTempOverlay = _context9.sent;
               restoreCameraViewOffset = (0, _rememberCameraViewOffset.rememberCameraViewOffset)(this.camera); // store original state values
               origVariantPath = this._materialVariantPath;
@@ -862,67 +896,69 @@ var Three3D = exports.Three3D = /*#__PURE__*/function (_ThreeBase) {
                   return _ref4.apply(this, arguments);
                 };
               }();
-              _context9.next = 21;
+              _context9.next = 22;
               return this.setupScreenshots();
-            case 21:
+            case 22:
               restoreScreenshotSetup = _context9.sent;
               // get the size from the size param, or use default values
               width = (size === null || size === void 0 ? void 0 : size.width) || 1024;
               height = (size === null || size === void 0 ? void 0 : size.height) || 768;
               screenshots = {};
-              views = this.screenshotViews || this.cameraViews; // if the viewList option is provided, use it as keys instead of the list of all views
-              viewKeyList = viewList instanceof Array && viewList.length > 0 ? viewList : Object.keys(views);
+              views = _objectSpread(_objectSpread({}, this.cameraViews), this.screenshotViews); // if the viewList option is provided, use it as keys instead of the list of all views
+              viewKeyList = viewList instanceof Array && viewList.length > 0 ? viewList.filter(function (viewKey) {
+                return views[viewKey];
+              }) : Object.keys(views);
               _iterator3 = _createForOfIteratorHelper(variantList);
-              _context9.prev = 28;
+              _context9.prev = 29;
               _iterator3.s();
-            case 30:
+            case 31:
               if ((_step3 = _iterator3.n()).done) {
-                _context9.next = 77;
+                _context9.next = 78;
                 break;
               }
               variant = _step3.value;
               if (!this._abortScreenshotting) {
-                _context9.next = 36;
+                _context9.next = 37;
                 break;
               }
-              _context9.next = 35;
+              _context9.next = 36;
               return restoreOriginalValues();
-            case 35:
-              return _context9.abrupt("return", _context9.sent);
             case 36:
+              return _context9.abrupt("return", _context9.sent);
+            case 37:
               data = {};
               this.setMaterialVariantPath(variant);
-              _context9.prev = 38;
-              _context9.next = 41;
+              _context9.prev = 39;
+              _context9.next = 42;
               return this.updateMaterial(this.scene, {
                 screenshot: true
               });
-            case 41:
-              _context9.next = 46;
+            case 42:
+              _context9.next = 47;
               break;
-            case 43:
-              _context9.prev = 43;
-              _context9.t0 = _context9["catch"](38);
-              return _context9.abrupt("continue", 75);
-            case 46:
+            case 44:
+              _context9.prev = 44;
+              _context9.t0 = _context9["catch"](39);
+              return _context9.abrupt("continue", 76);
+            case 47:
               _iterator4 = _createForOfIteratorHelper(viewKeyList);
-              _context9.prev = 47;
+              _context9.prev = 48;
               _iterator4.s();
-            case 49:
+            case 50:
               if ((_step4 = _iterator4.n()).done) {
-                _context9.next = 66;
+                _context9.next = 67;
                 break;
               }
               viewKey = _step4.value;
               if (!this._abortScreenshotting) {
-                _context9.next = 55;
+                _context9.next = 56;
                 break;
               }
-              _context9.next = 54;
+              _context9.next = 55;
               return restoreOriginalValues();
-            case 54:
-              return _context9.abrupt("return", _context9.sent);
             case 55:
+              return _context9.abrupt("return", _context9.sent);
+            case 56:
               view = views[viewKey];
               position = view.position, orientation = view.orientation, target = view.lookat, fov = view.fov; // set the camera to the screenshot size
               this.renderer.setPixelRatio(1);
@@ -932,51 +968,51 @@ var Three3D = exports.Three3D = /*#__PURE__*/function (_ThreeBase) {
               this.setCameraPosition(position, orientation, target, fov);
               this.render();
               data[viewKey] = this.renderer.domElement.toDataURL("image/png");
-            case 64:
-              _context9.next = 49;
+            case 65:
+              _context9.next = 50;
               break;
-            case 66:
-              _context9.next = 71;
+            case 67:
+              _context9.next = 72;
               break;
-            case 68:
-              _context9.prev = 68;
-              _context9.t1 = _context9["catch"](47);
+            case 69:
+              _context9.prev = 69;
+              _context9.t1 = _context9["catch"](48);
               _iterator4.e(_context9.t1);
-            case 71:
-              _context9.prev = 71;
+            case 72:
+              _context9.prev = 72;
               _iterator4.f();
-              return _context9.finish(71);
-            case 74:
-              screenshots[variant] = data;
+              return _context9.finish(72);
             case 75:
-              _context9.next = 30;
+              screenshots[variant] = data;
+            case 76:
+              _context9.next = 31;
               break;
-            case 77:
-              _context9.next = 82;
+            case 78:
+              _context9.next = 83;
               break;
-            case 79:
-              _context9.prev = 79;
-              _context9.t2 = _context9["catch"](28);
+            case 80:
+              _context9.prev = 80;
+              _context9.t2 = _context9["catch"](29);
               _iterator3.e(_context9.t2);
-            case 82:
-              _context9.prev = 82;
+            case 83:
+              _context9.prev = 83;
               _iterator3.f();
-              return _context9.finish(82);
-            case 85:
-              _context9.next = 87;
+              return _context9.finish(83);
+            case 86:
+              _context9.next = 88;
               return restoreScreenshotSetup();
-            case 87:
-              _context9.next = 89;
+            case 88:
+              _context9.next = 90;
               return restoreOriginalValues();
-            case 89:
-              callback(screenshots);
             case 90:
+              callback(screenshots);
+            case 91:
             case "end":
               return _context9.stop();
           }
-        }, _callee9, this, [[28, 79, 82, 85], [38, 43], [47, 68, 71, 74]]);
+        }, _callee9, this, [[29, 80, 83, 86], [39, 44], [48, 69, 72, 75]]);
       }));
-      function getScreenshots(_x5, _x6) {
+      function getScreenshots(_x5) {
         return _getScreenshots.apply(this, arguments);
       }
       return getScreenshots;
@@ -1039,11 +1075,13 @@ var Three3D = exports.Three3D = /*#__PURE__*/function (_ThreeBase) {
               materialName = _args10.length > 3 && _args10[3] !== undefined ? _args10[3] : undefined;
               material = materialName ? this.findMaterialByName(materialName) : (0, _first["default"])(this._customizableMaterials);
               if (!(!material || !material.map || !material.map.image)) {
-                _context10.next = 6;
+                _context10.next = 7;
                 break;
               }
-              throw new Error("Cannot get drawing context for material: ".concat(materialName, "! Is it prepared already?"));
-            case 6:
+              // eslint-disable-next-line no-console
+              console.error("Cannot get drawing context for material: ".concat(materialName, "! Is it prepared already?"));
+              return _context10.abrupt("return");
+            case 7:
               _this$getCanvasContex = this.getCanvasContextForTexture(material.map), ctx = _this$getCanvasContex.ctx, canvas = _this$getCanvasContex.canvas, originalImage = _this$getCanvasContex.originalImage, texture = _this$getCanvasContex.texture;
               scaling = this.calculateTextureScaling(canvas);
               getTextureBuilder = (0, _createTextureBuilder.createTextureBuilder)(originalImage, {
@@ -1055,34 +1093,34 @@ var Three3D = exports.Three3D = /*#__PURE__*/function (_ThreeBase) {
                 ctx.drawImage(originalImage, 0, 0);
               }
               if (!(updateAlpha && material.alphaMap)) {
-                _context10.next = 18;
+                _context10.next = 19;
                 break;
               }
               // create a temporary canvas
               _createWorkingCanvas = (0, _createCanvas.createWorkingCanvas)(canvas), _createWorkingCanvas2 = _slicedToArray(_createWorkingCanvas, 2), tmpCanvas = _createWorkingCanvas2[0], tmpCtx = _createWorkingCanvas2[1]; // do the drawing on a temporary canvas first, so we can get the alpha values
-              _context10.next = 14;
+              _context10.next = 15;
               return drawingFn(tmpCtx, getTextureBuilder);
-            case 14:
+            case 15:
               // copy the temp canvas on the diffuse map
               ctx.drawImage(tmpCanvas, 0, 0);
               this.updateAlphaMap(material.alphaMap, tmpCanvas);
-              _context10.next = 20;
+              _context10.next = 21;
               break;
-            case 18:
-              _context10.next = 20;
+            case 19:
+              _context10.next = 21;
               return drawingFn(ctx, getTextureBuilder);
-            case 20:
+            case 21:
               texture.needsUpdate = true;
               if (!this.isAnimating()) {
                 this.render();
               }
-            case 22:
+            case 23:
             case "end":
               return _context10.stop();
           }
         }, _callee10, this);
       }));
-      function getDrawingContext(_x7) {
+      function getDrawingContext(_x6) {
         return _getDrawingContext.apply(this, arguments);
       }
       return getDrawingContext;