redhotmagma-visualization 1.44.0 → 1.44.2

package/Three/Three3DScene.js

@@ -1111,7 +1111,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 +1187,17 @@ 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: "getCameraViewRatio",
+    value: function getCameraViewRatio(view1, view2) {
+      return view2.lookat.distanceTo(view2.position) / view1.lookat.distanceTo(view1.position);
+    }
+  }, {
+    key: "shouldViewChangeTriggerJumpToView",
+    value: function shouldViewChangeTriggerJumpToView(view1, view2) {
+      var tolerance = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0.5;
+      return Math.abs(this.getCameraViewRatio(view1, view2) - 1) > tolerance;
     }
   }, {
     key: "initCameraViews",
@@ -1205,8 +1211,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] && this.shouldViewChangeTriggerJumpToView(previousCameraView, this.cameraViews[currentCameraName])) {
+        this.currentCameraView = null;
+        this.jumpToView(currentCameraName, true);
+      }
     }
   }, {
     key: "jumpToView",
@@ -1348,9 +1364,13 @@ var Three3DScene = exports.Three3DScene = /*#__PURE__*/function (_Three3D) {
       controls.maxDistance = maxDistance;
       camera.near = minDistance * 0.01;
       camera.far = maxDistance * 100;
-      camera.position.copy(camera.position.normalize().multiplyScalar(maxDistance * 0.75));
+      // update current position only if it does not fit into the distance range
+      var currentDistance = sphere.center.distanceTo(camera.position);
+      if (currentDistance < minDistance || currentDistance > maxDistance) {
+        camera.position.copy(camera.position.normalize().multiplyScalar(maxDistance * 0.75));
+        controls.target = sphere.center;
+      }
       camera.updateProjectionMatrix();
-      controls.target = sphere.center;
       controls.update();
     }
   }, {

package/package.json

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

package/src/Three/Three3DScene.js

@@ -888,7 +888,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 +964,14 @@ 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);
-    }
+  getCameraViewRatio(view1, view2) {
+    return view2.lookat.distanceTo(view2.position) / view1.lookat.distanceTo(view1.position);
+  }
+
+  shouldViewChangeTriggerJumpToView(view1, view2, tolerance = 0.5) {
+    return Math.abs(this.getCameraViewRatio(view1, view2) - 1) > tolerance;
   }
 
   initCameraViews(cameras) {
@@ -983,8 +985,27 @@ 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] &&
+      this.shouldViewChangeTriggerJumpToView(
+        previousCameraView,
+        this.cameraViews[currentCameraName]
+      )
+    ) {
+      this.currentCameraView = null;
+      this.jumpToView(currentCameraName, true);
+    }
   }
 
   jumpToView(viewName, animate = true, duration = {}) {
@@ -1109,9 +1130,13 @@ export class Three3DScene extends Three3D {
     controls.maxDistance = maxDistance;
     camera.near = minDistance * 0.01;
     camera.far = maxDistance * 100;
-    camera.position.copy(camera.position.normalize().multiplyScalar(maxDistance * 0.75));
+    // update current position only if it does not fit into the distance range
+    const currentDistance = sphere.center.distanceTo(camera.position);
+    if (currentDistance < minDistance || currentDistance > maxDistance) {
+      camera.position.copy(camera.position.normalize().multiplyScalar(maxDistance * 0.75));
+      controls.target = sphere.center;
+    }
     camera.updateProjectionMatrix();
-    controls.target = sphere.center;
 
     controls.update();
   }