redhotmagma-visualization 1.44.0 → 1.44.1

package/Three/Three3DScene.js

@@ -13,6 +13,7 @@ var _RGBELoader = require("three/examples/jsm/loaders/RGBELoader");
 var _get = _interopRequireDefault(require("lodash/get"));
 var _size = _interopRequireDefault(require("lodash/size"));
 var _isPlainObject = _interopRequireDefault(require("lodash/isPlainObject"));
+var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _glTFExporter = require("./Exporters/glTFExporter");
 var _findIndex = _interopRequireDefault(require("lodash/findIndex"));
 var _merge = _interopRequireDefault(require("lodash/merge"));
@@ -1111,7 +1112,7 @@ var Three3DScene = exports.Three3DScene = /*#__PURE__*/function (_Three3D) {
           var lookat = dir.multiplyScalar(distance).add(position);
           var rotation = new _three.Quaternion();
           camera.getWorldQuaternion(rotation);
-          var orientation = _three.Object3D.DefaultUp.clone().applyQuaternion(rotation);
+          var orientation = _three.Object3D.DefaultUp.clone();
           var fov = camera.fov || 45;
           var cameraView = {
             position: position,
@@ -1187,11 +1188,6 @@ var Three3DScene = exports.Three3DScene = /*#__PURE__*/function (_Three3D) {
         };
       }
       this.screenshotViews = this.calculateRelativeViews(this.relativeScreenshotViews, center, (this.controls.minDistance + this.controls.maxDistance) * 0.5);
-      if (!this._firstCameraInitDone) {
-        this._firstCameraInitDone = true;
-        this.currentCameraView = null;
-        this.jumpToView("default", false);
-      }
     }
   }, {
     key: "initCameraViews",
@@ -1205,8 +1201,18 @@ var Three3DScene = exports.Three3DScene = /*#__PURE__*/function (_Three3D) {
       }
       var box = this.getSceneContainerBox();
       var center = box.getCenter(new _three.Vector3());
+      var currentCameraName = this.currentCameraView;
+      var previousCameraView = this.cameraViews[currentCameraName];
       this.setupRelativeCameras(center);
       this.setupSceneCameras(cameras, center);
+      if (!this._firstCameraInitDone) {
+        this._firstCameraInitDone = true;
+        this.currentCameraView = null;
+        this.jumpToView("default", false);
+      } else if (previousCameraView && this.cameraViews[currentCameraName] && !(0, _isEqual["default"])(previousCameraView, this.cameraViews[currentCameraName])) {
+        this.currentCameraView = null;
+        this.jumpToView(currentCameraName, true);
+      }
     }
   }, {
     key: "jumpToView",

package/package.json

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

package/src/Three/Three3DScene.js

@@ -35,6 +35,7 @@ import { RGBELoader } from "three/examples/jsm/loaders/RGBELoader";
 import get from "lodash/get";
 import size from "lodash/size";
 import isPlainObject from "lodash/isPlainObject";
+import isEqual from "lodash/isEqual";
 import { exportGLTF } from "./Exporters/glTFExporter";
 import findIndex from "lodash/findIndex";
 import merge from "lodash/merge";
@@ -888,7 +889,7 @@ export class Three3DScene extends Three3D {
 
       const rotation = new Quaternion();
       camera.getWorldQuaternion(rotation);
-      const orientation = Object3D.DefaultUp.clone().applyQuaternion(rotation);
+      const orientation = Object3D.DefaultUp.clone();
 
       const fov = camera.fov || 45;
 
@@ -964,12 +965,6 @@ export class Three3DScene extends Three3D {
       center,
       (this.controls.minDistance + this.controls.maxDistance) * 0.5
     );
-
-    if (!this._firstCameraInitDone) {
-      this._firstCameraInitDone = true;
-      this.currentCameraView = null;
-      this.jumpToView("default", false);
-    }
   }
 
   initCameraViews(cameras) {
@@ -983,8 +978,24 @@ export class Three3DScene extends Three3D {
     const box = this.getSceneContainerBox();
     const center = box.getCenter(new Vector3());
 
+    const currentCameraName = this.currentCameraView;
+    const previousCameraView = this.cameraViews[currentCameraName];
+
     this.setupRelativeCameras(center);
     this.setupSceneCameras(cameras, center);
+
+    if (!this._firstCameraInitDone) {
+      this._firstCameraInitDone = true;
+      this.currentCameraView = null;
+      this.jumpToView("default", false);
+    } else if (
+      previousCameraView &&
+      this.cameraViews[currentCameraName] &&
+      !isEqual(previousCameraView, this.cameraViews[currentCameraName])
+    ) {
+      this.currentCameraView = null;
+      this.jumpToView(currentCameraName, true);
+    }
   }
 
   jumpToView(viewName, animate = true, duration = {}) {