Merge pull request #1260 from jsxcad/xform

Lazy matrix composition

Author: pentacular

algorithm/cgal/Geometry.h

@@ -180,6 +180,19 @@ enum GeometryType {
   GEOMETRY_GROUP = 8,
 };
 
+enum TransformType {
+  TRANSFORM_COMPOSE = 0,
+  TRANSFORM_EXACT = 1,
+  TRANSFORM_APPROXIMATE = 2,
+  TRANSFORM_INVERT = 3,
+  TRANSFORM_ROTATE_X = 4,
+  TRANSFORM_ROTATE_Y = 5,
+  TRANSFORM_ROTATE_Z = 6,
+  TRANSFORM_TRANSLATE = 7,
+  TRANSFORM_SCALE = 8,
+  TRANSFORM_IDENTITY = 9,
+};
+
 #include "Edge.h"
 
 class DN {

algorithm/cgal/cgal_browser.cjs

@@ -1,5 +1,6 @@
 import { computeArea } from './computeArea.js';
 import { initCgal } from './getCgal.js';
+import { makeApproximateMatrix } from './transform.js';
 
 import test from 'ava';
 
@@ -35,7 +36,9 @@ test('Area of polygon with hole', (t) => {
         },
       ],
       plane: [0, 0, 1, 0],
-      matrix: [2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1],
+      matrix: makeApproximateMatrix([
+        2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1,
+      ]),
     },
   ]);
   t.is(area.toFixed(4), (6).toFixed(4));

algorithm/cgal/cgal_browser.wasm

@@ -1,4 +1,5 @@
 import { computeCentroid } from './computeCentroid.js';
+import { identityMatrix } from './transform.js';
 import { initCgal } from './getCgal.js';
 
 import test from 'ava';
@@ -28,55 +29,19 @@ test('Compute Centroid', (t) => {
       ],
       plane: [0, 0, 1, 0],
       exactPlane: '0 0 1 0',
-      matrix: [
-        1,
-        0,
-        0,
-        1,
-        0,
-        1,
-        0,
-        0,
-        0,
-        0,
-        1,
-        0,
-        0,
-        0,
-        0,
-        1,
-        '1 0 0 1 0 1 0 0 0 0 1 0 1',
-      ],
+      matrix: identityMatrix,
       tags: [],
     },
   ]);
   t.deepEqual(JSON.parse(JSON.stringify(centroid)), [
     {
       type: 'points',
-      points: [[1, -5.551115123125783e-17, 0]],
+      matrix: identityMatrix,
+      tags: [],
+      points: [[9.442564829413299e-17, -5.551115123125783e-17, 0]],
       exactPoints: [
-        '243388915243820068069523124935687/243388915243820045087367015432192 -1/18014398509481984 0',
+        '22982156109503495/243388915243820045087367015432192 -1/18014398509481984 0',
       ],
-      matrix: [
-        1,
-        0,
-        0,
-        0,
-        0,
-        1,
-        0,
-        0,
-        0,
-        0,
-        1,
-        0,
-        0,
-        0,
-        0,
-        1,
-        '1 0 0 0 0 1 0 0 0 0 1 0 1',
-      ],
-      tags: [],
     },
   ]);
 });