@eturnity/eturnity_3d 1.0.43-EPDM-7327 → 1.0.44

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eturnity/eturnity_3d",
   "private": false,
-  "version": "1.0.43-EPDM-7327",
+  "version": "1.0.44",
   "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({
-      setModuleTextureVersionId: 'mutate_moduleTextureVersionId'
+      set_module_texture_version_id: 'mutate_module_texture_version_id'
     }),
     setCamera(polygon, view_mode) {
       let margin=0.2
@@ -159,7 +159,6 @@ 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,
@@ -190,12 +189,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/materials.js

@@ -17,7 +17,7 @@ material.edge=new THREE.MeshPhongMaterial({ color: beamColor,transparent:true,op
 material.node=new THREE.PointsMaterial( { size: 0.05, sizeAttenuation: true,color: node3DColor, opacity:node3dOpacity, transparent: true } );
     const loader = new THREE.TextureLoader()
     // texture.minFilter = THREE.LinearFilter
-    material.panel={}
+material.panel={}
     
     for(let k=0;k<defaultTextureUrls.length;k++){
         let texture=loader.load(defaultTextureUrls[k], function (texture) {})
@@ -26,6 +26,7 @@ material.node=new THREE.PointsMaterial( { size: 0.05, sizeAttenuation: true,colo
             side: THREE.DoubleSide,
         })
     }
+    console.log('panel texture:',material.panel)
 
 material.flatRoof = new THREE.MeshPhongMaterial({
         color: 0x00ff00,

package/src/helper/renderMixin.js

@@ -79,7 +79,7 @@ export default {
 
   computed: {
     ...mapState({
-      moduleTextureVersionId: (state) => state.threeDModule.moduleTextureVersionId,
+      module_texture_version_id: (state) => state.threeDModule.module_texture_version_id,
       selectedMapLayer: (state) => state.threeDModule.selectedMapLayer,
       pvDataMemo: (state) => state.threeDModule.pvDataMemo
     }),
@@ -776,8 +776,10 @@ export default {
 
       this.panels.forEach((panelPolygon) => {
         //definition of the material
+        console.log('panelPolygon.moduleField.data.number_of_panels_override',panelPolygon.moduleField.data.number_of_panels_override)
         if(panelPolygon.moduleField.data.number_of_panels_override) return
-         let material = this.material.panel['default_'+this.moduleTextureVersionId]
+        console.log('material panel:','default_'+this.module_texture_version_id,this.material.panel)
+         let material = this.material.panel['default_'+this.module_texture_version_id]
          if (panelPolygon.moduleField.pvData) {
            let pvId = panelPolygon.moduleField.pvData.id
            if (this.material.panel[pvId]) {
@@ -825,7 +827,6 @@ export default {
             topMesh.geometry=updateBufferPanelGeometry(panelPolygon,topMesh.geometry)
             sideMesh.geometry=updateBufferPanelSideGeometry(panelPolygon,sideMesh.geometry)
           }
-          let pvId = panelPolygon.moduleField.pvData.id
           topMesh.material= material
           
         }

package/src/store/hydrateData.js

@@ -36,9 +36,10 @@ export async function hydrateData({ state, commit }, data) {
 
   if (!!layoutSettingResponse) {
     const layoutSetting = layoutSettingResponse
-    
+    const module_texture_version_id=layoutSetting.module_texture_version_id || 0
+    console.log("module_texture_version_id",module_texture_version_id)
     commit('mutate_layoutSettings', layoutSetting)
-    commit('mutate_moduleTextureVersionId', layoutSetting.module_texture_version_id)
+    commit('mutate_module_texture_version_id', module_texture_version_id)
     let layers=getLayers()
     let selectedLayer=layers.find(layer=>layer.key==layoutSetting.background_map_settings.layerKey)
     commit('mutate_selectedMapLayer', selectedLayer)
@@ -164,38 +165,7 @@ export async function hydrateData({ state, commit }, data) {
   //Get PV & Mounting system component Data (texture):
   pv_module_ids = [...new Set(pv_module_ids)]
   mounting_system_ids = [...new Set(mounting_system_ids)]
-  const promiseList = []
-  // for (let k in pv_module_ids) {
-  //   promiseList.push(
-  //     axios.get('/component_library/products/pv_modules/' + pv_module_ids[k])
-  //   )
-  // }
-  // for (let k in mounting_system_ids) {
-  //   promiseList.push(
-  //     axios.get(
-  //       '/component_library/products/mounting_systems/' + mounting_system_ids[k]
-  //     )
-  //   )
-  // }
-  // const results = await Promise.all(promiseList)
-  // for (let k in pv_module_ids) {
-  //   const pv_module_id = pv_module_ids[k]
-  //   const pvData = results[k].data
-  //   moduleFields.forEach((m) => {
-  //     if (m.data.component_id_pv_module == pv_module_id) {
-  //       m.pvData = pvData
-  //     }
-  //   })
-  // }
-  // for (let k in mounting_system_ids) {
-  //   const mounting_system_id = mounting_system_ids[k]
-  //   const mountingData = results[parseInt(k) + pv_module_ids.length].data
-  //   moduleFields.forEach((m) => {
-  //     if (m.data.component_id_mounting_system == mounting_system_id) {
-  //       m.mountingData = mountingData
-  //     }
-  //   })
-  // }
+  
   state.polygons = [
     ...roofs,
     ...obstacles,

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

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