@eturnity/eturnity_3d 6.34.2 → 6.34.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eturnity/eturnity_3d",
   "private": false,
-  "version": "6.34.2",
+  "version": "6.34.3",
   "main": "dist/main.js",
   "scripts": {
     "dev": "vue-cli-service serve --skip-plugins @vue/cli-plugin-eslint",

package/src/components/ThreeCanvasViewer.vue

@@ -10,8 +10,7 @@
 <script>
 import { mapActions, mapState, mapGetters, mapMutations } from 'vuex'
 import * as THREE from 'three'
-import { addVector, multiplyVector } from '@eturnity/eturnity_maths'
-import { updateComputedGeometryPolygon } from '@eturnity/eturnity_maths'
+import { addVector, multiplyVector,updateComputedGeometryPolygon, normalizeVector } from '@eturnity/eturnity_maths'
 
 import threeMixin from '../helper/threeMixin'
 import materialMixin from '../helper/materialMixin'
@@ -154,14 +153,13 @@ export default {
             geometry.boundingSphere.center.z
           ]
           let objectRadius = geometry.boundingSphere.radius
+          
           distance =
-            5 + objectRadius / Math.sin(((this.camera.fov / 2) * Math.PI) / 180)
-          //_sphere.copy( geometry.boundingSphere ).applyMatrix4( object.matrixWorld );
+          5+(objectRadius) / (Math.sin(((this.camera.fov / 2) * Math.PI) / 180))
         }
 
         polygonRef = updateComputedGeometryPolygon(polygonRef)
         const targetVector = polygonRef.meanPoint
-        //const target=[targetVector.x/1000,targetVector.y/1000,targetVector.z/1000]
         let cameraMoveVector = { x: 0, y: 0, z: 0 }
         let flatRoof =
           polygonRef.normalVector.x == 0 && polygonRef.normalVector.y == 0
@@ -193,20 +191,22 @@ export default {
           this.orthographicCamera.updateProjectionMatrix()
         } else {
           //street view
-          const horizontalVector = { ...polygonRef.normalVector, z: 0 }
+          let horizontalVector = { ...polygonRef.normalVector, z: 0 }
+
           if (horizontalVector.x == 0 && horizontalVector.y == 0) {
             //if flat roof=> go south
             horizontalVector.y = 1
           }
-          let distanceCoefficient = 2
-          if(flatRoof){
-            distanceCoefficient = 1.5
-          }
-          cameraMoveVector = multiplyVector(distance * 1000 * distanceCoefficient, horizontalVector)
+          horizontalVector=normalizeVector(horizontalVector)
+          // let distanceCoefficient = 2
+          // if(flatRoof){
+          //   distanceCoefficient = 1.5
+          // }
+          cameraMoveVector = multiplyVector(distance * 1000 , horizontalVector)
         }
 
         const positionVector = addVector(polygonRef.meanPoint, cameraMoveVector)
-        if (flatRoof) positionVector.z += 2000
+        positionVector.z += 1000
         const position = [
           positionVector.x / 1000,
           positionVector.y / 1000 - 1,