@eturnity/eturnity_maths 7.16.0-qa-dev03.1 → 7.16.0-qa-dev03.2

package/package.json

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

package/src/geometry.js

@@ -987,7 +987,12 @@ export function getIndexesOfBiggestTriangleWithFixedIndexes(points,fixedIndexes,
 						if(numberOfPreferedOrFixedIndexes > maxNumberOfPreferedOrFixedIndexes){
 							maxArea = -1
 						}
-						const area = triangleArea(points[i], points[j], points[k])
+						let area = triangleArea(points[i], points[j], points[k])
+						const selectedIndexes = preferedAndFixedIndexes.filter(i=>points[i].selected)
+						//give advantages to connected area
+						if(areConsecutiveIndexes(i,j,k,points.length) && isMiddleIndexPartOf(i,j,k,selectedIndexes)){
+							area=area*1.2
+						}
 						if (area >= maxArea) {
 							maxArea = area
 							maxNumberOfPreferedOrFixedIndexes = numberOfPreferedOrFixedIndexes
@@ -1021,7 +1026,13 @@ export function getIndexesOfBiggestTriangleWithTwoFixedIndexes(points,fixedIndex
 						if(numberOfPreferedOrFixedIndexes > maxNumberOfPreferedOrFixedIndexes){
 							maxArea = -1
 						}
-						const area = triangleArea(points[i], points[j], points[k])
+						let area = triangleArea(points[i], points[j], points[k])
+						
+						//give advantages to connected area
+						const selectedIndexes = preferedAndFixedIndexes.filter(i=>points[i].selected)
+						if(areConsecutiveIndexes(i,j,k,points.length) && isMiddleIndexPartOf(i,j,k,selectedIndexes)){
+							area=area*1.2
+						}
 						if (area > maxArea) {
 							maxArea = area
 							maxNumberOfPreferedOrFixedIndexes = numberOfPreferedOrFixedIndexes
@@ -1036,4 +1047,29 @@ export function getIndexesOfBiggestTriangleWithTwoFixedIndexes(points,fixedIndex
 	}
 	return maxTriangle
 }
-  
+function isMiddleIndexPartOf(i,j,k,indexes){
+	let midIndex=j
+	if(i==0 && j!=1){
+		midIndex = k
+	}else if(i==0 && j==1 && k!=2){
+		midIndex = i
+	}
+	return indexes.includes(midIndex)
+}
+function areConsecutiveIndexes(index1, index2, index3, totalVertices) {
+	// Sort the indexes
+	const sortedIndexes = [index1, index2, index3].sort()
+
+	// Check if the indexes form a continuous sequence
+	if (sortedIndexes[2] - sortedIndexes[0] === 2) {
+		return true // If consecutive
+	}
+
+	// Special case: If the sorted indexes wrap around from the last vertex to the first
+	if ((sortedIndexes[0] === 0 && sortedIndexes[1] === totalVertices - 2 && sortedIndexes[2] === totalVertices - 1) ||
+        (sortedIndexes[0] === 0 && sortedIndexes[1] === 1 && sortedIndexes[2] === totalVertices - 1)) {
+		return true
+	}
+
+	return false // If not consecutive
+}