@eturnity/eturnity_3d 6.43.0 → 6.44.1

package/CODEOWNERS

@@ -0,0 +1 @@
+* elisee.reclus@eturnity.com

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eturnity/eturnity_3d",
   "private": false,
-  "version": "6.43.0",
+  "version": "6.44.1",
   "main": "dist/main.js",
   "scripts": {
     "dev": "vue-cli-service serve --skip-plugins @vue/cli-plugin-eslint",
@@ -10,7 +10,7 @@
     "prettier": "prettier --write \"**/*.{js,vue}\""
   },
   "dependencies": {
-    "@eturnity/eturnity_maths": "6.43.0",
+    "@eturnity/eturnity_maths": "6.44.1",
     "axios": "^1.3.2",
     "core-js": "^2.6.12",
     "cors": "^2.8.5",

package/src/components/ThreeCanvasViewer.vue

@@ -34,7 +34,7 @@ export default {
         1,
         1000
       ),
-      layers:null,
+      layers: null,
       provider: null,
       cameraProjection: null,
       texture: null,
@@ -60,9 +60,13 @@ export default {
         camera: false
       },
       screenshotable: false,
-      areModuleFieldsVisible: false
+      areModuleFieldsVisible: false,
+      intervalId: null
     }
   },
+  beforeDestroy() {
+    clearInterval(this.intervalId)
+  },
   mixins: [renderMixin, threeMixin, materialMixin],
   async mounted() {
     await this.hydrateData(this.geometryData)
@@ -73,33 +77,45 @@ 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)
+    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)
+    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) =>
       this.setCameraOrthogonalTo(polygon)
     )
-    this.initializeProjectionMaterial()
+    await this.updateProjectionMaterials()
 
     const polygon = this.polygons.find((p) => p.id == this.uuid)
     this.setCamera(polygon, this.view_mode)
     this.isReady.geometry = true
     this.render()
-    //this.animate()
+    this.intervalId = setInterval(() => this.render(), 500)
   },
   computed: {
     ...mapState({
@@ -108,7 +124,7 @@ export default {
       view_mode: (state) => state.threeDModule.view_mode,
       isInteractive: (state) => state.threeDModule.isInteractive,
       isBuildingVisible: (state) => state.threeDModule.isBuildingVisible,
-      imageOverlay: (state) => state.threeDModule.imageOverlay,
+      imageOverlay: (state) => state.threeDModule.imageOverlay
     }),
     ...mapGetters({
       polygons: 'getPolygons',
@@ -132,8 +148,8 @@ export default {
       setModuleTextureVersionId: 'mutate_moduleTextureVersionId',
       setSelectedMapLayer: 'mutate_selectedMapLayer'
     }),
-    hideMesh(mesh){
-      if(mesh){
+    hideMesh(mesh) {
+      if (mesh) {
         mesh.visible = false
       }
     },
@@ -223,7 +239,7 @@ export default {
             horizontalVector.y = 1
           }
           horizontalVector = normalizeVector(horizontalVector)
-        
+
           cameraMoveVector = multiplyVector(distance * 1000, horizontalVector)
         }
 

package/src/helper/materialMixin.js

@@ -44,11 +44,14 @@ export default {
       opacity: node3dOpacity,
       transparent: true
     })
-    
+
     this.material.panel = {}
 
     for (let k = 0; k < defaultTextureUrls.length; k++) {
-      let texture = this.loader.load(defaultTextureUrls[k], function (texture) {})
+      const texture = this.loader.load(
+        defaultTextureUrls[k],
+        function (texture) {}
+      )
       this.material.panel['default_' + k] = new THREE.MeshBasicMaterial({
         map: texture,
         side: THREE.DoubleSide

package/src/helper/render/loader.js

@@ -10,11 +10,11 @@ export default {
           if (!component.texture_img_url) {
             this.material.panel[pvId] = this.material.panel.default
           } else {
-            let texture = this.loader.load(component.texture_img_url)
+            const texture = this.loader.load(component.texture_img_url)
             this.material.panel[pvId] = new THREE.MeshBasicMaterial({
               map: texture,
               side: THREE.FrontSide,
-              transparent: false,
+              transparent: false
             })
           }
         }
@@ -26,13 +26,18 @@ export default {
         const pvId = mf.data.component_id_pv_module
         if (!this.material.panel[pvId]) {
           if (!mf.data.texture_img_url) {
-            this.material.panel[pvId] = this.material.panel.default
+            this.material.panel[pvId] =
+              this.material.panel[`default_${this.moduleTextureVersionId}`]
           } else {
-            let texture = await this.loader.load(mf.data.texture_img_url)
-            this.material.panel[pvId] = new THREE.MeshBasicMaterial({
-              map: texture,
-              side: THREE.FrontSide,
-              transparent: false,
+            await new Promise((resolve) => {
+              this.loader.load(mf.data.texture_img_url, (texture) => {
+                this.material.panel[pvId] = new THREE.MeshBasicMaterial({
+                  map: texture,
+                  side: THREE.FrontSide,
+                  transparent: false
+                })
+                resolve(texture)
+              })
             })
           }
         }

package/src/helper/render/panel.js

@@ -80,7 +80,6 @@ export default {
             material = this.material.panel[materialId]
           }
         }
-
         if (
           !this.meshes.panelsMeshes[panelPolygon.id + '_top'] ||
           !this.meshes.panelsMeshes[panelPolygon.id + '_side']

package/src/helper/render/roof.js

@@ -75,8 +75,8 @@ export default {
       return geometry
     },
 
-    applyTextureOnRoofs(){
-      const material=this.material.roof
+    applyTextureOnRoofs() {
+      const material = this.material.roof
       this.reorderRoofMaterials()
       if (this.mergedRoofMesh) {
         this.applyTextureOnMesh(material, this.mergedRoofMesh)

package/src/helper/renderMixin.js

@@ -11,7 +11,7 @@ export default {
       //lastTic:(new Date()).getTime()
       lastGeometryEventIdDone: -1,
       backgroundImagesizeInMm: null,
-      meshes : {
+      meshes: {
         baseMeshes: {},
         roofMeshes: {},
         flatRoofMeshes: {},
@@ -25,8 +25,7 @@ export default {
       }
     }
   },
-  created() {
-  },
+  created() {},
   computed: {
     ...mapState({
       moduleTextureVersionId: (state) =>
@@ -317,7 +316,6 @@ export default {
       this.renderModuleFields()
       this.renderPanels()
       this.renderRoofsMargin()
-      this.updateProjectionMaterials()
     },
     renderBuilding() {
       this.renderBase()
@@ -328,10 +326,6 @@ export default {
       this.renderFlatRoofs()
     },
 
-    async initializeProjectionMaterial() {
-      await this.updateProjectionMaterials()
-    },
-
     getCanvasOffset() {
       if (!this.$refs.canvas3DContainer) return { top: 0, left: 0 }
       var box = this.$refs.canvas3DContainer.getBoundingClientRect()
@@ -383,7 +377,7 @@ export default {
   },
   watch: {
     pvDataMemo: {
-      handler(val) {
+      handler() {
         this.loadNewPanelTextures()
       }
     },

package/src/main.js

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

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

@@ -17,9 +17,7 @@ const init_state = {
 
   //for Panels
   cancelTokenGlobal: '',
-  globalProjectProperties: [],
   buildingLocation: null,
-  imageOverlay: null,
   layoutSettings: {
     layout_latitude: null,
     layout_longitude: null,

package/vue.config.js

@@ -32,7 +32,7 @@ module.exports = {
           test: /\.(js)$/,
           // exclude: /\node_modules/,
           use: 'babel-loader'
-        },
+        }
       ]
     },
     plugins: [