abstract-3d 2.7.29 → 2.7.32

package/src/renderers/step/step-encoding.ts

@@ -1,6 +1,6 @@
-import { Vec2, Vec3 } from "../../abstract-3d.js";
+import type { Vec2, Vec3 } from "../../abstract-3d.js";
 
-export type MutableStep = { refs: Map<string, number>; step: string; geoContext3d: number; };
+export type MutableStep = { refs: Map<string, number>; step: string; geoContext3d: number };
 
 export const STEP_NUMBER_EPSILON: number = 1e-5;
 
@@ -19,17 +19,17 @@ const mutate = (step: string, m: MutableStep): number => {
 
 const stepNumber = (num: number): number => {
   const absNum = Math.abs(num);
-  if(absNum < STEP_NUMBER_EPSILON) {
+  if (absNum < STEP_NUMBER_EPSILON) {
     return 0.0;
   }
 
   const roundNum = Math.round(num);
-  if(Math.abs(absNum - Math.abs(roundNum)) < STEP_NUMBER_EPSILON) {
+  if (Math.abs(absNum - Math.abs(roundNum)) < STEP_NUMBER_EPSILON) {
     return roundNum;
   }
 
   return num;
-}
+};
 
 export const HEADER = (date: string): string =>
   `ISO-10303-21;
@@ -114,8 +114,12 @@ export const PCURVE = (
 export const CYLINDRICAL_SURFACE = (AXIS2_PLACEMENT_3D: number, radius: number, m: MutableStep): number =>
   mutate(`CYLINDRICAL_SURFACE('',#${AXIS2_PLACEMENT_3D},${stepNumber(radius)})`, m);
 
-export const CONICAL_SURFACE = (AXIS2_PLACEMENT_3D: number, radius: number, semiAngle: number, m: MutableStep): number =>
-  mutate(`CONICAL_SURFACE('',#${AXIS2_PLACEMENT_3D},${stepNumber(radius)},${stepNumber(semiAngle)})`, m);
+export const CONICAL_SURFACE = (
+  AXIS2_PLACEMENT_3D: number,
+  radius: number,
+  semiAngle: number,
+  m: MutableStep
+): number => mutate(`CONICAL_SURFACE('',#${AXIS2_PLACEMENT_3D},${stepNumber(radius)},${stepNumber(semiAngle)})`, m);
 
 export const DEFINITIONAL_REPRESENTATION = (LINEorCircle: number, m: MutableStep): number =>
   mutate(`DEFINITIONAL_REPRESENTATION('',(#${LINEorCircle}),#7)`, m);
@@ -126,16 +130,21 @@ export const SHELL_BASED_SURFACE_MODEL = (OPEN_SHELL: number, m: MutableStep): n
 export const MANIFOLD_SURFACE_SHAPE_REPRESENTATION = (
   AXIS2_PLACEMENT_3D: number,
   CLOSED_SHELL: number,
-  GEOMETRY_CONTEXT: number, 
+  GEOMETRY_CONTEXT: number,
   m: MutableStep
-): number => mutate(`MANIFOLD_SURFACE_SHAPE_REPRESENTATION('',(#${AXIS2_PLACEMENT_3D},#${CLOSED_SHELL}),#${GEOMETRY_CONTEXT})`, m);
+): number =>
+  mutate(`MANIFOLD_SURFACE_SHAPE_REPRESENTATION('',(#${AXIS2_PLACEMENT_3D},#${CLOSED_SHELL}),#${GEOMETRY_CONTEXT})`, m);
 
 export const ADVANCED_BREP_SHAPE_REPRESENTATION = (
   AXIS2_PLACEMENT_3D: number,
   MANIFOLD_SOLID_BREP: number,
   GEOMETRY_CONTEXT: number,
   m: MutableStep
-): number => mutate(`ADVANCED_BREP_SHAPE_REPRESENTATION('',(#${AXIS2_PLACEMENT_3D},#${MANIFOLD_SOLID_BREP}),#${GEOMETRY_CONTEXT})`, m);
+): number =>
+  mutate(
+    `ADVANCED_BREP_SHAPE_REPRESENTATION('',(#${AXIS2_PLACEMENT_3D},#${MANIFOLD_SOLID_BREP}),#${GEOMETRY_CONTEXT})`,
+    m
+  );
 
 export const CLOSED_SHELL = (ADVANCED_FACE: ReadonlyArray<number>, m: MutableStep): number =>
   mutate(`CLOSED_SHELL('',(${ADVANCED_FACE.map((af) => `#${af}`).join(",")}))`, m);
@@ -153,7 +162,11 @@ export const AXIS2_PLACEMENT_3D = (
   m: MutableStep
 ): number => mutate(`AXIS2_PLACEMENT_3D('',#${CARTESIAN_POINT},#${DIRECTION_NORMAL},#${DIRECTION_PLANE_DIRECITON})`, m);
 
-export const MECHANICAL_DESIGN_GEOMETRIC_PRESENTATION_REPRESENTATION = (STYLED_ITEM: number, GEOMETRY_CONTEXT: number, m: MutableStep): number =>
+export const MECHANICAL_DESIGN_GEOMETRIC_PRESENTATION_REPRESENTATION = (
+  STYLED_ITEM: number,
+  GEOMETRY_CONTEXT: number,
+  m: MutableStep
+): number =>
   mutate(`MECHANICAL_DESIGN_GEOMETRIC_PRESENTATION_REPRESENTATION('',(#${STYLED_ITEM}),#${GEOMETRY_CONTEXT})`, m);
 
 export const STYLED_ITEM = (
@@ -231,51 +244,37 @@ export const UNCERTAINTY_MEASURE_WITH_UNIT = (LENGTH_UNIT: number, m: MutableSte
   );
 
 export const APPLICATION_PROTOCOL_DEFINITION = (APPLICATION_CONTEXT: number, m: MutableStep): number =>
-  mutate(`APPLICATION_PROTOCOL_DEFINITION('international standard','automotive_design',2000,#${APPLICATION_CONTEXT})`, m);
+  mutate(
+    `APPLICATION_PROTOCOL_DEFINITION('international standard','automotive_design',2000,#${APPLICATION_CONTEXT})`,
+    m
+  );
 
 export const APPLICATION_CONTEXT = (m: MutableStep): number =>
   mutate(`APPLICATION_CONTEXT('core data for automotive mechanical design processes')`, m);
 
-
-export const SHAPE_DEFINITION_REPRESENTATION = (productDefinitionShape: number, manifoldSurfaceShapeRepr: number, m: MutableStep): number =>
-  mutate(
-    `SHAPE_DEFINITION_REPRESENTATION(#${productDefinitionShape},#${manifoldSurfaceShapeRepr})`,
-    m
-  );
+export const SHAPE_DEFINITION_REPRESENTATION = (
+  productDefinitionShape: number,
+  manifoldSurfaceShapeRepr: number,
+  m: MutableStep
+): number => mutate(`SHAPE_DEFINITION_REPRESENTATION(#${productDefinitionShape},#${manifoldSurfaceShapeRepr})`, m);
 
 export const PRODUCT_DEFINITION_SHAPE = (productDefinition: number, m: MutableStep): number =>
-  mutate(
-    `PRODUCT_DEFINITION_SHAPE('','',#${productDefinition})`,
-    m
-  )
+  mutate(`PRODUCT_DEFINITION_SHAPE('','',#${productDefinition})`, m);
 
-export const PRODUCT_DEFINITION = (productDefinitionFormation: number, productDefinitionContext: number, m: MutableStep): number =>
-  mutate(
-    `PRODUCT_DEFINITION('design',#${productDefinitionFormation},#${productDefinitionContext})`,
-    m
-  )
+export const PRODUCT_DEFINITION = (
+  productDefinitionFormation: number,
+  productDefinitionContext: number,
+  m: MutableStep
+): number => mutate(`PRODUCT_DEFINITION('design',#${productDefinitionFormation},#${productDefinitionContext})`, m);
 
 export const PRODUCT_DEFINITION_FORMATION = (product: number, m: MutableStep): number =>
-  mutate(
-    `PRODUCT_DEFINITION_FORMATION('','',#${product})`,
-    m
-  )
+  mutate(`PRODUCT_DEFINITION_FORMATION('','',#${product})`, m);
 
 export const PRODUCT = (productContext: number, name: string, m: MutableStep): number =>
-  mutate(
-    `PRODUCT('${name}','${name}','',(#${productContext}))`,
-    m
-  )
+  mutate(`PRODUCT('${name}','${name}','',(#${productContext}))`, m);
 
 export const PRODUCT_CONTEXT = (applicationContext: number, m: MutableStep): number =>
-  mutate(
-    `PRODUCT_CONTEXT('',#${applicationContext},'mechanical')`,
-    m
-  )
+  mutate(`PRODUCT_CONTEXT('',#${applicationContext},'mechanical')`, m);
 
 export const PRODUCT_DEFINITION_CONTEXT = (applicationContext: number, m: MutableStep): number =>
-  mutate(
-    `PRODUCT_DEFINITION_CONTEXT('part definition',#${applicationContext},'design')`,
-    m
-  )
-
+  mutate(`PRODUCT_DEFINITION_CONTEXT('part definition',#${applicationContext},'design')`, m);

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

@@ -1,7 +1,5 @@
+import type { Box, Material, Vec3 } from "../../../abstract-3d.js";
 import {
-  Box,
-  Material,
-  Vec3,
   vec3Scale,
   vec3TransRot,
   vec3RotCombine,
@@ -11,14 +9,13 @@ import {
   vec3Sub,
   vec3Add,
   vec3Rot,
-  vec3Length,
 } from "../../../abstract-3d.js";
 import { parseRgb } from "../../../utils.js";
+import type { MutableStep } from "../step-encoding.js";
 import {
   ADVANCED_BREP_SHAPE_REPRESENTATION,
   ADVANCED_FACE,
   APPLICATION_CONTEXT,
-  APPLICATION_PROTOCOL_DEFINITION,
   AXIS2_PLACEMENT_3D,
   CARTESIAN_POINT,
   CLOSED_SHELL,
@@ -34,7 +31,6 @@ import {
   LINE,
   MANIFOLD_SOLID_BREP,
   MECHANICAL_DESIGN_GEOMETRIC_PRESENTATION_REPRESENTATION,
-  MutableStep,
   ORIENTED_EDGE,
   PLANE,
   PRESENTATION_STYLE_ASSIGNMENT,
@@ -45,7 +41,6 @@ import {
   PRODUCT_DEFINITION_FORMATION,
   PRODUCT_DEFINITION_SHAPE,
   SHAPE_DEFINITION_REPRESENTATION,
-  STEP_NUMBER_EPSILON,
   STYLED_ITEM,
   SURFACE_SIDE_STYLE,
   SURFACE_STYLE_FILL_AREA,
@@ -62,7 +57,7 @@ export function stepBox(b: Box, mat: Material, parentPos: Vec3, parentRot: Vec3,
   const color = parseRgb(mat.normal);
   const rotate = (v: Vec3): Vec3 => vec3Rot(v, vec3Zero, rotation);
 
-  if(size.x === 0.0 || size.y === 0.0 || size.z === 0.0) {
+  if (size.x === 0.0 || size.y === 0.0 || size.z === 0.0) {
     return;
   }
 

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

@@ -1,18 +1,7 @@
-import {
-  Material,
-  Vec3,
-  vec3,
-  Cone,
-  Cylinder,
-} from "../../../abstract-3d.js";
-import {
-  MutableStep,
-} from "../step-encoding.js";
-import { stepBox } from "./step-box.js";
+import type { Material, Vec3, Cone, Cylinder } from "../../../abstract-3d.js";
+import type { MutableStep } from "../step-encoding.js";
 import { stepCylinder } from "./step-cylinder.js";
 
-const PLANE_THICKNESS = 1e-4;
-
 export function stepCone(c: Cone, mat: Material, parentPos: Vec3, parentRot: Vec3, m: MutableStep): void {
   //convert it into a box
   const cylinder: Cylinder = {
@@ -23,4 +12,4 @@ export function stepCone(c: Cone, mat: Material, parentPos: Vec3, parentRot: Vec
     radius: c.radius,
   };
   stepCylinder(cylinder, mat, parentPos, parentRot, m, 0.0);
-}
+}

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

@@ -1,15 +1,7 @@
-import {
-  Material,
-  Vec3,
-  vec3TransRot,
-  vec3RotCombine,
-  vec3Zero,
-  vec3,
-  Cylinder,
-  vec3Add,
-  vec3Rot,
-} from "../../../abstract-3d.js";
+import type { Material, Vec3, Cylinder } from "../../../abstract-3d.js";
+import { vec3TransRot, vec3RotCombine, vec3Zero, vec3, vec3Add, vec3Rot } from "../../../abstract-3d.js";
 import { parseRgb } from "../../../utils.js";
+import type { MutableStep } from "../step-encoding.js";
 import {
   ADVANCED_BREP_SHAPE_REPRESENTATION,
   ADVANCED_FACE,
@@ -32,7 +24,6 @@ import {
   LINE,
   MANIFOLD_SOLID_BREP,
   MECHANICAL_DESIGN_GEOMETRIC_PRESENTATION_REPRESENTATION,
-  MutableStep,
   ORIENTED_EDGE,
   PLANE,
   PRESENTATION_STYLE_ASSIGNMENT,
@@ -69,53 +60,29 @@ export function stepCylinder(
   }
 
   const bottomRadius = Math.max(c.radius, SMALLEST_RADIUS);
-  const requestedTopRadius = Math.max(
-    rSmall ?? c.radius,
-    SMALLEST_RADIUS
-  );
+  const requestedTopRadius = Math.max(rSmall ?? c.radius, SMALLEST_RADIUS);
 
-  const radiusTolerance =
-    GEOMETRY_EPSILON *
-    Math.max(1, bottomRadius, requestedTopRadius);
+  const radiusTolerance = GEOMETRY_EPSILON * Math.max(1, bottomRadius, requestedTopRadius);
 
-  const isCylinder =
-    Math.abs(requestedTopRadius - bottomRadius) <= radiusTolerance;
+  const isCylinder = Math.abs(requestedTopRadius - bottomRadius) <= radiusTolerance;
 
-  const topRadius = isCylinder
-    ? bottomRadius
-    : requestedTopRadius;
+  const topRadius = isCylinder ? bottomRadius : requestedTopRadius;
 
   const pos = vec3TransRot(c.pos, parentPos, parentRot);
-  const rotation = vec3RotCombine(
-    parentRot,
-    c.rot ?? vec3Zero
-  );
+  const rotation = vec3RotCombine(parentRot, c.rot ?? vec3Zero);
 
-  const rot = (v: Vec3): Vec3 =>
-    vec3Rot(v, vec3Zero, rotation);
+  const rot = (v: Vec3): Vec3 => vec3Rot(v, vec3Zero, rotation);
 
   const axis = rot(vec3(0, 1, 0));
   const radial = rot(vec3(1, 0, 0));
 
-  const bottomCenter = vec3Add(
-    pos,
-    rot(vec3(0, -h / 2, 0))
-  );
+  const bottomCenter = vec3Add(pos, rot(vec3(0, -h / 2, 0)));
 
-  const topCenter = vec3Add(
-    pos,
-    rot(vec3(0, h / 2, 0))
-  );
+  const topCenter = vec3Add(pos, rot(vec3(0, h / 2, 0)));
 
-  const bottomSeamPoint = vec3Add(
-    pos,
-    rot(vec3(bottomRadius, -h / 2, 0))
-  );
+  const bottomSeamPoint = vec3Add(pos, rot(vec3(bottomRadius, -h / 2, 0)));
 
-  const topSeamPoint = vec3Add(
-    pos,
-    rot(vec3(topRadius, h / 2, 0))
-  );
+  const topSeamPoint = vec3Add(pos, rot(vec3(topRadius, h / 2, 0)));
 
   const seamDelta = vec3(
     topSeamPoint.x - bottomSeamPoint.x,
@@ -123,154 +90,63 @@ export function stepCylinder(
     topSeamPoint.z - bottomSeamPoint.z
   );
 
-  const seamLength = Math.hypot(
-    seamDelta.x,
-    seamDelta.y,
-    seamDelta.z
-  );
+  const seamLength = Math.hypot(seamDelta.x, seamDelta.y, seamDelta.z);
 
   if (seamLength <= GEOMETRY_EPSILON) {
     return;
   }
 
-  const seamDirection = vec3(
-    seamDelta.x / seamLength,
-    seamDelta.y / seamLength,
-    seamDelta.z / seamLength
-  );
+  const seamDirection = vec3(seamDelta.x / seamLength, seamDelta.y / seamLength, seamDelta.z / seamLength);
 
   const applicationContext = APPLICATION_CONTEXT(m);
-  APPLICATION_PROTOCOL_DEFINITION(
-    applicationContext,
-    m
-  );
+  APPLICATION_PROTOCOL_DEFINITION(applicationContext, m);
 
   const axisDirection = DIRECTION(axis, m);
   const radialDirection = DIRECTION(radial, m);
 
-  const bottomCenterPoint = CARTESIAN_POINT(
-    bottomCenter,
-    m
-  );
+  const bottomCenterPoint = CARTESIAN_POINT(bottomCenter, m);
 
-  const topCenterPoint = CARTESIAN_POINT(
-    topCenter,
-    m
-  );
+  const topCenterPoint = CARTESIAN_POINT(topCenter, m);
 
-  const bottomSeamCartesianPoint = CARTESIAN_POINT(
-    bottomSeamPoint,
-    m
-  );
+  const bottomSeamCartesianPoint = CARTESIAN_POINT(bottomSeamPoint, m);
 
-  const topSeamCartesianPoint = CARTESIAN_POINT(
-    topSeamPoint,
-    m
-  );
+  const topSeamCartesianPoint = CARTESIAN_POINT(topSeamPoint, m);
 
-  const bottomVertex = VERTEX_POINT(
-    bottomSeamCartesianPoint,
-    m
-  );
+  const bottomVertex = VERTEX_POINT(bottomSeamCartesianPoint, m);
 
-  const topVertex = VERTEX_POINT(
-    topSeamCartesianPoint,
-    m
-  );
+  const topVertex = VERTEX_POINT(topSeamCartesianPoint, m);
 
-  const bottomPlacement = AXIS2_PLACEMENT_3D(
-    bottomCenterPoint,
-    axisDirection,
-    radialDirection,
-    m
-  );
+  const bottomPlacement = AXIS2_PLACEMENT_3D(bottomCenterPoint, axisDirection, radialDirection, m);
 
-  const topPlacement = AXIS2_PLACEMENT_3D(
-    topCenterPoint,
-    axisDirection,
-    radialDirection,
-    m
-  );
+  const topPlacement = AXIS2_PLACEMENT_3D(topCenterPoint, axisDirection, radialDirection, m);
 
   const seamEdge = EDGE_CURVE(
     bottomVertex,
     topVertex,
-    LINE(
-      bottomSeamCartesianPoint,
-      VECTOR(
-        DIRECTION(seamDirection, m),
-        m
-      ),
-      m
-    ),
+    LINE(bottomSeamCartesianPoint, VECTOR(DIRECTION(seamDirection, m), m), m),
     m,
     "T"
   );
 
-  const bottomCircleEdge = EDGE_CURVE(
-    bottomVertex,
-    bottomVertex,
-    CIRCLE(
-      bottomPlacement,
-      bottomRadius,
-      m
-    ),
-    m,
-    "T"
-  );
+  const bottomCircleEdge = EDGE_CURVE(bottomVertex, bottomVertex, CIRCLE(bottomPlacement, bottomRadius, m), m, "T");
 
-  const topCircleEdge = EDGE_CURVE(
-    topVertex,
-    topVertex,
-    CIRCLE(
-      topPlacement,
-      topRadius,
-      m
-    ),
-    m,
-    "T"
-  );
+  const topCircleEdge = EDGE_CURVE(topVertex, topVertex, CIRCLE(topPlacement, topRadius, m), m, "T");
 
-  const growsTowardTop =
-    topRadius >= bottomRadius;
+  const growsTowardTop = topRadius >= bottomRadius;
 
-  const coneAxis = growsTowardTop
-    ? axis
-    : vec3(-axis.x, -axis.y, -axis.z);
+  const coneAxis = growsTowardTop ? axis : vec3(-axis.x, -axis.y, -axis.z);
 
-  const coneLocation = growsTowardTop
-    ? bottomCenterPoint
-    : topCenterPoint;
+  const coneLocation = growsTowardTop ? bottomCenterPoint : topCenterPoint;
 
-  const coneStartRadius = Math.min(
-    bottomRadius,
-    topRadius
-  );
+  const coneStartRadius = Math.min(bottomRadius, topRadius);
 
-  const semiAngle = Math.atan2(
-    Math.abs(topRadius - bottomRadius),
-    h
-  );
+  const semiAngle = Math.atan2(Math.abs(topRadius - bottomRadius), h);
 
-  const conePlacement = AXIS2_PLACEMENT_3D(
-    coneLocation,
-    DIRECTION(coneAxis, m),
-    radialDirection,
-    m
-  );
+  const conePlacement = AXIS2_PLACEMENT_3D(coneLocation, DIRECTION(coneAxis, m), radialDirection, m);
 
   const sideSurface = isCylinder
-    ? CYLINDRICAL_SURFACE(
-      bottomPlacement,
-      bottomRadius,
-      m
-    )
-    : CONICAL_SURFACE(
-      conePlacement,
-      coneStartRadius,
-      semiAngle,
-      m
-    );
+    ? CYLINDRICAL_SURFACE(bottomPlacement, bottomRadius, m)
+    : CONICAL_SURFACE(conePlacement, coneStartRadius, semiAngle, m);
 
   const sideFace = ADVANCED_FACE(
     FACE_BOUND(
@@ -292,124 +168,46 @@ export function stepCylinder(
   );
 
   const bottomFace = ADVANCED_FACE(
-    FACE_BOUND(
-      EDGE_LOOP(
-        [
-          ORIENTED_EDGE(
-            bottomCircleEdge,
-            m,
-            "F"
-          ),
-        ],
-        m
-      ),
-      "T",
-      m
-    ),
+    FACE_BOUND(EDGE_LOOP([ORIENTED_EDGE(bottomCircleEdge, m, "F")], m), "T", m),
     PLANE(bottomPlacement, m),
     m,
     "F"
   );
 
   const topFace = ADVANCED_FACE(
-    FACE_BOUND(
-      EDGE_LOOP(
-        [
-          ORIENTED_EDGE(
-            topCircleEdge,
-            m,
-            "F"
-          ),
-        ],
-        m
-      ),
-      "F",
-      m
-    ),
+    FACE_BOUND(EDGE_LOOP([ORIENTED_EDGE(topCircleEdge, m, "F")], m), "F", m),
     PLANE(topPlacement, m),
     m,
     "T"
   );
 
-  const msb = MANIFOLD_SOLID_BREP(
-    CLOSED_SHELL(
-      [
-        sideFace,
-        bottomFace,
-        topFace,
-      ],
-      m
-    ),
-    m
-  );
-
-  const absp =
-    ADVANCED_BREP_SHAPE_REPRESENTATION(
-      AXIS2_PLACEMENT_3D(
-        CARTESIAN_POINT(vec3Zero, m),
-        DIRECTION(vec3(0, 0, 1), m),
-        DIRECTION(vec3(1, 0, 0), m),
-        m
-      ),
-      msb,
-      m.geoContext3d,
-      m
-    );
+  const msb = MANIFOLD_SOLID_BREP(CLOSED_SHELL([sideFace, bottomFace, topFace], m), m);
 
-  const prod = PRODUCT(
-    PRODUCT_CONTEXT(applicationContext, m),
-    isCylinder ? "Cylinder" : "Cone",
+  const absp = ADVANCED_BREP_SHAPE_REPRESENTATION(
+    AXIS2_PLACEMENT_3D(CARTESIAN_POINT(vec3Zero, m), DIRECTION(vec3(0, 0, 1), m), DIRECTION(vec3(1, 0, 0), m), m),
+    msb,
+    m.geoContext3d,
     m
   );
 
+  const prod = PRODUCT(PRODUCT_CONTEXT(applicationContext, m), isCylinder ? "Cylinder" : "Cone", m);
+
   SHAPE_DEFINITION_REPRESENTATION(
     PRODUCT_DEFINITION_SHAPE(
-      PRODUCT_DEFINITION(
-        PRODUCT_DEFINITION_FORMATION(
-          prod,
-          m
-        ),
-        PRODUCT_DEFINITION_CONTEXT(
-          applicationContext,
-          m
-        ),
-        m
-      ),
+      PRODUCT_DEFINITION(PRODUCT_DEFINITION_FORMATION(prod, m), PRODUCT_DEFINITION_CONTEXT(applicationContext, m), m),
       m
     ),
     absp,
     m
   );
 
-  const color = COLOUR_RGB(
-    parseRgb(mat.normal),
-    m
-  );
+  const color = COLOUR_RGB(parseRgb(mat.normal), 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
-        ),
+        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,
@@ -418,4 +216,4 @@ export function stepCylinder(
     m.geoContext3d,
     m
   );
-}
+}

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

@@ -1,13 +1,6 @@
-import {
-  Plane,
-  Material,
-  Vec3,
-  vec3,
-  Box,
-} from "../../../abstract-3d.js";
-import {
-  MutableStep,
-} from "../step-encoding.js";
+import type { Plane, Material, Vec3, Box } from "../../../abstract-3d.js";
+import { vec3 } from "../../../abstract-3d.js";
+import type { MutableStep } from "../step-encoding.js";
 import { stepBox } from "./step-box.js";
 
 const PLANE_THICKNESS = 1e-4;
@@ -22,4 +15,4 @@ export function stepPlane(p: Plane, mat: Material, parentPos: Vec3, parentRot: V
     size: vec3(p.size.x, p.size.y, PLANE_THICKNESS),
   };
   stepBox(box, mat, parentPos, parentRot, m);
-}
+}

package/src/renderers/step/step.ts

@@ -1,23 +1,7 @@
+import type { Scene, Group, Vec3 } from "../../abstract-3d.js";
+import { vec3Zero, vec3TransRot, vec3RotCombine } from "../../abstract-3d.js";
+import type { MutableStep } from "./step-encoding.js";
 import {
-  Scene,
-  vec3Zero,
-  Group,
-  Vec3,
-  vec3TransRot,
-  vec3RotCombine,
-  Cylinder,
-  Material,
-  Plane,
-  Box,
-  Vec2,
-  vec3,
-  vec3Scale,
-  vec3Add,
-  vec3Sub,
-  vec3Rot,
-} from "../../abstract-3d.js";
-import {
-  MutableStep,
   GEOMETRIC_REPRESENTATION_CONTEXT_3D,
   LENGTH_UNIT,
   NAMED_UNIT,

package/src/renderers/stl/stl-encoding.ts

@@ -1,4 +1,5 @@
-import { Vec3, vec3Sub } from "../../abstract-3d.js";
+import type { Vec3 } from "../../abstract-3d.js";
+import { vec3Sub } from "../../abstract-3d.js";
 
 export const stlTriangle = (vec1: Vec3, vec2: Vec3, vec3: Vec3): string => {
   const v = vec3Sub(vec2, vec1);