Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel
M32: apply STEP242 orientation semantics in importer
Yuechen Li5b7bcc22b505
diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242OrientationSemanticsTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242OrientationSemanticsTests.csnew file mode 100644index 00000000..acf32570--- /dev/null+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242OrientationSemanticsTests.cs@@ -0,0 +1,76 @@+using Aetheris.Kernel.Core.Diagnostics;+using Aetheris.Kernel.Core.Step242;++namespace Aetheris.Kernel.Core.Tests.Step242;++public sealed class Step242OrientationSemanticsTests+{+ [Fact]+ public void ImportBody_EdgeCurveSameSenseFalse_ImportsAndFlipsCoedgeReversalState()+ {+ var forward = Step242Importer.ImportBody(BuildSingleTriangleStep(edgeCurveSameSense: true, faceBoundOrientation: true, advancedFaceSameSense: true));+ var reversed = Step242Importer.ImportBody(BuildSingleTriangleStep(edgeCurveSameSense: false, faceBoundOrientation: true, advancedFaceSameSense: true));++ Assert.True(forward.IsSuccess);+ Assert.True(reversed.IsSuccess);++ var forwardCoedge = Assert.Single(forward.Value.Topology.Coedges);+ var reversedCoedge = Assert.Single(reversed.Value.Topology.Coedges);+ Assert.NotEqual(forwardCoedge.IsReversed, reversedCoedge.IsReversed);+ }++ [Fact]+ public void ImportBody_FaceBoundOrientationFalse_FlipsCoedgeReversalState()+ {+ var forward = Step242Importer.ImportBody(BuildSingleTriangleStep(edgeCurveSameSense: true, faceBoundOrientation: true, advancedFaceSameSense: true));+ var reversed = Step242Importer.ImportBody(BuildSingleTriangleStep(edgeCurveSameSense: true, faceBoundOrientation: false, advancedFaceSameSense: true));++ Assert.True(forward.IsSuccess);+ Assert.True(reversed.IsSuccess);++ var forwardCoedge = Assert.Single(forward.Value.Topology.Coedges);+ var reversedCoedge = Assert.Single(reversed.Value.Topology.Coedges);+ Assert.NotEqual(forwardCoedge.IsReversed, reversedCoedge.IsReversed);+ }++ [Fact]+ public void ImportBody_AdvancedFaceSameSenseFalse_FlipsPlaneNormal()+ {+ var forward = Step242Importer.ImportBody(BuildSingleTriangleStep(edgeCurveSameSense: true, faceBoundOrientation: true, advancedFaceSameSense: true));+ var reversed = Step242Importer.ImportBody(BuildSingleTriangleStep(edgeCurveSameSense: true, faceBoundOrientation: true, advancedFaceSameSense: false));++ Assert.True(forward.IsSuccess);+ Assert.True(reversed.IsSuccess);++ var forwardFace = Assert.Single(forward.Value.Topology.Faces);+ var reversedFace = Assert.Single(reversed.Value.Topology.Faces);++ Assert.True(forward.Value.TryGetFaceSurfaceGeometry(forwardFace.Id, out var forwardSurface));+ Assert.True(reversed.Value.TryGetFaceSurfaceGeometry(reversedFace.Id, out var reversedSurface));++ Assert.Equal(1d, forwardSurface!.Value.Plane!.Value.Normal.Z);+ Assert.Equal(-1d, reversedSurface!.Value.Plane!.Value.Normal.Z);+ }++ [Fact]+ public void ImportBody_OrientationTypeMismatch_ReturnsDiagnosticsWithoutThrowing()+ {+ const string invalidOrientation = "ISO-10303-21;\nHEADER;\nENDSEC;\nDATA;\n#1=MANIFOLD_SOLID_BREP('solid',#2);\n#2=CLOSED_SHELL($,(#3));\n#3=ADVANCED_FACE((#4),#5,.T.);\n#4=FACE_OUTER_BOUND($,#6,#7);\n#5=PLANE($,#20);\n#6=EDGE_LOOP($,(#8));\n#7=CARTESIAN_POINT($,(0,0,0));\n#8=ORIENTED_EDGE($,$,$,#9,.T.);\n#9=EDGE_CURVE($,#10,#11,#12,.T.);\n#10=VERTEX_POINT($,#13);\n#11=VERTEX_POINT($,#14);\n#12=LINE($,#13,#15);\n#13=CARTESIAN_POINT($,(0,0,0));\n#14=CARTESIAN_POINT($,(1,0,0));\n#15=VECTOR($,#16,1.0);\n#16=DIRECTION($,(1,0,0));\n#20=AXIS2_PLACEMENT_3D($,#13,#21,#22);\n#21=DIRECTION($,(0,0,1));\n#22=DIRECTION($,(1,0,0));\nENDSEC;\nEND-ISO-10303-21;";++ var import = Record.Exception(() => Step242Importer.ImportBody(invalidOrientation));++ Assert.Null(import);+ var result = Step242Importer.ImportBody(invalidOrientation);+ Assert.False(result.IsSuccess);+ Assert.NotEmpty(result.Diagnostics);+ }++ private static string BuildSingleTriangleStep(bool edgeCurveSameSense, bool faceBoundOrientation, bool advancedFaceSameSense)+ {+ var edgeSense = edgeCurveSameSense ? ".T." : ".F.";+ var boundOrientation = faceBoundOrientation ? ".T." : ".F.";+ var faceSense = advancedFaceSameSense ? ".T." : ".F.";++ return $"ISO-10303-21;\nHEADER;\nENDSEC;\nDATA;\n#1=MANIFOLD_SOLID_BREP('solid',#2);\n#2=CLOSED_SHELL($,(#3));\n#3=ADVANCED_FACE((#4),#5,{faceSense});\n#4=FACE_OUTER_BOUND($,#6,{boundOrientation});\n#5=PLANE($,#20);\n#6=EDGE_LOOP($,(#7));\n#7=ORIENTED_EDGE($,$,$,#8,.T.);\n#8=EDGE_CURVE($,#9,#10,#11,{edgeSense});\n#9=VERTEX_POINT($,#12);\n#10=VERTEX_POINT($,#13);\n#11=LINE($,#12,#14);\n#12=CARTESIAN_POINT($,(0,0,0));\n#13=CARTESIAN_POINT($,(1,0,0));\n#14=VECTOR($,#15,1.0);\n#15=DIRECTION($,(1,0,0));\n#20=AXIS2_PLACEMENT_3D($,#12,#21,#22);\n#21=DIRECTION($,(0,0,1));\n#22=DIRECTION($,(1,0,0));\nENDSEC;\nEND-ISO-10303-21;";+ }+}diff --git a/Aetheris.Kernel.Core/Step242/Step242Importer.cs b/Aetheris.Kernel.Core/Step242/Step242Importer.csindex ff413b47..d028c4ae 100644--- a/Aetheris.Kernel.Core/Step242/Step242Importer.cs+++ b/Aetheris.Kernel.Core/Step242/Step242Importer.cs@@ -132,6 +132,14 @@ public static class Step242Importerreturn KernelResult<BrepBody>.Failure(loopRefResult.Diagnostics);}+ var boundOrientationResult = Step242SubsetDecoder.ReadBoolean(boundEntity, 2, "FACE_BOUND orientation");+ if (!boundOrientationResult.IsSuccess)+ {+ return KernelResult<BrepBody>.Failure(boundOrientationResult.Diagnostics);+ }++ var boundOrientation = boundOrientationResult.Value;+var loopEntityResult = document.TryGetEntity(loopRefResult.Value.TargetId, "EDGE_LOOP");if (!loopEntityResult.IsSuccess){@@ -192,19 +200,31 @@ public static class Step242Importerreturn KernelResult<BrepBody>.Failure(edgeIdResult.Diagnostics);}+ var edgeSameSenseResult = Step242SubsetDecoder.ReadBoolean(edgeCurveEntityResult.Value, 4, "EDGE_CURVE same_sense");+ if (!edgeSameSenseResult.IsSuccess)+ {+ return KernelResult<BrepBody>.Failure(edgeSameSenseResult.Diagnostics);+ }+var orientedSenseResult = Step242SubsetDecoder.ReadBoolean(orientedEdgeEntity, 4, "ORIENTED_EDGE orientation");if (!orientedSenseResult.IsSuccess){return KernelResult<BrepBody>.Failure(orientedSenseResult.Diagnostics);}+ var isReversed = orientedSenseResult.Value != edgeSameSenseResult.Value;+ if (!boundOrientation)+ {+ isReversed = !isReversed;+ }+coedges.Add(new Coedge(coedgeIds[i],edgeIdResult.Value,loopId,coedgeIds[(i + 1) % coedgeIds.Count],coedgeIds[(i + coedgeIds.Count - 1) % coedgeIds.Count],- IsReversed: !orientedSenseResult.Value));+ IsReversed: isReversed));}builder.AddLoop(new Loop(loopId, coedgeIds));@@ -232,8 +252,27 @@ public static class Step242Importerreturn KernelResult<BrepBody>.Failure(planeResult.Diagnostics);}+ var faceSameSenseResult = Step242SubsetDecoder.ReadBoolean(faceEntity, 2, "ADVANCED_FACE same_sense");+ if (!faceSameSenseResult.IsSuccess)+ {+ return KernelResult<BrepBody>.Failure(faceSameSenseResult.Diagnostics);+ }++ var faceSurface = planeResult.Value;+ if (!faceSameSenseResult.Value)+ {+ if (!Direction3D.TryCreate(-faceSurface.Normal.ToVector(), out var reversedNormal))+ {+ return OrientationFailure<BrepBody>(+ "ADVANCED_FACE same_sense not supported for this face",+ SourceFor(faceEntity.Id, "Importer.Orientation.AdvancedFaceSense"));+ }++ faceSurface = new PlaneSurface(faceSurface.Origin, reversedNormal, faceSurface.UAxis);+ }+var surfaceGeometryId = new SurfaceGeometryId(nextSurfaceGeometryId++);- geometry.AddSurface(surfaceGeometryId, SurfaceGeometry.FromPlane(planeResult.Value));+ geometry.AddSurface(surfaceGeometryId, SurfaceGeometry.FromPlane(faceSurface));bindings.AddFaceBinding(new FaceGeometryBinding(faceId, surfaceGeometryId));}@@ -294,12 +333,7 @@ public static class Step242Importerreturn KernelResult<EdgeId>.Failure(sameSenseResult.Diagnostics);}- if (!sameSenseResult.Value)- {- return KernelResult<EdgeId>.Failure([- new KernelDiagnostic(KernelDiagnosticCode.NotImplemented, KernelDiagnosticSeverity.Error, "EDGE_CURVE with same_sense=.F. is unsupported in M23 subset.", SourceFor(edgeCurveEntity.Id, "Importer.EdgeCurveSense"))- ]);- }+ var edgeSameSense = sameSenseResult.Value;var startVertexResult = EnsureVertex(document, startRefResult.Value.TargetId, builder, vertexMap);if (!startVertexResult.IsSuccess)@@ -330,6 +364,19 @@ public static class Step242Importervar startParameter = ComputeLineParameter(lineResult.Value, startVertexResult.Value.Point);var endParameter = ComputeLineParameter(lineResult.Value, endVertexResult.Value.Point);++ if (endParameter < startParameter)+ {+ if (!edgeSameSense)+ {+ return OrientationFailure<EdgeId>(+ "EDGE_CURVE same_sense semantics unsupported for this edge",+ SourceFor(edgeCurveEntity.Id, "Importer.Orientation.EdgeCurveSense"));+ }++ return FailureEdge("EDGE_CURVE line parameterization is opposite to vertex ordering.", SourceFor(edgeCurveEntity.Id, "Importer.Geometry.EdgeCurveParameters"));+ }+var curveGeometryId = new CurveGeometryId(nextCurveGeometryId++);geometry.AddCurve(curveGeometryId, CurveGeometry.FromLine(lineResult.Value));@@ -377,5 +424,11 @@ public static class Step242Importerprivate static KernelResult<BrepBody> Failure(string message, string source) =>KernelResult<BrepBody>.Failure([new KernelDiagnostic(KernelDiagnosticCode.NotImplemented, KernelDiagnosticSeverity.Error, message, source)]);+ private static KernelResult<EdgeId> FailureEdge(string message, string source) =>+ KernelResult<EdgeId>.Failure([new KernelDiagnostic(KernelDiagnosticCode.NotImplemented, KernelDiagnosticSeverity.Error, message, source)]);++ private static KernelResult<T> OrientationFailure<T>(string message, string source) =>+ KernelResult<T>.Failure([new KernelDiagnostic(KernelDiagnosticCode.ValidationFailed, KernelDiagnosticSeverity.Error, message, source)]);+private static string SourceFor(int _entityId, string stableSource) => stableSource;}