@eturnity/eturnity_maths 6.50.1 → 7.2.0

package/package.json

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

package/src/geometry.js

@@ -10,6 +10,7 @@ import {addVector,
   meanVector,
   vectorLength,
   normalizeVector} from './vector'
+import {inverse3x3matrix,multiplyMatrices} from './matrix'
 import {Point} from './objects/Point'
 import {Line} from './objects/Line'
 import concaveman from 'concaveman'
@@ -91,6 +92,23 @@ export function getParallelLinePassingByPoint(A, B, C) {
   const D = new Point(C.x + B.x - A.x, C.y + B.y - A.y)
   return new Line(C, D, '')
 }
+
+export function getDataAboutTwo3DLines(A,u,B,v){
+  let w=crossProduct(u,v)
+  let m=[
+    [u.x,v.x,w.x],
+    [u.y,v.y,w.y],
+    [u.z,v.z,w.z]
+  ]
+  let mInv=inverse3x3matrix(m)
+  let AB=substractVector(B,A)
+  let [t1,t2,t3] = multiplyMatrices(mInv,[[AB.x],[AB.y],[AB.z]])
+  let M=addVector(A,multiplyVector(t1,u))
+  let N=addVector(B,multiplyVector(t2,v))
+  let distance=get3DDistanceBetweenPoints(M,N)
+  return {m,mInv,M,N,A,B,u,v,w,distance,t1,t2,t3}
+
+}
 export function vectorFromAngleInDegCanvas(angle) {
   return {
     x: Math.sin((angle * Math.PI) / 180),
@@ -104,6 +122,7 @@ export function getDistanceBetweenPoints(firstPoint, secondPoint) {
     )
     return distance
   }
+
 export function get3DDistanceBetweenPoints(firstPoint, secondPoint) {
     const distance = Math.hypot(
       firstPoint.x - secondPoint.x,
@@ -143,6 +162,9 @@ export function get3DDistanceBetweenPoints(firstPoint, secondPoint) {
   export function isSamePoint3D(A, B) {
     return A.x == B.x && A.y == B.y && A.z == B.z
   }
+  export function isAlmostSamePoint3D(A, B, tolerance) {
+    return Math.abs(A.x - B.x) < tolerance && Math.abs(A.y - B.y) < tolerance && Math.abs(A.z - B.z) < tolerance
+  }
   export function isSamePoint2D(A, B) {
     return A.x == B.x && A.y == B.y
   }
@@ -172,6 +194,15 @@ export function get3DDistanceBetweenPoints(firstPoint, secondPoint) {
       isSamePoint3D(seg_0[0], seg_1[1]) && isSamePoint3D(seg_0[1], seg_1[0])
     return check_1 || check_2
   }
+  export function isAlmostSameSegment3D(seg_0, seg_1, tolerance) {
+    let check_1 =
+      isAlmostSamePoint3D(seg_0[0], seg_1[0], tolerance) &&
+      isAlmostSamePoint3D(seg_0[1], seg_1[1], tolerance)
+    let check_2 =
+      isAlmostSamePoint3D(seg_0[0], seg_1[1], tolerance) &&
+      isAlmostSamePoint3D(seg_0[1], seg_1[0], tolerance)
+    return check_1 || check_2
+  }
   export function isSameLine(AB, CD) {
     if (!AB || !CD) {
       console.error('AB or CD not defined')
@@ -600,7 +631,13 @@ export function get3DDistanceBetweenPoints(firstPoint, secondPoint) {
     const normalVector = normalizeVector(crossProduct(AB, BC))
     return normalVector
   }
-  
+  export function normalVectorWithDirectionAndIncline(direction,incline){
+    return {
+      x:Math.sin(direction*Math.PI/180)*Math.sin(incline*Math.PI/180),
+      y:Math.cos(direction*Math.PI/180)*Math.sin(incline*Math.PI/180),
+      z:Math.cos(incline*Math.PI/180)
+    }
+  }
   export function inclineWithNormalVector(normalVector) {
     const angleRad = Math.acos(dotProduct(normalVector, { x: 0, y: 0, z: 1 }))
     const angleDeg = (angleRad * 180) / Math.PI

package/src/objects/Polygon.js

@@ -188,7 +188,8 @@ export class Polygon {
         roof_margins_mm: margins_roof_mm,
         roof_slope_degrees: this.incline,
         roof_orientation_degrees: this.direction,
-        roof_name: this.name
+        roof_name: this.name,
+        shading_data: this.shadingData ? this.shadingData : undefined
       }
     } else if (this.layer == 'obstacle') {
       const margins_obstacle_mm = this.margins.isSameMargin