@eturnity/eturnity_3d 7.8.0-splitLine.0 → 7.10.0-EPDM-10188.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eturnity/eturnity_3d",
   "private": false,
-  "version": "7.8.0-splitLine.0",
+  "version": "7.10.0-EPDM-10188.0",
   "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": "7.4.0-EPDM-7379.4",
+    "@eturnity/eturnity_maths": "7.10.0",
     "core-js": "^2.6.12",
     "cors": "^2.8.5",
     "earcut": "^2.2.4",

package/src/helper/UpdateRoofModuleFieldRelations.js

@@ -35,7 +35,7 @@ export function UpdateRoofModuleFieldRelations(state) {
       const intersection = intersectOutlines(moduleField.outline, roof.outline)
       if (intersection.length == 0) return false
       const intersectionArea = calculateArea(intersection[0])
-      return intersectionArea > 100 && moduleField.area <= roof.area
+      return intersectionArea > 100 && moduleField.area <= roof.area + 0.1
     })
     //roofs on roof can lead to multiple roof under a point. moduleField is on the smallest
     let smallestRoof = null

package/src/helper/render/clear.js

@@ -25,6 +25,23 @@ export default {
         if (obj.material.dispose) obj.material.dispose()
       }
     },
+    clearPanelsFromChangingRoofs(roofIds) {
+      const roofs = this.polygons.filter((polygon) =>
+        roofIds.includes(polygon.id)
+      )
+      roofs.forEach((roof) =>
+        roof.moduleFields.forEach((mf) =>
+          mf.panels.forEach((panel) => {
+            let meshTop = this.meshes.panelsMeshes[panel.id + '_top']
+            let meshSide = this.meshes.panelsMeshes[panel.id + '_side']
+            if (meshTop || meshSide) {
+              this.clearMeshFromScene(meshTop, this.scene)
+              this.clearMeshFromScene(meshSide, this.scene)
+            }
+          })
+        )
+      )
+    },
     clearMeshFromScene(mesh, scene) {
       if (!mesh || !scene) {
         return

package/src/helper/render/edge.js

@@ -87,8 +87,6 @@ export default {
           cylinder.userData.edgeId = edge.id
           cylinder.userData.type = 'edgeMeshes'
           cylinder.userData.layer = edge.layer
-          cylinder.frustumCulled = false
-          cylinder.renderOrder = 10
 
           cylinder.frustumCulled = false
           cylinder.renderOrder = 10

package/src/helper/render/panel.js

@@ -73,6 +73,7 @@ export default {
         //2. create or update individual meshes
         //  2a. Fill in panelTopGeometries & panelSideGeometries
         if (!panelPolygon.visible) {
+          console.log('panelPolygon hidden', panelPolygon)
           return
         }
         if (panelPolygon.moduleField.data.number_of_panels_override) {
@@ -95,7 +96,7 @@ export default {
 
           materialId = 'default_' + moduleTextureId
           material = this.material.panel[materialId]
-          
+
           if (panelPolygon.moduleField.data) {
             if (
               this.material.panel[
@@ -115,67 +116,74 @@ export default {
           material.opacity = this.panelOpacity
         }
         //2. create or update individual meshes
-        if (
-          !this.meshes.panelsMeshes[panelPolygon.id + '_top'] ||
-          !this.meshes.panelsMeshes[panelPolygon.id + '_side']
-        ) {
-          //mesh creation
-          const geometry = getBufferPanelGeometry(panelPolygon)
-          const geometrySide = getBufferPanelSideGeometry(panelPolygon)
-          //2a.Fill in panelTopGeometries & panelSideGeometries
+        //update existing geometry
+        if (this.meshes.panelsMeshes[panelPolygon.id + '_top']) {
+          const topMesh = this.meshes.panelsMeshes[panelPolygon.id + '_top']
+          if (panelPolygon.version > topMesh.userData.version) {
+            let topGeometry = updateBufferPanelGeometry(
+              panelPolygon,
+              topMesh.geometry
+            )
+            topMesh.geometry = topGeometry
+          }
+
+          if (!panelTopGeometries[materialId]) {
+            panelTopGeometries[materialId] = []
+          }
+          panelTopGeometries[materialId].push(topMesh.geometry)
+          topMesh.material = material
+        }
+        if (this.meshes.panelsMeshes[panelPolygon.id + '_side']) {
+          const sideMesh = this.meshes.panelsMeshes[panelPolygon.id + '_side']
+          if (panelPolygon.version > sideMesh.userData.version) {
+            let sideGeometry = updateBufferPanelSideGeometry(
+              panelPolygon,
+              sideMesh.geometry
+            )
+            sideMesh.geometry = sideGeometry
+          }
+          if (panelPolygon.layer != 'user_deactivated_panel') {
+            panelSideGeometries.push(sideMesh.geometry)
+          }
+        }
+        //2a.Fill in panelTopGeometries & panelSideGeometries
+        //mesh creation
+        if (!this.meshes.panelsMeshes[panelPolygon.id + '_top']) {
           //gather all geometry with similar material together to merge them for faster rendering
+          const geometry = getBufferPanelGeometry(panelPolygon)
           if (!panelTopGeometries[materialId]) {
             panelTopGeometries[materialId] = []
           }
           panelTopGeometries[materialId].push(geometry)
+          if (geometry) {
+            const mesh = new THREE.Mesh(geometry, this.material.hidden)
+            mesh.userData.version = panelPolygon.version
+            mesh.userData.type = 'panelsMeshes'
+            mesh.userData.meshId = panelPolygon.id + '_top'
+            mesh.userData.polygonId = panelPolygon.id
+            this.scene.add(mesh)
+            mesh.matrixAutoUpdate = false
+            this.meshes.panelsMeshes[panelPolygon.id + '_top'] = mesh
+          }
+        }
+        if (!this.meshes.panelsMeshes[panelPolygon.id + 'side']) {
+          //sidemesh creation
+          const geometrySide = getBufferPanelSideGeometry(panelPolygon)
           if (panelPolygon.layer != 'user_deactivated_panel') {
             panelSideGeometries.push(geometrySide)
           }
-          if (geometry && geometrySide) {
-            const mesh = new THREE.Mesh(geometry, this.material.hidden)
+          if (geometrySide) {
             const meshSide = new THREE.Mesh(
               geometrySide,
               this.material.panelSide
             )
-            mesh.userData.version = panelPolygon.version
-            mesh.userData.type = 'panelsMeshes'
-            mesh.userData.meshId = panelPolygon.id + '_top'
-            mesh.userData.polygonId = panelPolygon.id
-            this.scene.add(mesh)
             meshSide.userData.version = panelPolygon.version
             meshSide.userData.type = 'panelsMeshes'
             meshSide.userData.meshId = panelPolygon.id + '_side'
             meshSide.userData.polygonId = panelPolygon.id
-            mesh.matrixAutoUpdate = false
             meshSide.matrixAutoUpdate = false
-            this.meshes.panelsMeshes[panelPolygon.id + '_top'] = mesh
             this.meshes.panelsMeshes[panelPolygon.id + '_side'] = meshSide
           }
-        } else {
-          //update existing geometry
-          const topMesh = this.meshes.panelsMeshes[panelPolygon.id + '_top']
-          const sideMesh = this.meshes.panelsMeshes[panelPolygon.id + '_side']
-          if (panelPolygon.version > topMesh.userData.version) {
-            let topGeometry = updateBufferPanelGeometry(
-              panelPolygon,
-              topMesh.geometry
-            )
-            let sideGeometry = updateBufferPanelSideGeometry(
-              panelPolygon,
-              sideMesh.geometry
-            )
-
-            topMesh.geometry = topGeometry
-            sideMesh.geometry = sideGeometry
-          }
-          if (panelPolygon.layer != 'user_deactivated_panel') {
-            panelSideGeometries.push(sideMesh.geometry)
-          }
-          if (!panelTopGeometries[materialId]) {
-            panelTopGeometries[materialId] = []
-          }
-          panelTopGeometries[materialId].push(topMesh.geometry)
-          topMesh.material = material
         }
       })
 
@@ -186,7 +194,10 @@ export default {
       )
       //if no panels, no materialIds,
       for (let materialId of materialIdsToRemove) {
-        this.clearMeshFromScene(this.mergedPanelTopMeshes[materialId], this.scene)
+        this.clearMeshFromScene(
+          this.mergedPanelTopMeshes[materialId],
+          this.scene
+        )
         delete this.mergedPanelTopMeshes[materialId]
       }
       this.mergedPanelSideMesh = this.updateOrCreateMergedMesh(

package/src/helper/renderMixin.js

@@ -296,6 +296,7 @@ export default {
             method: this.renderRoofsMargin,
             arg: []
           })
+          break
         case 'selectedModuleFieldChange':
           methodList.push({
             name: 'renderEdges',
@@ -379,6 +380,13 @@ export default {
             arg: []
           })
           break
+        case 'clearPanelFromChangingRoofs':
+          methodList.push({
+            name: 'clearPanelsFromChangingRoofs',
+            method: this.clearPanelsFromChangingRoofs,
+            arg: [params.roofIds]
+          })
+          break
         case 'selectedPanelChange':
           methodList.push({
             name: 'renderModuleFields',

package/src/store/nodesEdgesCreation.js

@@ -119,7 +119,7 @@ export function generateNodes3D(polygons) {
   return nodes3D
 }
 
-export function generateEdges2D(polygons, splitEdgesIds = []) {
+export function generateEdges2D(polygons) {
   let edges2D = []
   polygons
     .filter((poly) =>
@@ -162,27 +162,6 @@ export function generateEdges2D(polygons, splitEdgesIds = []) {
         edge2D.id += '_' + polygon.id + '_' + i
       })
     })
-  edges2D.forEach((edge2D) => {
-    edge2D.isSplit = splitEdgesIds.includes(edge2D.id)
-  })
-  edges2D.forEach((edge2D) => {
-    const isNotSplit = edge2D.belongsTo.every((item, index, array) => {
-      const outline0 = array[0].polygon.outline
-      const outline1 = item.polygon.outline
-      const point0 = outline0[array[0].index]
-      const nextPoint0 = outline0[(array[0].index + 1) % outline0.length]
-      const point1 = outline1[item.index]
-      const nextPoint1 = outline1[(item.index + 1) % outline1.length]
-      return isAlmostSameSegment3D(
-        [point0, nextPoint0],
-        [point1, nextPoint1],
-        mmTolerance
-      )
-    })
-    if (!isNotSplit && edge2D.belongsTo.length == 2) {
-      edge2D.isSplit = true
-    }
-  })
   return edges2D
 }
 

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

@@ -8,7 +8,7 @@ import { hydrateData } from './hydrateData.js'
 
 const init_state = {
   isLoading: false,
-  
+
   polygons: [],
   nodes: [],
   edges: [],