abstract-3d 2.7.32 → 2.8.0

package/src/renderers/react/react-mesh.tsx

@@ -1,6 +1,6 @@
-import React, { useMemo } from "react";
-import { extend, useThree } from "@react-three/fiber";
 import { Text, Line } from "@react-three/drei";
+import { extend, useThree } from "@react-three/fiber";
+import React, { useMemo } from "react";
 import {
   BoxGeometry,
   BufferAttribute,
@@ -23,6 +23,7 @@ import {
   Vector2,
   Vector3,
 } from "three";
+import { exhaustiveCheck } from "ts-exhaustive-check";
 import type {
   Mesh,
   Box,
@@ -34,20 +35,7 @@ import type {
   CircleCurve as A3dCircleCurve,
   Hole,
 } from "../../abstract-3d.js";
-import {
-  vec2Scale,
-  vec2Sub,
-  vec2Add,
-  isZero,
-  vec3Scale,
-  vec3,
-  vec3Add,
-  vec3RotCombine,
-  vec3Zero,
-  vec3Rot,
-  equals,
-} from "../../abstract-3d.js";
-import { exhaustiveCheck } from "ts-exhaustive-check";
+import { vec2Scale, vec2Sub, vec2Add, isZero, vec3Scale, vec3, vec3Add, vec3RotCombine, vec3Zero, vec3Rot, equals } from "../../abstract-3d.js";
 import { planeGeometry } from "./react-image-material.js";
 
 extend({
@@ -77,13 +65,7 @@ export const euler = new Euler();
 export const vector3 = new Vector3();
 export const quaternion = new Quaternion();
 
-export function ReactMesh({
-  mesh,
-  children,
-}: {
-  readonly mesh: Mesh;
-  readonly children?: React.JSX.Element;
-}): React.JSX.Element {
+export function ReactMesh({ mesh, children }: { readonly mesh: Mesh; readonly children?: React.JSX.Element }): React.JSX.Element {
   const culledLineGeometry = useMemo(() => {
     const g = new BufferGeometry();
 
@@ -159,14 +141,8 @@ export function ReactMesh({
         const aEnd = angleEnd - Math.PI / 2;
         const plane1Rot = vec3RotCombine(rot ?? vec3Zero, vec3(0, aStart, 0));
         const plane2Rot = vec3RotCombine(rot ?? vec3Zero, vec3(0, aEnd, 0));
-        const plane1Pos = vec3Add(
-          vec3Rot(vec3Scale(vec3(Math.cos(aStart), 0, -Math.sin(aStart)), halfRadius), vec3Zero, rot ?? vec3Zero),
-          pos
-        );
-        const plane2Pos = vec3Add(
-          vec3Rot(vec3Scale(vec3(Math.cos(aEnd), 0, -Math.sin(aEnd)), halfRadius), vec3Zero, rot ?? vec3Zero),
-          pos
-        );
+        const plane1Pos = vec3Add(vec3Rot(vec3Scale(vec3(Math.cos(aStart), 0, -Math.sin(aStart)), halfRadius), vec3Zero, rot ?? vec3Zero), pos);
+        const plane2Pos = vec3Add(vec3Rot(vec3Scale(vec3(Math.cos(aEnd), 0, -Math.sin(aEnd)), halfRadius), vec3Zero, rot ?? vec3Zero), pos);
         return (
           <mesh>
             <mesh
@@ -345,13 +321,7 @@ function ExcrudeBoxPlane({
   );
 }
 
-function ExcrudeShape({
-  s,
-  children,
-}: {
-  readonly s: Shape_1;
-  readonly children?: React.JSX.Element;
-}): React.JSX.Element {
+function ExcrudeShape({ s, children }: { readonly s: Shape_1; readonly children?: React.JSX.Element }): React.JSX.Element {
   const excrudeGeometry = React.useMemo(() => {
     const shape = new Shape();
     if (s.points.length > 0) {
@@ -377,13 +347,7 @@ function ExcrudeShape({
   );
 }
 
-function ExcrudeCylinder({
-  cyl,
-  children,
-}: {
-  readonly cyl: Cylinder;
-  readonly children?: React.JSX.Element;
-}): React.JSX.Element {
+function ExcrudeCylinder({ cyl, children }: { readonly cyl: Cylinder; readonly children?: React.JSX.Element }): React.JSX.Element {
   const excrudeGeometry = React.useMemo(() => {
     const shape = new Shape();
     shape.moveTo(0, cyl.radius).absellipse(0, 0, cyl.radius, cyl.radius, 0, Math.PI * 2, true);
@@ -394,7 +358,7 @@ function ExcrudeCylinder({
   return (
     // Doesn't seem to adjust for excrude z size directly???
     <mesh rotation={[cyl.rot?.x ?? 0, cyl.rot?.y ?? 0, cyl.rot?.z ?? 0]} position={[cyl.pos.x, cyl.pos.y, cyl.pos.z]}>
-      <mesh geometry={excrudeGeometry} rotation-x={Math.PI / 2} position-y={+cyl.length / 2} castShadow receiveShadow>
+      <mesh geometry={excrudeGeometry} rotation-x={Math.PI / 2} position-y={cyl.length / 2} castShadow receiveShadow>
         {children}
       </mesh>
     </mesh>
@@ -424,13 +388,7 @@ function holes(holes: ReadonlyArray<Hole> | undefined, shape: Shape): void {
     });
 }
 
-function Polygon({
-  polygon,
-  children,
-}: {
-  readonly polygon: A3dPolygon;
-  readonly children?: React.JSX.Element;
-}): React.JSX.Element {
+function Polygon({ polygon, children }: { readonly polygon: A3dPolygon; readonly children?: React.JSX.Element }): React.JSX.Element {
   const vertices = React.useMemo(() => {
     if (polygon.points.length === 4) {
       const [v0, v1, v2, v3] = polygon.points;
@@ -476,29 +434,16 @@ function Polygon({
       receiveShadow
     >
       <bufferGeometry key={vertices.join("")} attach="geometry" onUpdate={(self) => self.computeVertexNormals()}>
-        <bufferAttribute
-          attach="attributes-position"
-          needsUpdate={true}
-          args={fakeArgs}
-          array={vertices}
-          count={vertices.length / 3}
-          itemSize={3}
-        />
+        <bufferAttribute attach="attributes-position" needsUpdate={true} args={fakeArgs} array={vertices} count={vertices.length / 3} itemSize={3} />
       </bufferGeometry>
       {children}
     </mesh>
   );
 }
 
-const fakeArgs = [] as any;
+const fakeArgs = [] as unknown as ConstructorParameters<typeof BufferAttribute>;
 
-function Tube({
-  tube,
-  children,
-}: {
-  readonly tube: A3dTube;
-  readonly children?: React.JSX.Element;
-}): React.JSX.Element {
+function Tube({ tube, children }: { readonly tube: A3dTube; readonly children?: React.JSX.Element }): React.JSX.Element {
   const tubeGeometry = React.useMemo(() => {
     return new TubeGeometry(
       tube.curve.type === "SplineCurve"
@@ -537,6 +482,7 @@ function holeIsZero(hole: Hole): boolean {
   }
 }
 
+// oxlint-disable-next-line functional/no-classes -- extends three.js Curve, which requires a class
 class CircleCurve extends Curve<Vector3> {
   radius: number;
   angleLength: number;

package/src/renderers/react/react-scene.tsx

@@ -1,12 +1,12 @@
+import { Html } from "@react-three/drei";
+import type { ThreeEvent } from "@react-three/fiber";
 import React from "react";
 import type { Scene, Group } from "../../abstract-3d.js";
-import type { HotSpotInfo } from "./react-hotspot.js";
-import { ReactHotSpots } from "./react-hotspot.js";
 import { ReactDimensions } from "./react-dimension.js";
 import { ReactGroup } from "./react-group.js";
+import type { HotSpotInfo } from "./react-hotspot.js";
+import { ReactHotSpots } from "./react-hotspot.js";
 import type { MaterialState } from "./react-material.js";
-import { Html } from "@react-three/drei";
-import type { ThreeEvent } from "@react-three/fiber";
 import type { ReactPopover } from "./react-types.js";
 
 export type SceneMouseEvent = ThreeEvent<MouseEvent>;
@@ -69,16 +69,8 @@ export function ReactScene({
 }): React.JSX.Element {
   return (
     <group
-      rotation={[
-        scene.rotation_deprecated?.x ?? 0,
-        scene.rotation_deprecated?.y ?? 0,
-        scene.rotation_deprecated?.z ?? 0,
-      ]}
-      position={[
-        -(scene.center_deprecated?.x ?? 0),
-        -(scene.center_deprecated?.y ?? 0),
-        -(scene.center_deprecated?.z ?? 0),
-      ]}
+      rotation={[scene.rotation_deprecated?.x ?? 0, scene.rotation_deprecated?.y ?? 0, scene.rotation_deprecated?.z ?? 0]}
+      position={[-(scene.center_deprecated?.x ?? 0), -(scene.center_deprecated?.y ?? 0), -(scene.center_deprecated?.z ?? 0)]}
     >
       {scene.groups.map((g, i) => {
         const id = createGroupId ? createGroupId(g) : "";
@@ -117,13 +109,7 @@ export function ReactScene({
         showHotSpotTexts={showHotSpotTexts}
       />
       {reactPopovers?.map((p) => (
-        <Html
-          key={p.id}
-          position={[p.pos.x, p.pos.y, p.pos.z]}
-          center
-          pointerEvents="none"
-          style={{ pointerEvents: "none" }}
-        >
+        <Html key={p.id} position={[p.pos.x, p.pos.y, p.pos.z]} center pointerEvents="none" style={{ pointerEvents: "none" }}>
           {p.content}
         </Html>
       ))}

package/src/renderers/react/react.tsx

@@ -1,13 +1,13 @@
-import React, { memo } from "react";
-import { Canvas, type CanvasProps, type ThreeEvent } from "@react-three/fiber";
 import { Html, type OrbitControlsProps } from "@react-three/drei";
+import { Canvas, type CanvasProps, type ThreeEvent } from "@react-three/fiber";
 import { EffectComposer, N8AO } from "@react-three/postprocessing";
-import { ReactScene } from "./react-scene.js";
+import React, { memo } from "react";
 import type { Scene, View, Group } from "../../abstract-3d.js";
 import type { ControlsHelper, Camera, BufferZones } from "./react-camera.js";
 import { ReactCamera } from "./react-camera.js";
 import type { HotSpotInfo } from "./react-hotspot.js";
 import type { MaterialState } from "./react-material.js";
+import { ReactScene } from "./react-scene.js";
 import type { ReactPopover } from "./react-types.js";
 
 type ReactProps = {
@@ -173,7 +173,7 @@ export const render = memo(
         </React.Suspense>
       </Canvas>
     ) : (
-      sceneFallback ?? <></>
+      (sceneFallback ?? <></>)
     );
   }
 );

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

@@ -47,39 +47,22 @@ ENDSEC;
 END-ISO-10303-21;`;
 
 export const CARTESIAN_POINT = (p: Vec3 | Vec2, m: MutableStep): number =>
-  mutate(
-    `CARTESIAN_POINT('',(${stepNumber(p.x)},${stepNumber(p.y)}${
-      (p as Vec3)?.z !== undefined ? `,${stepNumber((p as Vec3).z)}` : ""
-    }))`,
-    m
-  );
+  mutate(`CARTESIAN_POINT('',(${stepNumber(p.x)},${stepNumber(p.y)}${(p as Vec3)?.z !== undefined ? `,${stepNumber((p as Vec3).z)}` : ""}))`, m);
 
 export const DIRECTION = (d: Vec3 | Vec2, m: MutableStep): number =>
-  mutate(
-    `DIRECTION('',(${stepNumber(d.x)},${stepNumber(d.y)}${
-      (d as Vec3)?.z !== undefined ? `,${stepNumber((d as Vec3).z)}` : ""
-    }))`,
-    m
-  );
+  mutate(`DIRECTION('',(${stepNumber(d.x)},${stepNumber(d.y)}${(d as Vec3)?.z !== undefined ? `,${stepNumber((d as Vec3).z)}` : ""}))`, m);
 
-export const VERTEX_POINT = (CARTESIAN_POINT: number, m: MutableStep): number =>
-  mutate(`VERTEX_POINT('',#${CARTESIAN_POINT})`, m);
+export const VERTEX_POINT = (CARTESIAN_POINT: number, m: MutableStep): number => mutate(`VERTEX_POINT('',#${CARTESIAN_POINT})`, m);
 
-export const LINE = (CARTESIAN_POINT: number, VECTOR: number, m: MutableStep): number =>
-  mutate(`LINE('',#${CARTESIAN_POINT},#${VECTOR})`, m);
+export const LINE = (CARTESIAN_POINT: number, VECTOR: number, m: MutableStep): number => mutate(`LINE('',#${CARTESIAN_POINT},#${VECTOR})`, m);
 
 export const CIRCLE = (AXIS2_PLACEMENT_3D: number, radius: number, m: MutableStep): number =>
   mutate(`CIRCLE('',#${AXIS2_PLACEMENT_3D},${radius})`, m);
 
 export const VECTOR = (DIRECTION: number, m: MutableStep): number => mutate(`VECTOR('',#${DIRECTION},1.)`, m);
 
-export const EDGE_CURVE = (
-  startVertex: number,
-  endVertex: number,
-  line: number,
-  m: MutableStep,
-  type: "T" | "F" = "F"
-): number => mutate(`EDGE_CURVE('',#${startVertex},#${endVertex},#${line},.${type}.)`, m);
+export const EDGE_CURVE = (startVertex: number, endVertex: number, line: number, m: MutableStep, type: "T" | "F" = "F"): number =>
+  mutate(`EDGE_CURVE('',#${startVertex},#${endVertex},#${line},.${type}.)`, m);
 
 export const ORIENTED_EDGE = (EDGE_CURVE: number, m: MutableStep, type: "T" | "F" = "F"): number =>
   mutate(`ORIENTED_EDGE('',*,*,#${EDGE_CURVE},.${type}.)`, m);
@@ -93,93 +76,61 @@ export const SEAM_CURVE = (LINE: number, PCURVE1: number, PCURVE2: number, m: Mu
 export const ADVANCED_FACE = (faceBound: number, planeOrSurface: number, m: MutableStep, type: "T" | "F"): number =>
   mutate(`ADVANCED_FACE('',(#${faceBound}),#${planeOrSurface},.${type}.)`, m);
 
-export const OPEN_SHELL = (ADVANCED_FACE: number, m: MutableStep): number =>
-  mutate(`OPEN_SHELL('',(#${ADVANCED_FACE}))`, m);
+export const OPEN_SHELL = (ADVANCED_FACE: number, m: MutableStep): number => mutate(`OPEN_SHELL('',(#${ADVANCED_FACE}))`, m);
 
-export const FACE_BOUND = (EDGE_LOOP: number, type: "T" | "F", m: MutableStep): number =>
-  mutate(`FACE_BOUND('',#${EDGE_LOOP},.${type}.)`, m);
+export const FACE_BOUND = (EDGE_LOOP: number, type: "T" | "F", m: MutableStep): number => mutate(`FACE_BOUND('',#${EDGE_LOOP},.${type}.)`, m);
 
 export const EDGE_LOOP = (ORIENTED_EDGE: ReadonlyArray<number>, m: MutableStep): number =>
   mutate(`EDGE_LOOP('',(${ORIENTED_EDGE.map((af) => `#${af}`).join(",")}))`, m);
 
-export const PLANE = (AXIS2_PLACEMENT_3D: number, m: MutableStep): number =>
-  mutate(`PLANE('',#${AXIS2_PLACEMENT_3D})`, m);
+export const PLANE = (AXIS2_PLACEMENT_3D: number, m: MutableStep): number => mutate(`PLANE('',#${AXIS2_PLACEMENT_3D})`, m);
 
-export const PCURVE = (
-  CYLINDRICAL_SURFACE_or_PLANE: number,
-  DEFINITIONAL_REPRESENTATION: number,
-  m: MutableStep
-): number => mutate(`PCURVE('',#${CYLINDRICAL_SURFACE_or_PLANE},#${DEFINITIONAL_REPRESENTATION})`, m);
+export const PCURVE = (CYLINDRICAL_SURFACE_or_PLANE: number, DEFINITIONAL_REPRESENTATION: number, m: MutableStep): number =>
+  mutate(`PCURVE('',#${CYLINDRICAL_SURFACE_or_PLANE},#${DEFINITIONAL_REPRESENTATION})`, m);
 
 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);
 
-export const SHELL_BASED_SURFACE_MODEL = (OPEN_SHELL: number, m: MutableStep): number =>
-  mutate(`SHELL_BASED_SURFACE_MODEL('',(#${OPEN_SHELL}))`, m);
+export const SHELL_BASED_SURFACE_MODEL = (OPEN_SHELL: number, m: MutableStep): number => mutate(`SHELL_BASED_SURFACE_MODEL('',(#${OPEN_SHELL}))`, m);
 
 export const MANIFOLD_SURFACE_SHAPE_REPRESENTATION = (
   AXIS2_PLACEMENT_3D: number,
   CLOSED_SHELL: 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);
 
-export const CLOSED_SHELL2 = (ADVANCED_FACE: number, m: MutableStep): number =>
-  mutate(`CLOSED_SHELL('',(#${ADVANCED_FACE}))`, m);
+export const CLOSED_SHELL2 = (ADVANCED_FACE: number, m: MutableStep): number => mutate(`CLOSED_SHELL('',(#${ADVANCED_FACE}))`, m);
 
-export const MANIFOLD_SOLID_BREP = (closedRef: number, m: MutableStep): number =>
-  mutate(`MANIFOLD_SOLID_BREP('',#${closedRef})`, m);
+export const MANIFOLD_SOLID_BREP = (closedRef: number, m: MutableStep): number => mutate(`MANIFOLD_SOLID_BREP('',#${closedRef})`, m);
 
-export const AXIS2_PLACEMENT_3D = (
-  CARTESIAN_POINT: number,
-  DIRECTION_NORMAL: number,
-  DIRECTION_PLANE_DIRECITON: number,
-  m: MutableStep
-): number => mutate(`AXIS2_PLACEMENT_3D('',#${CARTESIAN_POINT},#${DIRECTION_NORMAL},#${DIRECTION_PLANE_DIRECITON})`, m);
+export const AXIS2_PLACEMENT_3D = (CARTESIAN_POINT: number, DIRECTION_NORMAL: number, DIRECTION_PLANE_DIRECITON: number, 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 = (
-  PRESENTATION_STYLE_ASSIGNMENT: number,
-  MANIFOLD_SOLID_BREP: number,
-  m: MutableStep
-): number => mutate(`STYLED_ITEM('color',(#${PRESENTATION_STYLE_ASSIGNMENT}),#${MANIFOLD_SOLID_BREP})`, m);
+export const STYLED_ITEM = (PRESENTATION_STYLE_ASSIGNMENT: number, MANIFOLD_SOLID_BREP: number, m: MutableStep): number =>
+  mutate(`STYLED_ITEM('color',(#${PRESENTATION_STYLE_ASSIGNMENT}),#${MANIFOLD_SOLID_BREP})`, m);
 
-export const PRESENTATION_STYLE_ASSIGNMENT = (
-  SURFACE_STYLE_USAGE: number,
-  CURVE_STYLE: number,
-  m: MutableStep
-): number => mutate(`PRESENTATION_STYLE_ASSIGNMENT((#${SURFACE_STYLE_USAGE},#${CURVE_STYLE}))`, m);
+export const PRESENTATION_STYLE_ASSIGNMENT = (SURFACE_STYLE_USAGE: number, CURVE_STYLE: number, m: MutableStep): number =>
+  mutate(`PRESENTATION_STYLE_ASSIGNMENT((#${SURFACE_STYLE_USAGE},#${CURVE_STYLE}))`, m);
 
 export const SURFACE_STYLE_USAGE = (SURFACE_SIDE_STYLE: number, m: MutableStep): number =>
   mutate(`SURFACE_STYLE_USAGE(.BOTH.,#${SURFACE_SIDE_STYLE})`, m);
@@ -187,14 +138,12 @@ export const SURFACE_STYLE_USAGE = (SURFACE_SIDE_STYLE: number, m: MutableStep):
 export const SURFACE_SIDE_STYLE = (SURFACE_STYLE_FILL_AREA: number, m: MutableStep): number =>
   mutate(`SURFACE_SIDE_STYLE('',(#${SURFACE_STYLE_FILL_AREA}))`, m);
 
-export const SURFACE_STYLE_FILL_AREA = (FILL_AREA_STYLE: number, m: MutableStep): number =>
-  mutate(`SURFACE_STYLE_FILL_AREA(#${FILL_AREA_STYLE})`, m);
+export const SURFACE_STYLE_FILL_AREA = (FILL_AREA_STYLE: number, m: MutableStep): number => mutate(`SURFACE_STYLE_FILL_AREA(#${FILL_AREA_STYLE})`, m);
 
 export const FILL_AREA_STYLE = (FILL_AREA_STYLE_COLOUR: number, m: MutableStep): number =>
   mutate(`FILL_AREA_STYLE('',(#${FILL_AREA_STYLE_COLOUR}))`, m);
 
-export const FILL_AREA_STYLE_COLOUR = (COLOUR_RGB: number, m: MutableStep): number =>
-  mutate(`FILL_AREA_STYLE_COLOUR('',#${COLOUR_RGB})`, m);
+export const FILL_AREA_STYLE_COLOUR = (COLOUR_RGB: number, m: MutableStep): number => mutate(`FILL_AREA_STYLE_COLOUR('',#${COLOUR_RGB})`, m);
 
 export const CURVE_STYLE = (DRAUGHTING_PRE_DEFINED_CURVE_FONT: number, COLOUR_RGB: number, m: MutableStep): number =>
   mutate(`CURVE_STYLE('',#${DRAUGHTING_PRE_DEFINED_CURVE_FONT},POSITIVE_LENGTH_MEASURE(0.1),#${COLOUR_RGB})`, m);
@@ -228,13 +177,10 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
     m
   );
 
-export const LENGTH_UNIT = (m: MutableStep): number =>
-  mutate(`( LENGTH_UNIT() NAMED_UNIT(*) SI_UNIT(.MILLI.,.METRE.) )`, m);
+export const LENGTH_UNIT = (m: MutableStep): number => mutate(`( LENGTH_UNIT() NAMED_UNIT(*) SI_UNIT(.MILLI.,.METRE.) )`, m);
 
-export const NAMED_UNIT = (
-  unit: "PLANE_ANGLE_UNIT() SI_UNIT($,.RADIAN.)" | "SI_UNIT($,.STERADIAN.) SOLID_ANGLE_UNIT()",
-  m: MutableStep
-): number => mutate(`( NAMED_UNIT(*) ${unit} )`, m);
+export const NAMED_UNIT = (unit: "PLANE_ANGLE_UNIT() SI_UNIT($,.RADIAN.)" | "SI_UNIT($,.STERADIAN.) SOLID_ANGLE_UNIT()", m: MutableStep): number =>
+  mutate(`( NAMED_UNIT(*) ${unit} )`, m);
 
 export const UNCERTAINTY_MEASURE_WITH_UNIT = (LENGTH_UNIT: number, m: MutableStep): number =>
   mutate(
@@ -244,31 +190,21 @@ 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);
 
-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);
+export const PRODUCT_DEFINITION_FORMATION = (product: number, m: MutableStep): number => mutate(`PRODUCT_DEFINITION_FORMATION('','',#${product})`, m);
 
 export const PRODUCT = (productContext: number, name: string, m: MutableStep): number =>
   mutate(`PRODUCT('${name}','${name}','',(#${productContext}))`, m);

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

@@ -1,15 +1,5 @@
 import type { Box, Material, Vec3 } from "../../../abstract-3d.js";
-import {
-  vec3Scale,
-  vec3TransRot,
-  vec3RotCombine,
-  vec3Zero,
-  vec3,
-  vec3Normalize,
-  vec3Sub,
-  vec3Add,
-  vec3Rot,
-} from "../../../abstract-3d.js";
+import { vec3Scale, vec3TransRot, vec3RotCombine, vec3Zero, vec3, vec3Normalize, vec3Sub, vec3Add, vec3Rot } from "../../../abstract-3d.js";
 import { parseRgb } from "../../../utils.js";
 import type { MutableStep } from "../step-encoding.js";
 import {
@@ -131,12 +121,7 @@ export function stepBox(b: Box, mat: Material, parentPos: Vec3, parentRot: Vec3,
   const closedShell = CLOSED_SHELL(faces, m);
   const manifoldSolidBrep = MANIFOLD_SOLID_BREP(closedShell, m);
 
-  const axisPlacement = AXIS2_PLACEMENT_3D(
-    CARTESIAN_POINT(vec3Zero, m),
-    DIRECTION(normFrontGlobal, m),
-    DIRECTION(normRightGlobal, m),
-    m
-  );
+  const axisPlacement = AXIS2_PLACEMENT_3D(CARTESIAN_POINT(vec3Zero, m), DIRECTION(normFrontGlobal, m), DIRECTION(normRightGlobal, m), m);
 
   const advBrepShapeRepr = ADVANCED_BREP_SHAPE_REPRESENTATION(axisPlacement, manifoldSolidBrep, m.geoContext3d, m);
 

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

@@ -45,14 +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, rSmall?: number): void {
   const h = c.length;
 
   if (h <= GEOMETRY_EPSILON) {
@@ -84,11 +77,7 @@ export function stepCylinder(
 
   const topSeamPoint = vec3Add(pos, rot(vec3(topRadius, h / 2, 0)));
 
-  const seamDelta = vec3(
-    topSeamPoint.x - bottomSeamPoint.x,
-    topSeamPoint.y - bottomSeamPoint.y,
-    topSeamPoint.z - bottomSeamPoint.z
-  );
+  const seamDelta = vec3(topSeamPoint.x - bottomSeamPoint.x, topSeamPoint.y - bottomSeamPoint.y, topSeamPoint.z - bottomSeamPoint.z);
 
   const seamLength = Math.hypot(seamDelta.x, seamDelta.y, seamDelta.z);
 
@@ -120,13 +109,7 @@ export function stepCylinder(
 
   const topPlacement = AXIS2_PLACEMENT_3D(topCenterPoint, axisDirection, radialDirection, m);
 
-  const seamEdge = EDGE_CURVE(
-    bottomVertex,
-    topVertex,
-    LINE(bottomSeamCartesianPoint, VECTOR(DIRECTION(seamDirection, m), m), m),
-    m,
-    "T"
-  );
+  const seamEdge = EDGE_CURVE(bottomVertex, topVertex, LINE(bottomSeamCartesianPoint, VECTOR(DIRECTION(seamDirection, m), m), m), m, "T");
 
   const bottomCircleEdge = EDGE_CURVE(bottomVertex, bottomVertex, CIRCLE(bottomPlacement, bottomRadius, m), m, "T");
 
@@ -167,19 +150,9 @@ export function stepCylinder(
     "T"
   );
 
-  const bottomFace = ADVANCED_FACE(
-    FACE_BOUND(EDGE_LOOP([ORIENTED_EDGE(bottomCircleEdge, m, "F")], m), "T", m),
-    PLANE(bottomPlacement, m),
-    m,
-    "F"
-  );
+  const bottomFace = ADVANCED_FACE(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),
-    PLANE(topPlacement, m),
-    m,
-    "T"
-  );
+  const topFace = ADVANCED_FACE(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);
 
@@ -193,10 +166,7 @@ export function stepCylinder(
   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),
-      m
-    ),
+    PRODUCT_DEFINITION_SHAPE(PRODUCT_DEFINITION(PRODUCT_DEFINITION_FORMATION(prod, m), PRODUCT_DEFINITION_CONTEXT(applicationContext, m), m), m),
     absp,
     m
   );

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

@@ -22,8 +22,7 @@ export function stlCone(c: Cone, _m: Material, sides: number, parentPos: Vec3, p
 
     if (i !== 0) {
       const prevBot = botVec3Array[i - 1]!;
-      stlString +=
-        stlPlaneOfVertices(botPos, prevBot, currBot, currBot) + stlPlaneOfVertices(currBot, prevBot, topPos, topPos);
+      stlString += stlPlaneOfVertices(botPos, prevBot, currBot, currBot) + stlPlaneOfVertices(currBot, prevBot, topPos, topPos);
     }
     currentAngle += angleStep;
   }

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

@@ -33,8 +33,7 @@ export function stlCylinder(c: Cylinder, m: Material, sides: number, parentPos:
       const prevBot = botVec3Array[i - 1]!;
       const prevTop = topVec3Array[i - 1]!;
       if (!c.open) {
-        stlString +=
-          stlPlaneOfVertices(botPos, prevBot, currBot, currBot) + stlPlaneOfVertices(topPos, prevTop, currTop, currTop);
+        stlString += stlPlaneOfVertices(botPos, prevBot, currBot, currBot) + stlPlaneOfVertices(topPos, prevTop, currTop, currTop);
       }
       stlString += stlPlaneOfVertices(currBot, prevBot, prevTop, currTop);
     }

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

@@ -7,11 +7,6 @@ export function stlPlane(p: Plane, _m: Material, parentPos: Vec3, parentRot: Vec
   const pos = vec3TransRot(p.pos, parentPos, parentRot);
   const rot = vec3RotCombine(parentRot, p.rot ?? vec3Zero);
   const vec3tr = (x: number, y: number): Vec3 => vec3TransRot(vec3(x, y, 0), pos, rot);
-  const [v1, v2, v3, v4] = [
-    vec3tr(-half.x, -half.y),
-    vec3tr(half.x, -half.y),
-    vec3tr(half.x, half.y),
-    vec3tr(-half.x, half.y),
-  ];
+  const [v1, v2, v3, v4] = [vec3tr(-half.x, -half.y), vec3tr(half.x, -half.y), vec3tr(half.x, half.y), vec3tr(-half.x, half.y)];
   return stlTriangle(v1, v2, v3) + stlTriangle(v3, v4, v1);
 }

package/src/renderers/stl/stl.ts

@@ -1,18 +1,14 @@
 import type { Scene, Group, Vec3 } from "../../abstract-3d.js";
 import { vec3Zero, vec3TransRot, vec3RotCombine } from "../../abstract-3d.js";
-import { stlPlane } from "./stl-geometries/stl-plane.js";
 import { stlBox } from "./stl-geometries/stl-box.js";
-import { stlCylinder } from "./stl-geometries/stl-cylinder.js";
 import { stlCone } from "./stl-geometries/stl-cone.js";
+import { stlCylinder } from "./stl-geometries/stl-cylinder.js";
+import { stlPlane } from "./stl-geometries/stl-plane.js";
 import { stlPolygon } from "./stl-geometries/stl-polygon.js";
 
 export const render = (scene: Scene): string =>
   `solid
-` +
-  scene.groups.reduce(
-    (a, c) => a + stlGroup(c, scene.center_deprecated ?? vec3Zero, scene.rotation_deprecated ?? vec3Zero),
-    ""
-  );
+` + scene.groups.reduce((a, c) => a + stlGroup(c, scene.center_deprecated ?? vec3Zero, scene.rotation_deprecated ?? vec3Zero), "");
 
 function stlGroup(g: Group, parentPos: Vec3, parentRot: Vec3): string {
   const pos = vec3TransRot(g.pos, parentPos, parentRot);