abstract-3d 0.9.13 → 0.9.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (19) hide show
  1. package/lib/renderers/react/react-mesh.d.ts.map +1 -1
  2. package/lib/renderers/react/react-mesh.js +9 -5
  3. package/lib/renderers/react/react-mesh.js.map +1 -1
  4. package/lib/renderers/step/step-geometries/step-cone.d.ts +4 -0
  5. package/lib/renderers/step/step-geometries/step-cone.d.ts.map +1 -0
  6. package/lib/renderers/step/step-geometries/step-cone.js +14 -0
  7. package/lib/renderers/step/step-geometries/step-cone.js.map +1 -0
  8. package/lib/renderers/step/step-geometries/step-cylinder.d.ts +1 -1
  9. package/lib/renderers/step/step-geometries/step-cylinder.d.ts.map +1 -1
  10. package/lib/renderers/step/step-geometries/step-cylinder.js +5 -4
  11. package/lib/renderers/step/step-geometries/step-cylinder.js.map +1 -1
  12. package/lib/renderers/step/step.d.ts.map +1 -1
  13. package/lib/renderers/step/step.js +4 -0
  14. package/lib/renderers/step/step.js.map +1 -1
  15. package/package.json +2 -2
  16. package/src/renderers/react/react-mesh.tsx +11 -4
  17. package/src/renderers/step/step-geometries/step-cone.ts +26 -0
  18. package/src/renderers/step/step-geometries/step-cylinder.ts +6 -4
  19. package/src/renderers/step/step.ts +4 -0
package/lib/renderers/react/react-mesh.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"react-mesh.d.ts","sourceRoot":"","sources":["../../../src/renderers/react/react-mesh.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EAOL,KAAK,EAIL,UAAU,EAIV,OAAO,EACR,MAAM,OAAO,CAAC;AACf,OAAO,EACL,IAAI,EAgBL,MAAM,sBAAsB,CAAC;AA2B9B,eAAO,MAAM,KAAK,OAAc,CAAC;AACjC,eAAO,MAAM,OAAO,SAAgB,CAAC;AACrC,eAAO,MAAM,UAAU,YAAmB,CAAC;AAE3C,wBAAgB,SAAS,CAAC,EACxB,IAAI,EACJ,QAAQ,GACT,EAAE;IACD,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IACpB,QAAQ,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC;CACvC,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CA0JpB"}
1
+ {"version":3,"file":"react-mesh.d.ts","sourceRoot":"","sources":["../../../src/renderers/react/react-mesh.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EAOL,KAAK,EAIL,UAAU,EAIV,OAAO,EACR,MAAM,OAAO,CAAC;AACf,OAAO,EACL,IAAI,EAmBL,MAAM,sBAAsB,CAAC;AA2B9B,eAAO,MAAM,KAAK,OAAc,CAAC;AACjC,eAAO,MAAM,OAAO,SAAgB,CAAC;AACrC,eAAO,MAAM,UAAU,YAAmB,CAAC;AAE3C,wBAAgB,SAAS,CAAC,EACxB,IAAI,EACJ,QAAQ,GACT,EAAE;IACD,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IACpB,QAAQ,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC;CACvC,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CA8JpB"}
package/lib/renderers/react/react-mesh.js CHANGED
@@ -5,7 +5,7 @@ import React from "react";
5
5
  import { extend } from "@react-three/fiber";
6
6
  import { Text, Line } from "@react-three/drei";
7
7
  import { BoxGeometry, BufferAttribute, CatmullRomCurve3, ConeGeometry, Curve, CylinderGeometry, Euler, ExtrudeGeometry, Path, PlaneGeometry, Quaternion, Shape, SphereGeometry, TubeGeometry, Vector3, } from "three";
8
- import { vec2Scale, vec2Sub, vec2Add, isZero, vec3Scale, vec3, } from "../../abstract-3d.js";
8
+ import { vec2Scale, vec2Sub, vec2Add, isZero, vec3Scale, vec3, vec3Add, vec3RotCombine, vec3Zero, vec3Rot, } from "../../abstract-3d.js";
9
9
  import { exhaustiveCheck } from "ts-exhaustive-check";
10
10
  extend({
11
11
  SphereGeometry,
@@ -54,12 +54,16 @@ export function ReactMesh({ mesh, children, }) {
54
54
  const angledCylinder = new CylinderGeometry(1, 1, 1, CYLINDER_SEGMENTS, 1, false, angleStart, angleLength);
55
55
  const angleEnd = angleStart + angleLength;
56
56
  const halfRadius = radius / 2;
57
- const plane1Pos = vec3Scale(vec3(0, -Math.sin(-angleStart + Math.PI / 2), Math.cos(-angleStart + Math.PI / 2)), halfRadius);
58
- const plane2Pos = vec3Scale(vec3(0, -Math.sin(-angleEnd + Math.PI / 2), Math.cos(-angleEnd + Math.PI / 2)), halfRadius);
57
+ const aStart = angleStart - Math.PI / 2;
58
+ const aEnd = angleEnd - Math.PI / 2;
59
+ const plane1Rot = vec3RotCombine(rot ?? vec3Zero, vec3(0, aStart, 0));
60
+ const plane2Rot = vec3RotCombine(rot ?? vec3Zero, vec3(0, aEnd, 0));
61
+ const plane1Pos = vec3Add(vec3Rot(vec3Scale(vec3(Math.cos(aStart), 0, -Math.sin(aStart)), halfRadius), vec3Zero, rot ?? vec3Zero), pos);
62
+ const plane2Pos = vec3Add(vec3Rot(vec3Scale(vec3(Math.cos(aEnd), 0, -Math.sin(aEnd)), halfRadius), vec3Zero, rot ?? vec3Zero), pos);
59
63
  return (React.createElement("mesh", null,
60
64
  React.createElement("mesh", { geometry: angledCylinder, scale: [radius, length, radius], position: [pos.x, pos.y, pos.z], rotation: [rot?.x ?? 0, rot?.y ?? 0, rot?.z ?? 0] }, children),
61
- React.createElement("mesh", { geometry: planeGeometry, scale: [radius, length, 1], position: [plane1Pos.x, plane1Pos.y, plane1Pos.z], rotation: [-angleStart, Math.PI, Math.PI / 2] }, children),
62
- React.createElement("mesh", { geometry: planeGeometry, scale: [radius, length, 1], position: [plane2Pos.x, plane2Pos.y, plane2Pos.z], rotation: [-angleEnd, 0, Math.PI / 2] }, children)));
65
+ React.createElement("mesh", { geometry: planeGeometry, scale: [radius, length, 1], position: [plane1Pos.x, plane1Pos.y, plane1Pos.z], rotation: [plane1Rot.x, plane1Rot.y, plane1Rot.z] }, children),
66
+ React.createElement("mesh", { geometry: planeGeometry, scale: [radius, length, 1], position: [plane2Pos.x, plane2Pos.y, plane2Pos.z], rotation: [plane2Rot.x, plane2Rot.y, plane2Rot.z] }, children)));
63
67
  }
64
68
  }
65
69
  case "Plane": {
package/lib/renderers/react/react-mesh.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"react-mesh.js","sourceRoot":"","sources":["../../../src/renderers/react/react-mesh.tsx"],"names":[],"mappings":"AAAA,wCAAwC;AACxC,kDAAkD;AAClD,oDAAoD;AACpD,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EACL,WAAW,EACX,eAAe,EACf,gBAAgB,EAChB,YAAY,EACZ,KAAK,EACL,gBAAgB,EAChB,KAAK,EACL,eAAe,EACf,IAAI,EACJ,aAAa,EACb,UAAU,EACV,KAAK,EACL,cAAc,EACd,YAAY,EACZ,OAAO,GACR,MAAM,OAAO,CAAC;AACf,OAAO,EAIL,SAAS,EAGT,OAAO,EACP,OAAO,EAKP,MAAM,EACN,SAAS,EACT,IAAI,GAEL,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,MAAM,CAAC;IACL,cAAc;IACd,aAAa;IACb,YAAY;IACZ,UAAU;IACV,OAAO;IACP,KAAK;IACL,WAAW;IACX,IAAI;IACJ,KAAK;IACL,YAAY;IACZ,gBAAgB;IAChB,eAAe;IACf,eAAe;IACf,gBAAgB;CACjB,CAAC,CAAC;AAEH,MAAM,iBAAiB,GAAG,EAAE,CAAC;AAC7B,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;AACtC,MAAM,gBAAgB,GAAG,IAAI,gBAAgB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC;AAC7E,MAAM,oBAAoB,GAAG,IAAI,gBAAgB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,iBAAiB,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;AACvF,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;AACnD,MAAM,aAAa,GAAG,IAAI,aAAa,EAAE,CAAC;AAC1C,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;AACrD,MAAM,CAAC,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;AACjC,MAAM,CAAC,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AACrC,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,UAAU,EAAE,CAAC;AAE3C,MAAM,UAAU,SAAS,CAAC,EACxB,IAAI,EACJ,QAAQ,GAIT;IACC,QAAQ,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QAC3B,KAAK,KAAK,CAAC,CAAC,CAAC;YACX,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;YAChD,OAAO,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CACpC,8BACE,QAAQ,EAAE,WAAW,EACrB,KAAK,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAC/B,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,EAC/B,QAAQ,EAAE,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,IAEhD,QAAQ,CACJ,CACR,CAAC,CAAC,CAAC,CACF,oBAAC,eAAe,IAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,IAC/C,QAAQ,CACO,CACnB,CAAC;QACJ,CAAC;QACD,KAAK,MAAM,CAAC,CAAC,CAAC;YACZ,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;YACnD,OAAO,CACL,8BACE,QAAQ,EAAE,YAAY,EACtB,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAC/B,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,EAC/B,QAAQ,EAAE,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,IAEhD,QAAQ,CACJ,CACR,CAAC;QACJ,CAAC;QACD,KAAK,UAAU,CAAC,CAAC,CAAC;YAChB,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;YACzF,MAAM,SAAS,GAAG,UAAU,KAAK,SAAS,IAAI,WAAW,KAAK,SAAS,CAAC;YACxE,MAAM,OAAO,GAAG,CAAC,SAAS,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,WAAW,CAAC,IAAI,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;YAC1F,IAAG,OAAO,EAAE,CAAC;gBACX,OAAO,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CACpC,8BACE,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,gBAAgB,EACxD,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAC/B,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,EAC/B,QAAQ,EAAE,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,IAEhD,QAAQ,CACJ,CACR,CAAC,CAAC,CAAC,CACF,oBAAC,eAAe,IAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,IAAG,QAAQ,CAAmB,CAClE,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,MAAM,cAAc,GAAG,IAAI,gBAAgB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,iBAAiB,EAAE,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;gBAC3G,MAAM,QAAQ,GAAG,UAAU,GAAG,WAAW,CAAC;gBAC1C,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,CAAC;gBAC9B,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,UAAU,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,UAAU,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;gBAC5H,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;gBACxH,OAAO,CACL;oBACE,8BACE,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAC/B,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,EAC/B,QAAQ,EAAE,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,IAEhD,QAAQ,CACJ;oBACP,8BACE,QAAQ,EAAE,aAAa,EACvB,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,EAC1B,QAAQ,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,EACjD,QAAQ,EAAE,CAAC,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,IAE5C,QAAQ,CACJ;oBACP,8BACE,QAAQ,EAAE,aAAa,EACvB,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,EAC1B,QAAQ,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,EACjD,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,IAEpC,QAAQ,CACJ,CACF,CACR,CAAC;YACJ,CAAC;QACH,CAAC;QACD,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;YAChD,OAAO,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CACpC,8BACE,QAAQ,EAAE,aAAa,EACvB,KAAK,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,EAC1B,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,EAC/B,QAAQ,EAAE,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,IAEhD,QAAQ,CACJ,CACR,CAAC,CAAC,CAAC,CACF,oBAAC,eAAe,IAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC,IAC1C,QAAQ,CACO,CACnB,CAAC;QACJ,CAAC;QACD,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;YACtC,OAAO,CACL,8BAAM,QAAQ,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,IAC3E,QAAQ,CACJ,CACR,CAAC;QACJ,CAAC;QACD,KAAK,OAAO;YACV,OAAO,oBAAC,YAAY,IAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,IAAG,QAAQ,CAAgB,CAAC;QACnE,KAAK,MAAM,CAAC,CAAC,CAAC;YACZ,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;YACnD,OAAO,CACL,oBAAC,IAAI,IACH,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,EAC/B,QAAQ,EAAE,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,EACjD,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAC,QAAQ,EAClB,aAAa,EAAE,KAAK,EACpB,UAAU,EAAE,GAAG;gBAMd,QAAQ;gBACR,IAAI,CACA,CACR,CAAC;QACJ,CAAC;QACD,KAAK,MAAM,CAAC,CAAC,CAAC;YACZ,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;YAChD,OAAO,CACL,oBAAC,IAAI,IACH,MAAM,EAAE;oBACN,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;oBAC3B,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;iBACtB,EACD,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,IAE1B,QAAQ,CACJ,CACR,CAAC;QACJ,CAAC;QACD,KAAK,SAAS;YACZ,OAAO,oBAAC,OAAO,IAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,IAAG,QAAQ,CAAW,CAAC;QAC/D,KAAK,MAAM;YACT,OAAO,oBAAC,IAAI,IAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,IAAG,QAAQ,CAAQ,CAAC;QACtD;YACE,OAAO,kCAAS,CAAC;IACrB,CAAC;AACH,CAAC;AAED,SAAS,eAAe,CAAC,EACvB,GAAG,EACH,KAAK,EACL,QAAQ,GAKT;IACC,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAEtC,MAAM,eAAe,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QACzC,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;QAC1B,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;QAClH,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QACxB,OAAO,IAAI,eAAe,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,CAAC;IAC3E,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAEV,OAAO;IACL,wDAAwD;IACxD,8BAAM,QAAQ,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QAC9G,8BAAM,QAAQ,EAAE,eAAe,gBAAc,CAAC,KAAK,GAAG,CAAC,IACpD,QAAQ,CACJ,CACF,CACR,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CAAC,EACpB,CAAC,EACD,QAAQ,GAIT;IACC,MAAM,eAAe,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QACzC,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;QAC1B,IAAI,CAAC,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAE,CAAC;YACvB,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACzB,CAAC;QACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACzC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAE,CAAC;YACvB,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACzB,CAAC;QACD,KAAK,CAAC,SAAS,EAAE,CAAC;QAClB,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QACtB,OAAO,IAAI,eAAe,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,SAAS,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,CAAC;IACjF,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAER,OAAO;IACL,wDAAwD;IACxD,8BAAM,QAAQ,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAClG,8BAAM,QAAQ,EAAE,eAAe,gBAAc,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,IAC1D,QAAQ,CACJ,CACF,CACR,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CAAC,EACvB,GAAG,EACH,QAAQ,GAIT;IACC,MAAM,eAAe,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QACzC,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;QAC1B,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;QAC3F,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QACxB,OAAO,IAAI,eAAe,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,CAAC;IAChF,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAEV,OAAO;IACL,wDAAwD;IACxD,8BAAM,QAAQ,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QAC9G,8BAAM,QAAQ,EAAE,eAAe,gBAAc,IAAI,CAAC,EAAE,GAAG,CAAC,gBAAc,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,IAClF,QAAQ,CACJ,CACF,CACR,CAAC;AACJ,CAAC;AAED,SAAS,KAAK,CAAC,KAAsC,EAAE,KAAY;IACjE,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACnB,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC;YACf,KAAK,WAAW;gBACd,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;gBACtF,MAAM;YACR,KAAK,YAAY,CAAC,CAAC,CAAC;gBAClB,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;gBACxB,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;gBACxC,MAAM,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;gBACrC,MAAM,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;gBACrC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;gBACrG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACvB,MAAM;YACR,CAAC;YACD;gBACE,eAAe,CAAC,CAAC,CAAC,CAAC;QACvB,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,OAAO,CAAC,EACf,OAAO,EACP,QAAQ,GAIT;IACC,MAAM,GAAG,GAAG,KAAK,CAAC,MAAM,CAAkB,SAAU,CAAC,CAAC;IACtD,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QAClC,IAAI,WAAW,GAAiB,SAAU,CAAC;QAC3C,QAAQ,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YAC9B,QAAQ;YACR,KAAK,CAAC,CAAC,CAAC,CAAC;gBACP,WAAW,GAAG,IAAI,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;gBAC1D,IAAI,CAAC,GAAG,CAAC,CAAC;gBACV,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;oBAC3B,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;oBACvB,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;oBACvB,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACzB,CAAC,CAAC,CAAC;gBACH,MAAM;YACR,CAAC;YACD,KAAK,CAAC,CAAC,CAAC,CAAC;gBACP,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAE,CAAC;gBAC9B,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAE,CAAC;gBAC9B,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAE,CAAC;gBAC9B,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAE,CAAC;gBAC9B,WAAW,GAAG,IAAI,YAAY,CAAC;oBAC7B,EAAE,CAAC,CAAC;oBACJ,EAAE,CAAC,CAAC;oBACJ,EAAE,CAAC,CAAC;oBACJ,EAAE,CAAC,CAAC;oBACJ,EAAE,CAAC,CAAC;oBACJ,EAAE,CAAC,CAAC;oBACJ,EAAE,CAAC,CAAC;oBACJ,EAAE,CAAC,CAAC;oBACJ,EAAE,CAAC,CAAC;oBACJ,EAAE,CAAC,CAAC;oBACJ,EAAE,CAAC,CAAC;oBACJ,EAAE,CAAC,CAAC;oBACJ,EAAE,CAAC,CAAC;oBACJ,EAAE,CAAC,CAAC;oBACJ,EAAE,CAAC,CAAC;oBACJ,EAAE,CAAC,CAAC;oBACJ,EAAE,CAAC,CAAC;oBACJ,EAAE,CAAC,CAAC;iBACL,CAAC,CAAC;gBACH,MAAM;YACR,CAAC;QACH,CAAC;QACD,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;YAChB,GAAG,CAAC,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;QACjC,CAAC;QACD,OAAO,WAAW,CAAC;IACrB,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAEd,OAAO,CACL,8BACE,QAAQ,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,EACzE,QAAQ,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;QAEvD,wCAAgB,MAAM,EAAC,UAAU,EAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,oBAAoB,EAAE;YAC/E,yCACE,MAAM,EAAC,qBAAqB,EAC5B,WAAW,EAAE,IAAI,EACjB,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,QAAQ,EACf,KAAK,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC,EAC1B,QAAQ,EAAE,CAAC,GACX,CACa;QAChB,QAAQ,CACJ,CACR,CAAC;AACJ,CAAC;AAED,MAAM,QAAQ,GAAG,EAAS,CAAC;AAE3B,SAAS,IAAI,CAAC,EACZ,IAAI,EACJ,QAAQ,GAIT;IACC,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QACtC,OAAO,IAAI,YAAY,CACrB,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,aAAa;YAC/B,CAAC,CAAC,IAAI,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAChF,CAAC,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,EAC/B,CAAC,EACD,IAAI,CAAC,MAAM,EACX,CAAC,EACD,KAAK,CACN,CAAC;IACJ,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAEX,OAAO,CACL,8BACE,QAAQ,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,EAChE,QAAQ,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAC9C,QAAQ,EAAE,YAAY,IAErB,QAAQ,CACJ,CACR,CAAC;AACJ,CAAC;AAED,MAAM,WAAY,SAAQ,KAAc;IACtC,MAAM,CAAS;IACf,WAAW,CAAS;IACpB,UAAU,CAAS;IAEnB,YAAY,WAA2B;QACrC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC;QACjC,IAAI,CAAC,UAAU,GAAG,WAAW,CAAC,UAAU,CAAC;QACzC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC,WAAW,CAAC;IAC7C,CAAC;IAED,QAAQ,CAAC,CAAS,EAAE,cAAc,GAAG,IAAI,OAAO,EAAE;QAChD,OAAO,cAAc,CAAC,GAAG,CACvB,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,EAC/D,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,EAC/D,CAAC,CACF,CAAC;IACJ,CAAC;CACF"}
1
+ {"version":3,"file":"react-mesh.js","sourceRoot":"","sources":["../../../src/renderers/react/react-mesh.tsx"],"names":[],"mappings":"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"}
package/lib/renderers/step/step-geometries/step-cone.d.ts ADDED
@@ -0,0 +1,4 @@
1
+ import { Material, Vec3, Cone } from "../../../abstract-3d.js";
2
+ import { MutableStep } from "../step-encoding.js";
3
+ export declare function stepCone(c: Cone, mat: Material, parentPos: Vec3, parentRot: Vec3, m: MutableStep): void;
4
+ //# sourceMappingURL=step-cone.d.ts.map
package/lib/renderers/step/step-geometries/step-cone.d.ts.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"step-cone.d.ts","sourceRoot":"","sources":["../../../../src/renderers/step/step-geometries/step-cone.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,IAAI,EAEJ,IAAI,EAEL,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,WAAW,EACZ,MAAM,qBAAqB,CAAC;AAM7B,wBAAgB,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,EAAE,WAAW,GAAG,IAAI,CAUvG"}
package/lib/renderers/step/step-geometries/step-cone.js ADDED
@@ -0,0 +1,14 @@
1
+ import { stepCylinder } from "./step-cylinder.js";
2
+ const PLANE_THICKNESS = 1e-4;
3
+ export function stepCone(c, mat, parentPos, parentRot, m) {
4
+ //convert it into a box
5
+ const cylinder = {
6
+ type: "Cylinder",
7
+ pos: c.pos,
8
+ rot: c.rot,
9
+ length: c.length,
10
+ radius: c.radius,
11
+ };
12
+ stepCylinder(cylinder, mat, parentPos, parentRot, m, 0.0);
13
+ }
14
+ //# sourceMappingURL=step-cone.js.map
package/lib/renderers/step/step-geometries/step-cone.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"step-cone.js","sourceRoot":"","sources":["../../../../src/renderers/step/step-geometries/step-cone.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,MAAM,eAAe,GAAG,IAAI,CAAC;AAE7B,MAAM,UAAU,QAAQ,CAAC,CAAO,EAAE,GAAa,EAAE,SAAe,EAAE,SAAe,EAAE,CAAc;IAC/F,uBAAuB;IACvB,MAAM,QAAQ,GAAa;QACzB,IAAI,EAAE,UAAU;QAChB,GAAG,EAAE,CAAC,CAAC,GAAG;QACV,GAAG,EAAE,CAAC,CAAC,GAAG;QACV,MAAM,EAAE,CAAC,CAAC,MAAM;QAChB,MAAM,EAAE,CAAC,CAAC,MAAM;KACjB,CAAC;IACF,YAAY,CAAC,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;AAC5D,CAAC"}
package/lib/renderers/step/step-geometries/step-cylinder.d.ts CHANGED
@@ -1,4 +1,4 @@
1
1
  import { Material, Vec3, Cylinder } from "../../../abstract-3d.js";
2
2
  import { MutableStep } from "../step-encoding.js";
3
- export declare function stepCylinder(c: Cylinder, mat: Material, parentPos: Vec3, parentRot: Vec3, m: MutableStep): void;
3
+ export declare function stepCylinder(c: Cylinder, mat: Material, parentPos: Vec3, parentRot: Vec3, m: MutableStep, rSmall?: number): void;
4
4
  //# sourceMappingURL=step-cylinder.d.ts.map
package/lib/renderers/step/step-geometries/step-cylinder.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"step-cylinder.d.ts","sourceRoot":"","sources":["../../../../src/renderers/step/step-geometries/step-cylinder.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EACR,IAAI,EAKJ,QAAQ,EAET,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAqBL,WAAW,EAiBZ,MAAM,qBAAqB,CAAC;AAE7B,wBAAgB,YAAY,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,EAAE,WAAW,GAAG,IAAI,CAiL/G"}
1
+ {"version":3,"file":"step-cylinder.d.ts","sourceRoot":"","sources":["../../../../src/renderers/step/step-geometries/step-cylinder.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EACR,IAAI,EAKJ,QAAQ,EAET,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAqBL,WAAW,EAiBZ,MAAM,qBAAqB,CAAC;AAI7B,wBAAgB,YAAY,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAiLhI"}
package/lib/renderers/step/step-geometries/step-cylinder.js CHANGED
@@ -2,10 +2,11 @@ import { Euler, Matrix4, Vector3 } from "three";
2
2
  import { vec3TransRot, vec3RotCombine, vec3Zero, vec3, vec3Add, } from "../../../abstract-3d.js";
3
3
  import { parseRgb } from "../../shared.js";
4
4
  import { ADVANCED_BREP_SHAPE_REPRESENTATION, ADVANCED_FACE, APPLICATION_CONTEXT, APPLICATION_PROTOCOL_DEFINITION, AXIS2_PLACEMENT_3D, CARTESIAN_POINT, CIRCLE, CLOSED_SHELL, COLOUR_RGB, CURVE_STYLE, CYLINDRICAL_SURFACE, DIRECTION, DRAUGHTING_PRE_DEFINED_CURVE_FONT, EDGE_CURVE, EDGE_LOOP, FACE_BOUND, FILL_AREA_STYLE_COLOUR, LINE, MANIFOLD_SOLID_BREP, MECHANICAL_DESIGN_GEOMETRIC_PRESENTATION_REPRESENTATION, 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, SURFACE_STYLE_USAGE, VECTOR, VERTEX_POINT, } from "../step-encoding.js";
5
- export function stepCylinder(c, mat, parentPos, parentRot, m) {
5
+ const SMALLEST_RADIUS = 1e-4;
6
+ export function stepCylinder(c, mat, parentPos, parentRot, m, rSmall) {
6
7
  const r = c.radius;
8
+ const r2 = Math.max(rSmall ?? c.radius, SMALLEST_RADIUS);
7
9
  const h = c.length;
8
- const rgb = parseRgb(mat.normal);
9
10
  const pos = vec3TransRot(c.pos, parentPos, parentRot);
10
11
  const rotation = vec3RotCombine(parentRot, c.rot ?? vec3Zero);
11
12
  const rotationMatrix = new Matrix4();
@@ -26,7 +27,7 @@ export function stepCylinder(c, mat, parentPos, parentRot, m) {
26
27
  circleBot.applyMatrix4(rotationMatrix);
27
28
  const v1 = new Vector3();
28
29
  const v2 = new Vector3();
29
- v1.set(r, h / 2, 0);
30
+ v1.set(r2, h / 2, 0);
30
31
  v2.set(r, -h / 2, 0);
31
32
  v1.applyMatrix4(rotationMatrix);
32
33
  v2.applyMatrix4(rotationMatrix);
@@ -34,7 +35,7 @@ export function stepCylinder(c, mat, parentPos, parentRot, m) {
34
35
  APPLICATION_PROTOCOL_DEFINITION(applicationContext, m);
35
36
  const ecurve0 = EDGE_CURVE(VERTEX_POINT(CARTESIAN_POINT(vec3Add(pos, v2), m), m), VERTEX_POINT(CARTESIAN_POINT(vec3Add(pos, v1), m), m), LINE(CARTESIAN_POINT(vec3Add(pos, v2), m), VECTOR(DIRECTION(upNormal, m), m), m), m, "T");
36
37
  const ecurve1 = EDGE_CURVE(VERTEX_POINT(CARTESIAN_POINT(vec3Add(pos, v2), m), m), VERTEX_POINT(CARTESIAN_POINT(vec3Add(pos, v2), m), m), CIRCLE(AXIS2_PLACEMENT_3D(CARTESIAN_POINT(vec3Add(pos, circleBot), m), DIRECTION(upNormal, m), DIRECTION(vec3(0, 1, 0), m), m), r, m), m, "T");
37
- const ecurve2 = EDGE_CURVE(VERTEX_POINT(CARTESIAN_POINT(vec3Add(pos, v1), m), m), VERTEX_POINT(CARTESIAN_POINT(vec3Add(pos, v1), m), m), CIRCLE(AXIS2_PLACEMENT_3D(CARTESIAN_POINT(vec3Add(pos, circleTop), m), DIRECTION(upNormal, m), DIRECTION(vec3(0, 1, 0), m), m), r, m), m);
38
+ const ecurve2 = EDGE_CURVE(VERTEX_POINT(CARTESIAN_POINT(vec3Add(pos, v1), m), m), VERTEX_POINT(CARTESIAN_POINT(vec3Add(pos, v1), m), m), CIRCLE(AXIS2_PLACEMENT_3D(CARTESIAN_POINT(vec3Add(pos, circleTop), m), DIRECTION(upNormal, m), DIRECTION(vec3(0, 1, 0), m), m), r2, m), m);
38
39
  const msb = MANIFOLD_SOLID_BREP(CLOSED_SHELL([
39
40
  ADVANCED_FACE(FACE_BOUND(EDGE_LOOP([
40
41
  ORIENTED_EDGE(ecurve0, m, "T"),
package/lib/renderers/step/step-geometries/step-cylinder.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"step-cylinder.js","sourceRoot":"","sources":["../../../../src/renderers/step/step-geometries/step-cylinder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"step-cylinder.js","sourceRoot":"","sources":["../../../../src/renderers/step/step-geometries/step-cylinder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChD,OAAO,EAGL,YAAY,EACZ,cAAc,EACd,QAAQ,EACR,IAAI,EAEJ,OAAO,GACR,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EACL,kCAAkC,EAClC,aAAa,EACb,mBAAmB,EACnB,+BAA+B,EAC/B,kBAAkB,EAClB,eAAe,EACf,MAAM,EACN,YAAY,EACZ,UAAU,EACV,WAAW,EACX,mBAAmB,EACnB,SAAS,EACT,iCAAiC,EACjC,UAAU,EACV,SAAS,EACT,UAAU,EACV,sBAAsB,EACtB,IAAI,EACJ,mBAAmB,EACnB,uDAAuD,EAEvD,aAAa,EACb,KAAK,EACL,6BAA6B,EAC7B,OAAO,EACP,eAAe,EACf,kBAAkB,EAClB,0BAA0B,EAC1B,4BAA4B,EAC5B,wBAAwB,EACxB,+BAA+B,EAC/B,WAAW,EACX,kBAAkB,EAClB,uBAAuB,EACvB,mBAAmB,EACnB,MAAM,EACN,YAAY,GACb,MAAM,qBAAqB,CAAC;AAE7B,MAAM,eAAe,GAAG,IAAI,CAAC;AAE7B,MAAM,UAAU,YAAY,CAAC,CAAW,EAAE,GAAa,EAAE,SAAe,EAAE,SAAe,EAAE,CAAc,EAAE,MAAe;IACxH,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC;IACnB,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IACzD,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC;IACnB,MAAM,GAAG,GAAG,YAAY,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;IACtD,MAAM,QAAQ,GAAG,cAAc,CAAC,SAAS,EAAE,CAAC,CAAC,GAAG,IAAI,QAAQ,CAAC,CAAC;IAE9D,MAAM,cAAc,GAAG,IAAI,OAAO,EAAE,CAAC;IACrC,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;IAC1B,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC9C,cAAc,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;IAE5C,MAAM,QAAQ,GAAG,IAAI,OAAO,EAAE,CAAC;IAC/B,MAAM,UAAU,GAAG,IAAI,OAAO,EAAE,CAAC;IACjC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACtB,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAEzB,QAAQ,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;IACtC,UAAU,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;IAExC,MAAM,SAAS,GAAG,IAAI,OAAO,EAAE,CAAC;IAChC,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IAC3B,SAAS,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;IAEvC,MAAM,SAAS,GAAG,IAAI,OAAO,EAAE,CAAC;IAChC,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IAC5B,SAAS,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;IAEvC,MAAM,EAAE,GAAG,IAAI,OAAO,EAAE,CAAC;IACzB,MAAM,EAAE,GAAG,IAAI,OAAO,EAAE,CAAC;IACzB,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IACrB,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IACrB,EAAE,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;IAChC,EAAE,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;IAEhC,MAAM,kBAAkB,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC;IAClD,+BAA+B,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC;IAEvD,MAAM,OAAO,GAAG,UAAU,CACxB,YAAY,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EACrD,YAAY,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EACrD,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAChF,CAAC,EACD,GAAG,CACJ,CAAC;IAEF,MAAM,OAAO,GAAG,UAAU,CACxB,YAAY,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EACrD,YAAY,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EACrD,MAAM,CACJ,kBAAkB,CAChB,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC,EAC3C,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC,EACtB,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAC3B,CAAC,CACF,EACD,CAAC,EACD,CAAC,CACF,EACD,CAAC,EACD,GAAG,CACJ,CAAC;IAEF,MAAM,OAAO,GAAG,UAAU,CACxB,YAAY,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EACrD,YAAY,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EACrD,MAAM,CACJ,kBAAkB,CAChB,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC,EAC3C,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC,EACtB,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAC3B,CAAC,CACF,EACD,EAAE,EACF,CAAC,CACF,EACD,CAAC,CACF,CAAC;IAEF,MAAM,GAAG,GAAG,mBAAmB,CAC7B,YAAY,CACV;QACE,aAAa,CACX,UAAU,CACR,SAAS,CACP;YACE,aAAa,CAAC,OAAO,EAAE,CAAC,EAAE,GAAG,CAAC;YAC9B,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC;YACzB,aAAa,CAAC,OAAO,EAAE,CAAC,EAAE,GAAG,CAAC;YAC9B,aAAa,CAAC,OAAO,EAAE,CAAC,EAAE,GAAG,CAAC;SAC/B,EACD,CAAC,CACF,EACD,GAAG,EACH,CAAC,CACF,EACD,mBAAmB,CACjB,kBAAkB,CAChB,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EACvF,SAAS,CAAC,UAAU,EAAE,CAAC,CAAC,EACxB,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAC5B,CAAC,CACF,EACD,CAAC,EACD,CAAC,CACF,EACD,CAAC,EACD,GAAG,CACJ;QAED,aAAa,CACX,UAAU,CAAC,SAAS,CAAC,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,EAClE,KAAK,CACH,kBAAkB,CAChB,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC,EAC3C,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC,EACtB,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAC3B,CAAC,CACF,EACD,CAAC,CACF,EACD,CAAC,EACD,GAAG,CACJ;QAED,aAAa,CACX,UAAU,CAAC,SAAS,CAAC,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,EAClE,KAAK,CACH,kBAAkB,CAChB,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC,EAC3C,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC,EACtB,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAC3B,CAAC,CACF,EACD,CAAC,CACF,EACD,CAAC,EACD,GAAG,CACJ;KACF,EACD,CAAC,CACF,EACD,CAAC,CACF,CAAC;IAEF,MAAM,IAAI,GAAG,kCAAkC,CAC7C,kBAAkB,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAC7G,GAAG,EACH,CAAC,CAAC,YAAY,EACd,CAAC,CACF,CAAC;IAEF,MAAM,IAAI,GAAG,OAAO,CAAC,eAAe,CAAC,kBAAkB,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;IAE5E,+BAA+B,CAC7B,wBAAwB,CACtB,kBAAkB,CAAC,4BAA4B,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,0BAA0B,CAAC,kBAAkB,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAC/G,CAAC,CACF,EACD,IAAI,EACJ,CAAC,CACF,CAAC;IAEF,MAAM,KAAK,GAAG,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;IAClD,uDAAuD,CACrD,WAAW,CACT,6BAA6B,CAC3B,mBAAmB,CAAC,kBAAkB,CAAC,uBAAuB,CAAC,sBAAsB,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAC3G,WAAW,CAAC,iCAAiC,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,EACzE,CAAC,CACF,EACD,GAAG,EACH,CAAC,CACF,EACD,CAAC,CAAC,YAAY,EACd,CAAC,CACF,CAAC;AACJ,CAAC"}
package/lib/renderers/step/step.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"step.d.ts","sourceRoot":"","sources":["../../../src/renderers/step/step.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAyI,MAAM,sBAAsB,CAAC;AAkBpL,eAAO,MAAM,MAAM,GAAI,OAAO,KAAK,KAAG,MA0BrC,CAAC"}
1
+ {"version":3,"file":"step.d.ts","sourceRoot":"","sources":["../../../src/renderers/step/step.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAyI,MAAM,sBAAsB,CAAC;AAmBpL,eAAO,MAAM,MAAM,GAAI,OAAO,KAAK,KAAG,MA0BrC,CAAC"}
package/lib/renderers/step/step.js CHANGED
@@ -1,6 +1,7 @@
1
1
  import { vec3Zero, vec3TransRot, vec3RotCombine } from "../../abstract-3d.js";
2
2
  import { GEOMETRIC_REPRESENTATION_CONTEXT_3D, LENGTH_UNIT, NAMED_UNIT, UNCERTAINTY_MEASURE_WITH_UNIT, HEADER, ENDSEC, APPLICATION_CONTEXT, APPLICATION_PROTOCOL_DEFINITION, } from "./step-encoding.js";
3
3
  import { stepBox } from "./step-geometries/step-box.js";
4
+ import { stepCone } from "./step-geometries/step-cone.js";
4
5
  import { stepCylinder } from "./step-geometries/step-cylinder.js";
5
6
  import { stepPlane } from "./step-geometries/step-plane.js";
6
7
  const DEFAULT_DATE_UNIX = '1970-01-01T00:00:00';
@@ -37,6 +38,9 @@ function stepGroup(g, parentPos, parentRot, m) {
37
38
  case "Cylinder":
38
39
  stepCylinder(mesh.geometry, mesh.material, pos, rot, m);
39
40
  break;
41
+ case "Cone":
42
+ stepCone(mesh.geometry, mesh.material, pos, rot, m);
43
+ break;
40
44
  default:
41
45
  break;
42
46
  }
package/lib/renderers/step/step.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"step.js","sourceRoot":"","sources":["../../../src/renderers/step/step.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"step.js","sourceRoot":"","sources":["../../../src/renderers/step/step.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "abstract-3d",
3
- "version": "0.9.13",
3
+ "version": "0.9.15",
4
4
  "description": "Abstract 3D",
5
5
  "author": "Divid AB <info@divid.se>",
6
6
  "repository": "https://github.com/dividab/abstract-visuals/tree/master/packages/abstract-3d",
@@ -34,5 +34,5 @@
34
34
  "@types/three": "^0.174.0",
35
35
  "react": "^19.0.0"
36
36
  },
37
- "gitHead": "777a3ac5ed0791b1df015606c32feabf815de36b"
37
+ "gitHead": "651eaea3fcf34aa67d61d96046e04c0c3bd03a7c"
38
38
  }
package/src/renderers/react/react-mesh.tsx CHANGED
@@ -38,6 +38,9 @@ import {
38
38
  vec3Scale,
39
39
  vec3,
40
40
  vec3Add,
41
+ vec3RotCombine,
42
+ vec3Zero,
43
+ vec3Rot,
41
44
  } from "../../abstract-3d.js";
42
45
  import { exhaustiveCheck } from "ts-exhaustive-check";
43
46
 
@@ -128,8 +131,12 @@ export function ReactMesh({
128
131
  const angledCylinder = new CylinderGeometry(1, 1, 1, CYLINDER_SEGMENTS, 1, false, angleStart, angleLength);
129
132
  const angleEnd = angleStart + angleLength;
130
133
  const halfRadius = radius / 2;
131
- const plane1Pos = vec3Scale(vec3(0, -Math.sin(-angleStart + Math.PI / 2), Math.cos(-angleStart + Math.PI / 2)), halfRadius);
132
- const plane2Pos = vec3Scale(vec3(0, -Math.sin(-angleEnd + Math.PI / 2), Math.cos(-angleEnd + Math.PI / 2)), halfRadius);
134
+ const aStart = angleStart - Math.PI / 2;
135
+ const aEnd = angleEnd - Math.PI / 2;
136
+ const plane1Rot = vec3RotCombine(rot ?? vec3Zero, vec3(0, aStart, 0));
137
+ const plane2Rot = vec3RotCombine(rot ?? vec3Zero, vec3(0, aEnd, 0));
138
+ const plane1Pos = vec3Add(vec3Rot(vec3Scale(vec3(Math.cos(aStart), 0, -Math.sin(aStart)), halfRadius), vec3Zero, rot ?? vec3Zero), pos);
139
+ const plane2Pos = vec3Add(vec3Rot(vec3Scale(vec3(Math.cos(aEnd), 0, -Math.sin(aEnd)), halfRadius), vec3Zero, rot ?? vec3Zero), pos);
133
140
  return (
134
141
  <mesh>
135
142
  <mesh
@@ -144,7 +151,7 @@ export function ReactMesh({
144
151
  geometry={planeGeometry}
145
152
  scale={[radius, length, 1]}
146
153
  position={[plane1Pos.x, plane1Pos.y, plane1Pos.z]}
147
- rotation={[-angleStart, Math.PI, Math.PI / 2]}
154
+ rotation={[plane1Rot.x, plane1Rot.y, plane1Rot.z]}
148
155
  >
149
156
  {children}
150
157
  </mesh>
@@ -152,7 +159,7 @@ export function ReactMesh({
152
159
  geometry={planeGeometry}
153
160
  scale={[radius, length, 1]}
154
161
  position={[plane2Pos.x, plane2Pos.y, plane2Pos.z]}
155
- rotation={[-angleEnd, 0, Math.PI / 2]}
162
+ rotation={[plane2Rot.x, plane2Rot.y, plane2Rot.z]}
156
163
  >
157
164
  {children}
158
165
  </mesh>
package/src/renderers/step/step-geometries/step-cone.ts ADDED
@@ -0,0 +1,26 @@
1
+ import {
2
+ Material,
3
+ Vec3,
4
+ vec3,
5
+ Cone,
6
+ Cylinder,
7
+ } from "../../../abstract-3d.js";
8
+ import {
9
+ MutableStep,
10
+ } from "../step-encoding.js";
11
+ import { stepBox } from "./step-box.js";
12
+ import { stepCylinder } from "./step-cylinder.js";
13
+
14
+ const PLANE_THICKNESS = 1e-4;
15
+
16
+ export function stepCone(c: Cone, mat: Material, parentPos: Vec3, parentRot: Vec3, m: MutableStep): void {
17
+ //convert it into a box
18
+ const cylinder: Cylinder = {
19
+ type: "Cylinder",
20
+ pos: c.pos,
21
+ rot: c.rot,
22
+ length: c.length,
23
+ radius: c.radius,
24
+ };
25
+ stepCylinder(cylinder, mat, parentPos, parentRot, m, 0.0);
26
+ }
package/src/renderers/step/step-geometries/step-cylinder.ts CHANGED
@@ -50,10 +50,12 @@ import {
50
50
  VERTEX_POINT,
51
51
  } from "../step-encoding.js";
52
52
 
53
- export function stepCylinder(c: Cylinder, mat: Material, parentPos: Vec3, parentRot: Vec3, m: MutableStep): void {
53
+ const SMALLEST_RADIUS = 1e-4;
54
+
55
+ export function stepCylinder(c: Cylinder, mat: Material, parentPos: Vec3, parentRot: Vec3, m: MutableStep, rSmall?: number): void {
54
56
  const r = c.radius;
57
+ const r2 = Math.max(rSmall ?? c.radius, SMALLEST_RADIUS);
55
58
  const h = c.length;
56
- const rgb = parseRgb(mat.normal);
57
59
  const pos = vec3TransRot(c.pos, parentPos, parentRot);
58
60
  const rotation = vec3RotCombine(parentRot, c.rot ?? vec3Zero);
59
61
 
@@ -80,7 +82,7 @@ export function stepCylinder(c: Cylinder, mat: Material, parentPos: Vec3, parent
80
82
 
81
83
  const v1 = new Vector3();
82
84
  const v2 = new Vector3();
83
- v1.set(r, h / 2, 0);
85
+ v1.set(r2, h / 2, 0);
84
86
  v2.set(r, -h / 2, 0);
85
87
  v1.applyMatrix4(rotationMatrix);
86
88
  v2.applyMatrix4(rotationMatrix);
@@ -123,7 +125,7 @@ export function stepCylinder(c: Cylinder, mat: Material, parentPos: Vec3, parent
123
125
  DIRECTION(vec3(0, 1, 0), m),
124
126
  m
125
127
  ),
126
- r,
128
+ r2,
127
129
  m
128
130
  ),
129
131
  m
package/src/renderers/step/step.ts CHANGED
@@ -11,6 +11,7 @@ import {
11
11
  APPLICATION_PROTOCOL_DEFINITION,
12
12
  } from "./step-encoding.js";
13
13
  import { stepBox } from "./step-geometries/step-box.js";
14
+ import { stepCone } from "./step-geometries/step-cone.js";
14
15
  import { stepCylinder } from "./step-geometries/step-cylinder.js";
15
16
  import { stepPlane } from "./step-geometries/step-plane.js";
16
17
 
@@ -60,6 +61,9 @@ function stepGroup(g: Group, parentPos: Vec3, parentRot: Vec3, m: MutableStep):
60
61
  case "Cylinder":
61
62
  stepCylinder(mesh.geometry, mesh.material, pos, rot, m);
62
63
  break;
64
+ case "Cone":
65
+ stepCone(mesh.geometry, mesh.material, pos, rot, m);
66
+ break;
63
67
  default:
64
68
  break;
65
69
  }