@eturnity/eturnity_maths 7.51.2 → 8.4.0

package/package.json

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

package/src/geometry.js

@@ -9,7 +9,7 @@ import {
   vectorLength,
   normalizeVector,
 } from './vector'
-import { inverse3x3matrix, multiplyMatrices } from './matrix'
+import { inverse3x3Matrix, multiplyMatrices } from './matrix'
 import { Point } from './objects/Point'
 import { Line } from './objects/Line'
 import concaveman from './lib/concaveman'
@@ -132,7 +132,7 @@ export function getDataAboutTwo3DLines(A, u, B, v) {
     [u.y, v.y, w.y],
     [u.z, v.z, w.z],
   ]
-  let mInv = inverse3x3matrix(m)
+  let mInv = inverse3x3Matrix(m)
   if (!mInv) {
     return null
   }

package/src/intersectionPolygon.js

@@ -12,6 +12,33 @@ import {
   getOutlineList,
 } from './splitMergePolygons'
 
+export function isOutlineTouchingOutline(outline, outlineSelection) {
+  const isOutlinePointWithinSelection = outline.some((p) =>
+    isInsidePolygon(p, outlineSelection)
+  )
+  if (isOutlinePointWithinSelection) {
+    return true
+  }
+
+  const isEdgeInSelection = outline.some((p, index) => {
+    const nextIndex = (index + 1) % outline.length
+    const nextP = outline[nextIndex]
+    return outlineSelection.some((selectionPoint, selectionIndex) => {
+      const nextSelectionIndex = (selectionIndex + 1) % outlineSelection.length
+      const nextSelectionPoint = outlineSelection[nextSelectionIndex]
+      return doLineSegmentsIntersect(
+        p,
+        nextP,
+        selectionPoint,
+        nextSelectionPoint
+      )
+    })
+  })
+  if (isEdgeInSelection) {
+    return true
+  }
+  return false
+}
 export function isOutlineTouchingBoundingBox(outline, bbox) {
   const isOutlinePointWithinBbox = outline.some(
     (p) =>

package/src/matrix.js

@@ -1,15 +1,21 @@
-import { substractVector } from './vector'
-export function inverse2x2Matrix([a, b, c, d]) {
-  //inverse matrix |a,c|
-  //               |b,d|
-  const det = a * b - c * b
+import { substractVector, addVector, multiplyVector } from './vector'
+export function inverse2x2Matrix([[a, b], [c, d]]) {
+  //inverse matrix |a,b|
+  //               |c,d|
+  const det = a * d - c * b
   if (det == 0) {
     return null
   }
-  return [d / det, -b / det, -c / det, a / det]
+  return [
+    [d / det, -b / det],
+    [-c / det, a / det],
+  ]
 }
 
-export function inverse3x3matrix(m) {
+export function inverse3x3Matrix(m) {
+  //inverse matrix |a,b,c|
+  //               |d,e,f|
+  //               |g,h,i|
   let [[a, b, c], [d, e, f], [g, h, i]] = m
   let x = e * i - h * f
   let y = f * g - d * i
@@ -19,7 +25,7 @@ export function inverse3x3matrix(m) {
     ? [
         [x, c * h - b * i, b * f - c * e],
         [y, a * i - c * g, d * c - a * f],
-        [z, g * b - a * h, a * e - d * b]
+        [z, g * b - a * h, a * e - d * b],
       ].map((r) => r.map((v) => (v /= det)))
     : null
 }
@@ -55,11 +61,32 @@ export function multiplyMatrices(a, b) {
 export function rotateTransformation(point, angle, center = { x: 0, y: 0 }) {
   let rotationMatrix = [
     [Math.cos(angle), Math.sin(angle)],
-    [-Math.sin(angle), Math.cos(angle)]
+    [-Math.sin(angle), Math.cos(angle)],
   ]
   let k = multiplyMatrices(rotationMatrix, [
     [point.x - center.x],
-    [point.y - center.y]
+    [point.y - center.y],
   ])
   return { x: k[0][0] + center.x, y: k[1][0] + center.y }
 }
+
+export function getOutlineFromCornerPointsAndDirections(
+  downPoint,
+  point,
+  directions
+) {
+  let M = [
+    [directions[0].x, directions[1].x],
+    [directions[0].y, directions[1].y],
+  ]
+  let invM = inverse2x2Matrix(M)
+  const v = substractVector(point, downPoint)
+  const coefs = multiplyMatrices(invM, [[v.x], [v.y]])
+  const coords = [
+    downPoint,
+    addVector(downPoint, multiplyVector(coefs[0], directions[0])),
+    point,
+    addVector(downPoint, multiplyVector(coefs[1], directions[1])),
+  ]
+  return coords
+}

package/src/tests/matrix/inverse2x2Matrix.spec.js

@@ -0,0 +1,17 @@
+import { inverse2x2Matrix, multiplyMatrices } from '../../index'
+
+describe('inverse2x2Matrix function', () => {
+  test('returns identity if MxinvM ', () => {
+    const M = [
+      [4, 3],
+      [7, 1],
+    ]
+    const invM = inverse2x2Matrix(M)
+    const id = multiplyMatrices(M, invM)
+    for (let i = 0; i < id.length; i++) {
+      for (let j = 0; j < id.length; j++) {
+        expect(id[i][j] - (i == j ? 1 : 0) < 0.001).toBe(true)
+      }
+    }
+  })
+})

package/src/tests/matrix/inverse3x3Matrix.spec.js

@@ -0,0 +1,18 @@
+import { inverse3x3Matrix, multiplyMatrices } from '../../index'
+
+describe('inverse3x3Matrix function', () => {
+  test('returns identity if MxinvM ', () => {
+    const M = [
+      [4, 3, 2],
+      [7, 1, 0],
+      [2, 1, 8],
+    ]
+    const invM = inverse3x3Matrix(M)
+    const id = multiplyMatrices(M, invM)
+    for (let i = 0; i < id.length; i++) {
+      for (let j = 0; j < id.length; j++) {
+        expect(id[i][j] - (i == j ? 1 : 0) < 0.001).toBe(true)
+      }
+    }
+  })
+})