Step cylinder (#148)

* cylinder...?

* step cylinder

* Normal fix for planes?

* Fixed the boxes.

Author: rashal01

packages/abstract-3d/src/abstract-3d.ts

@@ -1,4 +1,4 @@
-import { Euler, Quaternion, Vector3 } from "three";
+import { Euler, Matrix4, Quaternion, Vector3 } from "three";
 
 export type Scene = {
   readonly size_deprecated: Vec3; // Move size calculation to every renderer??
@@ -406,6 +406,19 @@ export function vec3RotCombine(outer: Vec3, inner: Vec3): Vec3 {
   return vec3(euler1.x, euler1.y, euler1.z);
 }
 
+export function vec3RotNormal(referenceNormal: Vec3, eulerRot: Vec3): Vec3 {
+  const rotationMatrix = new Matrix4();
+  const euler = new Euler();
+  euler.set(eulerRot.x, eulerRot.y, eulerRot.z);
+  rotationMatrix.makeRotationFromEuler(euler);
+
+  const normal = new Vector3();
+  normal.set(referenceNormal.x, referenceNormal.y, referenceNormal.z);
+  normal.applyMatrix4(rotationMatrix);
+  const normalized = normal.normalize();
+  return vec3(normalized.x, normalized.y, normalized.z);
+}
+
 export function vec3Rot(point: Vec3, origin: Vec3, rotation: Vec3): Vec3 {
   euler1.set(rotation.x, rotation.y, rotation.z);
   quaternion1.setFromEuler(euler1);

packages/abstract-3d/src/renderers/step/step-encoding.ts

@@ -16,7 +16,7 @@ const mutate = (step: string, m: MutableStep): number => {
 };
 
 export const HEADER = (): string =>
-  `ISO-10303-21
+  `ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION(('FreeCAD Model'),'2;1');
 FILE_NAME('Open CASCADE Shape Model','2024-09-10T08:42:01',('Author'),(
@@ -52,16 +52,16 @@ export const VERTEX_POINT = (CARTESIAN_POINT: number, m: MutableStep): number =>
 export const LINE = (CARTESIAN_POINT: number, VECTOR: number, m: MutableStep): number =>
   mutate(`LINE('',#${CARTESIAN_POINT},#${VECTOR})`, m);
 
-export const CIRCLE = (AXIS2_PLACEMENT_3D: number, m: MutableStep): number =>
-  mutate(`CIRCLE('',#${AXIS2_PLACEMENT_3D},2.)`, 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 = (VERTEX_POINT_FROM: number, VERTEX_POINT_TO: number, LINE: number, m: MutableStep): number =>
-  mutate(`EDGE_CURVE('',#${VERTEX_POINT_TO},#${VERTEX_POINT_FROM},#${LINE},.T.)`, m);
+export const EDGE_CURVE = (VERTEX_POINT_FROM: number, VERTEX_POINT_TO: number, LINE: number, m: MutableStep, type: "T" | "F" = "F"): number =>
+  mutate(`EDGE_CURVE('',#${VERTEX_POINT_TO},#${VERTEX_POINT_FROM},#${LINE},.${type}.)`, m);
 
-export const ORIENTED_EDGE = (EDGE_CURVE: number, m: MutableStep): number =>
-  mutate(`ORIENTED_EDGE('',*,*,#${EDGE_CURVE},.F.)`, m);
+export const ORIENTED_EDGE = (EDGE_CURVE: number, m: MutableStep, type: "T" | "F" = "F"): number =>
+  mutate(`ORIENTED_EDGE('',*,*,#${EDGE_CURVE},.${type}.)`, m);
 
 export const SURFACE_CURVE = (CIRCLE: number, PCURVE1: number, PCURVE2: number, m: MutableStep): number =>
   mutate(`SURFACE_CURVE('',#${CIRCLE},(#${PCURVE1},#${PCURVE2}),.PCURVE_S1.)`, m);
@@ -94,8 +94,8 @@ export const PCURVE = (
   m: MutableStep
 ): number => mutate(`PCURVE('',#${CYLINDRICAL_SURFACE_or_PLANE},#${DEFINITIONAL_REPRESENTATION})`, m);
 
-export const CYLINDRICAL_SURFACE = (AXIS2_PLACEMENT_3D: number, m: MutableStep): number =>
-  mutate(`CYLINDRICAL_SURFACE('',#${AXIS2_PLACEMENT_3D},2.)`, m);
+export const CYLINDRICAL_SURFACE = (AXIS2_PLACEMENT_3D: number, radius: number, m: MutableStep): number =>
+  mutate(`CYLINDRICAL_SURFACE('',#${AXIS2_PLACEMENT_3D},${radius})`, m);
 
 export const DEFINITIONAL_REPRESENTATION = (LINEorCircle: number, m: MutableStep): number =>
   mutate(`DEFINITIONAL_REPRESENTATION('',(#${LINEorCircle}),#7)`, m);
@@ -206,3 +206,53 @@ export const UNCERTAINTY_MEASURE_WITH_UNIT = (LENGTH_UNIT: number, m: MutableSte
   'distance_accuracy_value','confusion accuracy')`,
     m
   );
+
+export const APPLICATION_PROTOCOL_DEFINITION = (m: MutableStep): number =>
+  mutate(`APPLICATION_PROTOCOL_DEFINITION('international standard','automotive_design',2000,#q2);`, 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 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_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
+  )
+
+export const PRODUCT_CONTEXT = (applicationContext: number, m: MutableStep): number =>
+  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
+  )
+

packages/abstract-3d/src/renderers/step/step-geometries/step-box.ts

@@ -1,3 +1,4 @@
+import { Euler, Matrix4, Vector3 } from "three";
 import {
   Box,
   Material,
@@ -13,11 +14,14 @@ import {
   vec3NegX,
   vec3NegY,
   vec3NegZ,
+  vec3RotNormal,
 } from "../../../abstract-3d.js";
 import { parseRgb } from "../../shared.js";
 import {
   ADVANCED_BREP_SHAPE_REPRESENTATION,
   ADVANCED_FACE,
+  APPLICATION_CONTEXT,
+  APPLICATION_PROTOCOL_DEFINITION,
   AXIS2_PLACEMENT_3D,
   CARTESIAN_POINT,
   CLOSED_SHELL,
@@ -36,6 +40,13 @@ import {
   ORIENTED_EDGE,
   PLANE,
   PRESENTATION_STYLE_ASSIGNMENT,
+  PRODUCT,
+  PRODUCT_CONTEXT,
+  PRODUCT_DEFINITION,
+  PRODUCT_DEFINITION_CONTEXT,
+  PRODUCT_DEFINITION_FORMATION,
+  PRODUCT_DEFINITION_SHAPE,
+  SHAPE_DEFINITION_REPRESENTATION,
   STYLED_ITEM,
   SURFACE_SIDE_STYLE,
   SURFACE_STYLE_FILL_AREA,
@@ -50,7 +61,9 @@ export function stepBox(b: Box, mat: Material, parentPos: Vec3, parentRot: Vec3,
   const rot = vec3RotCombine(parentRot, b.rot ?? vec3Zero);
   const cart3tr = (x: number, y: number, z: number): number =>
     CARTESIAN_POINT(vec3TransRot(vec3(x, y, z), pos, rot), m);
-  const v0 = VECTOR(DIRECTION(vec3Zero, m), m);
+  const v0 = VECTOR(DIRECTION(vec3PosX, m), m);
+  const negNormal = DIRECTION(vec3NegZ, m);
+  const posNormal = DIRECTION(vec3PosZ, m);
   const c0 = CARTESIAN_POINT(vec3Zero, m);
   const [c1, c2] = [cart3tr(-half.x, -half.y, -half.z), cart3tr(half.x, -half.y, -half.z)];
   const [c3, c4] = [cart3tr(half.x, half.y, -half.z), cart3tr(-half.x, half.y, -half.z)];
@@ -60,11 +73,14 @@ export function stepBox(b: Box, mat: Material, parentPos: Vec3, parentRot: Vec3,
   const [v5, v6, v7, v8] = [VERTEX_POINT(c5, m), VERTEX_POINT(c6, m), VERTEX_POINT(c7, m), VERTEX_POINT(c8, m)];
   const [l1, l2, l3, l4] = [LINE(c1, v0, m), LINE(c2, v0, m), LINE(c3, v0, m), LINE(c4, v0, m)];
   const [l5, l6, l7, l8] = [LINE(c5, v0, m), LINE(c6, v0, m), LINE(c7, v0, m), LINE(c8, v0, 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 [d1, d2] = [DIRECTION(vec3RotNormal(vec3NegX, rot), m), DIRECTION(vec3RotNormal(vec3NegY, rot), m)];
+  const [d3, d4] = [DIRECTION(vec3RotNormal(vec3NegZ, rot), m), DIRECTION(vec3RotNormal(vec3PosX, rot), m)];
+  const [d5, d6] = [DIRECTION(vec3RotNormal(vec3PosY, rot), m), DIRECTION(vec3RotNormal(vec3PosZ, rot), m)];
   const color = COLOUR_RGB(parseRgb(mat.normal), m);
 
+  APPLICATION_PROTOCOL_DEFINITION(m);
+  const applicationContext = APPLICATION_CONTEXT(m);
+
   const msb = MANIFOLD_SOLID_BREP(
     CLOSED_SHELL(
       [
@@ -83,7 +99,7 @@ export function stepBox(b: Box, mat: Material, parentPos: Vec3, parentRot: Vec3,
             "T",
             m
           ),
-          PLANE(AXIS2_PLACEMENT_3D(c0, d3, d1, m), m),
+          PLANE(AXIS2_PLACEMENT_3D(c0, d3, posNormal, m), m),
           m
         ),
         // Back
@@ -101,7 +117,7 @@ export function stepBox(b: Box, mat: Material, parentPos: Vec3, parentRot: Vec3,
             "T",
             m
           ),
-          PLANE(AXIS2_PLACEMENT_3D(c0, d6, d4, m), m),
+          PLANE(AXIS2_PLACEMENT_3D(c0, d6, negNormal, m), m),
           m
         ),
         // Left
@@ -119,10 +135,10 @@ export function stepBox(b: Box, mat: Material, parentPos: Vec3, parentRot: Vec3,
             "T",
             m
           ),
-          PLANE(AXIS2_PLACEMENT_3D(c0, d4, d3, m), m),
+          PLANE(AXIS2_PLACEMENT_3D(c0, d4, negNormal, m), m),
           m
         ),
-        // Right
+        // Right ??? <<-----
         ADVANCED_FACE(
           FACE_BOUND(
             EDGE_LOOP(
@@ -137,7 +153,7 @@ export function stepBox(b: Box, mat: Material, parentPos: Vec3, parentRot: Vec3,
             "T",
             m
           ),
-          PLANE(AXIS2_PLACEMENT_3D(c0, d1, d6, m), m),
+          PLANE(AXIS2_PLACEMENT_3D(c0, d1, posNormal, m), m),
           m
         ),
         // Top
@@ -155,7 +171,7 @@ export function stepBox(b: Box, mat: Material, parentPos: Vec3, parentRot: Vec3,
             "T",
             m
           ),
-          PLANE(AXIS2_PLACEMENT_3D(c0, d2, d1, m), m),
+          PLANE(AXIS2_PLACEMENT_3D(c0, d2, posNormal, m), m),
           m
         ),
         // Bottom
@@ -173,15 +189,15 @@ export function stepBox(b: Box, mat: Material, parentPos: Vec3, parentRot: Vec3,
             "T",
             m
           ),
-          PLANE(AXIS2_PLACEMENT_3D(c0, d5, d4, m), m),
+          PLANE(AXIS2_PLACEMENT_3D(c0, d5, negNormal, m), m),
           m
         ),
       ],
       m
     ),
     m
   );
-  ADVANCED_BREP_SHAPE_REPRESENTATION(AXIS2_PLACEMENT_3D(c0, DIRECTION(vec3PosZ, m), DIRECTION(vec3PosX, m), m), msb, m);
+  const absp = ADVANCED_BREP_SHAPE_REPRESENTATION(AXIS2_PLACEMENT_3D(c0, DIRECTION(vec3PosZ, m), DIRECTION(vec3PosX, m), m), msb, m);
   MECHANICAL_DESIGN_GEOMETRIC_PRESENTATION_REPRESENTATION(
     STYLED_ITEM(
       PRESENTATION_STYLE_ASSIGNMENT(
@@ -194,4 +210,29 @@ export function stepBox(b: Box, mat: Material, parentPos: Vec3, parentRot: Vec3,
     ),
     m
   );
+  SHAPE_DEFINITION_REPRESENTATION(
+      PRODUCT_DEFINITION_SHAPE(
+        PRODUCT_DEFINITION(
+          PRODUCT_DEFINITION_FORMATION(
+            PRODUCT(
+              PRODUCT_CONTEXT(
+                applicationContext,
+                m
+              ),
+              "Cube",
+              m
+            ),
+            m
+          ),
+          PRODUCT_DEFINITION_CONTEXT(
+            applicationContext,
+            m
+          ),
+          m
+        ),
+        m
+      ),
+      absp,
+      m
+    );
 }