Merge pull request #51 from bitbybit-dev/develop

Develop

Author: matas-bitbybit-dev

lib/api/inputs/occ-inputs.ts

@@ -162,6 +162,37 @@ export namespace OCCT {
          */
         point: Base.Point3 = [0, 0, 0];
     }
+    export class XYZDto {
+        constructor(x?: number, y?: number, z?: number) {
+            if (x !== undefined) { this.x = x; }
+            if (y !== undefined) { this.y = y; }
+            if (z !== undefined) { this.z = z; }
+        }
+        /**
+         * X coord
+         * @default 0
+         * @minimum -Infinity
+         * @maximum Infinity
+         * @step 0.1
+         */
+        x: number;
+        /**
+         * Y coord
+         * @default 0
+         * @minimum -Infinity
+         * @maximum Infinity
+         * @step 0.1
+         */
+        y: number;
+        /**
+         * Z coord
+         * @default 0
+         * @minimum -Infinity
+         * @maximum Infinity
+         * @step 0.1
+         */
+        z: number;
+    }
     export class PointsDto {
         constructor(points?: Base.Point3[]) {
             if (points !== undefined) { this.points = points; }

lib/services/base/faces.service.ts

@@ -9,7 +9,6 @@ import { WiresService } from "./wires.service";
 import { BooleansService } from "./booleans.service";
 import { ConverterService } from "./converter.service";
 import { FilletsService } from "./fillets.service";
-import { IteratorService } from "./iterator.service";
 
 export class FacesService {
 
@@ -611,6 +610,13 @@ export class FacesService {
     }
 
     subdivideToRectangleHoles(inputs: Inputs.OCCT.FaceSubdivisionToRectanglesDto<TopoDS_Face>): TopoDS_Face[] {
+        // default should be smaller then 1 as that can't punch holes or create faces nicely.
+        if (inputs.scalePatternU === undefined) {
+            inputs.scalePatternU = [0.5];
+        }
+        if(inputs.scalePatternV === undefined){
+            inputs.scalePatternV = [0.5];
+        }
         const wires = this.subdivideToRectangleWires(inputs);
         const faceWires = this.shapeGettersService.getWires({ shape: inputs.shape });
         const wireLengths = this.wiresService.getWiresLengths({ shapes: faceWires });
@@ -626,7 +632,7 @@ export class FacesService {
             });
         }
         revWires.forEach(w => w.delete());
-        
+
         return [newFace, ...faces];
     }
 

lib/services/shapes/vertex.ts

@@ -10,6 +10,10 @@ export class OCCTVertex {
     ) {
     }
 
+    vertexFromXYZ(inputs: Inputs.OCCT.XYZDto): TopoDS_Vertex {
+        return this.och.entitiesService.makeVertex([inputs.x, inputs.y, inputs.z]);
+    }
+
     vertexFromPoint(inputs: Inputs.OCCT.PointDto): TopoDS_Vertex {
         return this.och.entitiesService.makeVertex(inputs.point);
     }

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@bitbybit-dev/occt",
-    "version": "0.16.4",
+    "version": "0.16.5",
     "description": "Bit By Bit Developers CAD algorithms using OpenCascade Technology kernel. Run in Node and in Browser.",
     "main": "index.js",
     "repository": {