redhotmagma-visualization 1.43.4 → 1.44.1

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.
@@ -1,9 +1,13 @@
1
1
  "use strict";
2
2
 
3
+ 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); }
3
4
  Object.defineProperty(exports, "__esModule", {
4
5
  value: true
5
6
  });
6
7
  exports.getRectCenter = exports.alignToElement = void 0;
8
+ 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; }
9
+ 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); } }
10
+ 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); }); }; }
7
11
  var getRectCenter = exports.getRectCenter = function getRectCenter(_ref) {
8
12
  var width = _ref.width,
9
13
  height = _ref.height,
@@ -22,26 +26,47 @@ var getRectCenter = exports.getRectCenter = function getRectCenter(_ref) {
22
26
  * @param {ThreeBase} visualization
23
27
  * @param {Element} element
24
28
  */
25
- var alignToElement = exports.alignToElement = function alignToElement(visualization, element) {
26
- var canvas = visualization.renderer && visualization.renderer.domElement;
27
- if (visualization && visualization.camera) {
28
- if (!element) {
29
- visualization.camera.clearViewOffset();
30
- return;
31
- } else if (!canvas) {
32
- return;
33
- }
34
- var containerRect = canvas.getBoundingClientRect();
35
- var width = containerRect.width,
36
- height = containerRect.height;
37
- var _getRectCenter = getRectCenter(containerRect),
38
- cx = _getRectCenter.x,
39
- cy = _getRectCenter.y;
40
- var _getRectCenter2 = getRectCenter(element.getBoundingClientRect()),
41
- tx = _getRectCenter2.x,
42
- ty = _getRectCenter2.y;
43
- var dx = cx - tx;
44
- var dy = cy - ty;
45
- visualization.camera.setViewOffset(width, height, dx, dy, width, height);
46
- }
47
- };
29
+ var alignToElement = exports.alignToElement = /*#__PURE__*/function () {
30
+ var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(visualization, element) {
31
+ var canvas, containerRect, width, height, _getRectCenter, cx, cy, _getRectCenter2, tx, ty, dx, dy;
32
+ return _regeneratorRuntime().wrap(function _callee$(_context) {
33
+ while (1) switch (_context.prev = _context.next) {
34
+ case 0:
35
+ _context.next = 2;
36
+ return visualization.getScreenshotsReady();
37
+ case 2:
38
+ canvas = visualization.renderer && visualization.renderer.domElement;
39
+ if (!(visualization && visualization.camera)) {
40
+ _context.next = 18;
41
+ break;
42
+ }
43
+ if (element) {
44
+ _context.next = 9;
45
+ break;
46
+ }
47
+ visualization.camera.clearViewOffset();
48
+ return _context.abrupt("return");
49
+ case 9:
50
+ if (canvas) {
51
+ _context.next = 11;
52
+ break;
53
+ }
54
+ return _context.abrupt("return");
55
+ case 11:
56
+ containerRect = canvas.getBoundingClientRect();
57
+ width = containerRect.width, height = containerRect.height;
58
+ _getRectCenter = getRectCenter(containerRect), cx = _getRectCenter.x, cy = _getRectCenter.y;
59
+ _getRectCenter2 = getRectCenter(element.getBoundingClientRect()), tx = _getRectCenter2.x, ty = _getRectCenter2.y;
60
+ dx = cx - tx;
61
+ dy = cy - ty;
62
+ visualization.camera.setViewOffset(width, height, dx, dy, width, height);
63
+ case 18:
64
+ case "end":
65
+ return _context.stop();
66
+ }
67
+ }, _callee);
68
+ }));
69
+ return function alignToElement(_x, _x2) {
70
+ return _ref2.apply(this, arguments);
71
+ };
72
+ }();
@@ -27,6 +27,7 @@ var VisualizationInterface = exports.VisualizationInterface = /*#__PURE__*/funct
27
27
  _defineProperty(this, "_materialVariantPath", "");
28
28
  _defineProperty(this, "_isInitialized", false);
29
29
  _defineProperty(this, "_screenshottingInProgress", false);
30
+ _defineProperty(this, "_screenshotPromise", null);
30
31
  _defineProperty(this, "observable", new _Observable["default"](this));
31
32
  _defineProperty(this, "dispatchErrorEvent", function (data) {
32
33
  _this.observable.dispatch(_Constants.EventTypes.Error, data);
@@ -250,6 +251,44 @@ var VisualizationInterface = exports.VisualizationInterface = /*#__PURE__*/funct
250
251
  }
251
252
  return getScreenshots;
252
253
  }()
254
+ }, {
255
+ key: "getScreenshotsSync",
256
+ value: function () {
257
+ var _getScreenshotsSync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
258
+ var _args2 = arguments;
259
+ return _regeneratorRuntime().wrap(function _callee2$(_context2) {
260
+ while (1) switch (_context2.prev = _context2.next) {
261
+ case 0:
262
+ _context2.prev = 0;
263
+ _context2.next = 3;
264
+ return this._screenshotPromise;
265
+ case 3:
266
+ _context2.next = 7;
267
+ break;
268
+ case 5:
269
+ _context2.prev = 5;
270
+ _context2.t0 = _context2["catch"](0);
271
+ case 7:
272
+ this._screenshotPromise = this.getScreenshots.apply(this, _args2);
273
+ _context2.next = 10;
274
+ return this._screenshotPromise;
275
+ case 10:
276
+ case "end":
277
+ return _context2.stop();
278
+ }
279
+ }, _callee2, this, [[0, 5]]);
280
+ }));
281
+ function getScreenshotsSync() {
282
+ return _getScreenshotsSync.apply(this, arguments);
283
+ }
284
+ return getScreenshotsSync;
285
+ }()
286
+ }, {
287
+ key: "getScreenshotsReady",
288
+ value: function getScreenshotsReady() {
289
+ return this._screenshotPromise;
290
+ }
291
+
253
292
  /**
254
293
  * This function has to be called when the visualization instance is not needed any longer
255
294
  * The implementation has to free all the allocated resources including the removal of the element appended
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "redhotmagma-visualization",
3
- "version": "1.43.4",
3
+ "version": "1.44.1",
4
4
  "license": "UNLICENSED",
5
5
  "private": false,
6
6
  "main": "./index.js",
7
7
  "dependencies": {
8
8
  "@babel/polyfill": "^7.12.1",
9
- "@configuratorware/scripts": "1.43.4",
9
+ "@configuratorware/scripts": "1.44.1",
10
10
  "@tweenjs/tween.js": "^17.6.0",
11
11
  "console-polyfill": "^0.3.0",
12
12
  "css-element-queries": "^1.2.3",
package/src/DevApp.js CHANGED
@@ -299,6 +299,39 @@ const modelData = {
299
299
  },
300
300
  },
301
301
  },
302
+ SingleParamsMultipleMaterial: {
303
+ designAreaList: [],
304
+ configuration: {
305
+ visualizationData: {
306
+ sceneData: [
307
+ {
308
+ model: "models/3d/Chair/corido_chair.gltf",
309
+ },
310
+ {
311
+ params: {
312
+ materials: [
313
+ {
314
+ params: {
315
+ materialName: "stand Anthrazit",
316
+ color: "#AA0000",
317
+ },
318
+ },
319
+ {
320
+ params: {
321
+ materialName: "Korb",
322
+ map: "rhm.jpg",
323
+ },
324
+ },
325
+ ],
326
+ },
327
+ files: {
328
+ "rhm.jpg": "models/3d/Chair/rhm.jpg",
329
+ },
330
+ },
331
+ ],
332
+ },
333
+ },
334
+ },
302
335
  },
303
336
  };
304
337
 
@@ -180,7 +180,8 @@ export class Three2D extends ThreeBase {
180
180
  this._fitSize = sizeObj;
181
181
  }
182
182
 
183
- setCameraPositionToCurrentDesignArea({ animate, duration } = { animate: false, duration: {} }) {
183
+ async setCameraPositionToCurrentDesignArea({ animate, duration } = { animate: false, duration: {} }) {
184
+ await this.getScreenshotsReady();
184
185
  const designArea = this._currentDesignArea || first(this._designAreaList);
185
186
 
186
187
  const obj = designArea && this.findAreaObjectByName(designArea.identifier);
@@ -35,6 +35,7 @@ import { RGBELoader } from "three/examples/jsm/loaders/RGBELoader";
35
35
  import get from "lodash/get";
36
36
  import size from "lodash/size";
37
37
  import isPlainObject from "lodash/isPlainObject";
38
+ import isEqual from "lodash/isEqual";
38
39
  import { exportGLTF } from "./Exporters/glTFExporter";
39
40
  import findIndex from "lodash/findIndex";
40
41
  import merge from "lodash/merge";
@@ -466,77 +467,9 @@ export class Three3DScene extends Three3D {
466
467
  });
467
468
  }
468
469
 
469
- async applyCustomizations(model, item, imageLoader, options = {}) {
470
- const { saveAndRestore = true } = options;
471
-
472
- const { params } = item;
473
- if (params) {
474
- Object.keys(params).forEach(p => {
475
- // skip not allowed props
476
- if (allowedObjectProps.indexOf(p) === -1) {
477
- return;
478
- }
479
- // restore original value first
480
- if (params[p] === UNSET) {
481
- if (model.originalValues && model.originalValues[p]) {
482
- model[p].copy(model.originalValues[p]);
483
- }
484
- return;
485
- }
486
- // store original value for later restoration
487
- if (!model.originalValues) {
488
- model.originalValues = {};
489
- }
490
- if (!model.originalValues[p]) {
491
- model.originalValues[p] = model[p] ? model[p].clone() : model[p];
492
- }
493
- // apply the param values
494
- switch (p) {
495
- case "scale": {
496
- const { x = 1, y = 1, z = 1 } = params[p];
497
- model[p].set(x, y, z);
498
- break;
499
- }
500
- case "rotation":
501
- case "position": {
502
- const { x = 0, y = 0, z = 0 } = params[p];
503
- model[p].set(x, y, z);
504
- break;
505
- }
506
- }
507
- });
508
- }
509
-
510
- // store & restore original material and textures before applying new param values
511
- saveAndRestore &&
512
- Object.values(getMaterials(model)).map(mat => {
513
- if (!mat.original) {
514
- mat.original = mat.clone();
515
- Object.values(mat)
516
- .filter(value => value && value.isTexture)
517
- .forEach(texture => {
518
- if (!texture.original) {
519
- texture.original = texture.clone();
520
- }
521
- });
522
- } else {
523
- mat.copy(mat.original);
524
- Object.keys(mat).forEach(key => {
525
- const value = mat[key];
526
- if (value && value.original) {
527
- value.copy(value.original);
528
- }
529
- });
530
- mat.needsUpdate = true;
531
- }
532
- });
533
-
534
- // set new material params if provided
535
- // the material object should be located under item.params.material
536
- // item.material is only for backward compatibility
537
- const material = (params && params.material) || item.material;
538
- if (material) {
539
- const { params } = material;
470
+ async applyMaterialParams(model, materialOptions, imageLoader) {
471
+ if (materialOptions) {
472
+ const { params } = materialOptions;
540
473
  params &&
541
474
  (await Promise.all(
542
475
  getAllMaterials(model).map(async material => {
@@ -625,6 +558,83 @@ export class Three3DScene extends Three3D {
625
558
  }
626
559
  }
627
560
 
561
+ async applyCustomizations(model, item, imageLoader, options = {}) {
562
+ const { saveAndRestore = true } = options;
563
+
564
+ const { params } = item;
565
+ if (params) {
566
+ Object.keys(params).forEach(p => {
567
+ // skip not allowed props
568
+ if (allowedObjectProps.indexOf(p) === -1) {
569
+ return;
570
+ }
571
+ // restore original value first
572
+ if (params[p] === UNSET) {
573
+ if (model.originalValues && model.originalValues[p]) {
574
+ model[p].copy(model.originalValues[p]);
575
+ }
576
+ return;
577
+ }
578
+ // store original value for later restoration
579
+ if (!model.originalValues) {
580
+ model.originalValues = {};
581
+ }
582
+ if (!model.originalValues[p]) {
583
+ model.originalValues[p] = model[p] ? model[p].clone() : model[p];
584
+ }
585
+ // apply the param values
586
+ switch (p) {
587
+ case "scale": {
588
+ const { x = 1, y = 1, z = 1 } = params[p];
589
+ model[p].set(x, y, z);
590
+ break;
591
+ }
592
+ case "rotation":
593
+ case "position": {
594
+ const { x = 0, y = 0, z = 0 } = params[p];
595
+ model[p].set(x, y, z);
596
+ break;
597
+ }
598
+ }
599
+ });
600
+ }
601
+
602
+ // store & restore original material and textures before applying new param values
603
+ saveAndRestore &&
604
+ Object.values(getMaterials(model)).map(mat => {
605
+ if (!mat.original) {
606
+ mat.original = mat.clone();
607
+ Object.values(mat)
608
+ .filter(value => value && value.isTexture)
609
+ .forEach(texture => {
610
+ if (!texture.original) {
611
+ texture.original = texture.clone();
612
+ }
613
+ });
614
+ } else {
615
+ mat.copy(mat.original);
616
+ Object.keys(mat).forEach(key => {
617
+ const value = mat[key];
618
+ if (value && value.original) {
619
+ value.copy(value.original);
620
+ }
621
+ });
622
+ mat.needsUpdate = true;
623
+ }
624
+ });
625
+
626
+ // set new material params if provided
627
+ // the material object should be located under item.params.material
628
+ // item.material is only for backward compatibility
629
+ const materials = params?.materials || [];
630
+ const material = params?.material || item.material;
631
+ const allMaterials = [...materials, material].filter(v => v);
632
+ allMaterials.length &&
633
+ (await Promise.all(
634
+ allMaterials.map(material => this.applyMaterialParams(model, material, imageLoader))
635
+ ));
636
+ }
637
+
628
638
  loadSceneContainer(item) {
629
639
  let path;
630
640
  const itemType = typeof item;
@@ -812,7 +822,7 @@ export class Three3DScene extends Three3D {
812
822
  await Promise.all(
813
823
  toBeApplied.map(({ params: optionParams, files }) => {
814
824
  // find model based on objectName
815
- const { objectName, material = {} } = optionParams;
825
+ const { objectName, material = {}, materials = [] } = optionParams;
816
826
  const objects = objectName
817
827
  ? findAllObjectsWith(sceneContainer, ({ name }) => name === objectName)
818
828
  : sceneContainer.children;
@@ -824,6 +834,10 @@ export class Three3DScene extends Three3D {
824
834
  ...material,
825
835
  params: params && mapObjectValues(params, files),
826
836
  },
837
+ materials: materials.map(material => ({
838
+ ...material,
839
+ params: material.params && mapObjectValues(material.params, files),
840
+ })),
827
841
  },
828
842
  };
829
843
  return Promise.all(
@@ -875,7 +889,7 @@ export class Three3DScene extends Three3D {
875
889
 
876
890
  const rotation = new Quaternion();
877
891
  camera.getWorldQuaternion(rotation);
878
- const orientation = Object3D.DefaultUp.clone().applyQuaternion(rotation);
892
+ const orientation = Object3D.DefaultUp.clone();
879
893
 
880
894
  const fov = camera.fov || 45;
881
895
 
@@ -951,12 +965,6 @@ export class Three3DScene extends Three3D {
951
965
  center,
952
966
  (this.controls.minDistance + this.controls.maxDistance) * 0.5
953
967
  );
954
-
955
- if (!this._firstCameraInitDone) {
956
- this._firstCameraInitDone = true;
957
- this.currentCameraView = null;
958
- this.jumpToView("default", false);
959
- }
960
968
  }
961
969
 
962
970
  initCameraViews(cameras) {
@@ -970,8 +978,24 @@ export class Three3DScene extends Three3D {
970
978
  const box = this.getSceneContainerBox();
971
979
  const center = box.getCenter(new Vector3());
972
980
 
981
+ const currentCameraName = this.currentCameraView;
982
+ const previousCameraView = this.cameraViews[currentCameraName];
983
+
973
984
  this.setupRelativeCameras(center);
974
985
  this.setupSceneCameras(cameras, center);
986
+
987
+ if (!this._firstCameraInitDone) {
988
+ this._firstCameraInitDone = true;
989
+ this.currentCameraView = null;
990
+ this.jumpToView("default", false);
991
+ } else if (
992
+ previousCameraView &&
993
+ this.cameraViews[currentCameraName] &&
994
+ !isEqual(previousCameraView, this.cameraViews[currentCameraName])
995
+ ) {
996
+ this.currentCameraView = null;
997
+ this.jumpToView(currentCameraName, true);
998
+ }
975
999
  }
976
1000
 
977
1001
  jumpToView(viewName, animate = true, duration = {}) {
@@ -12,7 +12,8 @@ export const getRectCenter = ({ width, height, left, top }) => {
12
12
  * @param {ThreeBase} visualization
13
13
  * @param {Element} element
14
14
  */
15
- export const alignToElement = (visualization, element) => {
15
+ export const alignToElement = async (visualization, element) => {
16
+ await visualization.getScreenshotsReady();
16
17
  const canvas = visualization.renderer && visualization.renderer.domElement;
17
18
  if (visualization && visualization.camera) {
18
19
  if (!element) {
@@ -8,6 +8,7 @@ export class VisualizationInterface {
8
8
 
9
9
  _isInitialized = false;
10
10
  _screenshottingInProgress = false;
11
+ _screenshotPromise = null;
11
12
 
12
13
  observable = new Observable(this);
13
14
 
@@ -198,6 +199,20 @@ export class VisualizationInterface {
198
199
  callback && callback(null);
199
200
  }
200
201
 
202
+ async getScreenshotsSync(...args) {
203
+ try {
204
+ await this._screenshotPromise;
205
+ } catch {
206
+ // ignore
207
+ }
208
+ this._screenshotPromise = this.getScreenshots(...args);
209
+ await this._screenshotPromise;
210
+ }
211
+
212
+ getScreenshotsReady() {
213
+ return this._screenshotPromise;
214
+ }
215
+
201
216
  /**
202
217
  * This function has to be called when the visualization instance is not needed any longer
203
218
  * The implementation has to free all the allocated resources including the removal of the element appended