abstract-3d 2.6.18 → 2.6.20
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.
- package/lib/renderers/step/step-encoding.d.ts +2 -0
- package/lib/renderers/step/step-encoding.d.ts.map +1 -1
- package/lib/renderers/step/step-encoding.js +16 -3
- package/lib/renderers/step/step-encoding.js.map +1 -1
- package/lib/renderers/step/step-geometries/step-box.d.ts.map +1 -1
- package/lib/renderers/step/step-geometries/step-box.js +3 -0
- package/lib/renderers/step/step-geometries/step-box.js.map +1 -1
- package/lib/renderers/step/step-geometries/step-cylinder.d.ts.map +1 -1
- package/lib/renderers/step/step-geometries/step-cylinder.js +67 -21
- package/lib/renderers/step/step-geometries/step-cylinder.js.map +1 -1
- package/lib/renderers/svg/svg-geometries/svg-text.d.ts +1 -1
- package/lib/renderers/svg/svg-geometries/svg-text.d.ts.map +1 -1
- package/lib/renderers/svg/svg-geometries/svg-text.js +2 -3
- package/lib/renderers/svg/svg-geometries/svg-text.js.map +1 -1
- package/lib/renderers/svg/svg.js +4 -26
- package/lib/renderers/svg/svg.js.map +1 -1
- package/package.json +2 -2
- package/src/renderers/step/step-encoding.ts +24 -5
- package/src/renderers/step/step-geometries/step-box.ts +6 -0
- package/src/renderers/step/step-geometries/step-cylinder.ts +303 -101
- package/src/renderers/svg/svg-geometries/svg-text.ts +2 -4
- package/src/renderers/svg/svg.ts +3 -50
|
@@ -4,6 +4,7 @@ export type MutableStep = {
|
|
|
4
4
|
step: string;
|
|
5
5
|
geoContext3d: number;
|
|
6
6
|
};
|
|
7
|
+
export declare const STEP_NUMBER_EPSILON: number;
|
|
7
8
|
export declare const HEADER: (date: string) => string;
|
|
8
9
|
export declare const ENDSEC: () => string;
|
|
9
10
|
export declare const CARTESIAN_POINT: (p: Vec3 | Vec2, m: MutableStep) => number;
|
|
@@ -23,6 +24,7 @@ export declare const EDGE_LOOP: (ORIENTED_EDGE: ReadonlyArray<number>, m: Mutabl
|
|
|
23
24
|
export declare const PLANE: (AXIS2_PLACEMENT_3D: number, m: MutableStep) => number;
|
|
24
25
|
export declare const PCURVE: (CYLINDRICAL_SURFACE_or_PLANE: number, DEFINITIONAL_REPRESENTATION: number, m: MutableStep) => number;
|
|
25
26
|
export declare const CYLINDRICAL_SURFACE: (AXIS2_PLACEMENT_3D: number, radius: number, m: MutableStep) => number;
|
|
27
|
+
export declare const CONICAL_SURFACE: (AXIS2_PLACEMENT_3D: number, radius: number, semiAngle: number, m: MutableStep) => number;
|
|
26
28
|
export declare const DEFINITIONAL_REPRESENTATION: (LINEorCircle: number, m: MutableStep) => number;
|
|
27
29
|
export declare const SHELL_BASED_SURFACE_MODEL: (OPEN_SHELL: number, m: MutableStep) => number;
|
|
28
30
|
export declare const MANIFOLD_SURFACE_SHAPE_REPRESENTATION: (AXIS2_PLACEMENT_3D: number, CLOSED_SHELL: number, GEOMETRY_CONTEXT: number, m: MutableStep) => number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"step-encoding.d.ts","sourceRoot":"","sources":["../../../src/renderers/step/step-encoding.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAElD,MAAM,MAAM,WAAW,GAAG;IAAE,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;CAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"step-encoding.d.ts","sourceRoot":"","sources":["../../../src/renderers/step/step-encoding.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
export const STEP_NUMBER_EPSILON = 1e-5;
|
|
1
2
|
const mutate = (step, m) => {
|
|
2
3
|
const prevRef = m.refs.get(step);
|
|
3
4
|
if (prevRef !== undefined) {
|
|
@@ -11,6 +12,17 @@ const mutate = (step, m) => {
|
|
|
11
12
|
return newRef;
|
|
12
13
|
}
|
|
13
14
|
};
|
|
15
|
+
const stepNumber = (num) => {
|
|
16
|
+
const absNum = Math.abs(num);
|
|
17
|
+
if (absNum < STEP_NUMBER_EPSILON) {
|
|
18
|
+
return 0.0;
|
|
19
|
+
}
|
|
20
|
+
const roundNum = Math.round(num);
|
|
21
|
+
if (Math.abs(absNum - Math.abs(roundNum)) < STEP_NUMBER_EPSILON) {
|
|
22
|
+
return roundNum;
|
|
23
|
+
}
|
|
24
|
+
return num;
|
|
25
|
+
};
|
|
14
26
|
export const HEADER = (date) => `ISO-10303-21;
|
|
15
27
|
HEADER;
|
|
16
28
|
FILE_DESCRIPTION(('Step file converted from Abstract 3D'),'2;1');
|
|
@@ -22,8 +34,8 @@ DATA;`;
|
|
|
22
34
|
export const ENDSEC = () => `
|
|
23
35
|
ENDSEC;
|
|
24
36
|
END-ISO-10303-21;`;
|
|
25
|
-
export const CARTESIAN_POINT = (p, m) => mutate(`CARTESIAN_POINT('',(${p.x},${p.y}${p?.z !== undefined ? `,${p.z}` : ""}))`, m);
|
|
26
|
-
export const DIRECTION = (d, m) => mutate(`DIRECTION('',(${d.x},${d.y}${d?.z !== undefined ? `,${d.z}` : ""}))`, m);
|
|
37
|
+
export const CARTESIAN_POINT = (p, m) => mutate(`CARTESIAN_POINT('',(${stepNumber(p.x)},${stepNumber(p.y)}${p?.z !== undefined ? `,${stepNumber(p.z)}` : ""}))`, m);
|
|
38
|
+
export const DIRECTION = (d, m) => mutate(`DIRECTION('',(${stepNumber(d.x)},${stepNumber(d.y)}${d?.z !== undefined ? `,${stepNumber(d.z)}` : ""}))`, m);
|
|
27
39
|
export const VERTEX_POINT = (CARTESIAN_POINT, m) => mutate(`VERTEX_POINT('',#${CARTESIAN_POINT})`, m);
|
|
28
40
|
export const LINE = (CARTESIAN_POINT, VECTOR, m) => mutate(`LINE('',#${CARTESIAN_POINT},#${VECTOR})`, m);
|
|
29
41
|
export const CIRCLE = (AXIS2_PLACEMENT_3D, radius, m) => mutate(`CIRCLE('',#${AXIS2_PLACEMENT_3D},${radius})`, m);
|
|
@@ -38,7 +50,8 @@ export const FACE_BOUND = (EDGE_LOOP, type, m) => mutate(`FACE_BOUND('',#${EDGE_
|
|
|
38
50
|
export const EDGE_LOOP = (ORIENTED_EDGE, m) => mutate(`EDGE_LOOP('',(${ORIENTED_EDGE.map((af) => `#${af}`).join(",")}))`, m);
|
|
39
51
|
export const PLANE = (AXIS2_PLACEMENT_3D, m) => mutate(`PLANE('',#${AXIS2_PLACEMENT_3D})`, m);
|
|
40
52
|
export const PCURVE = (CYLINDRICAL_SURFACE_or_PLANE, DEFINITIONAL_REPRESENTATION, m) => mutate(`PCURVE('',#${CYLINDRICAL_SURFACE_or_PLANE},#${DEFINITIONAL_REPRESENTATION})`, m);
|
|
41
|
-
export const CYLINDRICAL_SURFACE = (AXIS2_PLACEMENT_3D, radius, m) => mutate(`CYLINDRICAL_SURFACE('',#${AXIS2_PLACEMENT_3D},${radius})`, m);
|
|
53
|
+
export const CYLINDRICAL_SURFACE = (AXIS2_PLACEMENT_3D, radius, m) => mutate(`CYLINDRICAL_SURFACE('',#${AXIS2_PLACEMENT_3D},${stepNumber(radius)})`, m);
|
|
54
|
+
export const CONICAL_SURFACE = (AXIS2_PLACEMENT_3D, radius, semiAngle, m) => mutate(`CONICAL_SURFACE('',#${AXIS2_PLACEMENT_3D},${stepNumber(radius)},${stepNumber(semiAngle)})`, m);
|
|
42
55
|
export const DEFINITIONAL_REPRESENTATION = (LINEorCircle, m) => mutate(`DEFINITIONAL_REPRESENTATION('',(#${LINEorCircle}),#7)`, m);
|
|
43
56
|
export const SHELL_BASED_SURFACE_MODEL = (OPEN_SHELL, m) => mutate(`SHELL_BASED_SURFACE_MODEL('',(#${OPEN_SHELL}))`, m);
|
|
44
57
|
export const MANIFOLD_SURFACE_SHAPE_REPRESENTATION = (AXIS2_PLACEMENT_3D, CLOSED_SHELL, GEOMETRY_CONTEXT, m) => mutate(`MANIFOLD_SURFACE_SHAPE_REPRESENTATION('',(#${AXIS2_PLACEMENT_3D},#${CLOSED_SHELL}),#${GEOMETRY_CONTEXT})`, m);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"step-encoding.js","sourceRoot":"","sources":["../../../src/renderers/step/step-encoding.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,GAAG,CAAC,IAAY,EAAE,CAAc,EAAU,EAAE;IACtD,MAAM,OAAO,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACjC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC1B,OAAO,OAAO,CAAC;IACjB,CAAC;SAAM,CAAC;QACN,MAAM,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;QAC/B,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACzB,CAAC,CAAC,IAAI,IAAI;GACX,MAAM,MAAM,IAAI,GAAG,CAAC;QACnB,OAAO,MAAM,CAAC;IAChB,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,IAAY,EAAU,EAAE,CAC7C;;;iCAG+B,IAAI;;;;MAI/B,CAAC;AAEP,MAAM,CAAC,MAAM,MAAM,GAAG,GAAW,EAAE,CACjC;;kBAEgB,CAAC;AAEnB,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAc,EAAE,CAAc,EAAU,EAAE,CACxE,MAAM,CACJ,uBAAuB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"step-encoding.js","sourceRoot":"","sources":["../../../src/renderers/step/step-encoding.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"step-box.d.ts","sourceRoot":"","sources":["../../../../src/renderers/step/step-geometries/step-box.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,GAAG,EACH,QAAQ,EACR,IAAI,
|
|
1
|
+
{"version":3,"file":"step-box.d.ts","sourceRoot":"","sources":["../../../../src/renderers/step/step-geometries/step-box.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,GAAG,EACH,QAAQ,EACR,IAAI,EAWL,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAoBL,WAAW,EAkBZ,MAAM,qBAAqB,CAAC;AAE7B,wBAAgB,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,EAAE,WAAW,GAAG,IAAI,CA+GrG"}
|
|
@@ -8,6 +8,9 @@ export function stepBox(b, mat, parentPos, parentRot, m) {
|
|
|
8
8
|
const rotation = vec3RotCombine(parentRot, b.rot ?? vec3Zero);
|
|
9
9
|
const color = parseRgb(mat.normal);
|
|
10
10
|
const rotate = (v) => vec3Rot(v, vec3Zero, rotation);
|
|
11
|
+
if (size.x === 0.0 || size.y === 0.0 || size.z === 0.0) {
|
|
12
|
+
return;
|
|
13
|
+
}
|
|
11
14
|
const corners = [
|
|
12
15
|
vec3(0, 0, 0),
|
|
13
16
|
vec3(0, 0, size.z),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"step-box.js","sourceRoot":"","sources":["../../../../src/renderers/step/step-geometries/step-box.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,SAAS,EACT,YAAY,EACZ,cAAc,EACd,QAAQ,EACR,IAAI,EACJ,aAAa,EACb,OAAO,EACP,OAAO,EACP,OAAO,
|
|
1
|
+
{"version":3,"file":"step-box.js","sourceRoot":"","sources":["../../../../src/renderers/step/step-geometries/step-box.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"step-cylinder.d.ts","sourceRoot":"","sources":["../../../../src/renderers/step/step-geometries/step-cylinder.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,IAAI,EAKJ,QAAQ,EAGT,MAAM,yBAAyB,CAAC;AAEjC,OAAO,
|
|
1
|
+
{"version":3,"file":"step-cylinder.d.ts","sourceRoot":"","sources":["../../../../src/renderers/step/step-geometries/step-cylinder.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,IAAI,EAKJ,QAAQ,EAGT,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAsBL,WAAW,EAiBZ,MAAM,qBAAqB,CAAC;AAK7B,wBAAgB,YAAY,CAC1B,CAAC,EAAE,QAAQ,EACX,GAAG,EAAE,QAAQ,EACb,SAAS,EAAE,IAAI,EACf,SAAS,EAAE,IAAI,EACf,CAAC,EAAE,WAAW,EACd,MAAM,CAAC,EAAE,MAAM,GACd,IAAI,CAqWN"}
|
|
@@ -1,37 +1,83 @@
|
|
|
1
1
|
import { vec3TransRot, vec3RotCombine, vec3Zero, vec3, vec3Add, vec3Rot, } from "../../../abstract-3d.js";
|
|
2
2
|
import { parseRgb } from "../../../utils.js";
|
|
3
|
-
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";
|
|
3
|
+
import { ADVANCED_BREP_SHAPE_REPRESENTATION, ADVANCED_FACE, APPLICATION_CONTEXT, APPLICATION_PROTOCOL_DEFINITION, AXIS2_PLACEMENT_3D, CARTESIAN_POINT, CIRCLE, CLOSED_SHELL, COLOUR_RGB, CONICAL_SURFACE, 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";
|
|
4
4
|
const SMALLEST_RADIUS = 1e-4;
|
|
5
|
+
const GEOMETRY_EPSILON = 1e-12;
|
|
5
6
|
export function stepCylinder(c, mat, parentPos, parentRot, m, rSmall) {
|
|
6
|
-
const r = c.radius;
|
|
7
|
-
const r2 = Math.max(rSmall ?? c.radius, SMALLEST_RADIUS);
|
|
8
7
|
const h = c.length;
|
|
8
|
+
if (h <= GEOMETRY_EPSILON) {
|
|
9
|
+
return;
|
|
10
|
+
}
|
|
11
|
+
const bottomRadius = Math.max(c.radius, SMALLEST_RADIUS);
|
|
12
|
+
const requestedTopRadius = Math.max(rSmall ?? c.radius, SMALLEST_RADIUS);
|
|
13
|
+
const radiusTolerance = GEOMETRY_EPSILON *
|
|
14
|
+
Math.max(1, bottomRadius, requestedTopRadius);
|
|
15
|
+
const isCylinder = Math.abs(requestedTopRadius - bottomRadius) <= radiusTolerance;
|
|
16
|
+
const topRadius = isCylinder
|
|
17
|
+
? bottomRadius
|
|
18
|
+
: requestedTopRadius;
|
|
9
19
|
const pos = vec3TransRot(c.pos, parentPos, parentRot);
|
|
10
20
|
const rotation = vec3RotCombine(parentRot, c.rot ?? vec3Zero);
|
|
11
21
|
const rot = (v) => vec3Rot(v, vec3Zero, rotation);
|
|
12
|
-
const
|
|
13
|
-
const
|
|
14
|
-
const
|
|
15
|
-
const
|
|
16
|
-
const
|
|
17
|
-
const
|
|
22
|
+
const axis = rot(vec3(0, 1, 0));
|
|
23
|
+
const radial = rot(vec3(1, 0, 0));
|
|
24
|
+
const bottomCenter = vec3Add(pos, rot(vec3(0, -h / 2, 0)));
|
|
25
|
+
const topCenter = vec3Add(pos, rot(vec3(0, h / 2, 0)));
|
|
26
|
+
const bottomSeamPoint = vec3Add(pos, rot(vec3(bottomRadius, -h / 2, 0)));
|
|
27
|
+
const topSeamPoint = vec3Add(pos, rot(vec3(topRadius, h / 2, 0)));
|
|
28
|
+
const seamDelta = vec3(topSeamPoint.x - bottomSeamPoint.x, topSeamPoint.y - bottomSeamPoint.y, topSeamPoint.z - bottomSeamPoint.z);
|
|
29
|
+
const seamLength = Math.hypot(seamDelta.x, seamDelta.y, seamDelta.z);
|
|
30
|
+
if (seamLength <= GEOMETRY_EPSILON) {
|
|
31
|
+
return;
|
|
32
|
+
}
|
|
33
|
+
const seamDirection = vec3(seamDelta.x / seamLength, seamDelta.y / seamLength, seamDelta.z / seamLength);
|
|
18
34
|
const applicationContext = APPLICATION_CONTEXT(m);
|
|
19
35
|
APPLICATION_PROTOCOL_DEFINITION(applicationContext, m);
|
|
20
|
-
const
|
|
21
|
-
const
|
|
22
|
-
const
|
|
36
|
+
const axisDirection = DIRECTION(axis, m);
|
|
37
|
+
const radialDirection = DIRECTION(radial, m);
|
|
38
|
+
const bottomCenterPoint = CARTESIAN_POINT(bottomCenter, m);
|
|
39
|
+
const topCenterPoint = CARTESIAN_POINT(topCenter, m);
|
|
40
|
+
const bottomSeamCartesianPoint = CARTESIAN_POINT(bottomSeamPoint, m);
|
|
41
|
+
const topSeamCartesianPoint = CARTESIAN_POINT(topSeamPoint, m);
|
|
42
|
+
const bottomVertex = VERTEX_POINT(bottomSeamCartesianPoint, m);
|
|
43
|
+
const topVertex = VERTEX_POINT(topSeamCartesianPoint, m);
|
|
44
|
+
const bottomPlacement = AXIS2_PLACEMENT_3D(bottomCenterPoint, axisDirection, radialDirection, m);
|
|
45
|
+
const topPlacement = AXIS2_PLACEMENT_3D(topCenterPoint, axisDirection, radialDirection, m);
|
|
46
|
+
const seamEdge = EDGE_CURVE(bottomVertex, topVertex, LINE(bottomSeamCartesianPoint, VECTOR(DIRECTION(seamDirection, m), m), m), m, "T");
|
|
47
|
+
const bottomCircleEdge = EDGE_CURVE(bottomVertex, bottomVertex, CIRCLE(bottomPlacement, bottomRadius, m), m, "T");
|
|
48
|
+
const topCircleEdge = EDGE_CURVE(topVertex, topVertex, CIRCLE(topPlacement, topRadius, m), m, "T");
|
|
49
|
+
const growsTowardTop = topRadius >= bottomRadius;
|
|
50
|
+
const coneAxis = growsTowardTop
|
|
51
|
+
? axis
|
|
52
|
+
: vec3(-axis.x, -axis.y, -axis.z);
|
|
53
|
+
const coneLocation = growsTowardTop
|
|
54
|
+
? bottomCenterPoint
|
|
55
|
+
: topCenterPoint;
|
|
56
|
+
const coneStartRadius = Math.min(bottomRadius, topRadius);
|
|
57
|
+
const semiAngle = Math.atan2(Math.abs(topRadius - bottomRadius), h);
|
|
58
|
+
const conePlacement = AXIS2_PLACEMENT_3D(coneLocation, DIRECTION(coneAxis, m), radialDirection, m);
|
|
59
|
+
const sideSurface = isCylinder
|
|
60
|
+
? CYLINDRICAL_SURFACE(bottomPlacement, bottomRadius, m)
|
|
61
|
+
: CONICAL_SURFACE(conePlacement, coneStartRadius, semiAngle, m);
|
|
62
|
+
const sideFace = ADVANCED_FACE(FACE_BOUND(EDGE_LOOP([
|
|
63
|
+
ORIENTED_EDGE(seamEdge, m, "T"),
|
|
64
|
+
ORIENTED_EDGE(topCircleEdge, m, "T"),
|
|
65
|
+
ORIENTED_EDGE(seamEdge, m, "F"),
|
|
66
|
+
ORIENTED_EDGE(bottomCircleEdge, m, "F"),
|
|
67
|
+
], m), "F", m), sideSurface, m, "T");
|
|
68
|
+
const bottomFace = ADVANCED_FACE(FACE_BOUND(EDGE_LOOP([
|
|
69
|
+
ORIENTED_EDGE(bottomCircleEdge, m, "F"),
|
|
70
|
+
], m), "T", m), PLANE(bottomPlacement, m), m, "F");
|
|
71
|
+
const topFace = ADVANCED_FACE(FACE_BOUND(EDGE_LOOP([
|
|
72
|
+
ORIENTED_EDGE(topCircleEdge, m, "F"),
|
|
73
|
+
], m), "F", m), PLANE(topPlacement, m), m, "T");
|
|
23
74
|
const msb = MANIFOLD_SOLID_BREP(CLOSED_SHELL([
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
ORIENTED_EDGE(ecurve0, m, "F"),
|
|
28
|
-
ORIENTED_EDGE(ecurve1, m, "F"),
|
|
29
|
-
], m), "F", m), CYLINDRICAL_SURFACE(AXIS2_PLACEMENT_3D(CARTESIAN_POINT(vec3(pos.x + circleTop.x, pos.y + circleTop.y, pos.z + circleTop.z), m), DIRECTION(downNormal, m), DIRECTION(vec3(0, -1, 0), m), m), r, m), m, "T"),
|
|
30
|
-
ADVANCED_FACE(FACE_BOUND(EDGE_LOOP([ORIENTED_EDGE(ecurve1, m, "F")], m), "T", m), PLANE(AXIS2_PLACEMENT_3D(CARTESIAN_POINT(vec3Add(pos, circleBot), m), DIRECTION(upNormal, m), DIRECTION(vec3(0, 1, 0), m), m), m), m, "F"),
|
|
31
|
-
ADVANCED_FACE(FACE_BOUND(EDGE_LOOP([ORIENTED_EDGE(ecurve2, m, "F")], m), "F", m), PLANE(AXIS2_PLACEMENT_3D(CARTESIAN_POINT(vec3Add(pos, circleTop), m), DIRECTION(upNormal, m), DIRECTION(vec3(0, 1, 0), m), m), m), m, "T"),
|
|
75
|
+
sideFace,
|
|
76
|
+
bottomFace,
|
|
77
|
+
topFace,
|
|
32
78
|
], m), m);
|
|
33
79
|
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);
|
|
34
|
-
const prod = PRODUCT(PRODUCT_CONTEXT(applicationContext, m), "Cylinder", m);
|
|
80
|
+
const prod = PRODUCT(PRODUCT_CONTEXT(applicationContext, m), isCylinder ? "Cylinder" : "Cone", m);
|
|
35
81
|
SHAPE_DEFINITION_REPRESENTATION(PRODUCT_DEFINITION_SHAPE(PRODUCT_DEFINITION(PRODUCT_DEFINITION_FORMATION(prod, m), PRODUCT_DEFINITION_CONTEXT(applicationContext, m), m), m), absp, m);
|
|
36
82
|
const color = COLOUR_RGB(parseRgb(mat.normal), m);
|
|
37
83
|
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), m), msb, m), m.geoContext3d, m);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"step-cylinder.js","sourceRoot":"","sources":["../../../../src/renderers/step/step-geometries/step-cylinder.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,YAAY,EACZ,cAAc,EACd,QAAQ,EACR,IAAI,EAEJ,OAAO,EACP,OAAO,GACR,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,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;
|
|
1
|
+
{"version":3,"file":"step-cylinder.js","sourceRoot":"","sources":["../../../../src/renderers/step/step-geometries/step-cylinder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { Text, Vec2, Vec3 } from "../../../abstract-3d.js";
|
|
2
2
|
import { SvgOptions, zOrderElement } from "./shared.js";
|
|
3
|
-
export declare function text(t: Text, point: (x: number, y: number) => Vec2, fill: string, opts: SvgOptions, parentPos: Vec3, parentRot: Vec3
|
|
3
|
+
export declare function text(t: Text, point: (x: number, y: number) => Vec2, fill: string, opts: SvgOptions, parentPos: Vec3, parentRot: Vec3): ReadonlyArray<zOrderElement>;
|
|
4
4
|
//# sourceMappingURL=svg-text.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"svg-text.d.ts","sourceRoot":"","sources":["../../../../src/renderers/svg/svg-geometries/svg-text.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAwG,MAAM,yBAAyB,CAAC;AACjK,OAAO,EAAgB,UAAU,EAAS,aAAa,EAAE,MAAM,aAAa,CAAC;AAO7E,wBAAgB,IAAI,CAClB,CAAC,EAAE,IAAI,EACP,KAAK,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,IAAI,EACrC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,IAAI,EACf,SAAS,EAAE,IAAI,
|
|
1
|
+
{"version":3,"file":"svg-text.d.ts","sourceRoot":"","sources":["../../../../src/renderers/svg/svg-geometries/svg-text.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAwG,MAAM,yBAAyB,CAAC;AACjK,OAAO,EAAgB,UAAU,EAAS,aAAa,EAAE,MAAM,aAAa,CAAC;AAO7E,wBAAgB,IAAI,CAClB,CAAC,EAAE,IAAI,EACP,KAAK,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,IAAI,EACrC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,IAAI,EACf,SAAS,EAAE,IAAI,GACd,aAAa,CAAC,aAAa,CAAC,CA0B9B"}
|
|
@@ -4,10 +4,9 @@ import { svgText } from "../svg-encoding.js";
|
|
|
4
4
|
const SVG_FORWARD = vec3(0.0, 0.0, 1.0);
|
|
5
5
|
const SVG_DOT_OPPOSITE_THRESHOLD = -0.9;
|
|
6
6
|
// dummy
|
|
7
|
-
export function text(t, point, fill, opts, parentPos, parentRot
|
|
7
|
+
export function text(t, point, fill, opts, parentPos, parentRot) {
|
|
8
8
|
const pos = vec3TransRot(t.pos, parentPos, parentRot);
|
|
9
|
-
const
|
|
10
|
-
const rot = vec3RotCombine(parentRot, vec3RotCombine(t.rot ?? vec3Zero, correctonRot));
|
|
9
|
+
const rot = vec3RotCombine(parentRot, t.rot ?? vec3Zero);
|
|
11
10
|
const textForward = vec3Rot({ x: 0, y: 0, z: 1 }, vec3Zero, rot);
|
|
12
11
|
//discard texts that are pointing away
|
|
13
12
|
if (vec3Dot(textForward, SVG_FORWARD) <= SVG_DOT_OPPOSITE_THRESHOLD) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"svg-text.js","sourceRoot":"","sources":["../../../../src/renderers/svg/svg-geometries/svg-text.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,YAAY,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAwC,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AACjK,OAAO,EAAE,YAAY,EAAc,KAAK,EAAiB,MAAM,aAAa,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,MAAM,WAAW,GAAS,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;AAC9C,MAAM,0BAA0B,GAAW,CAAC,GAAG,CAAC;AAEhD,QAAQ;AACR,MAAM,UAAU,IAAI,CAClB,CAAO,EACP,KAAqC,EACrC,IAAY,EACZ,IAAgB,EAChB,SAAe,EACf,SAAe
|
|
1
|
+
{"version":3,"file":"svg-text.js","sourceRoot":"","sources":["../../../../src/renderers/svg/svg-geometries/svg-text.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,YAAY,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAwC,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AACjK,OAAO,EAAE,YAAY,EAAc,KAAK,EAAiB,MAAM,aAAa,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,MAAM,WAAW,GAAS,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;AAC9C,MAAM,0BAA0B,GAAW,CAAC,GAAG,CAAC;AAEhD,QAAQ;AACR,MAAM,UAAU,IAAI,CAClB,CAAO,EACP,KAAqC,EACrC,IAAY,EACZ,IAAgB,EAChB,SAAe,EACf,SAAe;IAEf,MAAM,GAAG,GAAG,YAAY,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;IACtD,MAAM,GAAG,GAAG,cAAc,CAAC,SAAS,EAAE,CAAC,CAAC,GAAG,IAAI,QAAQ,CAAC,CAAC;IAEzD,MAAM,WAAW,GAAG,OAAO,CACvB,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EACpB,QAAQ,EACR,GAAG,CACN,CAAC;IAEF,sCAAsC;IACtC,IAAG,OAAO,CAAC,WAAW,EAAE,WAAW,CAAC,IAAI,0BAA0B,EAAE,CAAC;QACnE,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,KAAK,GAAG,KAAK,EAAiB,CAAC;IACrC,MAAM,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC;IAC5B,MAAM,OAAO,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACnC,IAAI,IAAI,GAAG,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,OAAO,CAAC,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;IACjF,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;QACxB,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;QAC7D,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACxE,IAAI,IAAI,QAAQ,GAAG,GAAG,CAAC;IACzB,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}
|
package/lib/renderers/svg/svg.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { exhaustiveCheck } from "ts-exhaustive-check";
|
|
2
|
-
import { vec2, vec3Rot, vec3Zero, vec3RotCombine, vec3, vec3TransRot, rotationForCameraPos, sizeBoundsForCameraPos, bounds2FromPosAndSize, bounds2ToSize, bounds2Merge, vec2Zero, vec3Flip,
|
|
2
|
+
import { vec2, vec3Rot, vec3Zero, vec3RotCombine, vec3, vec3TransRot, rotationForCameraPos, sizeBoundsForCameraPos, bounds2FromPosAndSize, bounds2ToSize, bounds2Merge, vec2Zero, vec3Flip, } from "../../abstract-3d.js";
|
|
3
3
|
import { box } from "./svg-geometries/svg-box.js";
|
|
4
4
|
import { cylinder } from "./svg-geometries/svg-cylinder.js";
|
|
5
5
|
import { line } from "./svg-geometries/svg-line.js";
|
|
@@ -44,7 +44,6 @@ function renderInternal(scene, options, offset) {
|
|
|
44
44
|
const cameraRot = rotationForCameraPos(opts.view);
|
|
45
45
|
const viewRot = opts.rotation ? vec3RotCombine(vec3(0, 0, (opts.rotation * Math.PI) / 180), cameraRot) : cameraRot;
|
|
46
46
|
const unitRot = vec3RotCombine(viewRot, scene.rotation_deprecated ?? vec3Zero);
|
|
47
|
-
const textCorrection = dimensionTextCorrection(viewRot, unitRot);
|
|
48
47
|
const unitCenter = vec3Rot(scene.center_deprecated ?? vec3Zero, vec3Zero, rotationForCameraPos(opts.view));
|
|
49
48
|
const [unitSize] = sizeBoundsForCameraPos(scene.size_deprecated, unitCenter, unitRot);
|
|
50
49
|
const svgSize = vec2(unitSize.x + 1.5 * opts.stroke_thickness, unitSize.y + 1.5 * opts.stroke_thickness);
|
|
@@ -86,7 +85,7 @@ function renderInternal(scene, options, offset) {
|
|
|
86
85
|
const pos = vec3TransRot(d.pos, unitCenterFlipped, unitRot);
|
|
87
86
|
const rot = vec3RotCombine(unitRot, d.rot);
|
|
88
87
|
for (const m of d.meshes) {
|
|
89
|
-
elements.push(...svgMesh(m, pos, rot, point, scene.dimensions_deprecated?.material ?? { normal: "" }, dimOpts
|
|
88
|
+
elements.push(...svgMesh(m, pos, rot, point, scene.dimensions_deprecated?.material ?? { normal: "" }, dimOpts));
|
|
90
89
|
}
|
|
91
90
|
}
|
|
92
91
|
}
|
|
@@ -104,7 +103,7 @@ function svgGroup(g, parentPos, parentRot, point, opts) {
|
|
|
104
103
|
}
|
|
105
104
|
return elements;
|
|
106
105
|
}
|
|
107
|
-
function svgMesh(mesh, parentPos, parentRot, point, material, opts
|
|
106
|
+
function svgMesh(mesh, parentPos, parentRot, point, material, opts) {
|
|
108
107
|
switch (mesh.geometry.type) {
|
|
109
108
|
case "Box":
|
|
110
109
|
return box(mesh.geometry, point, material, opts, parentPos, parentRot);
|
|
@@ -121,7 +120,7 @@ function svgMesh(mesh, parentPos, parentRot, point, material, opts, textCorrecti
|
|
|
121
120
|
case "Shape":
|
|
122
121
|
return shape(mesh.geometry, point, material, opts, parentPos, parentRot);
|
|
123
122
|
case "Text":
|
|
124
|
-
return text(mesh.geometry, point, material.normal, opts, parentPos, parentRot
|
|
123
|
+
return text(mesh.geometry, point, material.normal, opts, parentPos, parentRot);
|
|
125
124
|
case "Image":
|
|
126
125
|
return image(mesh.geometry, point, opts, parentPos, parentRot);
|
|
127
126
|
case "Tube":
|
|
@@ -131,25 +130,4 @@ function svgMesh(mesh, parentPos, parentRot, point, material, opts, textCorrecti
|
|
|
131
130
|
return exhaustiveCheck(mesh.geometry);
|
|
132
131
|
}
|
|
133
132
|
}
|
|
134
|
-
function signedAngle2D(from, to) {
|
|
135
|
-
const fromLength = Math.hypot(from.x, from.y);
|
|
136
|
-
const toLength = Math.hypot(to.x, to.y);
|
|
137
|
-
if (fromLength < 1e-6 || toLength < 1e-6) {
|
|
138
|
-
return 0;
|
|
139
|
-
}
|
|
140
|
-
const fromX = from.x / fromLength;
|
|
141
|
-
const fromY = from.y / fromLength;
|
|
142
|
-
const toX = to.x / toLength;
|
|
143
|
-
const toY = to.y / toLength;
|
|
144
|
-
const dot = fromX * toX + fromY * toY;
|
|
145
|
-
const cross = fromX * toY - fromY * toX;
|
|
146
|
-
return Math.atan2(cross, dot);
|
|
147
|
-
}
|
|
148
|
-
function dimensionTextCorrection(viewRot, unitRot) {
|
|
149
|
-
const pageUpInSceneSpace = vec3Rot(vec3(0, 1, 0), vec3Zero, vec3RotInverse(viewRot));
|
|
150
|
-
const transformedPageUp = vec3Rot(pageUpInSceneSpace, vec3Zero, unitRot);
|
|
151
|
-
const actualSvgUp = vec2(transformedPageUp.x, -transformedPageUp.y);
|
|
152
|
-
const desiredSvgUp = vec2(0, -1);
|
|
153
|
-
return signedAngle2D(actualSvgUp, desiredSvgUp);
|
|
154
|
-
}
|
|
155
133
|
//# sourceMappingURL=svg.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"svg.js","sourceRoot":"","sources":["../../../src/renderers/svg/svg.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EACL,IAAI,EAIJ,OAAO,EACP,QAAQ,EACR,cAAc,EACd,IAAI,EAGJ,YAAY,EAEZ,oBAAoB,EACpB,sBAAsB,EAEtB,qBAAqB,EACrB,aAAa,EACb,YAAY,EACZ,QAAQ,EACR,QAAQ,
|
|
1
|
+
{"version":3,"file":"svg.js","sourceRoot":"","sources":["../../../src/renderers/svg/svg.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "abstract-3d",
|
|
3
|
-
"version": "2.6.
|
|
3
|
+
"version": "2.6.20",
|
|
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",
|
|
@@ -65,5 +65,5 @@
|
|
|
65
65
|
"@types/three": "^0.180.0",
|
|
66
66
|
"react": "^19.2.6"
|
|
67
67
|
},
|
|
68
|
-
"gitHead": "
|
|
68
|
+
"gitHead": "b24c277157ec915eff76585726868fb1ff2d0595"
|
|
69
69
|
}
|
|
@@ -2,6 +2,8 @@ import { Vec2, Vec3 } from "../../abstract-3d.js";
|
|
|
2
2
|
|
|
3
3
|
export type MutableStep = { refs: Map<string, number>; step: string; geoContext3d: number; };
|
|
4
4
|
|
|
5
|
+
export const STEP_NUMBER_EPSILON: number = 1e-5;
|
|
6
|
+
|
|
5
7
|
const mutate = (step: string, m: MutableStep): number => {
|
|
6
8
|
const prevRef = m.refs.get(step);
|
|
7
9
|
if (prevRef !== undefined) {
|
|
@@ -15,6 +17,20 @@ const mutate = (step: string, m: MutableStep): number => {
|
|
|
15
17
|
}
|
|
16
18
|
};
|
|
17
19
|
|
|
20
|
+
const stepNumber = (num: number): number => {
|
|
21
|
+
const absNum = Math.abs(num);
|
|
22
|
+
if(absNum < STEP_NUMBER_EPSILON) {
|
|
23
|
+
return 0.0;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
const roundNum = Math.round(num);
|
|
27
|
+
if(Math.abs(absNum - Math.abs(roundNum)) < STEP_NUMBER_EPSILON) {
|
|
28
|
+
return roundNum;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
return num;
|
|
32
|
+
}
|
|
33
|
+
|
|
18
34
|
export const HEADER = (date: string): string =>
|
|
19
35
|
`ISO-10303-21;
|
|
20
36
|
HEADER;
|
|
@@ -32,16 +48,16 @@ END-ISO-10303-21;`;
|
|
|
32
48
|
|
|
33
49
|
export const CARTESIAN_POINT = (p: Vec3 | Vec2, m: MutableStep): number =>
|
|
34
50
|
mutate(
|
|
35
|
-
`CARTESIAN_POINT('',(${p.x},${p.y}${
|
|
36
|
-
(p as Vec3)?.z !== undefined ? `,${(p as Vec3).z}` : ""
|
|
51
|
+
`CARTESIAN_POINT('',(${stepNumber(p.x)},${stepNumber(p.y)}${
|
|
52
|
+
(p as Vec3)?.z !== undefined ? `,${stepNumber((p as Vec3).z)}` : ""
|
|
37
53
|
}))`,
|
|
38
54
|
m
|
|
39
55
|
);
|
|
40
56
|
|
|
41
57
|
export const DIRECTION = (d: Vec3 | Vec2, m: MutableStep): number =>
|
|
42
58
|
mutate(
|
|
43
|
-
`DIRECTION('',(${d.x},${d.y}${
|
|
44
|
-
(d as Vec3)?.z !== undefined ? `,${(d as Vec3).z}` : ""
|
|
59
|
+
`DIRECTION('',(${stepNumber(d.x)},${stepNumber(d.y)}${
|
|
60
|
+
(d as Vec3)?.z !== undefined ? `,${stepNumber((d as Vec3).z)}` : ""
|
|
45
61
|
}))`,
|
|
46
62
|
m
|
|
47
63
|
);
|
|
@@ -96,7 +112,10 @@ export const PCURVE = (
|
|
|
96
112
|
): number => mutate(`PCURVE('',#${CYLINDRICAL_SURFACE_or_PLANE},#${DEFINITIONAL_REPRESENTATION})`, m);
|
|
97
113
|
|
|
98
114
|
export const CYLINDRICAL_SURFACE = (AXIS2_PLACEMENT_3D: number, radius: number, m: MutableStep): number =>
|
|
99
|
-
mutate(`CYLINDRICAL_SURFACE('',#${AXIS2_PLACEMENT_3D},${radius})`, m);
|
|
115
|
+
mutate(`CYLINDRICAL_SURFACE('',#${AXIS2_PLACEMENT_3D},${stepNumber(radius)})`, m);
|
|
116
|
+
|
|
117
|
+
export const CONICAL_SURFACE = (AXIS2_PLACEMENT_3D: number, radius: number, semiAngle: number, m: MutableStep): number =>
|
|
118
|
+
mutate(`CONICAL_SURFACE('',#${AXIS2_PLACEMENT_3D},${stepNumber(radius)},${stepNumber(semiAngle)})`, m);
|
|
100
119
|
|
|
101
120
|
export const DEFINITIONAL_REPRESENTATION = (LINEorCircle: number, m: MutableStep): number =>
|
|
102
121
|
mutate(`DEFINITIONAL_REPRESENTATION('',(#${LINEorCircle}),#7)`, m);
|
|
@@ -11,6 +11,7 @@ import {
|
|
|
11
11
|
vec3Sub,
|
|
12
12
|
vec3Add,
|
|
13
13
|
vec3Rot,
|
|
14
|
+
vec3Length,
|
|
14
15
|
} from "../../../abstract-3d.js";
|
|
15
16
|
import { parseRgb } from "../../../utils.js";
|
|
16
17
|
import {
|
|
@@ -44,6 +45,7 @@ import {
|
|
|
44
45
|
PRODUCT_DEFINITION_FORMATION,
|
|
45
46
|
PRODUCT_DEFINITION_SHAPE,
|
|
46
47
|
SHAPE_DEFINITION_REPRESENTATION,
|
|
48
|
+
STEP_NUMBER_EPSILON,
|
|
47
49
|
STYLED_ITEM,
|
|
48
50
|
SURFACE_SIDE_STYLE,
|
|
49
51
|
SURFACE_STYLE_FILL_AREA,
|
|
@@ -60,6 +62,10 @@ export function stepBox(b: Box, mat: Material, parentPos: Vec3, parentRot: Vec3,
|
|
|
60
62
|
const color = parseRgb(mat.normal);
|
|
61
63
|
const rotate = (v: Vec3): Vec3 => vec3Rot(v, vec3Zero, rotation);
|
|
62
64
|
|
|
65
|
+
if(size.x === 0.0 || size.y === 0.0 || size.z === 0.0) {
|
|
66
|
+
return;
|
|
67
|
+
}
|
|
68
|
+
|
|
63
69
|
const corners = [
|
|
64
70
|
vec3(0, 0, 0),
|
|
65
71
|
vec3(0, 0, size.z),
|
|
@@ -20,6 +20,7 @@ import {
|
|
|
20
20
|
CIRCLE,
|
|
21
21
|
CLOSED_SHELL,
|
|
22
22
|
COLOUR_RGB,
|
|
23
|
+
CONICAL_SURFACE,
|
|
23
24
|
CURVE_STYLE,
|
|
24
25
|
CYLINDRICAL_SURFACE,
|
|
25
26
|
DIRECTION,
|
|
@@ -51,6 +52,7 @@ import {
|
|
|
51
52
|
} from "../step-encoding.js";
|
|
52
53
|
|
|
53
54
|
const SMALLEST_RADIUS = 1e-4;
|
|
55
|
+
const GEOMETRY_EPSILON = 1e-12;
|
|
54
56
|
|
|
55
57
|
export function stepCylinder(
|
|
56
58
|
c: Cylinder,
|
|
@@ -60,154 +62,354 @@ export function stepCylinder(
|
|
|
60
62
|
m: MutableStep,
|
|
61
63
|
rSmall?: number
|
|
62
64
|
): void {
|
|
63
|
-
const r = c.radius;
|
|
64
|
-
const r2 = Math.max(rSmall ?? c.radius, SMALLEST_RADIUS);
|
|
65
65
|
const h = c.length;
|
|
66
|
+
|
|
67
|
+
if (h <= GEOMETRY_EPSILON) {
|
|
68
|
+
return;
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
const bottomRadius = Math.max(c.radius, SMALLEST_RADIUS);
|
|
72
|
+
const requestedTopRadius = Math.max(
|
|
73
|
+
rSmall ?? c.radius,
|
|
74
|
+
SMALLEST_RADIUS
|
|
75
|
+
);
|
|
76
|
+
|
|
77
|
+
const radiusTolerance =
|
|
78
|
+
GEOMETRY_EPSILON *
|
|
79
|
+
Math.max(1, bottomRadius, requestedTopRadius);
|
|
80
|
+
|
|
81
|
+
const isCylinder =
|
|
82
|
+
Math.abs(requestedTopRadius - bottomRadius) <= radiusTolerance;
|
|
83
|
+
|
|
84
|
+
const topRadius = isCylinder
|
|
85
|
+
? bottomRadius
|
|
86
|
+
: requestedTopRadius;
|
|
87
|
+
|
|
66
88
|
const pos = vec3TransRot(c.pos, parentPos, parentRot);
|
|
67
|
-
const rotation = vec3RotCombine(
|
|
89
|
+
const rotation = vec3RotCombine(
|
|
90
|
+
parentRot,
|
|
91
|
+
c.rot ?? vec3Zero
|
|
92
|
+
);
|
|
93
|
+
|
|
94
|
+
const rot = (v: Vec3): Vec3 =>
|
|
95
|
+
vec3Rot(v, vec3Zero, rotation);
|
|
68
96
|
|
|
69
|
-
const
|
|
70
|
-
const
|
|
71
|
-
|
|
72
|
-
const
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
97
|
+
const axis = rot(vec3(0, 1, 0));
|
|
98
|
+
const radial = rot(vec3(1, 0, 0));
|
|
99
|
+
|
|
100
|
+
const bottomCenter = vec3Add(
|
|
101
|
+
pos,
|
|
102
|
+
rot(vec3(0, -h / 2, 0))
|
|
103
|
+
);
|
|
104
|
+
|
|
105
|
+
const topCenter = vec3Add(
|
|
106
|
+
pos,
|
|
107
|
+
rot(vec3(0, h / 2, 0))
|
|
108
|
+
);
|
|
109
|
+
|
|
110
|
+
const bottomSeamPoint = vec3Add(
|
|
111
|
+
pos,
|
|
112
|
+
rot(vec3(bottomRadius, -h / 2, 0))
|
|
113
|
+
);
|
|
114
|
+
|
|
115
|
+
const topSeamPoint = vec3Add(
|
|
116
|
+
pos,
|
|
117
|
+
rot(vec3(topRadius, h / 2, 0))
|
|
118
|
+
);
|
|
119
|
+
|
|
120
|
+
const seamDelta = vec3(
|
|
121
|
+
topSeamPoint.x - bottomSeamPoint.x,
|
|
122
|
+
topSeamPoint.y - bottomSeamPoint.y,
|
|
123
|
+
topSeamPoint.z - bottomSeamPoint.z
|
|
124
|
+
);
|
|
125
|
+
|
|
126
|
+
const seamLength = Math.hypot(
|
|
127
|
+
seamDelta.x,
|
|
128
|
+
seamDelta.y,
|
|
129
|
+
seamDelta.z
|
|
130
|
+
);
|
|
131
|
+
|
|
132
|
+
if (seamLength <= GEOMETRY_EPSILON) {
|
|
133
|
+
return;
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
const seamDirection = vec3(
|
|
137
|
+
seamDelta.x / seamLength,
|
|
138
|
+
seamDelta.y / seamLength,
|
|
139
|
+
seamDelta.z / seamLength
|
|
140
|
+
);
|
|
76
141
|
|
|
77
142
|
const applicationContext = APPLICATION_CONTEXT(m);
|
|
78
|
-
APPLICATION_PROTOCOL_DEFINITION(
|
|
143
|
+
APPLICATION_PROTOCOL_DEFINITION(
|
|
144
|
+
applicationContext,
|
|
145
|
+
m
|
|
146
|
+
);
|
|
147
|
+
|
|
148
|
+
const axisDirection = DIRECTION(axis, m);
|
|
149
|
+
const radialDirection = DIRECTION(radial, m);
|
|
150
|
+
|
|
151
|
+
const bottomCenterPoint = CARTESIAN_POINT(
|
|
152
|
+
bottomCenter,
|
|
153
|
+
m
|
|
154
|
+
);
|
|
155
|
+
|
|
156
|
+
const topCenterPoint = CARTESIAN_POINT(
|
|
157
|
+
topCenter,
|
|
158
|
+
m
|
|
159
|
+
);
|
|
160
|
+
|
|
161
|
+
const bottomSeamCartesianPoint = CARTESIAN_POINT(
|
|
162
|
+
bottomSeamPoint,
|
|
163
|
+
m
|
|
164
|
+
);
|
|
165
|
+
|
|
166
|
+
const topSeamCartesianPoint = CARTESIAN_POINT(
|
|
167
|
+
topSeamPoint,
|
|
168
|
+
m
|
|
169
|
+
);
|
|
170
|
+
|
|
171
|
+
const bottomVertex = VERTEX_POINT(
|
|
172
|
+
bottomSeamCartesianPoint,
|
|
173
|
+
m
|
|
174
|
+
);
|
|
175
|
+
|
|
176
|
+
const topVertex = VERTEX_POINT(
|
|
177
|
+
topSeamCartesianPoint,
|
|
178
|
+
m
|
|
179
|
+
);
|
|
79
180
|
|
|
80
|
-
const
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
181
|
+
const bottomPlacement = AXIS2_PLACEMENT_3D(
|
|
182
|
+
bottomCenterPoint,
|
|
183
|
+
axisDirection,
|
|
184
|
+
radialDirection,
|
|
185
|
+
m
|
|
186
|
+
);
|
|
187
|
+
|
|
188
|
+
const topPlacement = AXIS2_PLACEMENT_3D(
|
|
189
|
+
topCenterPoint,
|
|
190
|
+
axisDirection,
|
|
191
|
+
radialDirection,
|
|
192
|
+
m
|
|
193
|
+
);
|
|
194
|
+
|
|
195
|
+
const seamEdge = EDGE_CURVE(
|
|
196
|
+
bottomVertex,
|
|
197
|
+
topVertex,
|
|
198
|
+
LINE(
|
|
199
|
+
bottomSeamCartesianPoint,
|
|
200
|
+
VECTOR(
|
|
201
|
+
DIRECTION(seamDirection, m),
|
|
202
|
+
m
|
|
203
|
+
),
|
|
204
|
+
m
|
|
205
|
+
),
|
|
84
206
|
m,
|
|
85
207
|
"T"
|
|
86
208
|
);
|
|
87
209
|
|
|
88
|
-
const
|
|
89
|
-
|
|
90
|
-
|
|
210
|
+
const bottomCircleEdge = EDGE_CURVE(
|
|
211
|
+
bottomVertex,
|
|
212
|
+
bottomVertex,
|
|
91
213
|
CIRCLE(
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
DIRECTION(upNormal, m),
|
|
95
|
-
DIRECTION(vec3(0, 1, 0), m),
|
|
96
|
-
m
|
|
97
|
-
),
|
|
98
|
-
r,
|
|
214
|
+
bottomPlacement,
|
|
215
|
+
bottomRadius,
|
|
99
216
|
m
|
|
100
217
|
),
|
|
101
218
|
m,
|
|
102
219
|
"T"
|
|
103
220
|
);
|
|
104
221
|
|
|
105
|
-
const
|
|
106
|
-
|
|
107
|
-
|
|
222
|
+
const topCircleEdge = EDGE_CURVE(
|
|
223
|
+
topVertex,
|
|
224
|
+
topVertex,
|
|
108
225
|
CIRCLE(
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
226
|
+
topPlacement,
|
|
227
|
+
topRadius,
|
|
228
|
+
m
|
|
229
|
+
),
|
|
230
|
+
m,
|
|
231
|
+
"T"
|
|
232
|
+
);
|
|
233
|
+
|
|
234
|
+
const growsTowardTop =
|
|
235
|
+
topRadius >= bottomRadius;
|
|
236
|
+
|
|
237
|
+
const coneAxis = growsTowardTop
|
|
238
|
+
? axis
|
|
239
|
+
: vec3(-axis.x, -axis.y, -axis.z);
|
|
240
|
+
|
|
241
|
+
const coneLocation = growsTowardTop
|
|
242
|
+
? bottomCenterPoint
|
|
243
|
+
: topCenterPoint;
|
|
244
|
+
|
|
245
|
+
const coneStartRadius = Math.min(
|
|
246
|
+
bottomRadius,
|
|
247
|
+
topRadius
|
|
248
|
+
);
|
|
249
|
+
|
|
250
|
+
const semiAngle = Math.atan2(
|
|
251
|
+
Math.abs(topRadius - bottomRadius),
|
|
252
|
+
h
|
|
253
|
+
);
|
|
254
|
+
|
|
255
|
+
const conePlacement = AXIS2_PLACEMENT_3D(
|
|
256
|
+
coneLocation,
|
|
257
|
+
DIRECTION(coneAxis, m),
|
|
258
|
+
radialDirection,
|
|
259
|
+
m
|
|
260
|
+
);
|
|
261
|
+
|
|
262
|
+
const sideSurface = isCylinder
|
|
263
|
+
? CYLINDRICAL_SURFACE(
|
|
264
|
+
bottomPlacement,
|
|
265
|
+
bottomRadius,
|
|
266
|
+
m
|
|
267
|
+
)
|
|
268
|
+
: CONICAL_SURFACE(
|
|
269
|
+
conePlacement,
|
|
270
|
+
coneStartRadius,
|
|
271
|
+
semiAngle,
|
|
272
|
+
m
|
|
273
|
+
);
|
|
274
|
+
|
|
275
|
+
const sideFace = ADVANCED_FACE(
|
|
276
|
+
FACE_BOUND(
|
|
277
|
+
EDGE_LOOP(
|
|
278
|
+
[
|
|
279
|
+
ORIENTED_EDGE(seamEdge, m, "T"),
|
|
280
|
+
ORIENTED_EDGE(topCircleEdge, m, "T"),
|
|
281
|
+
ORIENTED_EDGE(seamEdge, m, "F"),
|
|
282
|
+
ORIENTED_EDGE(bottomCircleEdge, m, "F"),
|
|
283
|
+
],
|
|
113
284
|
m
|
|
114
285
|
),
|
|
115
|
-
|
|
286
|
+
"F",
|
|
116
287
|
m
|
|
117
288
|
),
|
|
118
|
-
|
|
289
|
+
sideSurface,
|
|
290
|
+
m,
|
|
291
|
+
"T"
|
|
119
292
|
);
|
|
120
293
|
|
|
121
|
-
const
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
ORIENTED_EDGE(ecurve2, m),
|
|
130
|
-
ORIENTED_EDGE(ecurve0, m, "F"),
|
|
131
|
-
ORIENTED_EDGE(ecurve1, m, "F"),
|
|
132
|
-
],
|
|
133
|
-
m
|
|
134
|
-
),
|
|
135
|
-
"F",
|
|
136
|
-
m
|
|
294
|
+
const bottomFace = ADVANCED_FACE(
|
|
295
|
+
FACE_BOUND(
|
|
296
|
+
EDGE_LOOP(
|
|
297
|
+
[
|
|
298
|
+
ORIENTED_EDGE(
|
|
299
|
+
bottomCircleEdge,
|
|
300
|
+
m,
|
|
301
|
+
"F"
|
|
137
302
|
),
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
m,
|
|
149
|
-
"T"
|
|
150
|
-
),
|
|
303
|
+
],
|
|
304
|
+
m
|
|
305
|
+
),
|
|
306
|
+
"T",
|
|
307
|
+
m
|
|
308
|
+
),
|
|
309
|
+
PLANE(bottomPlacement, m),
|
|
310
|
+
m,
|
|
311
|
+
"F"
|
|
312
|
+
);
|
|
151
313
|
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
),
|
|
161
|
-
m
|
|
314
|
+
const topFace = ADVANCED_FACE(
|
|
315
|
+
FACE_BOUND(
|
|
316
|
+
EDGE_LOOP(
|
|
317
|
+
[
|
|
318
|
+
ORIENTED_EDGE(
|
|
319
|
+
topCircleEdge,
|
|
320
|
+
m,
|
|
321
|
+
"F"
|
|
162
322
|
),
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
323
|
+
],
|
|
324
|
+
m
|
|
325
|
+
),
|
|
326
|
+
"F",
|
|
327
|
+
m
|
|
328
|
+
),
|
|
329
|
+
PLANE(topPlacement, m),
|
|
330
|
+
m,
|
|
331
|
+
"T"
|
|
332
|
+
);
|
|
166
333
|
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
DIRECTION(vec3(0, 1, 0), m),
|
|
174
|
-
m
|
|
175
|
-
),
|
|
176
|
-
m
|
|
177
|
-
),
|
|
178
|
-
m,
|
|
179
|
-
"T"
|
|
180
|
-
),
|
|
334
|
+
const msb = MANIFOLD_SOLID_BREP(
|
|
335
|
+
CLOSED_SHELL(
|
|
336
|
+
[
|
|
337
|
+
sideFace,
|
|
338
|
+
bottomFace,
|
|
339
|
+
topFace,
|
|
181
340
|
],
|
|
182
341
|
m
|
|
183
342
|
),
|
|
184
343
|
m
|
|
185
344
|
);
|
|
186
345
|
|
|
187
|
-
const absp =
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
346
|
+
const absp =
|
|
347
|
+
ADVANCED_BREP_SHAPE_REPRESENTATION(
|
|
348
|
+
AXIS2_PLACEMENT_3D(
|
|
349
|
+
CARTESIAN_POINT(vec3Zero, m),
|
|
350
|
+
DIRECTION(vec3(0, 0, 1), m),
|
|
351
|
+
DIRECTION(vec3(1, 0, 0), m),
|
|
352
|
+
m
|
|
353
|
+
),
|
|
354
|
+
msb,
|
|
355
|
+
m.geoContext3d,
|
|
356
|
+
m
|
|
357
|
+
);
|
|
358
|
+
|
|
359
|
+
const prod = PRODUCT(
|
|
360
|
+
PRODUCT_CONTEXT(applicationContext, m),
|
|
361
|
+
isCylinder ? "Cylinder" : "Cone",
|
|
191
362
|
m
|
|
192
363
|
);
|
|
193
364
|
|
|
194
|
-
const prod = PRODUCT(PRODUCT_CONTEXT(applicationContext, m), "Cylinder", m);
|
|
195
|
-
|
|
196
365
|
SHAPE_DEFINITION_REPRESENTATION(
|
|
197
366
|
PRODUCT_DEFINITION_SHAPE(
|
|
198
|
-
PRODUCT_DEFINITION(
|
|
367
|
+
PRODUCT_DEFINITION(
|
|
368
|
+
PRODUCT_DEFINITION_FORMATION(
|
|
369
|
+
prod,
|
|
370
|
+
m
|
|
371
|
+
),
|
|
372
|
+
PRODUCT_DEFINITION_CONTEXT(
|
|
373
|
+
applicationContext,
|
|
374
|
+
m
|
|
375
|
+
),
|
|
376
|
+
m
|
|
377
|
+
),
|
|
199
378
|
m
|
|
200
379
|
),
|
|
201
380
|
absp,
|
|
202
381
|
m
|
|
203
382
|
);
|
|
204
383
|
|
|
205
|
-
const color = COLOUR_RGB(
|
|
384
|
+
const color = COLOUR_RGB(
|
|
385
|
+
parseRgb(mat.normal),
|
|
386
|
+
m
|
|
387
|
+
);
|
|
388
|
+
|
|
206
389
|
MECHANICAL_DESIGN_GEOMETRIC_PRESENTATION_REPRESENTATION(
|
|
207
390
|
STYLED_ITEM(
|
|
208
391
|
PRESENTATION_STYLE_ASSIGNMENT(
|
|
209
|
-
SURFACE_STYLE_USAGE(
|
|
210
|
-
|
|
392
|
+
SURFACE_STYLE_USAGE(
|
|
393
|
+
SURFACE_SIDE_STYLE(
|
|
394
|
+
SURFACE_STYLE_FILL_AREA(
|
|
395
|
+
FILL_AREA_STYLE_COLOUR(
|
|
396
|
+
color,
|
|
397
|
+
m
|
|
398
|
+
),
|
|
399
|
+
m
|
|
400
|
+
),
|
|
401
|
+
m
|
|
402
|
+
),
|
|
403
|
+
m
|
|
404
|
+
),
|
|
405
|
+
CURVE_STYLE(
|
|
406
|
+
DRAUGHTING_PRE_DEFINED_CURVE_FONT(
|
|
407
|
+
"continuous",
|
|
408
|
+
m
|
|
409
|
+
),
|
|
410
|
+
color,
|
|
411
|
+
m
|
|
412
|
+
),
|
|
211
413
|
m
|
|
212
414
|
),
|
|
213
415
|
msb,
|
|
@@ -216,4 +418,4 @@ export function stepCylinder(
|
|
|
216
418
|
m.geoContext3d,
|
|
217
419
|
m
|
|
218
420
|
);
|
|
219
|
-
}
|
|
421
|
+
}
|
|
@@ -12,12 +12,10 @@ export function text(
|
|
|
12
12
|
fill: string,
|
|
13
13
|
opts: SvgOptions,
|
|
14
14
|
parentPos: Vec3,
|
|
15
|
-
parentRot: Vec3
|
|
16
|
-
textCorrection: number = 0,
|
|
15
|
+
parentRot: Vec3
|
|
17
16
|
): ReadonlyArray<zOrderElement> {
|
|
18
17
|
const pos = vec3TransRot(t.pos, parentPos, parentRot);
|
|
19
|
-
const
|
|
20
|
-
const rot = vec3RotCombine(parentRot, vec3RotCombine(t.rot ?? vec3Zero, correctonRot));
|
|
18
|
+
const rot = vec3RotCombine(parentRot, t.rot ?? vec3Zero);
|
|
21
19
|
|
|
22
20
|
const textForward = vec3Rot(
|
|
23
21
|
{ x: 0, y: 0, z: 1 },
|
package/src/renderers/svg/svg.ts
CHANGED
|
@@ -99,7 +99,6 @@ function renderInternal(
|
|
|
99
99
|
const cameraRot = rotationForCameraPos(opts.view);
|
|
100
100
|
const viewRot = opts.rotation ? vec3RotCombine(vec3(0, 0, (opts.rotation * Math.PI) / 180), cameraRot) : cameraRot;
|
|
101
101
|
const unitRot = vec3RotCombine(viewRot, scene.rotation_deprecated ?? vec3Zero);
|
|
102
|
-
const textCorrection = dimensionTextCorrection(viewRot, unitRot);
|
|
103
102
|
|
|
104
103
|
const unitCenter = vec3Rot(scene.center_deprecated ?? vec3Zero, vec3Zero, rotationForCameraPos(opts.view));
|
|
105
104
|
const [unitSize] = sizeBoundsForCameraPos(scene.size_deprecated, unitCenter, unitRot);
|
|
@@ -151,7 +150,7 @@ function renderInternal(
|
|
|
151
150
|
const pos = vec3TransRot(d.pos, unitCenterFlipped, unitRot);
|
|
152
151
|
const rot = vec3RotCombine(unitRot, d.rot);
|
|
153
152
|
for (const m of d.meshes) {
|
|
154
|
-
elements.push(...svgMesh(m, pos, rot, point, scene.dimensions_deprecated?.material ?? { normal: "" }, dimOpts
|
|
153
|
+
elements.push(...svgMesh(m, pos, rot, point, scene.dimensions_deprecated?.material ?? { normal: "" }, dimOpts));
|
|
155
154
|
}
|
|
156
155
|
}
|
|
157
156
|
}
|
|
@@ -183,8 +182,7 @@ function svgMesh(
|
|
|
183
182
|
parentRot: Vec3,
|
|
184
183
|
point: (x: number, y: number) => Vec2,
|
|
185
184
|
material: Material,
|
|
186
|
-
opts: SvgOptions
|
|
187
|
-
textCorrection: number = 0
|
|
185
|
+
opts: SvgOptions
|
|
188
186
|
): ReadonlyArray<zOrderElement> {
|
|
189
187
|
switch (mesh.geometry.type) {
|
|
190
188
|
case "Box":
|
|
@@ -202,7 +200,7 @@ function svgMesh(
|
|
|
202
200
|
case "Shape":
|
|
203
201
|
return shape(mesh.geometry, point, material, opts, parentPos, parentRot);
|
|
204
202
|
case "Text":
|
|
205
|
-
return text(mesh.geometry, point, material.normal, opts, parentPos, parentRot
|
|
203
|
+
return text(mesh.geometry, point, material.normal, opts, parentPos, parentRot);
|
|
206
204
|
case "Image":
|
|
207
205
|
return image(mesh.geometry, point, opts, parentPos, parentRot);
|
|
208
206
|
case "Tube":
|
|
@@ -211,49 +209,4 @@ function svgMesh(
|
|
|
211
209
|
default:
|
|
212
210
|
return exhaustiveCheck(mesh.geometry);
|
|
213
211
|
}
|
|
214
|
-
}
|
|
215
|
-
|
|
216
|
-
function signedAngle2D(from: Vec2, to: Vec2): number {
|
|
217
|
-
const fromLength = Math.hypot(from.x, from.y);
|
|
218
|
-
const toLength = Math.hypot(to.x, to.y);
|
|
219
|
-
|
|
220
|
-
if (fromLength < 1e-6 || toLength < 1e-6) {
|
|
221
|
-
return 0;
|
|
222
|
-
}
|
|
223
|
-
|
|
224
|
-
const fromX = from.x / fromLength;
|
|
225
|
-
const fromY = from.y / fromLength;
|
|
226
|
-
const toX = to.x / toLength;
|
|
227
|
-
const toY = to.y / toLength;
|
|
228
|
-
|
|
229
|
-
const dot = fromX * toX + fromY * toY;
|
|
230
|
-
const cross = fromX * toY - fromY * toX;
|
|
231
|
-
|
|
232
|
-
return Math.atan2(cross, dot);
|
|
233
|
-
}
|
|
234
|
-
|
|
235
|
-
function dimensionTextCorrection(
|
|
236
|
-
viewRot: Vec3,
|
|
237
|
-
unitRot: Vec3
|
|
238
|
-
): number {
|
|
239
|
-
const pageUpInSceneSpace = vec3Rot(
|
|
240
|
-
vec3(0, 1, 0),
|
|
241
|
-
vec3Zero,
|
|
242
|
-
vec3RotInverse(viewRot)
|
|
243
|
-
);
|
|
244
|
-
|
|
245
|
-
const transformedPageUp = vec3Rot(
|
|
246
|
-
pageUpInSceneSpace,
|
|
247
|
-
vec3Zero,
|
|
248
|
-
unitRot
|
|
249
|
-
);
|
|
250
|
-
|
|
251
|
-
const actualSvgUp = vec2(
|
|
252
|
-
transformedPageUp.x,
|
|
253
|
-
-transformedPageUp.y
|
|
254
|
-
);
|
|
255
|
-
|
|
256
|
-
const desiredSvgUp = vec2(0, -1);
|
|
257
|
-
|
|
258
|
-
return signedAngle2D(actualSvgUp, desiredSvgUp);
|
|
259
212
|
}
|