@eturnity/eturnity_3d 7.8.0-EPDM-9779.5 → 7.8.0-splitLine.0

package/package.json

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

package/src/helper/render/clear.js

@@ -25,23 +25,6 @@ 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,7 +87,11 @@ 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
           this.meshes.edgeMeshes[edge.id] = cylinder
           this.scene.add(cylinder)
         }

package/src/helper/renderMixin.js

@@ -296,7 +296,6 @@ export default {
             method: this.renderRoofsMargin,
             arg: []
           })
-          break
         case 'selectedModuleFieldChange':
           methodList.push({
             name: 'renderEdges',
@@ -380,13 +379,6 @@ 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) {
+export function generateEdges2D(polygons, splitEdgesIds = []) {
   let edges2D = []
   polygons
     .filter((poly) =>
@@ -162,6 +162,27 @@ export function generateEdges2D(polygons) {
         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: [],