Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel
Support preserved dual-loop periodic curved tessellation family
Yuechen Li547601975bfc
diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242EdgeCurveSenseRegressionTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242EdgeCurveSenseRegressionTests.csindex 8321d58c..e89bf46a 100644--- a/Aetheris.Kernel.Core.Tests/Step242/Step242EdgeCurveSenseRegressionTests.cs+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242EdgeCurveSenseRegressionTests.cs@@ -33,7 +33,7 @@ public sealed class Step242EdgeCurveSenseRegressionTests{Assert.Equal("tessellator", first.FirstFailureLayer);Assert.Equal(string.Empty, first.FirstDiagnostic.Source);- Assert.StartsWith("Face 30 curved tessellation requires exactly one loop.", first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);+ Assert.StartsWith("Face 33 spherical trim loop must contain at least three coedges. Observed 1.", first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);}Assert.Equal(first.FirstFailureLayer, second.FirstFailureLayer);diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242RevolvedTopologyFamilyRegressionTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242RevolvedTopologyFamilyRegressionTests.csindex 78035b8e..4b9ed651 100644--- a/Aetheris.Kernel.Core.Tests/Step242/Step242RevolvedTopologyFamilyRegressionTests.cs+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242RevolvedTopologyFamilyRegressionTests.cs@@ -85,7 +85,8 @@ public sealed class Step242RevolvedTopologyFamilyRegressionTestsAssert.Equal(first.FirstDiagnostic.MessagePrefix, second.FirstDiagnostic.MessagePrefix);Assert.DoesNotContain("unsupported subfamily 'circle-only seam reused loop'", first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);- Assert.StartsWith("Face 91 curved tessellation requires exactly one loop.", first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);+ Assert.DoesNotContain("requires exactly one loop", first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);+ Assert.Equal("No diagnostics.", first.FirstDiagnostic.MessagePrefix);}[Theory]diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242UnsupportedSurfaceForHolesRegressionTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242UnsupportedSurfaceForHolesRegressionTests.csindex ab7824a5..1db34e99 100644--- a/Aetheris.Kernel.Core.Tests/Step242/Step242UnsupportedSurfaceForHolesRegressionTests.cs+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242UnsupportedSurfaceForHolesRegressionTests.cs@@ -7,10 +7,11 @@ public sealed class Step242UnsupportedSurfaceForHolesRegressionTests[Theory][InlineData("testdata/step242/nist/CTC/nist_ctc_05_asme1_ap242-e1.stp",- "tessellator",- "Importer.LoopRole.UnsupportedSurfaceForHoles","",- "Face 91 curved tessellation requires exactly one loop.")]+ "Importer.LoopRole.UnsupportedSurfaceForHoles",+ "Audit.None",+ "No diagnostics.")]+[InlineData("testdata/step242/nist/FTC/nist_ftc_08_asme1_ap242-e2.stp","tessellator",@@ -21,14 +22,16 @@ public sealed class Step242UnsupportedSurfaceForHolesRegressionTests"testdata/step242/nist/FTC/nist_ftc_11_asme1_ap242-e2.stp","tessellator","Topology.GraphValidator",- "",- "Face 4 curved tessellation requires exactly one loop.")]+ "Viewer.Tessellation.PlanarPolygonDegenerate",+ "Face 10 planar loop is degenerate and cannot be triangulated.")]+[InlineData("testdata/step242/nist/STC/nist_stc_06_asme1_ap242-e3.stp","tessellator","Importer.LoopRole.UnsupportedSurfaceForHoles","",- "Face 30 curved tessellation requires exactly one loop.")]+ "Face 33 spherical trim loop must contain at least three coedges. Observed 1.")]+public void Step242_NistTargets_AdvancePastGenericUnsupportedSurfaceForHoles_Deterministically(string relativePath,string expectedLayer,diff --git a/Aetheris.Kernel.Core/Brep/Tessellation/BrepDisplayTessellator.cs b/Aetheris.Kernel.Core/Brep/Tessellation/BrepDisplayTessellator.csindex 0790a964..dc63e204 100644--- a/Aetheris.Kernel.Core/Brep/Tessellation/BrepDisplayTessellator.cs+++ b/Aetheris.Kernel.Core/Brep/Tessellation/BrepDisplayTessellator.cs@@ -575,15 +575,13 @@ public static class BrepDisplayTessellatorbool allowThreeCoedgeConeTopology,Func<Point3D, double>? axialParameterFromPoint = null){- var loopIds = body.GetLoopIds(faceId);- if (loopIds.Count != 1)+ var coedgesResult = TryGetSupportedRevolvedCoedges(body, faceId);+ if (!coedgesResult.IsSuccess){- return KernelResult<(double, double, int, int)>.Failure([CreateNotImplemented($"Face {faceId.Value} curved tessellation requires exactly one loop.")]);+ return KernelResult<(double, double, int, int)>.Failure(coedgesResult.Diagnostics);}- var coedges = body.GetCoedgeIds(loopIds[0])- .Select(id => body.Topology.GetCoedge(id))- .ToArray();+ var coedges = coedgesResult.Value;var lineCoedges = coedges.Where(c => body.GetEdgeCurve(c.EdgeId).Kind == CurveGeometryKind.Line3).ToArray();var circleCoedges = coedges.Where(c => body.GetEdgeCurve(c.EdgeId).Kind == CurveGeometryKind.Circle3).ToArray();@@ -661,6 +659,15 @@ public static class BrepDisplayTessellatorCalculateAxialSegments(sixUseBsplineOnlyParameters.VStart, sixUseBsplineOnlyParameters.VEnd, options)), sixUseBsplineOnlyDiagnostics);}+ if (TryResolveDualSeamCircleRevolvedLoop(body, coedges, lineCoedges, circleCoedges, axialParameterFromPoint, faceId, out var dualSeamCircleParameters, out var dualSeamCircleDiagnostics))+ {+ return KernelResult<(double, double, int, int)>.Success((+ dualSeamCircleParameters.VStart,+ dualSeamCircleParameters.VEnd,+ CalculateSegmentCount(2d * double.Pi, System.Math.Max(1e-6d, radiusHint), options),+ CalculateAxialSegments(dualSeamCircleParameters.VStart, dualSeamCircleParameters.VEnd, options)), dualSeamCircleDiagnostics);+ }+if (TryResolveRepeatedMixedRevolvedLoop(body, coedges, lineCoedges, circleCoedges, axialParameterFromPoint, faceId, out var repeatedMixedParameters, out var repeatedMixedDiagnostics)){return KernelResult<(double, double, int, int)>.Success((@@ -725,6 +732,66 @@ public static class BrepDisplayTessellatorreturn KernelResult<(double, double, int, int)>.Failure([CreateNotImplemented($"Face {faceId.Value} curved tessellation supports selected repeated {topologyFamily} boundary subfamilies; unsupported subfamily '{observedFamily}'. Observed: {DescribeRevolvedLoopTopology(body, coedges)}")]);}+ private static KernelResult<IReadOnlyList<Coedge>> TryGetSupportedRevolvedCoedges(BrepBody body, FaceId faceId)+ {+ var loopIds = body.GetLoopIds(faceId);+ if (loopIds.Count == 1)+ {+ var singleLoopCoedges = body.GetCoedgeIds(loopIds[0])+ .Select(id => body.Topology.GetCoedge(id))+ .ToArray();+ return KernelResult<IReadOnlyList<Coedge>>.Success(singleLoopCoedges);+ }++ if (TryResolvePreservedPeriodicDualSeamCircleLoopFamily(body, loopIds, out var preservedFamilyCoedges))+ {+ return KernelResult<IReadOnlyList<Coedge>>.Success(preservedFamilyCoedges);+ }++ return KernelResult<IReadOnlyList<Coedge>>.Failure([+ CreateNotImplemented($"Face {faceId.Value} curved tessellation supports exactly one loop or the preserved periodic dual single-coedge seam-circle loop family. Observed: {DescribeRevolvedFaceTopology(body, loopIds)}", CurvedTopologyUnsupportedSource)+ ]);+ }++ private static bool TryResolvePreservedPeriodicDualSeamCircleLoopFamily(+ BrepBody body,+ IReadOnlyList<LoopId> loopIds,+ out IReadOnlyList<Coedge> coedges)+ {+ coedges = [];+ if (loopIds.Count != 2)+ {+ return false;+ }++ var resolved = new List<Coedge>(2);+ foreach (var loopId in loopIds)+ {+ var coedgeIds = body.GetCoedgeIds(loopId);+ if (coedgeIds.Count != 1)+ {+ return false;+ }++ var coedge = body.Topology.GetCoedge(coedgeIds[0]);+ if (body.GetEdgeCurve(coedge.EdgeId).Kind != CurveGeometryKind.Circle3)+ {+ return false;+ }++ var edge = body.Topology.GetEdge(coedge.EdgeId);+ if (edge.StartVertexId != edge.EndVertexId)+ {+ return false;+ }++ resolved.Add(coedge);+ }++ coedges = resolved;+ return true;+ }+private static bool TryResolveRepeatedCircleBsplineRevolvedLoop(BrepBody body,@@ -808,6 +875,48 @@ public static class BrepDisplayTessellatorreturn true;}++ private static bool TryResolveDualSeamCircleRevolvedLoop(+ BrepBody body,+ IReadOnlyList<Coedge> coedges,+ IReadOnlyList<Coedge> lineCoedges,+ IReadOnlyList<Coedge> circleCoedges,+ Func<Point3D, double>? axialParameterFromPoint,+ FaceId faceId,+ out (double VStart, double VEnd) parameters,+ out IReadOnlyList<KernelDiagnostic> diagnostics)+ {+ parameters = default;+ diagnostics = [];++ if (axialParameterFromPoint is null || coedges.Count != 2 || lineCoedges.Count != 0 || circleCoedges.Count != 2)+ {+ return false;+ }++ var seamUses = coedges.Count(c =>+ {+ var edge = body.Topology.GetEdge(c.EdgeId);+ return edge.StartVertexId == edge.EndVertexId;+ });++ if (seamUses != 2 || coedges.Select(c => c.EdgeId).Distinct().Count() != 2)+ {+ return false;+ }++ var result = TryResolveAxialBoundsFromProjectedLoopVertices(body, coedges, axialParameterFromPoint, faceId);+ if (!result.IsSuccess)+ {+ diagnostics = result.Diagnostics;+ return false;+ }++ parameters = result.Value;+ diagnostics = result.Diagnostics;+ return true;+ }+private static bool TryResolveSingleCoedgeCircleSeamReusedConeLoop(BrepBody body,IReadOnlyList<Coedge> coedges,@@ -1332,7 +1441,7 @@ public static class BrepDisplayTessellatorreturn System.Math.Max(1, System.Math.Clamp((int)double.Ceiling(axialSpan / options.ChordTolerance), 1, options.MaximumSegments));}- private static string DescribeRevolvedLoopTopology(BrepBody body, IReadOnlyList<Coedge> coedges)+ private static string DescribeRevolvedLoopTopology(BrepBody body, IReadOnlyList<Coedge> coedges, int loopCount = 1){var lineUseCount = 0;var circleUseCount = 0;@@ -1371,7 +1480,33 @@ public static class BrepDisplayTessellator.Select(c => $"{c.EdgeId.Value}:{body.GetEdgeCurve(c.EdgeId).Kind}").ToArray();- return $"loops=1 coedges={coedges.Count} lineUses={lineUseCount} circleUses={circleUseCount} ellipseUses={ellipseUseCount} bSplineUses={bSplineUseCount} seamEdgeUses={seamUseCount} edgeFamilies=[{string.Join(", ", edgeFamilies)}]";+ return $"loops={loopCount} coedges={coedges.Count} lineUses={lineUseCount} circleUses={circleUseCount} ellipseUses={ellipseUseCount} bSplineUses={bSplineUseCount} seamEdgeUses={seamUseCount} edgeFamilies=[{string.Join(", ", edgeFamilies)}]";+ }++ private static string DescribeRevolvedFaceTopology(BrepBody body, IReadOnlyList<LoopId> loopIds)+ {+ var loopDescriptions = new List<string>(loopIds.Count);+ var aggregateCoedges = new List<Coedge>();++ foreach (var loopId in loopIds)+ {+ var coedges = body.GetCoedgeIds(loopId)+ .Select(id => body.Topology.GetCoedge(id))+ .ToArray();+ aggregateCoedges.AddRange(coedges);++ var uniqueEdges = coedges.Select(c => c.EdgeId).Distinct().Count();+ var circleUses = coedges.Count(c => body.GetEdgeCurve(c.EdgeId).Kind == CurveGeometryKind.Circle3);+ var seamUses = coedges.Count(c =>+ {+ var edge = body.Topology.GetEdge(c.EdgeId);+ return edge.StartVertexId == edge.EndVertexId;+ });++ loopDescriptions.Add($"{loopId.Value}:coedges={coedges.Length}:uniqueEdges={uniqueEdges}:circleUses={circleUses}:seamUses={seamUses}");+ }++ return $"{DescribeRevolvedLoopTopology(body, aggregateCoedges, loopIds.Count)} loopFamilies=[{string.Join(", ", loopDescriptions)}]";}private static string ClassifyRevolvedTopologyFamily(diff --git a/testdata/step242/manifests/nist.v0.report.json b/testdata/step242/manifests/nist.v0.report.jsonindex 0fb44b17..ed6c90db 100644--- a/testdata/step242/manifests/nist.v0.report.json+++ b/testdata/step242/manifests/nist.v0.report.json@@ -99,14 +99,14 @@"fileId": "testdata_step242_nist_CTC_nist_ctc_05_asme1_ap242-e1","path": "testdata/step242/nist/CTC/nist_ctc_05_asme1_ap242-e1.stp","sizeBytes": 863826,- "status": "importFail",- "firstFailureLayer": "tessellator",+ "status": "success",+ "firstFailureLayer": "","firstDiagnostic": {- "code": "NotImplemented",- "source": "",- "messagePrefix": "Face 91 curved tessellation requires exactly one loop."+ "code": "Unknown",+ "source": "Audit.None",+ "messagePrefix": "No diagnostics."},- "diagnosticCount": 1,+ "diagnosticCount": 0,"exceptionEscaped": false,"topologyCounts": {"vertices": 239,@@ -114,10 +114,10 @@"faces": 156},"tessellationCounts": {- "facePatches": 0,- "edgePolylines": 0+ "facePatches": 156,+ "edgePolylines": 331},- "canonicalSha256": null+ "canonicalSha256": "159ea2f5a3996f954b26e7a1a5d6c0c63d1a0df16d33124f6ee49f5176836547"},{"fileId": "testdata_step242_nist_FTC_nist_ftc_06_asme1_ap242-e2",@@ -270,9 +270,9 @@"status": "importFail","firstFailureLayer": "tessellator","firstDiagnostic": {- "code": "NotImplemented",- "source": "",- "messagePrefix": "Face 4 curved tessellation requires exactly one loop."+ "code": "InvalidArgument",+ "source": "Viewer.Tessellation.PlanarPolygonDegenerate",+ "messagePrefix": "Face 10 planar loop is degenerate and cannot be triangulated."},"diagnosticCount": 1,"exceptionEscaped": false,@@ -296,7 +296,7 @@"firstDiagnostic": {"code": "NotImplemented","source": "",- "messagePrefix": "Face 30 curved tessellation requires exactly one loop."+ "messagePrefix": "Face 33 spherical trim loop must contain at least three coedges. Observed 1."},"diagnosticCount": 1,"exceptionEscaped": false,