@eturnity/eturnity_3d 1.0.42 → 1.0.43-EPDM-7327

package/package.json

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

package/src/components/ThreeCanvasViewer.vue

@@ -104,7 +104,7 @@ export default {
       hydrateData: 'hydrateData'
     }),
     ...mapMutations({
-      set_module_texture_version_id: 'mutate_module_texture_version_id'
+      setModuleTextureVersionId: 'mutate_moduleTextureVersionId'
     }),
     setCamera(polygon, view_mode) {
       let margin=0.2
@@ -159,6 +159,7 @@ export default {
         //const target=[targetVector.x/1000,targetVector.y/1000,targetVector.z/1000]
         let cameraMoveVector = { x: 0, y: 0, z: 0 }
         console.log('normalVector:', polygonRef.normalVector)
+        let flatRoof=polygonRef.normalVector.x==0 && polygonRef.normalVector.y==0
         if (view_mode == 'ortho') {
           cameraMoveVector = multiplyVector(
             distance * 1000,
@@ -189,12 +190,12 @@ export default {
           if (horizontalVector.x == 0 && horizontalVector.y == 0) {
             //if flat roof=> go south
             horizontalVector.y = 1
-            
           }
           cameraMoveVector = multiplyVector(distance * 2000, horizontalVector)
         }
 
         const positionVector = addVector(polygonRef.meanPoint, cameraMoveVector)
+        if(flatRoof) positionVector.z+=2000
         const position = [
           positionVector.x / 1000,
           positionVector.y / 1000 - 1,

package/src/helper/renderMixin.js

@@ -79,7 +79,7 @@ export default {
 
   computed: {
     ...mapState({
-      module_texture_version_id: (state) => state.threeDModule.module_texture_version_id,
+      moduleTextureVersionId: (state) => state.threeDModule.moduleTextureVersionId,
       selectedMapLayer: (state) => state.threeDModule.selectedMapLayer,
       pvDataMemo: (state) => state.threeDModule.pvDataMemo
     }),
@@ -777,7 +777,7 @@ export default {
       this.panels.forEach((panelPolygon) => {
         //definition of the material
         if(panelPolygon.moduleField.data.number_of_panels_override) return
-         let material = this.material.panel['default_'+this.module_texture_version_id]
+         let material = this.material.panel['default_'+this.moduleTextureVersionId]
          if (panelPolygon.moduleField.pvData) {
            let pvId = panelPolygon.moduleField.pvData.id
            if (this.material.panel[pvId]) {

package/src/store/hydrateData.js

@@ -38,7 +38,7 @@ export async function hydrateData({ state, commit }, data) {
     const layoutSetting = layoutSettingResponse
     
     commit('mutate_layoutSettings', layoutSetting)
-    commit('mutate_module_texture_version_id', layoutSetting.module_texture_version_id)
+    commit('mutate_moduleTextureVersionId', layoutSetting.module_texture_version_id)
     let layers=getLayers()
     let selectedLayer=layers.find(layer=>layer.key==layoutSetting.background_map_settings.layerKey)
     commit('mutate_selectedMapLayer', selectedLayer)

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

@@ -30,7 +30,7 @@ const init_state = {
   //useless state for viewer
   pvDataMemo:[],
   mountingDataMemo:[],
-  module_texture_version_id:0,
+  moduleTextureVersionId:0,
   selectedMapLayer:null,
   globalProjectProperties: [],
 }
@@ -129,11 +129,8 @@ const mutations = {
   mutate_buildingLocation(state, value) {
     state.buildingLocation = value
   },
-  mutate_module_texture_version_id(state,value){
-    state.module_texture_version_id=value
-  },
-  mutate_module_texture_version_id(state,value){
-    state.module_texture_version_id=value
+  mutate_moduleTextureVersionId(state,value){
+    state.moduleTextureVersionId=value
   },
   mutate_selectedMapLayer(state,value){
     state.selectedMapLayer=value