@eturnity/eturnity_3d 6.34.2 → 6.34.3-EPDM-8085.1

package/bitbucket-pipelines.yml

@@ -829,34 +829,6 @@ pipelines:
 
       - step: *build_and_push_image
       - step: *dev_deploy_only
-    staging-all:
-    - parallel:
-
-      - step:
-          name: Deploy to staging-01
-          script:
-            - pipe: atlassian/trigger-pipeline:5.2.0
-              variables:
-                BITBUCKET_ACCESS_TOKEN: $BB_ETURNITY_DEPLOY_ACCESS_TOKEN_1
-                REPOSITORY: 'eturnity_expert'
-                CUSTOM_PIPELINE_NAME: 'staging-01-deploy'
-                REF_TYPE: 'branch'
-                REF_NAME: 'staging-v.${BB_STAGING_VERSION}'
-                DEBUG: 'true'
-                WAIT: 'true'
-
-      - step:
-          name: Deploy to staging-02
-          script:
-            - pipe: atlassian/trigger-pipeline:5.2.0
-              variables:
-                BITBUCKET_ACCESS_TOKEN: $BB_ETURNITY_DEPLOY_ACCESS_TOKEN_1
-                REPOSITORY: 'eturnity_expert'
-                CUSTOM_PIPELINE_NAME: 'staging-02-deploy'
-                REF_TYPE: 'branch'
-                REF_NAME: 'staging-v.${BB_STAGING_VERSION}'
-                DEBUG: 'true'
-                WAIT: 'true'
 
 
 ####################################################################################################################

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eturnity/eturnity_3d",
   "private": false,
-  "version": "6.34.2",
+  "version": "6.34.3-EPDM-8085.1",
   "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,

package/src/helper/render/texture.js

@@ -1,7 +1,7 @@
 export default {
   methods: {
     applyTextureOnMesh(materials, mesh) {
-      if (materials && materials.length > 0) {
+      if (mesh && materials && materials.length > 0) {
         let geometry = mesh.geometry
         geometry.clearGroups()
         for (let k = 0; k < materials.length; k++) {

package/src/helper/render/tile.js

@@ -267,8 +267,8 @@ export default {
         y: (yMax + yMin) / 2000
       }
       let deltaLatLng = distanceToDeltaLatLng(
-        roofsBoundCenterMeter.x,
-        roofsBoundCenterMeter.y,
+        roofsBoundCenterMeter.x*1000,
+        roofsBoundCenterMeter.y*1000,
         this.layoutSettings.layout_latitude
       )
       let roofsBoundCenterLatLng = {
@@ -298,17 +298,18 @@ export default {
           (Math.cos((this.layoutSettings.layout_latitude * Math.PI) / 180) *
             2 *
             Math.PI *
-            6378137) /
-          (256 * Math.pow(2, zoomLevel))
-        let sizeInMeter = groundResolution * size
+            earthRadius) /
+          ( Math.pow(2, zoomLevel))
+        let sizeInMeter = groundResolution * size / 256
         planeGeometry[indexGoogleBackground] = new THREE.PlaneGeometry(
           sizeInMeter,
-          sizeInMeter * 0.9
+          //sizeInMeter * 0.9
+          sizeInMeter
         )
-
         //to remove attribution in bottom of the image
         var uvs = new Float32Array([
-          0, 0.95, 1, 0.95, 0, 0.05, 1, 0.05, 0, 0.05, 1, 0.95
+          //0, 0.95, 1, 0.95, 0, 0.05, 1, 0.05, 0, 0.05, 1, 0.95
+          0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0
         ])
         planeGeometry[indexGoogleBackground].setAttribute(
           'uv',
@@ -353,6 +354,7 @@ export default {
       this.scene.add(this.backgroundMap)
     },
     async renderGoogleTilesCenter() {
+      
       this.clearByType('tileMeshes')
       if (this.backgroundMap) {
         this.backgroundMap.clear()
@@ -392,7 +394,7 @@ export default {
           (Math.cos((this.layoutSettings.layout_latitude * Math.PI) / 180) *
             2 *
             Math.PI *
-            6378137) /
+            earthRadius) /
           (256 * Math.pow(2, zoomLevel))
         let sizeInMeter = groundResolution * size
         planeGeometry[indexGoogleBackground] = new THREE.PlaneGeometry(