@eturnity/eturnity_3d 6.34.7 → 6.37.0

package/src/components/ThreeCanvasViewer.vue

@@ -51,11 +51,9 @@ export default {
       tweenCamera: null,
       tweenOrbit: null,
       three_map: null,
-      backgroundImagesizeInMm: null,
       isReady: {
         texturesLoaded: 0,
         texturesToLoad: 0,
-        backgroundImage: false,
         threeMap: false,
         geometry: false,
         camera: false
@@ -74,6 +72,21 @@ export default {
     this.initialiseThreeMap()
     await this.loadPanelsTexture()
     this.renderGeometry()
+    if(!this.isBuildingVisible){
+      Object.values(this.meshes.roofMeshes).forEach(mesh=>mesh.visible=false)
+      Object.values(this.meshes.baseMeshes).forEach(mesh=>mesh.visible=false)
+      Object.values(this.meshes.obstacleMeshes).forEach(mesh=>mesh.visible=false)
+      Object.values(this.meshes.edgeMeshes).forEach(mesh=>mesh.visible=false)
+      Object.values(this.meshes.panelsMeshes).forEach(mesh=>mesh.visible=false)
+      this.hideMesh(this.mergedBaseMesh)
+      this.hideMesh(this.mergedRoofMesh)
+      this.hideMesh(this.mergedObstacleMesh)
+      this.hideMesh(this.mergedObstacleSideMesh)
+      this.hidePanels()
+     
+    }
+    Object.values(this.meshes.flatRoofMeshes).forEach(mesh=>mesh.visible=false)
+    Object.values(this.meshes.edgeMeshes).forEach(mesh=>mesh.visible=false)
     this.onWindowResize()
     this.updateProjectionMaterials()
     this.$root.$on('on-roofSelected', (polygon) =>
@@ -93,7 +106,8 @@ export default {
       uuid: (state) => state.threeDModule.uuid,
       view_mode: (state) => state.threeDModule.view_mode,
       isInteractive: (state) => state.threeDModule.isInteractive,
-      imageOverlay: (state) => state.threeDModule.imageOverlay
+      isBuildingVisible: (state) => state.threeDModule.isBuildingVisible,
+      imageOverlay: (state) => state.threeDModule.imageOverlay,
     }),
     ...mapGetters({
       polygons: 'getPolygons',
@@ -116,6 +130,11 @@ export default {
     ...mapMutations({
       setModuleTextureVersionId: 'mutate_moduleTextureVersionId'
     }),
+    hideMesh(mesh){
+      if(mesh){
+        mesh.visible = false
+      }
+    },
     setCamera(polygon, view_mode) {
       let margin = 0.2
       if (!polygon || view_mode == 'global') {
@@ -165,6 +184,7 @@ export default {
 
         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
@@ -197,7 +217,6 @@ export default {
         } else {
           //street view
           let horizontalVector = { ...polygonRef.normalVector, z: 0 }
-
           if (horizontalVector.x == 0 && horizontalVector.y == 0) {
             horizontalVector.y = 1
           }
@@ -207,7 +226,7 @@ export default {
         }
 
         const positionVector = addVector(polygonRef.meanPoint, cameraMoveVector)
-        positionVector.z += 1000
+        if (flatRoof) positionVector.z += 2000
         const position = [
           positionVector.x / 1000,
           positionVector.y / 1000 - 1,
@@ -266,7 +285,6 @@ export default {
       handler() {
         if (
           this.isReady.texturesToLoad == this.isReady.texturesLoaded &&
-          this.isReady.backgroundImage &&
           this.isReady.geometry &&
           this.isReady.threeMap &&
           this.isReady.camera

package/src/helper/UpdateRoofObstacleRelations.js

@@ -42,6 +42,18 @@ export function UpdateRoofObstacleRelations(state, updateVersionEnable = true) {
 
     let heightReference = 0
     for (let roof of roofsWithObstacle) {
+      //updateObstacle z values
+      if (obstacle.layer == 'obstacle') {
+        obstacle.outline.forEach(
+          (p) =>
+            (p.z = verticalProjectionOnPlane(
+              p,
+              roof.normalVector,
+              roof.flatOutline[0]
+            ).z)
+        )
+      }
+
       heightReference = obstacle.outline.reduce((acc, cur) => {
         acc = Math.max(
           acc,

package/src/helper/customProvider.js

@@ -8,6 +8,7 @@ export class CustomProvider extends MapProvider {
     this.layer = layer
     this.mapLayer = map_layer
     this.maxZoom = this.layer.layerData.options.maxNativeZoom || 20
+    this.minZoom = this.layer.layerData.options.minZoom || 17
     this.defaultImage = document.createElement('img')
     this.defaultImage.src = require('../assets/images/white_tile.png')
     this.defaultImage.crossOrigin = 'Anonymous'

package/src/helper/render/clear.js

@@ -99,7 +99,9 @@ export default {
         this.scene.remove(mesh)
       })
       this.meshes[type] = {}
-      this.renderer.renderLists.dispose()
+      if (this.renderer) {
+        this.renderer.renderLists.dispose()
+      }
     }
   }
 }

package/src/helper/render/imageOverlay.js

@@ -58,10 +58,10 @@ export default {
       }
       this.meshes.backgroundMesh.position.z = 0.15
       if (this.imageOverlayMaterial) {
-        // this.applyTextureOnMesh(
-        //   [this.imageOverlayMaterial],
-        //   this.meshes.backgroundMesh
-        // )
+        this.applyTextureOnMesh(
+          [this.imageOverlayMaterial],
+          this.meshes.backgroundMesh
+        )
       }
       this.meshes.backgroundMesh.visible = true
     },

package/src/helper/render/index.js

@@ -1,5 +1,4 @@
 import node from './node'
-import background from './background'
 import base from './base'
 import clear from './clear'
 import edge from './edge'
@@ -17,11 +16,9 @@ import tileProjection from './tileProjection'
 import mergedGeometry from './mergedGeometry'
 
 export default {
-  //mixins:[node,background,clear,edge,loader,margin,moduleField,obstacle,panel,roof,base]
   mixins: [
     margin,
     node,
-    background,
     base,
     roof,
     edge,

package/src/helper/render/mergedGeometry.js

@@ -89,7 +89,8 @@ export default {
       mergedGeometry.computeVertexNormals()
       return mergedGeometry
     },
-    updateOrCreateMergedMesh(mesh, geometries, material) {
+
+    updateOrCreateMergedMesh(mesh, geometries, material, type = undefined) {
       if (!mesh) {
         let mergedGeometry = this.createMergedGeometry(geometries)
         mesh = new THREE.Mesh(mergedGeometry, material)

package/src/helper/render/panel.js

@@ -54,12 +54,13 @@ export default {
           this.clearMesh(mesh)
         }
       })
-
       let panelSideGeometries = []
       let panelTopGeometries = {}
       this.panels.forEach((panelPolygon) => {
         //definition of the material
-        if (panelPolygon.moduleField.data.number_of_panels_override) return
+        if (panelPolygon.moduleField.data.number_of_panels_override) {
+          return
+        }
         let materialId = 'default_' + this.moduleTextureVersionId
         let material = this.material.panel[materialId]
         material.transparent = true
@@ -149,14 +150,15 @@ export default {
       this.mergedPanelSideMesh = this.updateOrCreateMergedMesh(
         this.mergedPanelSideMesh,
         panelSideGeometries,
-        this.material.panelSide
+        this.material.panelSide,
+        'panelSide'
       )
-
       for (let [key, geometries] of Object.entries(panelTopGeometries)) {
         this.mergedPanelTopMeshes[key] = this.updateOrCreateMergedMesh(
           this.mergedPanelTopMeshes[key],
           geometries,
-          this.material.panel[key]
+          this.material.panel[key],
+          'panelTop_' + key
         )
       }
     }

package/src/helper/render/projectionMaterial.js

@@ -10,7 +10,7 @@ export default {
     async updateProjectionMaterials() {
       this.setImageOverlayCameraPosition()
       this.imageOverlayMaterial = await this.getImageOverlayMaterial()
-
+      //add or remove imageOverlayMaterial
       const index = this.material.roof.findIndex(
         (material) => material.userData.type == 'imageOverlayMaterial'
       )

package/src/helper/render/texture.js

@@ -12,10 +12,10 @@ export default {
         for (let m = 0; m < materials.length; m++) {
           if (materials[m].project) {
             materials[m].project(mesh)
-            materials[m].needsUpdate = true
-            mesh.needsUpdate = true
           }
+          materials[m].needsUpdate = true
         }
+        mesh.needsUpdate = true
       }
     }
   }

package/src/helper/render/tile.js

@@ -120,7 +120,7 @@ export default {
         }
       }
 
-      while (zoomLvl > 16) {
+      while (zoomLvl > 17) {
         xTileMin = xTileMin / 2 - 1
         xTileMax = (xTileMax + 1) / 2
         yTileMin = yTileMin / 2 - 1

package/src/helper/render/tileProjection.js

@@ -118,6 +118,7 @@ export default {
   },
   watch: {
     selectedMapLayer(newMapLayer) {
+      if (!newMapLayer) return
       this.disposeTileMaterialDifferentMapLayer(newMapLayer.key)
     }
   }

package/src/main.js

@@ -9,6 +9,9 @@ Vue.use(Vuex)
 const Renderer = class {
   constructor() {}
   mount(identifier, geometryData, specificData, isInteractive = false) {
+    if(specificData.isBuildingVisible===undefined){
+      specificData.isBuildingVisible=true
+    }
     const myStore = new Vuex.Store({
       modules: {
         threeDModule: {

package/src/store/hydrateData.js

@@ -14,6 +14,11 @@ export async function hydrateData({ state, commit }, data) {
   let moduleFieldsResponse = data.moduleFields
   const layoutSettingResponse = data.layoutSettings
   const imageOverlayResponse = data.imageOverlay
+  const mapType = data.mapType
+  let layers = getLayers()
+  let selectedLayer = layers.find((layer) => layer.key == mapType)
+  commit('mutate_selectedMapLayer', selectedLayer)
+
   //removing empty roof,obstacle and modulefield generated by BE on variant creation
   roofsResponse = roofsResponse.reduce((acc, cur) => {
     if (cur.roof_outline.length > 0) {
@@ -49,19 +54,6 @@ export async function hydrateData({ state, commit }, data) {
     commit('mutate_layoutSettings', layoutSetting)
     commit('mutate_moduleTextureVersionId', moduleTextureVersionId)
     commit('mutate_wallColor', layoutSetting.wall_color)
-    let layers = getLayers()
-    let selectedLayer
-    if (
-      layoutSetting.background_map_settings &&
-      layoutSetting.background_map_settings.layerKey
-    ) {
-      selectedLayer = layers.find(
-        (layer) => layer.key == layoutSetting.background_map_settings.layerKey
-      )
-    } else {
-      selectedLayer = layers.find((layer) => layer.key == 'googleLayer')
-    }
-    commit('mutate_selectedMapLayer', selectedLayer)
 
     //end of layoutSetting correction
     const newMapConfig = state.mapConfig
@@ -69,7 +61,7 @@ export async function hydrateData({ state, commit }, data) {
       lat: layoutSetting.layout_latitude,
       lng: layoutSetting.layout_longitude
     }
-    newMapConfig.layer = layoutSetting.map_layer
+    newMapConfig.layer = selectedLayer
     newMapConfig.zoom = layoutSetting.map_zoom
     commit('mutate_mapConfig', newMapConfig)
   }

package/src/store/three-d-module.js

@@ -21,10 +21,9 @@ const init_state = {
   buildingLocation: null,
   imageOverlay: null,
   layoutSettings: {
-    base64_image_url: null,
     layout_latitude: null,
     layout_longitude: null,
-    map_layer: 'swisstopoLayer_swissimage',
+    map_layer: 'googleLayerTerrain',
     map_zoom: 19,
     camera_3d: {}
   },

package/src/utils/cancellablePromise.js

@@ -1,23 +1,26 @@
-export function cancellablePromise(promise){
-    let status='pending'
-    let isCancel=false
-    const promiseObject=new Promise(function(res,rej){
-      promise
-        .then(data=>{
-          if(!isCancel){res(data);status='resolved'}else{
-            status='resolved but cancelled before'
-          }
-        })
-        .catch(data=>{
-          status='rejected'
-          if(!isCancel) rej(data)
-        })
-    })
-    promiseObject.getStatus=()=>{
-      return status  
-    }
-    promiseObject.cancel=()=>{
-      isCancel=true
-    }
-    return promiseObject
-  }
+export function cancellablePromise(promise) {
+  let status = 'pending'
+  let isCancel = false
+  const promiseObject = new Promise(function (res, rej) {
+    promise
+      .then((data) => {
+        if (!isCancel) {
+          res(data)
+          status = 'resolved'
+        } else {
+          status = 'resolved but cancelled before'
+        }
+      })
+      .catch((data) => {
+        status = 'rejected'
+        if (!isCancel) rej(data)
+      })
+  })
+  promiseObject.getStatus = () => {
+    return status
+  }
+  promiseObject.cancel = () => {
+    isCancel = true
+  }
+  return promiseObject
+}

package/src/helper/render/background.js

@@ -1,5 +0,0 @@
-import * as THREE from 'three'
-
-export default {
-  methods: {}
-}