redhotmagma-visualization 1.43.2 → 1.44.0

package/Utils/alignToElement.js

@@ -1,9 +1,13 @@
 "use strict";
 
+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); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getRectCenter = exports.alignToElement = void 0;
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 var getRectCenter = exports.getRectCenter = function getRectCenter(_ref) {
   var width = _ref.width,
     height = _ref.height,
@@ -22,26 +26,47 @@ var getRectCenter = exports.getRectCenter = function getRectCenter(_ref) {
  * @param {ThreeBase} visualization
  * @param {Element} element
  */
-var alignToElement = exports.alignToElement = function alignToElement(visualization, element) {
-  var canvas = visualization.renderer && visualization.renderer.domElement;
-  if (visualization && visualization.camera) {
-    if (!element) {
-      visualization.camera.clearViewOffset();
-      return;
-    } else if (!canvas) {
-      return;
-    }
-    var containerRect = canvas.getBoundingClientRect();
-    var width = containerRect.width,
-      height = containerRect.height;
-    var _getRectCenter = getRectCenter(containerRect),
-      cx = _getRectCenter.x,
-      cy = _getRectCenter.y;
-    var _getRectCenter2 = getRectCenter(element.getBoundingClientRect()),
-      tx = _getRectCenter2.x,
-      ty = _getRectCenter2.y;
-    var dx = cx - tx;
-    var dy = cy - ty;
-    visualization.camera.setViewOffset(width, height, dx, dy, width, height);
-  }
-};
+var alignToElement = exports.alignToElement = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(visualization, element) {
+    var canvas, containerRect, width, height, _getRectCenter, cx, cy, _getRectCenter2, tx, ty, dx, dy;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.next = 2;
+          return visualization.getScreenshotsReady();
+        case 2:
+          canvas = visualization.renderer && visualization.renderer.domElement;
+          if (!(visualization && visualization.camera)) {
+            _context.next = 18;
+            break;
+          }
+          if (element) {
+            _context.next = 9;
+            break;
+          }
+          visualization.camera.clearViewOffset();
+          return _context.abrupt("return");
+        case 9:
+          if (canvas) {
+            _context.next = 11;
+            break;
+          }
+          return _context.abrupt("return");
+        case 11:
+          containerRect = canvas.getBoundingClientRect();
+          width = containerRect.width, height = containerRect.height;
+          _getRectCenter = getRectCenter(containerRect), cx = _getRectCenter.x, cy = _getRectCenter.y;
+          _getRectCenter2 = getRectCenter(element.getBoundingClientRect()), tx = _getRectCenter2.x, ty = _getRectCenter2.y;
+          dx = cx - tx;
+          dy = cy - ty;
+          visualization.camera.setViewOffset(width, height, dx, dy, width, height);
+        case 18:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function alignToElement(_x, _x2) {
+    return _ref2.apply(this, arguments);
+  };
+}();

package/VisualizationInterface.js

@@ -27,6 +27,7 @@ var VisualizationInterface = exports.VisualizationInterface = /*#__PURE__*/funct
     _defineProperty(this, "_materialVariantPath", "");
     _defineProperty(this, "_isInitialized", false);
     _defineProperty(this, "_screenshottingInProgress", false);
+    _defineProperty(this, "_screenshotPromise", null);
     _defineProperty(this, "observable", new _Observable["default"](this));
     _defineProperty(this, "dispatchErrorEvent", function (data) {
       _this.observable.dispatch(_Constants.EventTypes.Error, data);
@@ -250,6 +251,44 @@ var VisualizationInterface = exports.VisualizationInterface = /*#__PURE__*/funct
       }
       return getScreenshots;
     }()
+  }, {
+    key: "getScreenshotsSync",
+    value: function () {
+      var _getScreenshotsSync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+        var _args2 = arguments;
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              _context2.prev = 0;
+              _context2.next = 3;
+              return this._screenshotPromise;
+            case 3:
+              _context2.next = 7;
+              break;
+            case 5:
+              _context2.prev = 5;
+              _context2.t0 = _context2["catch"](0);
+            case 7:
+              this._screenshotPromise = this.getScreenshots.apply(this, _args2);
+              _context2.next = 10;
+              return this._screenshotPromise;
+            case 10:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this, [[0, 5]]);
+      }));
+      function getScreenshotsSync() {
+        return _getScreenshotsSync.apply(this, arguments);
+      }
+      return getScreenshotsSync;
+    }()
+  }, {
+    key: "getScreenshotsReady",
+    value: function getScreenshotsReady() {
+      return this._screenshotPromise;
+    }
+
     /**
      * This function has to be called when the visualization instance is not needed any longer
      * The implementation has to free all the allocated resources including the removal of the element appended

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "redhotmagma-visualization",
-  "version": "1.43.2",
+  "version": "1.44.0",
   "license": "UNLICENSED",
   "private": false,
   "main": "./index.js",
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
-    "@configuratorware/scripts": "1.43.2",
+    "@configuratorware/scripts": "1.44.0",
     "@tweenjs/tween.js": "^17.6.0",
     "console-polyfill": "^0.3.0",
     "css-element-queries": "^1.2.3",

package/src/DevApp.js

@@ -299,6 +299,39 @@ const modelData = {
         },
       },
     },
+    SingleParamsMultipleMaterial: {
+      designAreaList: [],
+      configuration: {
+        visualizationData: {
+          sceneData: [
+            {
+              model: "models/3d/Chair/corido_chair.gltf",
+            },
+            {
+              params: {
+                materials: [
+                  {
+                    params: {
+                      materialName: "stand Anthrazit",
+                      color: "#AA0000",
+                    },
+                  },
+                  {
+                    params: {
+                      materialName: "Korb",
+                      map: "rhm.jpg",
+                    },
+                  },
+                ],
+              },
+              files: {
+                "rhm.jpg": "models/3d/Chair/rhm.jpg",
+              },
+            },
+          ],
+        },
+      },
+    },
   },
 };
 

package/src/Three/Three2D.js

@@ -180,7 +180,8 @@ export class Three2D extends ThreeBase {
     this._fitSize = sizeObj;
   }
 
-  setCameraPositionToCurrentDesignArea({ animate, duration } = { animate: false, duration: {} }) {
+  async setCameraPositionToCurrentDesignArea({ animate, duration } = { animate: false, duration: {} }) {
+    await this.getScreenshotsReady();
     const designArea = this._currentDesignArea || first(this._designAreaList);
 
     const obj = designArea && this.findAreaObjectByName(designArea.identifier);

package/src/Three/Three3DScene.js

@@ -466,77 +466,9 @@ export class Three3DScene extends Three3D {
     });
   }
 
-  async applyCustomizations(model, item, imageLoader, options = {}) {
-    const { saveAndRestore = true } = options;
-
-    const { params } = item;
-    if (params) {
-      Object.keys(params).forEach(p => {
-        // skip not allowed props
-        if (allowedObjectProps.indexOf(p) === -1) {
-          return;
-        }
-        // restore original value first
-        if (params[p] === UNSET) {
-          if (model.originalValues && model.originalValues[p]) {
-            model[p].copy(model.originalValues[p]);
-          }
-          return;
-        }
-        // store original value for later restoration
-        if (!model.originalValues) {
-          model.originalValues = {};
-        }
-        if (!model.originalValues[p]) {
-          model.originalValues[p] = model[p] ? model[p].clone() : model[p];
-        }
-        // apply the param values
-        switch (p) {
-          case "scale": {
-            const { x = 1, y = 1, z = 1 } = params[p];
-            model[p].set(x, y, z);
-            break;
-          }
-          case "rotation":
-          case "position": {
-            const { x = 0, y = 0, z = 0 } = params[p];
-            model[p].set(x, y, z);
-            break;
-          }
-        }
-      });
-    }
-
-    // store & restore original material and textures before applying new param values
-    saveAndRestore &&
-      Object.values(getMaterials(model)).map(mat => {
-        if (!mat.original) {
-          mat.original = mat.clone();
-          Object.values(mat)
-            .filter(value => value && value.isTexture)
-            .forEach(texture => {
-              if (!texture.original) {
-                texture.original = texture.clone();
-              }
-            });
-        } else {
-          mat.copy(mat.original);
-          Object.keys(mat).forEach(key => {
-            const value = mat[key];
-            if (value && value.original) {
-              value.copy(value.original);
-            }
-          });
-          mat.needsUpdate = true;
-        }
-      });
-
-    // set new material params if provided
-    // the material object should be located under item.params.material
-    // item.material is only for backward compatibility
-    const material = (params && params.material) || item.material;
-    if (material) {
-      const { params } = material;
+  async applyMaterialParams(model, materialOptions, imageLoader) {
+    if (materialOptions) {
+      const { params } = materialOptions;
       params &&
         (await Promise.all(
           getAllMaterials(model).map(async material => {
@@ -625,6 +557,83 @@ export class Three3DScene extends Three3D {
     }
   }
 
+  async applyCustomizations(model, item, imageLoader, options = {}) {
+    const { saveAndRestore = true } = options;
+
+    const { params } = item;
+    if (params) {
+      Object.keys(params).forEach(p => {
+        // skip not allowed props
+        if (allowedObjectProps.indexOf(p) === -1) {
+          return;
+        }
+        // restore original value first
+        if (params[p] === UNSET) {
+          if (model.originalValues && model.originalValues[p]) {
+            model[p].copy(model.originalValues[p]);
+          }
+          return;
+        }
+        // store original value for later restoration
+        if (!model.originalValues) {
+          model.originalValues = {};
+        }
+        if (!model.originalValues[p]) {
+          model.originalValues[p] = model[p] ? model[p].clone() : model[p];
+        }
+        // apply the param values
+        switch (p) {
+          case "scale": {
+            const { x = 1, y = 1, z = 1 } = params[p];
+            model[p].set(x, y, z);
+            break;
+          }
+          case "rotation":
+          case "position": {
+            const { x = 0, y = 0, z = 0 } = params[p];
+            model[p].set(x, y, z);
+            break;
+          }
+        }
+      });
+    }
+
+    // store & restore original material and textures before applying new param values
+    saveAndRestore &&
+      Object.values(getMaterials(model)).map(mat => {
+        if (!mat.original) {
+          mat.original = mat.clone();
+          Object.values(mat)
+            .filter(value => value && value.isTexture)
+            .forEach(texture => {
+              if (!texture.original) {
+                texture.original = texture.clone();
+              }
+            });
+        } else {
+          mat.copy(mat.original);
+          Object.keys(mat).forEach(key => {
+            const value = mat[key];
+            if (value && value.original) {
+              value.copy(value.original);
+            }
+          });
+          mat.needsUpdate = true;
+        }
+      });
+
+    // set new material params if provided
+    // the material object should be located under item.params.material
+    // item.material is only for backward compatibility
+    const materials = params?.materials || [];
+    const material = params?.material || item.material;
+    const allMaterials = [...materials, material].filter(v => v);
+    allMaterials.length &&
+      (await Promise.all(
+        allMaterials.map(material => this.applyMaterialParams(model, material, imageLoader))
+      ));
+  }
+
   loadSceneContainer(item) {
     let path;
     const itemType = typeof item;
@@ -812,7 +821,7 @@ export class Three3DScene extends Three3D {
     await Promise.all(
       toBeApplied.map(({ params: optionParams, files }) => {
         // find model based on objectName
-        const { objectName, material = {} } = optionParams;
+        const { objectName, material = {}, materials = [] } = optionParams;
         const objects = objectName
           ? findAllObjectsWith(sceneContainer, ({ name }) => name === objectName)
           : sceneContainer.children;
@@ -824,6 +833,10 @@ export class Three3DScene extends Three3D {
               ...material,
               params: params && mapObjectValues(params, files),
             },
+            materials: materials.map(material => ({
+              ...material,
+              params: material.params && mapObjectValues(material.params, files),
+            })),
           },
         };
         return Promise.all(

package/src/Utils/alignToElement.js

@@ -12,7 +12,8 @@ export const getRectCenter = ({ width, height, left, top }) => {
  * @param {ThreeBase} visualization
  * @param {Element} element
  */
-export const alignToElement = (visualization, element) => {
+export const alignToElement = async (visualization, element) => {
+  await visualization.getScreenshotsReady();
   const canvas = visualization.renderer && visualization.renderer.domElement;
   if (visualization && visualization.camera) {
     if (!element) {

package/src/VisualizationInterface.js

@@ -8,6 +8,7 @@ export class VisualizationInterface {
 
   _isInitialized = false;
   _screenshottingInProgress = false;
+  _screenshotPromise = null;
 
   observable = new Observable(this);
 
@@ -198,6 +199,20 @@ export class VisualizationInterface {
     callback && callback(null);
   }
 
+  async getScreenshotsSync(...args) {
+    try {
+      await this._screenshotPromise;
+    } catch {
+      // ignore
+    }
+    this._screenshotPromise = this.getScreenshots(...args);
+    await this._screenshotPromise;
+  }
+
+  getScreenshotsReady() {
+    return this._screenshotPromise;
+  }
+
   /**
    * This function has to be called when the visualization instance is not needed any longer
    * The implementation has to free all the allocated resources including the removal of the element appended