geometrix 1.0.7 → 1.0.9

package/dist/index.d.ts

@@ -294,6 +294,22 @@ declare class PaxPath {
 }
 declare function paxPath(): PaxPath;
 
+interface tEnvelop {
+    xMin: number;
+    xMax: number;
+    yMin: number;
+    yMax: number;
+    orientation: boolean;
+}
+declare class Envelop {
+    /** @internal */
+    pEnvelop: tEnvelop;
+    constructor(iEnvelop: tEnvelop);
+    add(iEnvelop: tEnvelop): boolean;
+    check(iEnvelop: tEnvelop): boolean;
+}
+declare function envelop(iEnvelop: tEnvelop): Envelop;
+
 declare abstract class AContour {
     abstract circle: boolean;
     abstract imposedColor: string;
@@ -301,7 +317,7 @@ declare abstract class AContour {
     abstract extractSkeleton(): AContour;
     abstract generateContour(): AContour;
     abstract generatePoints(dnb: number): Point[];
-    abstract getEnvelop(): [number, number, number, number, boolean];
+    abstract getEnvelop(): tEnvelop;
     abstract generateLines(): Line[];
     abstract check(): string;
     abstract toSvg(yCeiling: number, color?: string): string;
@@ -369,7 +385,7 @@ declare class Contour extends AContour {
     generateContour(): Contour;
     generatePoints(dnb: number): Point[];
     getOrientation(iPts: Point[], extremX: number): boolean;
-    getEnvelop(): [number, number, number, number, boolean];
+    getEnvelop(): tEnvelop;
     generateLines(): Line[];
     /** @internal */
     checkContour(ctr: Contour): void;
@@ -378,7 +394,7 @@ declare class Contour extends AContour {
     toDxfSeg(): DxfSeg[];
     toPax(): tPaxContourPath;
     getPerimeter(): number;
-    generateRevertOrientation(): AContour;
+    generateRevertOrientation(): Contour;
 }
 /**
  * class `ContourCircle`
@@ -400,14 +416,14 @@ declare class ContourCircle extends AContour {
     extractSkeleton(): ContourCircle;
     generateContour(): ContourCircle;
     generatePoints(dnb: number): Point[];
-    getEnvelop(): [number, number, number, number, boolean];
+    getEnvelop(): tEnvelop;
     generateLines(): Line[];
     check(): string;
     toSvg(yCeiling: number, color?: string): string;
     toDxfSeg(): DxfSeg[];
     toPax(): tPaxContourCircle;
     getPerimeter(): number;
-    generateRevertOrientation(): AContour;
+    generateRevertOrientation(): ContourCircle;
 }
 declare function contour(ix: number, iy: number, icolor?: string): Contour;
 declare function contourCircle(ix: number, iy: number, iRadius: number, icolor?: string): ContourCircle;
@@ -641,6 +657,21 @@ interface tParamValInFile {
 declare function createParamFile(lastModif: string, iPartName: string, idparams: tParamVal, comment: string): string;
 declare function parseParamFile(fContentStr: string): [tParamValInFile, string];
 
+type tVec2 = [number, number];
+type tVec3b = [number, number, number];
+type tT2dMatrix = [tVec3b, tVec3b, tVec3b];
+declare class Transform2d {
+    mmat: tT2dMatrix;
+    constructor(iMat: tT2dMatrix);
+    addRotation(az: number): this;
+    addTranslation(ax: number, ay: number): this;
+    getMatrix(): tT2dMatrix;
+    getRotation(): number;
+    getTranslation(): tVec2;
+    transform(iv: tVec2): tVec2;
+}
+declare function transform2d(initM?: tT2dMatrix): Transform2d;
+
 type tVec3 = [number, number, number];
 type tVec4 = [number, number, number, number];
 type tT3dMatrix = [tVec4, tVec4, tVec4, tVec4];
@@ -694,4 +725,4 @@ declare function version_details(appPackage: tPackage): string[];
 
 declare function checkImpPages(pages: tAllPageDef): [boolean, string];
 
-export { Contour, ContourCircle, DesignParam, DxfSeg, DxfWrite, EBVolume, EExtrude, EFormat, Figure, Line, PSeg, PType, PaxPath, Point, SegDbg, SegEnum, Segment1, Segment2, ShapePoint, Transform3d, Vector, aBFromLaLbAa, aCFromAaAb, aCFromLaLbLc, adjustCenter, adjustCopy, adjustInit, adjustMini, adjustRect, adjustScale, adjustTranslate, adjustZero, arcSeg1To2, arcSeg2To1, bisector, canvas2point, canvasTranslatePolar, checkGeom, checkImpPages, circleCenter, colors, contour, contourCircle, copyLayers, createParamFile, ctrOblong, ctrRectRot, ctrRectRot2, ctrRectangle, ctrTrapezoid, ctrTrapezoidRot2, degToRad, designParam, dxfSegArc, dxfSegCircle, dxfSegLine, dxfWriter, ffix, figure, fileBin, fileBinContent, fileMime, fileSuffix, fileTextContent, fround, gSegDbg, initGeom, initLayers, isActiveCorner, isAddPoint, isCorner, isSeg, isWithin, lbFromLaAaAb, lcFromLaLbAc, line, linePP, makeCorner, mergeFaces, midArcPoint, oneDesignParam, orientedArc, pCheckbox, pDropdown, pNumber, pSectionSeparator, paramListToVal, parseParamFile, paxCircle, paxPath, point, point2canvas, pointCoord, pointMinMax, prefixLog, radToDeg, radius2canvas, rightTriLaFromLbLc, rightTriLbFromLaLc, roundZero, type tAffine, type tAllLink, type tAllPageDef, type tBVolume, type tCanvasAdjust, type tCartesian, type tContour, type tDependencies, type tDesignParamList, type tDesignParamOne, type tExtrude, type tFigures, type tGeom, type tGeomFunc, type tInherit, type tLayers, type tOuterInner, type tPackage, type tPageDef, type tParam, type tParamChanged, type tParamDef, type tParamVal, type tParamValInFile, type tPaxContour, type tPaxContourCircle, type tPaxContourPath, type tPaxFace, type tPaxSeg, type tPaxSegArc, type tPaxSegSt, type tPolar, type tPosiOrien, type tSimTime, type tSubDesign, type tSubInst, type tT3dMatrix, type tVec3, type tVec4, type tVolume, tolerance, transform3d, vector, version_details, withinHPiHPi, withinPiPi, withinZero2Pi, withinZeroPi, zeroPDef };
+export { Contour, ContourCircle, DesignParam, DxfSeg, DxfWrite, EBVolume, EExtrude, EFormat, Envelop, Figure, Line, PSeg, PType, PaxPath, Point, SegDbg, SegEnum, Segment1, Segment2, ShapePoint, Transform2d, Transform3d, Vector, aBFromLaLbAa, aCFromAaAb, aCFromLaLbLc, adjustCenter, adjustCopy, adjustInit, adjustMini, adjustRect, adjustScale, adjustTranslate, adjustZero, arcSeg1To2, arcSeg2To1, bisector, canvas2point, canvasTranslatePolar, checkGeom, checkImpPages, circleCenter, colors, contour, contourCircle, copyLayers, createParamFile, ctrOblong, ctrRectRot, ctrRectRot2, ctrRectangle, ctrTrapezoid, ctrTrapezoidRot2, degToRad, designParam, dxfSegArc, dxfSegCircle, dxfSegLine, dxfWriter, envelop, ffix, figure, fileBin, fileBinContent, fileMime, fileSuffix, fileTextContent, fround, gSegDbg, initGeom, initLayers, isActiveCorner, isAddPoint, isCorner, isSeg, isWithin, lbFromLaAaAb, lcFromLaLbAc, line, linePP, makeCorner, mergeFaces, midArcPoint, oneDesignParam, orientedArc, pCheckbox, pDropdown, pNumber, pSectionSeparator, paramListToVal, parseParamFile, paxCircle, paxPath, point, point2canvas, pointCoord, pointMinMax, prefixLog, radToDeg, radius2canvas, rightTriLaFromLbLc, rightTriLbFromLaLc, roundZero, type tAffine, type tAllLink, type tAllPageDef, type tBVolume, type tCanvasAdjust, type tCartesian, type tContour, type tDependencies, type tDesignParamList, type tDesignParamOne, type tEnvelop, type tExtrude, type tFigures, type tGeom, type tGeomFunc, type tInherit, type tLayers, type tOuterInner, type tPackage, type tPageDef, type tParam, type tParamChanged, type tParamDef, type tParamVal, type tParamValInFile, type tPaxContour, type tPaxContourCircle, type tPaxContourPath, type tPaxFace, type tPaxSeg, type tPaxSegArc, type tPaxSegSt, type tPolar, type tPosiOrien, type tSimTime, type tSubDesign, type tSubInst, type tT2dMatrix, type tT3dMatrix, type tVec2, type tVec3, type tVec3b, type tVec4, type tVolume, tolerance, transform2d, transform3d, vector, version_details, withinHPiHPi, withinPiPi, withinZero2Pi, withinZeroPi, zeroPDef };

package/dist/index.js

@@ -2309,7 +2309,7 @@ var Contour = class _Contour extends AContour {
     if (orient2 !== rOrientation) {
       throw `err390: orientation unstable ${rOrientation} ${orient2} with ${pts.length} points`;
     }
-    return [rXmin, rXmax, rYmin, rYmax, rOrientation];
+    return { xMin: rXmin, xMax: rXmax, yMin: rYmin, yMax: rYmax, orientation: rOrientation };
   }
   generateLines() {
     const rLines = [];
@@ -2507,13 +2507,13 @@ var ContourCircle = class _ContourCircle extends AContour {
     return rPoints;
   }
   getEnvelop() {
-    return [
-      this.px - this.radius,
-      this.px + this.radius,
-      this.py - this.radius,
-      this.py + this.radius,
-      true
-    ];
+    return {
+      xMin: this.px - this.radius,
+      xMax: this.px + this.radius,
+      yMin: this.py - this.radius,
+      yMax: this.py + this.radius,
+      orientation: true
+    };
   }
   generateLines() {
     return [];
@@ -4483,6 +4483,166 @@ function parseParamFile(fContentStr) {
   return [rObj, rlog];
 }
 
+// src/envelop.ts
+var Envelop = class {
+  /** @internal */
+  pEnvelop = { xMin: 0, xMax: 0, yMin: 0, yMax: 0, orientation: true };
+  constructor(iEnvelop) {
+    this.pEnvelop.xMin = iEnvelop.xMin;
+    this.pEnvelop.xMax = iEnvelop.xMax;
+    this.pEnvelop.yMin = iEnvelop.yMin;
+    this.pEnvelop.yMax = iEnvelop.yMax;
+    this.pEnvelop.orientation = iEnvelop.orientation;
+  }
+  add(iEnvelop) {
+    let rChange = false;
+    if (iEnvelop.xMin < this.pEnvelop.xMin) {
+      rChange = true;
+      this.pEnvelop.xMin = iEnvelop.xMin;
+      this.pEnvelop.orientation = iEnvelop.orientation;
+    }
+    if (iEnvelop.xMax > this.pEnvelop.xMax) {
+      this.pEnvelop.xMax = iEnvelop.xMax;
+    }
+    if (iEnvelop.yMin < this.pEnvelop.yMin) {
+      this.pEnvelop.yMin = iEnvelop.yMin;
+    }
+    if (iEnvelop.yMax > this.pEnvelop.yMax) {
+      this.pEnvelop.yMax = iEnvelop.yMax;
+    }
+    return rChange;
+  }
+  check(iEnvelop) {
+    let rOk = false;
+    const epsilon = 10 ** -2;
+    if (iEnvelop.xMin < this.pEnvelop.xMin + epsilon && iEnvelop.xMax > this.pEnvelop.xMax - epsilon && iEnvelop.yMin < this.pEnvelop.yMin + epsilon && iEnvelop.yMax > this.pEnvelop.yMax - epsilon) {
+      rOk = true;
+    }
+    return rOk;
+  }
+};
+function envelop(iEnvelop) {
+  return new Envelop(iEnvelop);
+}
+
+// src/transform2d.ts
+function t2dInitNull() {
+  const rM = [
+    [0, 0, 0],
+    [0, 0, 0],
+    [0, 0, 0]
+  ];
+  return rM;
+}
+function t2dInitIdentity() {
+  const rM = [
+    [1, 0, 0],
+    [0, 1, 0],
+    [0, 0, 1]
+  ];
+  return rM;
+}
+function t2dRotate(az) {
+  const rM = t2dInitIdentity();
+  const cos = Math.cos(az);
+  const sin = Math.sin(az);
+  rM[0][0] = cos;
+  rM[1][1] = cos;
+  rM[0][1] = -sin;
+  rM[1][0] = sin;
+  return rM;
+}
+function t2dMatMultiply(ma, mb) {
+  const rM = t2dInitNull();
+  for (let i = 0; i < 3; i++) {
+    for (let j = 0; j < 3; j++) {
+      let t = 0;
+      for (let k = 0; k < 3; k++) {
+        t += ma[i][k] * mb[k][j];
+      }
+      rM[i][j] = t;
+    }
+  }
+  return rM;
+}
+function t2dCombine(tM) {
+  let rM = t2dInitIdentity();
+  for (const tmi of tM) {
+    rM = t2dMatMultiply(tmi, rM);
+  }
+  return rM;
+}
+function t2dTranslate(ax, ay) {
+  const rM = t2dInitIdentity();
+  rM[0][2] = ax;
+  rM[1][2] = ay;
+  return rM;
+}
+function t2dCopyMatrix(tm) {
+  const rM = t2dInitNull();
+  for (let i = 0; i < 3; i++) {
+    for (let j = 0; j < 3; j++) {
+      rM[i][j] = tm[i][j];
+    }
+  }
+  return rM;
+}
+function t2dApply(ma, va) {
+  const vb = [va[0], va[1], 1];
+  const rV = [0, 0];
+  for (let i = 0; i < 2; i++) {
+    let t = 0;
+    for (let k = 0; k < 3; k++) {
+      t += ma[i][k] * vb[k];
+    }
+    rV[i] = t;
+  }
+  return rV;
+}
+function t2dGetTranslation(tm) {
+  const rVT = [tm[0][2], tm[1][2]];
+  return rVT;
+}
+function t2dGetRotation(tm) {
+  const rAz = Math.atan2(tm[1][0], tm[0][0]);
+  return rAz;
+}
+var Transform2d = class {
+  mmat;
+  constructor(iMat) {
+    this.mmat = t2dCopyMatrix(iMat);
+  }
+  addRotation(az) {
+    const mR = t2dRotate(az);
+    this.mmat = t2dCombine([this.mmat, mR]);
+    return this;
+  }
+  addTranslation(ax, ay) {
+    const mT = t2dTranslate(ax, ay);
+    this.mmat = t2dCombine([this.mmat, mT]);
+    return this;
+  }
+  getMatrix() {
+    return this.mmat;
+  }
+  getRotation() {
+    const rVR = t2dGetRotation(this.mmat);
+    return rVR;
+  }
+  getTranslation() {
+    const rVT = t2dGetTranslation(this.mmat);
+    return rVT;
+  }
+  transform(iv) {
+    const rV = t2dApply(this.mmat, iv);
+    return rV;
+  }
+};
+var initMid = t2dInitIdentity();
+function transform2d(initM = initMid) {
+  return new Transform2d(initM);
+}
+
 // src/transform3d.ts
 function t3dInitNull() {
   const rM = [
@@ -4641,8 +4801,8 @@ var Transform3d = class {
     return rV;
   }
 };
-var initMid = t3dInitIdentity();
-function transform3d(initM = initMid) {
+var initMid2 = t3dInitIdentity();
+function transform3d(initM = initMid2) {
   return new Transform3d(initM);
 }
 
@@ -4738,6 +4898,7 @@ export {
   Segment1,
   Segment2,
   ShapePoint,
+  Transform2d,
   Transform3d,
   Vector,
   aBFromLaLbAa,
@@ -4776,6 +4937,7 @@ export {
   dxfSegCircle,
   dxfSegLine,
   dxfWriter,
+  envelop,
   ffix,
   figure,
   fileBin,
@@ -4820,6 +4982,7 @@ export {
   rightTriLbFromLaLc,
   roundZero,
   tolerance,
+  transform2d,
   transform3d,
   vector,
   version_details,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "geometrix",
-	"version": "1.0.7",
+	"version": "1.0.9",
 	"description": "The 2D geometry engine of the parametrix",
 	"private": false,
 	"repository": {