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

package/package.json

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

package/src/geometry.js

@@ -150,14 +150,14 @@ export function getDegreeVectors(u,v){
 	return getDegree(u,{x:0,y:0,z:0},v)
 }
 
-  export function getDegree(H, I, J) {
-    let distanceFunction = get3DDistanceBetweenPoints
-    if(H.z==undefined || I.z==undefined || J.z==undefined || isNaN(H.z) || isNaN(I.z) || isNaN(J.z) ){
-      distanceFunction=getDistanceBetweenPoints
-    }
-    const a = distanceFunction(H, I)
-    const b = distanceFunction(I, J)
-    const c = distanceFunction(H, J)
+export function getDegree(H, I, J) {
+	let distanceFunction = get3DDistanceBetweenPoints
+	if(H.z==undefined || I.z==undefined || J.z==undefined || isNaN(H.z) || isNaN(I.z) || isNaN(J.z) ){
+		distanceFunction=getDistanceBetweenPoints
+	}
+	const a = distanceFunction(H, I)
+	const b = distanceFunction(I, J)
+	const c = distanceFunction(H, J)
   
   
 	let angle = (Math.acos((a * a + b * b - c * c) / (2 * a * b)) * 180) / Math.PI
@@ -967,24 +967,33 @@ export function getIndexesOfBiggestTriangleWithFixedIndexes(points,fixedIndexes,
 	if(points.length<3){
 		throw new Error('not enough points to make a triangle')
 	}
+	fixedIndexes=[...new Set(fixedIndexes)]
+	if(fixedIndexes.length>=3){
+		return getIndexesOfBiggestTriangleWithFixedIndexes(points,[],fixedIndexes)
+	}
+
 	let preferedAndFixedIndexes=[...fixedIndexes,...preferedIndexes]
 	preferedAndFixedIndexes=[...new Set(preferedAndFixedIndexes)]
-	console.log('preferedIndexes',preferedIndexes,'fixedIndexes',fixedIndexes)
 	let maxArea = -1
 	let maxNumberOfPreferedOrFixedIndexes = -1
 	let maxTriangle = [ 0, 1, 2]
-	fixedIndexes=[...new Set(fixedIndexes)]
-	if(fixedIndexes.length>=3){
-		return getIndexesOfBiggestTriangleWithFixedIndexes(points,[],fixedIndexes)
-	}
+	
 	for (let i = 0; i < points.length - 2; i++) {
 		for (let j = i + 1; j < points.length - 1; j++) {
 			for (let k = j + 1; k < points.length; k++) {
 				if(arrayIntersection(fixedIndexes,[i,j,k]).length==fixedIndexes.length){
 					const numberOfPreferedOrFixedIndexes = arrayIntersection(preferedAndFixedIndexes,[i,j,k]).length
 					if(numberOfPreferedOrFixedIndexes >= maxNumberOfPreferedOrFixedIndexes){
-						const area = triangleArea(points[i], points[j], points[k])
-						if (area > maxArea) {
+						if(numberOfPreferedOrFixedIndexes > maxNumberOfPreferedOrFixedIndexes){
+							maxArea = -1
+						}
+						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
 							maxTriangle = [i, j, k]
@@ -1014,7 +1023,16 @@ export function getIndexesOfBiggestTriangleWithTwoFixedIndexes(points,fixedIndex
 				if(arrayIntersection(fixedIndexes,[i,j,k]).length==2){
 					const numberOfPreferedOrFixedIndexes = arrayIntersection(preferedAndFixedIndexes,[i,j,k]).length
 					if(numberOfPreferedOrFixedIndexes >= maxNumberOfPreferedOrFixedIndexes){
-						const area = triangleArea(points[i], points[j], points[k])
+						if(numberOfPreferedOrFixedIndexes > maxNumberOfPreferedOrFixedIndexes){
+							maxArea = -1
+						}
+						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
@@ -1029,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
+}