abstract-3d 2.9.3 → 2.10.0

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

@@ -1,15 +1,7 @@
-import type { Material, Vec3, Cone, Cylinder } from "../../../abstract-3d.js";
+import type { Material, Vec3, Cone } from "../../../abstract-3d.js";
 import type { MutableStep } from "../step-encoding.js";
 import { stepCylinder } from "./step-cylinder.js";
 
 export function stepCone(c: Cone, mat: Material, parentPos: Vec3, parentRot: Vec3, m: MutableStep): void {
-  //convert it into a box
-  const cylinder: Cylinder = {
-    type: "Cylinder",
-    pos: c.pos,
-    rot: c.rot,
-    length: c.length,
-    radius: c.radius,
-  };
-  stepCylinder(cylinder, mat, parentPos, parentRot, m, 0.0);
+  stepCylinder({ type: "Cylinder", pos: c.pos, rot: c.rot, length: c.length, radius: c.radius, radiusEnd: 0 }, mat, parentPos, parentRot, m);
 }

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

@@ -45,7 +45,7 @@ import {
 const SMALLEST_RADIUS = 1e-4;
 const GEOMETRY_EPSILON = 1e-12;
 
-export function stepCylinder(c: Cylinder, mat: Material, parentPos: Vec3, parentRot: Vec3, m: MutableStep, rSmall?: number): void {
+export function stepCylinder(c: Cylinder, mat: Material, parentPos: Vec3, parentRot: Vec3, m: MutableStep): void {
   const h = c.length;
 
   if (h <= GEOMETRY_EPSILON) {
@@ -53,7 +53,7 @@ export function stepCylinder(c: Cylinder, mat: Material, parentPos: Vec3, parent
   }
 
   const bottomRadius = Math.max(c.radius, SMALLEST_RADIUS);
-  const requestedTopRadius = Math.max(rSmall ?? c.radius, SMALLEST_RADIUS);
+  const requestedTopRadius = Math.max(c.radiusEnd ?? c.radius, SMALLEST_RADIUS);
 
   const radiusTolerance = GEOMETRY_EPSILON * Math.max(1, bottomRadius, requestedTopRadius);
 

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

@@ -1,9 +1,8 @@
 import type { Cylinder, Material, Vec3 } from "../../../abstract-3d.js";
-import { vec3TransRot, vec3RotCombine, vec3Zero, vec3, equals, vec3Scale } from "../../../abstract-3d.js";
+import { vec3TransRot, vec3RotCombine, vec3Zero, vec3, equals } from "../../../abstract-3d.js";
 import { stlPlaneOfVertices } from "../stl-encoding.js";
-import { stlPlane } from "./stl-plane.js";
 
-export function stlCylinder(c: Cylinder, m: Material, sides: number, parentPos: Vec3, parentRot: Vec3): string {
+export function stlCylinder(c: Cylinder, _m: Material, sides: number, parentPos: Vec3, parentRot: Vec3): string {
   let stlString = "";
   const pos = vec3TransRot(c.pos, parentPos, parentRot);
   const rot = vec3RotCombine(parentRot, c.rot ?? vec3Zero);
@@ -16,6 +15,7 @@ export function stlCylinder(c: Cylinder, m: Material, sides: number, parentPos:
   let currentAngle = angleStart;
 
   const half = c.length / 2;
+  const radiusEnd = c.radiusEnd ?? c.radius;
   const topPos = vec3tr(0, half, 0);
   const botPos = vec3tr(0, -half, 0);
 
@@ -23,10 +23,10 @@ export function stlCylinder(c: Cylinder, m: Material, sides: number, parentPos:
   const topVec3Array = Array<Vec3>();
 
   for (let i = 0; i <= sides; i++) {
-    const x = Math.sin(currentAngle) * c.radius;
-    const z = Math.cos(currentAngle) * c.radius;
-    const currBot = vec3tr(x, -half, z);
-    const currTop = vec3tr(x, half, z);
+    const sin = Math.sin(currentAngle);
+    const cos = Math.cos(currentAngle);
+    const currBot = vec3tr(sin * c.radius, -half, cos * c.radius);
+    const currTop = vec3tr(sin * radiusEnd, half, cos * radiusEnd);
     botVec3Array.push(currBot);
     topVec3Array.push(currTop);
     if (i !== 0) {
@@ -41,16 +41,8 @@ export function stlCylinder(c: Cylinder, m: Material, sides: number, parentPos:
   }
 
   if (!equals(angleStart, angleEnd - Math.PI * 2) && angleLength > 0.0) {
-    const aStart = angleStart - Math.PI / 2;
-    const aEnd = angleEnd - Math.PI / 2;
-    const halfRadius = c.radius / 2;
-    const plane1Rot = vec3(0, aStart, 0);
-    const plane2Rot = vec3(0, aEnd, 0);
-    const plane1Pos = vec3Scale(vec3(Math.cos(aStart), 0, -Math.sin(aStart)), halfRadius);
-    const plane2Pos = vec3Scale(vec3(Math.cos(aEnd), 0, -Math.sin(aEnd)), halfRadius);
-    const planeSize = vec3(c.radius, c.length, 1);
-    stlString += stlPlane({ type: "Plane", pos: plane1Pos, size: planeSize, rot: plane1Rot }, m, pos, rot);
-    stlString += stlPlane({ type: "Plane", pos: plane2Pos, size: planeSize, rot: plane2Rot }, m, pos, rot);
+    stlString += stlPlaneOfVertices(botPos, botVec3Array[0]!, topVec3Array[0]!, topPos);
+    stlString += stlPlaneOfVertices(botPos, topPos, topVec3Array[sides]!, botVec3Array[sides]!);
   }
 
   return stlString;

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

@@ -13,7 +13,8 @@ export function cylinder(
   parentPos: Vec3,
   parentRot: Vec3
 ): ReadonlyArray<zOrderElement> {
-  const half = vec3(c.radius, c.length / 2, c.radius);
+  const half = c.length / 2;
+  const radiusEnd = c.radiusEnd ?? c.radius;
   const pos = vec3TransRot(c.pos, parentPos, parentRot);
   const rot = vec3RotCombine(parentRot, c.rot ?? vec3Zero);
   const vec3tr = (p: Vec3): Vec3 => vec3TransRot(p, pos, rot);
@@ -32,10 +33,10 @@ export function cylinder(
   const botVec3Array = Array<Vec3>();
   const topVec3Array = Array<Vec3>();
   for (let i = 0; i <= sides; i++) {
-    const x = Math.sin(currentAngle) * c.radius;
-    const z = Math.cos(currentAngle) * c.radius;
-    const currBot = vec3tr(vec3(x, -half.y, z));
-    const currTop = vec3tr(vec3(x, half.y, z));
+    const sin = Math.sin(currentAngle);
+    const cos = Math.cos(currentAngle);
+    const currBot = vec3tr(vec3(sin * c.radius, -half, cos * c.radius));
+    const currTop = vec3tr(vec3(sin * radiusEnd, half, cos * radiusEnd));
     botVec3Array.push(currBot);
     topVec3Array.push(currTop);
     if (i !== 0) {
@@ -49,11 +50,12 @@ export function cylinder(
   }
   if (!c.open) {
     // Add circle if direcly facing camera
-    const circleTop = vec3tr(vec3(0, half.y, 0));
-    const circleBottom = vec3tr(vec3(0, -half.y, 0));
+    const circleTop = vec3tr(vec3(0, half, 0));
+    const circleBottom = vec3tr(vec3(0, -half, 0));
     if (equals(circleTop.x, circleBottom.x, 0.1) && equals(circleTop.y, circleBottom.y, 0.1)) {
-      const circlePos = circleTop.z > circleBottom.z ? circleTop : circleBottom;
-      zOrderComponents.push(zElem(svgCircle(c.radius, rot, point(circlePos.x, circlePos.y), fill, opacity, stroke, stBW, c.holes), circlePos.z));
+      const [circlePos, circleRadius] = circleTop.z > circleBottom.z ? [circleTop, radiusEnd] : [circleBottom, c.radius];
+      const holes = radiusEnd === c.radius ? c.holes : undefined;
+      zOrderComponents.push(zElem(svgCircle(circleRadius, rot, point(circlePos.x, circlePos.y), fill, opacity, stroke, stBW, holes), circlePos.z));
     }
   }
   return zOrderComponents;