@eturnity/eturnity_3d 8.46.1 → 8.46.2-EPDM-13987.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eturnity/eturnity_3d",
   "private": false,
-  "version": "8.46.1",
+  "version": "8.46.2-EPDM-13987.1",
   "files": [
     "dist",
     "src"
@@ -16,7 +16,7 @@
     "merge-remote-master": "node scripts/merge-remote-master.js"
   },
   "dependencies": {
-    "@eturnity/eturnity_maths": "8.46.1",
+    "@eturnity/eturnity_maths": "8.46.2-EPDM-13987.2",
     "@originjs/vite-plugin-commonjs": "1.0.3",
     "core-js": "3.30.2",
     "cors": "2.8.5",

package/src/helper/cameraMixin.js

@@ -469,7 +469,37 @@ export default {
         this.setTweenTo({ position, target, fov: newFov })
       }
     },
-    setCameraGlobalVerticalPosition() {
+    setCameraGlobalAlmostVerticalPosition() {
+      let position, target
+      if (this.roofs.length != 0) {
+        let bounds = this.roofsBounds
+        let targetVector = {
+          x: (bounds.xMax + bounds.xMin) / 2000,
+          y: (bounds.yMax + bounds.yMin) / 2000,
+          z: 0,
+        }
+        let objectRadius_m = Math.max(
+          (bounds.xMax - bounds.xMin) / 2000,
+          (bounds.yMax - bounds.yMin) / 2000
+        )
+
+        let distance =
+          2 *
+          (objectRadius_m / Math.sin(((this.camera.fov / 2) * Math.PI) / 180))
+        let cameraMoveVector = { x: 0, y: 0, z: distance }
+        const positionVector = addVector(targetVector, cameraMoveVector)
+        position = [positionVector.x, positionVector.y - 1, positionVector.z]
+        target = [targetVector.x, targetVector.y, targetVector.z]
+      } else {
+        position = [0, -1, 300]
+        target = [0, 0, 0]
+      }
+      this.setTweenTo({
+        position,
+        target,
+      })
+    },
+    setCameraGlobalVerticalPosition(changeCameraTypeAsCallback = true) {
       let position, target
       let newFov = 10
       if (this.roofs.length != 0) {
@@ -498,7 +528,9 @@ export default {
         position,
         target,
         fov: newFov,
-        callback: this.turnPerspectiveCameraToOrthogonal,
+        callback: changeCameraTypeAsCallback
+          ? this.turnPerspectiveCameraToOrthogonal
+          : undefined,
       })
     },
     setCameraOrthogonalTo(polygon) {