abstract-3d 0.1.26 → 0.2.0

package/src/renderers/step/step-geometries/step-cylinder.ts

@@ -1,162 +1,195 @@
-// import {
-//   Plane,
-//   Material,
-//   Vec3,
-//   vec2Scale,
-//   vec3TransRot,
-//   vec3RotCombine,
-//   vec3Zero,
-//   vec3,
-//   vec3PosX,
-//   vec3PosZ,
-//   Cylinder,
-//   vec2Zero,
-//   vec2,
-// } from "../../../abstract-3d";
-// import { parseRgb } from "../../shared";
-// import {
-//   ADVANCED_BREP_SHAPE_REPRESENTATION,
-//   ADVANCED_FACE,
-//   AXIS2_PLACEMENT_3D,
-//   CARTESIAN_POINT,
-//   CLOSED_SHELL,
-//   COLOUR_RGB,
-//   CURVE_STYLE,
-//   CYLINDRICAL_SURFACE,
-//   DEFINITIONAL_REPRESENTATION,
-//   DIRECTION,
-//   DRAUGHTING_PRE_DEFINED_CURVE_FONT,
-//   EDGE_CURVE,
-//   EDGE_LOOP,
-//   FACE_BOUND,
-//   FILL_AREA_STYLE_COLOUR,
-//   LINE,
-//   MANIFOLD_SOLID_BREP,
-//   MANIFOLD_SURFACE_SHAPE_REPRESENTATION,
-//   MECHANICAL_DESIGN_GEOMETRIC_PRESENTATION_REPRESENTATION,
-//   MutableStep,
-//   OPEN_SHELL,
-//   ORIENTED_EDGE,
-//   PCURVE,
-//   PLANE,
-//   PRESENTATION_STYLE_ASSIGNMENT,
-//   SHELL_BASED_SURFACE_MODEL,
-//   STYLED_ITEM,
-//   SURFACE_SIDE_STYLE,
-//   SURFACE_STYLE_FILL_AREA,
-//   SURFACE_STYLE_USAGE,
-//   VECTOR,
-//   VERTEX_POINT,
-// } from "../step-encoding";
+import {
+  Plane,
+  Material,
+  Vec3,
+  vec2Scale,
+  vec3TransRot,
+  vec3RotCombine,
+  vec3Zero,
+  vec3,
+  vec3PosX,
+  vec3PosZ,
+  Cylinder,
+  vec2Zero,
+  vec2,
+  vec3NegX,
+  vec3NegY,
+  vec3NegZ,
+  vec3PosY,
+} from "../../../abstract-3d";
+import { parseRgb } from "../../shared";
+import {
+  ADVANCED_BREP_SHAPE_REPRESENTATION,
+  ADVANCED_FACE,
+  AXIS2_PLACEMENT_3D,
+  CARTESIAN_POINT,
+  CIRCLE,
+  CLOSED_SHELL,
+  COLOUR_RGB,
+  CURVE_STYLE,
+  CYLINDRICAL_SURFACE,
+  DEFINITIONAL_REPRESENTATION,
+  DIRECTION,
+  DRAUGHTING_PRE_DEFINED_CURVE_FONT,
+  EDGE_CURVE,
+  EDGE_LOOP,
+  FACE_BOUND,
+  FILL_AREA_STYLE_COLOUR,
+  LINE,
+  MANIFOLD_SOLID_BREP,
+  MANIFOLD_SURFACE_SHAPE_REPRESENTATION,
+  MECHANICAL_DESIGN_GEOMETRIC_PRESENTATION_REPRESENTATION,
+  MutableStep,
+  OPEN_SHELL,
+  ORIENTED_EDGE,
+  PCURVE,
+  PLANE,
+  PRESENTATION_STYLE_ASSIGNMENT,
+  SEAM_CURVE,
+  SHELL_BASED_SURFACE_MODEL,
+  STYLED_ITEM,
+  SURFACE_CURVE,
+  SURFACE_SIDE_STYLE,
+  SURFACE_STYLE_FILL_AREA,
+  SURFACE_STYLE_USAGE,
+  VECTOR,
+  VERTEX_POINT,
+} from "../step-encoding";
 
-// export function stepCylinder(c: Cylinder, mat: Material, parentPos: Vec3, parentRot: Vec3, m: MutableStep): void {
-//   const pos = vec3TransRot(c.pos, parentPos, parentRot);
-//   const rot = vec3RotCombine(parentRot, c.rot ?? vec3Zero);
-//   const cart3tr = (x: number, y: number): number => CARTESIAN_POINT(vec3TransRot(vec3(x, y, 0), pos, rot), m);
-//   const v0 = VECTOR(DIRECTION(vec3Zero, m), m);
-//   const c03 = CARTESIAN_POINT(vec3Zero, m);
-//   const c02 = CARTESIAN_POINT(vec2Zero, m);
-//   const [c1, c2] = [cart3tr(-half.x, -half.y), cart3tr(half.x, -half.y)];
-//   const [c3, c4] = [cart3tr(half.x, half.y), cart3tr(-half.x, half.y)];
-//   const [v1, v2, v3, v4] = [VERTEX_POINT(c1, m), VERTEX_POINT(c2, m), VERTEX_POINT(c3, m), VERTEX_POINT(c4, m)];
-//   const [l1, l2, l3, l4] = [LINE(c1, v0, m), LINE(c2, v0, m), LINE(c3, v0, m), LINE(c4, v0, m)];
-//   const [oe1, oe2, oe3, oe4] = [
-//     ORIENTED_EDGE(EDGE_CURVE(v1, v2, l1, m), m),
-//     ORIENTED_EDGE(EDGE_CURVE(v2, v3, l2, m), m),
-//     ORIENTED_EDGE(EDGE_CURVE(v3, v4, l3, m), m),
-//     ORIENTED_EDGE(EDGE_CURVE(v4, v1, l4, m), m),
-//   ];
+export function stepCylinder(c: Cylinder, mat: Material, parentPos: Vec3, parentRot: Vec3, m: MutableStep): void {
+  const pos = vec3TransRot(c.pos, parentPos, parentRot);
+  const rot = vec3RotCombine(parentRot, c.rot ?? vec3Zero);
+  const cart3tr = (x: number, y: number): number => CARTESIAN_POINT(vec3TransRot(vec3(x, y, 0), pos, rot), m);
+  const v0 = VECTOR(DIRECTION(vec3Zero, m), m);
+  const c03 = CARTESIAN_POINT(vec3Zero, m);
+  const c02 = CARTESIAN_POINT(vec2Zero, m);
+  const [d1, d2] = [DIRECTION(vec3RotCombine(vec3PosX, rot), m), DIRECTION(vec3RotCombine(vec3PosY, rot), m)];
+  const [d3, d4] = [DIRECTION(vec3RotCombine(vec3PosZ, rot), m), DIRECTION(vec3RotCombine(vec3NegX, rot), m)];
+  const [d5, d6] = [DIRECTION(vec3RotCombine(vec3NegY, rot), m), DIRECTION(vec3RotCombine(vec3NegZ, rot), m)];
+  const [down, up] = [AXIS2_PLACEMENT_3D(c03, d5, d4, m), AXIS2_PLACEMENT_3D(c03, d2, d1, m)];
+  const [c1, c2] = [cart3tr(-c.radius, -c.length / 2), cart3tr(c.radius, -c.length / 2)];
+  const [c3, c4] = [cart3tr(c.radius, c.length / 2), cart3tr(-c.radius, c.length / 2)];
+  const [v1, v2, v3, v4] = [VERTEX_POINT(c1, m), VERTEX_POINT(c2, m), VERTEX_POINT(c3, m), VERTEX_POINT(c4, m)];
+  const [l1, l2, l3, l4] = [LINE(c1, v0, m), LINE(c2, v0, m), LINE(c3, v0, m), LINE(c4, v0, m)];
 
-//   const [d1, d2] = [DIRECTION(vec3RotCombine(vec3PosX, rot), m), DIRECTION(vec3RotCombine(vec3PosZ, rot), m)];
+  const [oe1, oe2, oe3, oe4] = [
+    ORIENTED_EDGE(
+      EDGE_CURVE(
+        v1,
+        v2,
+        SEAM_CURVE(
+          LINE(c2, v0, m),
+          PCURVE(
+            CYLINDRICAL_SURFACE(down, m),
+            DEFINITIONAL_REPRESENTATION(LINE(c02, VECTOR(DIRECTION(vec2(-1, 0), m), m), m), m),
+            m
+          ),
+          PCURVE(
+            CYLINDRICAL_SURFACE(down, m),
+            DEFINITIONAL_REPRESENTATION(LINE(c02, VECTOR(DIRECTION(vec2(-1, 0), m), m), m), m),
+            m
+          ),
+          m
+        ),
+        m
+      ),
+      m
+    ),
+    ORIENTED_EDGE(
+      EDGE_CURVE(
+        v1,
+        v2,
+        SEAM_CURVE(
+          LINE(c2, v0, m),
+          PCURVE(
+            CYLINDRICAL_SURFACE(down, m),
+            DEFINITIONAL_REPRESENTATION(LINE(c02, VECTOR(DIRECTION(vec2(-1, 0), m), m), m), m),
+            m
+          ),
+          PCURVE(
+            CYLINDRICAL_SURFACE(down, m),
+            DEFINITIONAL_REPRESENTATION(LINE(c02, VECTOR(DIRECTION(vec2(-1, 0), m), m), m), m),
+            m
+          ),
+          m
+        ),
+        m
+      ),
+      m
+    ),
+    ORIENTED_EDGE(
+      EDGE_CURVE(
+        v2,
+        v2,
+        SURFACE_CURVE(
+          CIRCLE(down, m),
+          PCURVE(
+            CYLINDRICAL_SURFACE(down, m),
+            DEFINITIONAL_REPRESENTATION(LINE(c02, VECTOR(DIRECTION(vec2(-1, 0), m), m), m), m),
+            m
+          ),
+          PCURVE(down, DEFINITIONAL_REPRESENTATION(CIRCLE(up, m), m), m),
+          m
+        ),
+        m
+      ),
+      m
+    ), // Bottom  circle edge curve
+    ORIENTED_EDGE(
+      EDGE_CURVE(
+        v3,
+        v3,
+        SURFACE_CURVE(
+          CIRCLE(down, m),
+          PCURVE(
+            CYLINDRICAL_SURFACE(down, m),
+            DEFINITIONAL_REPRESENTATION(LINE(c02, VECTOR(DIRECTION(vec2(-1, 0), m), m), m), m),
+            m
+          ),
+          PCURVE(down, DEFINITIONAL_REPRESENTATION(CIRCLE(up, m), m), m),
+          m
+        ),
+        m
+      ),
+      m
+    ), // Top circle edge curve
+  ];
 
-//   const color = COLOUR_RGB(parseRgb(mat.normal), m);
-//   const sbsm = SHELL_BASED_SURFACE_MODEL(
-//     OPEN_SHELL(
-//       ADVANCED_FACE(FACE_BOUND(EDGE_LOOP([oe1, oe2, oe3, oe4], m), m), PLANE(AXIS2_PLACEMENT_3D(c03, d2, d1, m), m), m),
-//       m
-//     ),
-//     m
-//   );
-
-//   const msb = MANIFOLD_SOLID_BREP(
-//     CLOSED_SHELL(
-//       [
-//         // Front
-//         ADVANCED_FACE(
-//           FACE_BOUND(
-//             EDGE_LOOP(
-//               [
-//                 ORIENTED_EDGE(EDGE_CURVE(v1, v2, l1, m), m),
-//                 ORIENTED_EDGE(EDGE_CURVE(v2, v3, l2, m), m),
-//                 ORIENTED_EDGE(EDGE_CURVE(v3, v4, l3, m), m),
-//                 ORIENTED_EDGE(EDGE_CURVE(v4, v1, l4, m), m),
-//               ],
-//               m
-//             ),
-//             m
-//           ),
-//           PCURVE(
-//             CYLINDRICAL_SURFACE(AXIS2_PLACEMENT_3D(c03, d1, d2, m), m),
-//             DEFINITIONAL_REPRESENTATION(LINE(c02, DIRECTION(vec2(0, -1), m), m), 7, m),
-//             m
-//           ),
-//           m
-//         ),
-//         // Back
-//         ADVANCED_FACE(
-//           FACE_BOUND(
-//             EDGE_LOOP(
-//               [
-//                 ORIENTED_EDGE(EDGE_CURVE(v8, v7, l8, m), m),
-//                 ORIENTED_EDGE(EDGE_CURVE(v7, v6, l7, m), m),
-//                 ORIENTED_EDGE(EDGE_CURVE(v6, v5, l6, m), m),
-//                 ORIENTED_EDGE(EDGE_CURVE(v5, v8, l5, m), m),
-//               ],
-//               m
-//             ),
-//             m
-//           ),
-//           PLANE(AXIS2_PLACEMENT_3D(c03, d6, d4, m), m),
-//           m
-//         ),
-//         // Left
-//         ADVANCED_FACE(
-//           FACE_BOUND(
-//             EDGE_LOOP(
-//               [
-//                 ORIENTED_EDGE(EDGE_CURVE(v1, v5, l1, m), m),
-//                 ORIENTED_EDGE(EDGE_CURVE(v5, v8, l5, m), m),
-//                 ORIENTED_EDGE(EDGE_CURVE(v8, v4, l8, m), m),
-//                 ORIENTED_EDGE(EDGE_CURVE(v4, v1, l4, m), m),
-//               ],
-//               m
-//             ),
-//             m
-//           ),
-//           PLANE(AXIS2_PLACEMENT_3D(c03, d4, d3, m), m),
-//           m
-//         ),
-//       ],
-//       m
-//     ),
-//     m
-//   );
-
-//   ADVANCED_BREP_SHAPE_REPRESENTATION(
-//     AXIS2_PLACEMENT_3D(c03, DIRECTION(vec3PosZ, m), DIRECTION(vec3PosX, m), m),
-//     msb,
-//     m
-//   );
-//   MECHANICAL_DESIGN_GEOMETRIC_PRESENTATION_REPRESENTATION(
-//     STYLED_ITEM(
-//       PRESENTATION_STYLE_ASSIGNMENT(
-//         SURFACE_STYLE_USAGE(SURFACE_SIDE_STYLE(SURFACE_STYLE_FILL_AREA(FILL_AREA_STYLE_COLOUR(color, m), m), m), m),
-//         CURVE_STYLE(DRAUGHTING_PRE_DEFINED_CURVE_FONT("continuous", m), color, m),
-//         m
-//       ),
-//       sbsm,
-//       m
-//     ),
-//     m
-//   );
-// }
+  const color = COLOUR_RGB(parseRgb(mat.normal), m);
+  const msb = MANIFOLD_SOLID_BREP(
+    CLOSED_SHELL(
+      [
+        ADVANCED_FACE(
+          FACE_BOUND(EDGE_LOOP([oe1, oe2, oe3, oe4], m), "F", m),
+          PCURVE(
+            CYLINDRICAL_SURFACE(down, m),
+            DEFINITIONAL_REPRESENTATION(LINE(c02, VECTOR(DIRECTION(vec2(-1, 0), m), m), m), m),
+            m
+          ),
+          m
+        ),
+        ADVANCED_FACE(FACE_BOUND(EDGE_LOOP([oe3], m), "T", m), PLANE(down, m), m), // Circle down
+        ADVANCED_FACE(FACE_BOUND(EDGE_LOOP([oe4], m), "F", m), PLANE(up, m), m), // Circle up
+      ],
+      m
+    ),
+    m
+  );
+  ADVANCED_BREP_SHAPE_REPRESENTATION(
+    AXIS2_PLACEMENT_3D(c03, DIRECTION(vec3PosZ, m), DIRECTION(vec3PosX, m), m),
+    msb,
+    m
+  );
+  MECHANICAL_DESIGN_GEOMETRIC_PRESENTATION_REPRESENTATION(
+    STYLED_ITEM(
+      PRESENTATION_STYLE_ASSIGNMENT(
+        SURFACE_STYLE_USAGE(SURFACE_SIDE_STYLE(SURFACE_STYLE_FILL_AREA(FILL_AREA_STYLE_COLOUR(color, m), m), m), m),
+        CURVE_STYLE(DRAUGHTING_PRE_DEFINED_CURVE_FONT("continuous", m), color, m),
+        m
+      ),
+      msb,
+      m
+    ),
+    m
+  );
+}

package/src/renderers/step/step-geometries/step-plane.ts

@@ -63,7 +63,11 @@ export function stepPlane(p: Plane, mat: Material, parentPos: Vec3, parentRot: V
   const color = COLOUR_RGB(parseRgb(mat.normal), m);
   const sbsm = SHELL_BASED_SURFACE_MODEL(
     OPEN_SHELL(
-      ADVANCED_FACE(FACE_BOUND(EDGE_LOOP([oe1, oe2, oe3, oe4], m), m), PLANE(AXIS2_PLACEMENT_3D(c0, d2, d1, m), m), m),
+      ADVANCED_FACE(
+        FACE_BOUND(EDGE_LOOP([oe1, oe2, oe3, oe4], m), "T", m),
+        PLANE(AXIS2_PLACEMENT_3D(c0, d2, d1, m), m),
+        m
+      ),
       m
     ),
     m

package/src/renderers/svg/svg-geometries/svg-box.ts

@@ -1,7 +1,7 @@
 import * as A3D from "../../../abstract-3d";
 import { gray, black, zElem, zOrderElement } from "./shared";
 import { svgPolygon } from "../svg-encoding";
-import { rgbGray } from "../../shared";
+import { rgbGrayScale } from "../../shared";
 
 export function box(
   b: A3D.Box,
@@ -51,7 +51,7 @@ export function box(
 
   const [strokeColor, fill, strokeUse] = onlyStroke
     ? [grayScale ? gray : color, onlyStrokeFill, stroke]
-    : [black, grayScale ? rgbGray(color) : color, 0];
+    : [black, grayScale ? rgbGrayScale(color) : color, 0];
 
   return [
     zElem(svgPolygon(frontBackPoints, fill, strokeColor, strokeUse), frontBackMean),

package/src/renderers/svg/svg-geometries/svg-cone.ts

@@ -1,7 +1,7 @@
 import * as A3D from "../../../abstract-3d";
 import { gray, stBW, zElem, zOrderElement, transparent } from "./shared";
 import { svgPolygon } from "../svg-encoding";
-import { rgbGray } from "../../shared";
+import { rgbGrayScale } from "../../shared";
 
 export function cone(
   c: A3D.Cone,
@@ -21,7 +21,7 @@ export function cone(
 
   const [stroke, fill] = onlyStroke
     ? [grayScale ? gray : color, onlyStrokeFill]
-    : [transparent, grayScale ? rgbGray(color) : color];
+    : [transparent, grayScale ? rgbGrayScale(color) : color];
   const zOrderComponents = Array<zOrderElement>();
 
   const sides = 8;

package/src/renderers/svg/svg-geometries/svg-cylinder.ts

@@ -1,7 +1,7 @@
 import * as A3D from "../../../abstract-3d";
 import { gray, stBW, transparent, zElem, zOrderElement } from "./shared";
 import { svgPolygon } from "../svg-encoding";
-import { rgbGray } from "../../shared";
+import { rgbGrayScale } from "../../shared";
 
 export function cylinder(
   c: A3D.Cylinder,
@@ -21,7 +21,7 @@ export function cylinder(
 
   const [stroke, fill] = onlyStroke
     ? [grayScale ? gray : color, onlyStrokeFill]
-    : [transparent, grayScale ? rgbGray(color) : color];
+    : [transparent, grayScale ? rgbGrayScale(color) : color];
   const zOrderComponents = Array<zOrderElement>();
 
   const sides = 8;

package/src/renderers/svg/svg-geometries/svg-line.ts

@@ -1,7 +1,7 @@
 import * as A3D from "../../../abstract-3d";
 import { zElem, zOrderElement } from "./shared";
 import { svgLine } from "../svg-encoding";
-import { rgbGray } from "../../shared";
+import { rgbGrayScale } from "../../shared";
 
 export function line(
   l: A3D.Line,
@@ -16,7 +16,7 @@ export function line(
   const v2 = A3D.vec3TransRot(l.end, parentPos, parentRot);
   return [
     zElem(
-      svgLine(point(v1.x, v1.y), point(v2.x, v2.y), grayScale ? rgbGray(fill) : fill, l.thickness),
+      svgLine(point(v1.x, v1.y), point(v2.x, v2.y), grayScale ? rgbGrayScale(fill) : fill, l.thickness),
       A3D.vec3ZMean(v1, v2)
     ),
   ];

package/src/renderers/svg/svg-geometries/svg-plane.ts

@@ -1,7 +1,7 @@
 import * as A3D from "../../../abstract-3d";
 import { gray, black, zElem, zOrderElement } from "./shared";
 import { EmbededImage, svgImage, svgPolygon } from "../svg-encoding";
-import { rgbGray } from "../../shared";
+import { rgbGrayScale } from "../../shared";
 
 export function plane(
   p: A3D.Plane,
@@ -40,6 +40,6 @@ export function plane(
 
   const [strokeColor, fill, strokeThickness] = onlyStroke
     ? [grayScale ? gray : color, onlyStrokeFill, stroke]
-    : [black, grayScale ? rgbGray(color) : color, 0];
+    : [black, grayScale ? rgbGrayScale(color) : color, 0];
   return [zElem(svgPolygon(points, fill, strokeColor, strokeThickness), A3D.vec3ZMean(v1, v2, v3, v4))];
 }

package/src/renderers/svg/svg-geometries/svg-polygon.ts

@@ -1,7 +1,7 @@
 import { Polygon, vec3ZMean, Vec3, Vec2, vec3TransRot, vec3RotCombine, vec3Zero } from "../../../abstract-3d";
 import { gray, zElem, zOrderElement, transparent } from "./shared";
 import { svgPolygon } from "../svg-encoding";
-import { rgbGray } from "../../shared";
+import { rgbGrayScale } from "../../shared";
 
 export function polygon(
   p: Polygon,
@@ -20,6 +20,6 @@ export function polygon(
   const points = rotatedPoints.map(({ x, y }) => point(x, y));
   const [strokeColor, fill, strokeThickness] = onlyStroke
     ? [grayScale ? gray : color, onlyStrokeFill, stroke]
-    : [transparent, grayScale ? rgbGray(color) : color, 0];
+    : [transparent, grayScale ? rgbGrayScale(color) : color, 0];
   return [zElem(svgPolygon(points, fill, strokeColor, strokeThickness), vec3ZMean(...rotatedPoints))];
 }

package/src/renderers/svg/svg-geometries/svg-shape.ts

@@ -1,7 +1,7 @@
 import { vec3ZMean, Vec3, Vec2, vec3TransRot, vec3RotCombine, Shape, vec3, vec3Zero } from "../../../abstract-3d";
 import { gray, zElem, zOrderElement, transparent } from "./shared";
 import { svgPolygon } from "../svg-encoding";
-import { rgbGray } from "../../shared";
+import { rgbGrayScale } from "../../shared";
 
 export function shape(
   s: Shape,
@@ -20,6 +20,6 @@ export function shape(
   const points = rotatedPoints.map(({ x, y }) => point(x, y));
   const [strokeColor, fill] = onlyStroke
     ? [grayScale ? gray : color, onlyStrokeFill]
-    : [transparent, grayScale ? rgbGray(color) : color];
+    : [transparent, grayScale ? rgbGrayScale(color) : color];
   return [zElem(svgPolygon(points, fill, strokeColor, 0), vec3ZMean(...rotatedPoints))];
 }