@eturnity/eturnity_maths 6.37.0 → 6.38.0

package/package.json

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

package/src/geometry.js

@@ -104,6 +104,14 @@ export function getDistanceBetweenPoints(firstPoint, secondPoint) {
     )
     return distance
   }
+export function get3DDistanceBetweenPoints(firstPoint, secondPoint) {
+    const distance = Math.hypot(
+      firstPoint.x - secondPoint.x,
+      firstPoint.y - secondPoint.y,
+      firstPoint.z - secondPoint.z
+    )
+    return distance
+  }
   
   export function getDegree(H, I, J) {
     const a = getDistanceBetweenPoints(H, I)

package/src/matrix.js

@@ -52,7 +52,7 @@ export function inverse3x3matrix(m) {
     }
     return product
   }
-  export function rotateTransformation(point,angle,center){
+  export function rotateTransformation(point,angle,center = {x:0,y:0}){
     let rotationMatrix=[[Math.cos(angle),Math.sin(angle)],[-Math.sin(angle),Math.cos(angle)]]
     let k=multiplyMatrices(rotationMatrix,[[point.x-center.x],[point.y-center.y]])
     return {x:k[0][0]+center.x,y:k[1][0]+center.y}

package/src/objects/Circle.js

@@ -2,6 +2,8 @@
 import {
   getDistanceBetweenPoints,
   translate2D,
+  verticalProjectionOnPlane,
+  get3DDistanceBetweenPoints
 } from '../geometry'
 import { v4 as uuidv4 } from 'uuid'
 import {Point} from './Point'
@@ -32,11 +34,21 @@ export class Circle {
     const toCanvasRef = canvasContext.toCanvasRef
     let pxCenter = toCanvasRef(this.center)
     let pxRadius = this.radius / canvasContext.mmPerPx
-    return Math.abs(getDistanceBetweenPoints(point, pxCenter) - pxRadius)
+    if(this.normalVector){
+      point.z=verticalProjectionOnPlane(point,this.normalVector,this.center).z
+    }else{
+      point.z=this.center.z
+    }
+    return Math.abs(get3DDistanceBetweenPoints(point, pxCenter) - pxRadius)
   }
   getProjectedPoint(point) {
-    let distance = getDistanceBetweenPoints(point, this.center)
-    if (distance == 0) {
+    if(this.normalVector){
+      point.z=verticalProjectionOnPlane(point,this.normalVector,this.center).z
+    }else{
+      point.z=this.center.z
+    }
+    let distance = get3DDistanceBetweenPoints(point, this.center)
+        if (distance == 0) {
       console.error("can't project center to cercle", this)
       return null
     }

package/src/objects/Line.js

@@ -1,6 +1,7 @@
 
 import {
   getDistanceBetweenPoints,
+  get3DDistanceBetweenPoints,
   getPointOnLine,
   isSamePoint3D,
   translate2D,
@@ -40,8 +41,8 @@ export class Line {
       canvasContext.mmPerPx
     )
   }
-  mmLength(canvasContext) {
-    return getDistanceBetweenPoints(this.outline[0], this.outline[1])
+  mmLength() {
+    return get3DDistanceBetweenPoints(this.outline[0], this.outline[1])
   }
   
   getMidPoint() {

package/src/objects/Polygon.js

@@ -26,6 +26,7 @@ export class Polygon {
     this.highlight = false
     this.visible = true
     this.heightReference = 0
+    this.priority = 0
     this.margins = {
       isSameMargin: true,
       sameMargin: 200,