Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel
Add narrow tessellation support for near-full-wrap cylinder bridge family
Yuechen Li52b69de80720
diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242EdgeCurveSenseRegressionTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242EdgeCurveSenseRegressionTests.csindex 7c685f83..dfd43d7f 100644--- a/Aetheris.Kernel.Core.Tests/Step242/Step242EdgeCurveSenseRegressionTests.cs+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242EdgeCurveSenseRegressionTests.cs@@ -32,7 +32,8 @@ public sealed class Step242EdgeCurveSenseRegressionTestsif (string.Equals(relativePath, "testdata/step242/nist/STC/nist_stc_06_asme1_ap242-e3.stp", StringComparison.Ordinal)){Assert.Equal("tessellator", first.FirstFailureLayer);- Assert.Equal("Viewer.Tessellation.CylinderTrimAxialSpanDegenerate.SingleCoedgeNearFullWrap", first.FirstDiagnostic.Source);+ Assert.Equal(string.Empty, first.FirstDiagnostic.Source);+ Assert.StartsWith("Face 33 spherical trim loop must contain at least three coedges.", 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 283c306b..e3964265 100644--- a/Aetheris.Kernel.Core.Tests/Step242/Step242RevolvedTopologyFamilyRegressionTests.cs+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242RevolvedTopologyFamilyRegressionTests.cs@@ -85,7 +85,7 @@ 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 31 cylindrical trim loop 62 has 1 coedges, angular span", first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);+ Assert.StartsWith("Face 38 cylindrical trim loop 73 has 1 coedges, angular span", first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);}[Theory]diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242UnsupportedSurfaceForHolesRegressionTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242UnsupportedSurfaceForHolesRegressionTests.csindex 20266dff..7b3725fa 100644--- a/Aetheris.Kernel.Core.Tests/Step242/Step242UnsupportedSurfaceForHolesRegressionTests.cs+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242UnsupportedSurfaceForHolesRegressionTests.cs@@ -10,7 +10,7 @@ public sealed class Step242UnsupportedSurfaceForHolesRegressionTests"tessellator","Importer.LoopRole.UnsupportedSurfaceForHoles","Viewer.Tessellation.CylinderTrimAxialSpanDegenerate.SingleCoedgeNearFullWrap",- "Face 31 cylindrical trim loop 62 has 1 coedges, angular span")]+ "Face 38 cylindrical trim loop 73 has 1 coedges, angular span")][InlineData("testdata/step242/nist/FTC/nist_ftc_08_asme1_ap242-e2.stp","tessellator",@@ -27,8 +27,8 @@ public sealed class Step242UnsupportedSurfaceForHolesRegressionTests"testdata/step242/nist/STC/nist_stc_06_asme1_ap242-e3.stp","tessellator","Importer.LoopRole.UnsupportedSurfaceForHoles",- "Viewer.Tessellation.CylinderTrimAxialSpanDegenerate.SingleCoedgeNearFullWrap",- "Face 29 cylindrical trim loop 54 has 1 coedges, angular span")]+ "",+ "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 80e80595..0790a964 100644--- a/Aetheris.Kernel.Core/Brep/Tessellation/BrepDisplayTessellator.cs+++ b/Aetheris.Kernel.Core/Brep/Tessellation/BrepDisplayTessellator.cs@@ -21,6 +21,7 @@ public static class BrepDisplayTessellatorprivate const string CylinderTrimAxialSpanDegenerateSingleCoedgeNearFullWrapSource = "Viewer.Tessellation.CylinderTrimAxialSpanDegenerate.SingleCoedgeNearFullWrap";private const string CylinderTrimAxialSpanDegenerateSingleCoedgeSource = "Viewer.Tessellation.CylinderTrimAxialSpanDegenerate.SingleCoedge";private const string CylinderTrimAxialSpanDegenerateMultiCoedgeSource = "Viewer.Tessellation.CylinderTrimAxialSpanDegenerate.MultiCoedge";+ private const string CylinderTrimAxialSpanDegenerateSingleCoedgeNearFullWrapBridgeSource = "Viewer.Tessellation.CylinderTrimAxialSpanDegenerate.SingleCoedgeNearFullWrapBridge";private const string CylinderTrimAmbiguousUsedShorterSpanSource = "Viewer.Tessellation.CylinderTrimAmbiguousUsedShorterSpan";private const string CurvedTopologyUnsupportedSource = "Viewer.Tessellation.CurvedTopologyUnsupported";private const string BSplineSurfaceTrimUnsupportedSource = "Viewer.Tessellation.BSplineSurfaceTrimUnsupported";@@ -1682,6 +1683,8 @@ public static class BrepDisplayTessellator{const double minSpan = 1e-8d;const double nearFullWrapThreshold = 2d * double.Pi * 0.95d;+ const double bridgeSeamGapMin = 8d * (double.Pi / 180d);+ const double bridgeSeamGapMax = 12d * (double.Pi / 180d);var loopIds = body.GetLoopIds(faceId);if (loopIds.Count == 0){@@ -1694,7 +1697,7 @@ public static class BrepDisplayTessellatorvar yAxis = cylinder.YAxis.ToVector();(double UStart, double USpan, double VStart, double VEnd, bool UsedAmbiguousShorterSpanResolution)? best = null;- (LoopId LoopId, int CoedgeCount, double AngularSpan, double AxialSpan, bool IsNearFullWrap, bool AngularResolved, bool IsSingleCoedgeClosed)? bestAxialSpanDegenerate = null;+ (LoopId LoopId, int CoedgeCount, double AngularStart, double AngularSpan, double AxialSpan, bool IsNearFullWrap, bool AngularResolved, bool IsSingleCoedgeClosed, double VStart, bool HasBridgeTwin, SurfaceGeometryKind? TwinSurfaceKind)? bestAxialSpanDegenerate = null;foreach (var loopId in loopIds){@@ -1755,19 +1758,26 @@ public static class BrepDisplayTessellatorif (axialSpan <= minSpan){var isSingleCoedgeClosed = false;+ var hasBridgeTwin = false;+ SurfaceGeometryKind? twinSurfaceKind = null;if (coedges.Length == 1 && body.TryGetEdgeVertices(coedges[0].EdgeId, out var edgeStart, out var edgeEnd)){isSingleCoedgeClosed = edgeStart == edgeEnd;+ hasBridgeTwin = TryResolveBridgeTwinSurfaceKind(body, faceId, coedges[0].EdgeId, out twinSurfaceKind);}var degenerateCandidate = (LoopId: loopId,CoedgeCount: coedges.Length,+ AngularStart: angularBounds.IsSuccess ? angularBounds.Value.Start : 0d,AngularSpan: angularSpan,AxialSpan: axialSpan,IsNearFullWrap: angularBounds.IsSuccess && angularBounds.Value.Span >= nearFullWrapThreshold,AngularResolved: angularBounds.IsSuccess && angularBounds.Value.Span > minSpan,- IsSingleCoedgeClosed: isSingleCoedgeClosed);+ IsSingleCoedgeClosed: isSingleCoedgeClosed,+ VStart: vStart,+ HasBridgeTwin: hasBridgeTwin,+ TwinSurfaceKind: twinSurfaceKind);if (!bestAxialSpanDegenerate.HasValue ||degenerateCandidate.AngularSpan > bestAxialSpanDegenerate.Value.AngularSpan ||(System.Math.Abs(degenerateCandidate.AngularSpan - bestAxialSpanDegenerate.Value.AngularSpan) <= minSpan &&@@ -1798,6 +1808,31 @@ public static class BrepDisplayTessellatorif (bestAxialSpanDegenerate.HasValue && loopIds.Count == 1){var isSingleCoedge = bestAxialSpanDegenerate.Value.CoedgeCount == 1;+ var seamGap = (2d * double.Pi) - bestAxialSpanDegenerate.Value.AngularSpan;+ var isBridgeFamily =+ isSingleCoedge+ && bestAxialSpanDegenerate.Value.IsNearFullWrap+ && bestAxialSpanDegenerate.Value.AngularResolved+ && bestAxialSpanDegenerate.Value.AxialSpan <= minSpan+ && bestAxialSpanDegenerate.Value.IsSingleCoedgeClosed+ && seamGap >= bridgeSeamGapMin+ && seamGap <= bridgeSeamGapMax+ && bestAxialSpanDegenerate.Value.HasBridgeTwin+ && bestAxialSpanDegenerate.Value.TwinSurfaceKind is SurfaceGeometryKind.Plane or SurfaceGeometryKind.Cone or SurfaceGeometryKind.Torus;++ if (isBridgeFamily)+ {+ return KernelResult<(double, double, double, double)>.Success(+ (+ bestAxialSpanDegenerate.Value.AngularStart,+ bestAxialSpanDegenerate.Value.AngularStart + bestAxialSpanDegenerate.Value.AngularSpan,+ bestAxialSpanDegenerate.Value.VStart,+ bestAxialSpanDegenerate.Value.VStart),+ [CreateValidationWarning(+ $"Face {faceId.Value} cylindrical trim treated as zero-width bridge limit (loop {bestAxialSpanDegenerate.Value.LoopId.Value}, seam gap {seamGap * (180d / double.Pi):F3} deg, twin {bestAxialSpanDegenerate.Value.TwinSurfaceKind}).",+ CylinderTrimAxialSpanDegenerateSingleCoedgeNearFullWrapBridgeSource)]);+ }+var classification = bestAxialSpanDegenerate.Value.IsNearFullWrap? isSingleCoedge? bestAxialSpanDegenerate.Value.IsSingleCoedgeClosed@@ -1840,6 +1875,49 @@ public static class BrepDisplayTessellatordiagnostics);}+ private static bool TryResolveBridgeTwinSurfaceKind(BrepBody body, FaceId sourceFaceId, EdgeId edgeId, out SurfaceGeometryKind? twinSurfaceKind)+ {+ twinSurfaceKind = null;+ var uses = new HashSet<FaceId>();++ foreach (var face in body.Topology.Faces)+ {+ foreach (var loopId in face.LoopIds)+ {+ var coedgeIds = body.GetCoedgeIds(loopId);+ foreach (var coedgeId in coedgeIds)+ {+ var coedge = body.Topology.GetCoedge(coedgeId);+ if (coedge.EdgeId == edgeId)+ {+ uses.Add(face.Id);+ break;+ }+ }+ }+ }++ if (uses.Count != 2)+ {+ return false;+ }++ var useArray = uses.ToArray();+ var twinFaceId = useArray[0] == sourceFaceId ? useArray[1] : useArray[0];+ if (twinFaceId == sourceFaceId)+ {+ return false;+ }++ if (!body.TryGetFaceSurfaceGeometry(twinFaceId, out var twinSurface) || twinSurface is null)+ {+ return false;+ }++ twinSurfaceKind = twinSurface.Kind;+ return true;+ }+private static double CylinderAngleOf(CylinderSurface cylinder, Point3D point, Vector3D xAxis, Vector3D yAxis, Vector3D axis){var offset = point - cylinder.Origin;diff --git a/testdata/step242/manifests/nist.v0.report.json b/testdata/step242/manifests/nist.v0.report.jsonindex 13612202..11667bb1 100644--- a/testdata/step242/manifests/nist.v0.report.json+++ b/testdata/step242/manifests/nist.v0.report.json@@ -104,7 +104,7 @@"firstDiagnostic": {"code": "InvalidArgument","source": "Viewer.Tessellation.CylinderTrimAxialSpanDegenerate.SingleCoedgeNearFullWrap",- "messagePrefix": "Face 31 cylindrical trim loop 62 has 1 coedges, angular span 6.108652381980155, axial span 0, loop count 1; classified a"+ "messagePrefix": "Face 38 cylindrical trim loop 73 has 1 coedges, angular span 6.1086523819801535, axial span 0, loop count 1; classified "},"diagnosticCount": 1,"exceptionEscaped": false,@@ -294,9 +294,9 @@"status": "importFail","firstFailureLayer": "tessellator","firstDiagnostic": {- "code": "InvalidArgument",- "source": "Viewer.Tessellation.CylinderTrimAxialSpanDegenerate.SingleCoedgeNearFullWrap",- "messagePrefix": "Face 29 cylindrical trim loop 54 has 1 coedges, angular span 6.1086523819801535, axial span 0, loop count 1; classified "+ "code": "NotImplemented",+ "source": "",+ "messagePrefix": "Face 33 spherical trim loop must contain at least three coedges. Observed 1."},"diagnosticCount": 1,"exceptionEscaped": false,