@eturnity/eturnity_maths 7.2.2-qa-7.2.2 → 7.2.2-qa-7.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eturnity/eturnity_maths",
-  "version": "7.2.2-qa-7.2.2",
+  "version": "7.2.2-qa-7.2.4",
   "author": "Eturnity Team",
   "main": "src/index.js",
   "private": false,

package/src/geometry.js

@@ -15,13 +15,22 @@ import {Point} from './objects/Point'
 import {Line} from './objects/Line'
 import concaveman from 'concaveman'
 
-export function getConcaveOutline(selectedPanels,onPanelOutline){
+export function getConcaveOutlines(selectedPanels,onePanelOutline){
+  let buckets=groupAdjacentObjects(selectedPanels)
+  const outlines = []
+  for(let bucketIndex=0;bucketIndex<buckets.length;bucketIndex++){
+    outlines.push(getConcaveOutline(selectedPanels.filter((p,i)=>buckets[bucketIndex].includes(i)),onePanelOutline))
+  }
+  return outlines
+}
+
+export function getConcaveOutline(selectedPanels,onePanelOutline){
   const points = selectedPanels.reduce((acc, cur) => {
     acc.push(...cur.outline.map((p) => [p.x, p.y]))
     return acc
   }, [])
-  let AB = getDistanceBetweenPoints(onPanelOutline[0], onPanelOutline[1])
-  let AD = getDistanceBetweenPoints(onPanelOutline[0], onPanelOutline[3])
+  let AB = getDistanceBetweenPoints(onePanelOutline[0], onePanelOutline[1])
+  let AD = getDistanceBetweenPoints(onePanelOutline[0], onePanelOutline[3])
   let longEdgeLength = Math.max(AB, AD)+100
   var concaveResult = concaveman(points, 1, longEdgeLength)
   concaveResult.pop()
@@ -719,9 +728,54 @@ export function get3DDistanceBetweenPoints(firstPoint, secondPoint) {
     const det = (B.x - A.x) * (C.y - A.y) - (C.x - A.x) * (B.y - A.y)
     return det < 0
   }
-  
+  export function groupAdjacentObjects(objects){
+    if(!objects || objects.length==0) return []
+    // objects with 2D indexes
+    // Check if the objects form an adjacent group
+    let numberOfObjects=objects.length
+    let indexList=Array.from({length: numberOfObjects}, (e, i)=> i)
+    let buckets = []
+    let inBucket=0
+    while (inBucket<objects.length)
+    {
+      let detatchedIndex=indexList.find(i=>!buckets.flat().includes(i))
+      if(detatchedIndex==null) break
+      let queue = [detatchedIndex]
+      let visited = []
+      while (queue.length > 0) {
+        const currentObjectIndex = queue.pop()
+        if (visited.indexOf(currentObjectIndex) == -1) {
+          //if next queued index hasn't been visited, we mark it as visited and we collect all neighbourg to queue
+          visited.push(currentObjectIndex)
+          let x = objects[currentObjectIndex].index[0]
+          let y = objects[currentObjectIndex].index[1]
+          const left = objects.findIndex(
+            (o) => o.index[0] == x - 1 && o.index[1] == y
+          )
+          const right = objects.findIndex(
+            (o) => o.index[0] == x + 1 && o.index[1] == y
+          )
+          const top = objects.findIndex(
+            (o) => o.index[0] == x && o.index[1] == y - 1
+          )
+          const bottom = objects.findIndex(
+            (o) => o.index[0] == x && o.index[1] == y + 1
+          )
+          if (left != -1 && visited.indexOf(left) == -1) queue.push(left)
+          if (right != -1 && visited.indexOf(right) == -1) queue.push(right)
+          if (top != -1 && visited.indexOf(top) == -1) queue.push(top)
+          if (bottom != -1 && visited.indexOf(bottom) == -1) queue.push(bottom)
+        }
+      }
+      inBucket+=visited.length
+      buckets.push(visited)
+    }
+
+    return buckets
+  }
   // Function to check if two indexes are adjacent
   export function areAdjacent(objects) {
+    if(!objects || objects.length==0) return false
     // objects with 2D indexes
     // Check if the objects form an adjacent group
     let visited = []

package/src/objects/Polygon.js

@@ -166,6 +166,7 @@ export class Polygon {
       extraSerialization.mountingData = this.mountingData?{...this.mountingData}:null
       extraSerialization.modules = modules
       extraSerialization.needsOptimisation = this.needsOptimisation
+      extraSerialization.priority = this.priority
 
     } else if (this.layer == 'panel') {
       extraSerialization.index = this.index