@eturnity/eturnity_3d 1.0.14-debug → 1.0.16

package/package.json

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

package/src/helper/UpdateRoofModuleFieldRelations.js

@@ -1,8 +1,8 @@
 import {
   isInsidePolygon,
   verticalProjectionOnPlane,
-  calculateArea,
-  intersectOutlines
+  intersectOutlines,
+  calculateArea
 } from '@eturnity/eturnity_maths'
 //this function just update the "roof" and "moduleField(s)" properties of panels,moduleFields and roofs
 export function UpdateRoofModuleFieldRelations(state) {
@@ -30,7 +30,6 @@ export function UpdateRoofModuleFieldRelations(state) {
 
   for (let k in moduleFieldPolygons) {
     const moduleField = moduleFieldPolygons[k]
-    //check if everypoint is in the same roof and if they are not too far from the flat surface.(at least above)
     const moduleFieldArea=calculateArea(moduleField.outline)
     //check if everypoint is in the same roof and if they are not too far from the flat surface.(at least above)
     let roofPolygonCandidates = roofPolygons.filter((roof) =>
@@ -39,13 +38,12 @@ export function UpdateRoofModuleFieldRelations(state) {
           moduleField.outline,
           roof.outline
         )
-        console.log('inter:',intersection)
+        if(intersection.length==0) return false
         const intersectionArea=calculateArea(intersection[0])
-        console.log(intersectionArea,0.9*moduleFieldArea,intersectionArea>0.9*moduleFieldArea)
         return intersectionArea>0.9*moduleFieldArea
+
       }
     )
-    console.log(roofPolygonCandidates)
     //roofs on roof can lead to multiple roof under a point. moduleField is in the smallest
     let smallestRoof = null
     for (let roof of roofPolygonCandidates) {
@@ -54,30 +52,10 @@ export function UpdateRoofModuleFieldRelations(state) {
       }
     }
     let roofPolygon = smallestRoof
-
     if (!roofPolygon) {
       //no roof found under first node of moduleField => moduleField will be deleted
       continue
     }
-    let moduleFieldBelongsToRoof = true
-    moduleField.outline.forEach((p) => {
-      const distanceToFlatRoof =
-        p.z -
-        verticalProjectionOnPlane(
-          p,
-          roofPolygon.normalVector,
-          roofPolygon.flatOutline[0]
-        ).z
-      if (
-        !isInsidePolygon(p, roofPolygon.margins.innerOutline) ||
-        distanceToFlatRoof < -1 ||
-        distanceToFlatRoof > 50
-      ) {
-        // one point from moduleField is not inside the roof or too far from it's flat surface => moduleField will be deleted
-        moduleFieldBelongsToRoof = false
-      }
-    })
-    if (moduleFieldBelongsToRoof) {
       roofPolygon.moduleFields.push(moduleField)
       moduleField.roof = roofPolygon
       moduleField.panels.forEach((panel) => (panel.roof = roofPolygon))
@@ -86,7 +64,7 @@ export function UpdateRoofModuleFieldRelations(state) {
           p.roof = roofPolygon
         }
       })
-    }
+    //}
   }
 
   let newPolygons = state.polygons.map((p) => {

package/src/helper/renderMixin.js

@@ -746,7 +746,9 @@ export default {
       })
 
       this.panels.forEach((panelPolygon) => {
-         
+         if(panelPolygon.roof.isDirectionInclineHandleDraged){
+          return
+         }
         //definition of the material
          let material = this.material.panel['default_'+this.module_texture_version_id]
          if (panelPolygon.moduleField.pvData) {