Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel
Add planar Ellipse3 flattening for stc_06 progression
Yuechen Li60ed0e7fbbc5
diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242EdgeCurveSenseRegressionTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242EdgeCurveSenseRegressionTests.csindex ae162c8a..5b90edf7 100644--- a/Aetheris.Kernel.Core.Tests/Step242/Step242EdgeCurveSenseRegressionTests.cs+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242EdgeCurveSenseRegressionTests.cs@@ -32,7 +32,7 @@ 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.PlanarCurveFlatteningUnsupported", first.FirstDiagnostic.Source);+ Assert.Equal("Viewer.Tessellation.CylinderTrimAxialSpanDegenerate", first.FirstDiagnostic.Source);}Assert.Equal(first.FirstFailureLayer, second.FirstFailureLayer);diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242PlanarEllipseFlatteningDiagnosticsTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242PlanarEllipseFlatteningDiagnosticsTests.csnew file mode 100644index 00000000..7a614ae8--- /dev/null+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242PlanarEllipseFlatteningDiagnosticsTests.cs@@ -0,0 +1,68 @@+using Aetheris.Kernel.Core.Brep;+using Aetheris.Kernel.Core.Geometry;+using Aetheris.Kernel.Core.Step242;+using Aetheris.Kernel.Core.Topology;++namespace Aetheris.Kernel.Core.Tests.Step242;++public sealed class Step242PlanarEllipseFlatteningDiagnosticsTests+{+ [Fact]+ public void Step242_Stc06_Face18_PlanarEllipseFamily_IsExplicit_AndDeterministic()+ {+ const string relativePath = "testdata/step242/nist/STC/nist_stc_06_asme1_ap242-e3.stp";+ var body = ImportBody(relativePath);++ var faceId = new FaceId(18);+ var surface = body.GetFaceSurface(faceId);+ Assert.Equal(SurfaceGeometryKind.Plane, surface.Kind);++ Assert.True(surface.Plane.HasValue);+ var plane = surface.Plane!.Value;+ var coedges = GetFaceCoedges(body, faceId);+ var ellipseCoedges = coedges+ .Where(c => body.GetEdgeCurve(c.EdgeId).Kind == CurveGeometryKind.Ellipse3)+ .OrderBy(c => c.EdgeId.Value)+ .ToArray();++ Assert.NotEmpty(ellipseCoedges);++ foreach (var coedge in ellipseCoedges)+ {+ var curve = body.GetEdgeCurve(coedge.EdgeId);+ var ellipse = curve.Ellipse3!.Value;+ Assert.True(double.Abs(ellipse.Normal.ToVector().Dot(plane.Normal.ToVector())) > 0.999999d);+ Assert.True(double.Abs((ellipse.Center - plane.Origin).Dot(plane.Normal.ToVector())) <= 1e-7d);++ var binding = body.Bindings.GetEdgeBinding(coedge.EdgeId);+ Assert.True(binding.TrimInterval.HasValue);+ var trim = binding.TrimInterval!.Value;+ Assert.True(double.IsFinite(trim.Start));+ Assert.True(double.IsFinite(trim.End));+ Assert.True(double.Abs(trim.End - trim.Start) > 1e-9d);+ }+ }++ private static BrepBody ImportBody(string relativePath)+ {+ var absolutePath = Path.Combine(Step242CorpusManifestRunner.RepoRoot(), relativePath.Replace('/', Path.DirectorySeparatorChar));+ var text = File.ReadAllText(absolutePath);+ var result = Step242Importer.ImportBody(text);+ Assert.True(result.IsSuccess, result.IsSuccess ? string.Empty : result.Diagnostics[0].Message);+ return result.Value;+ }++ private static IReadOnlyList<Coedge> GetFaceCoedges(BrepBody body, FaceId faceId)+ {+ var coedges = new List<Coedge>();+ foreach (var loopId in body.GetLoopIds(faceId))+ {+ foreach (var coedgeId in body.GetCoedgeIds(loopId))+ {+ coedges.Add(body.Topology.GetCoedge(coedgeId));+ }+ }++ return coedges;+ }+}diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242UnsupportedSurfaceForHolesRegressionTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242UnsupportedSurfaceForHolesRegressionTests.csindex c210e2df..3473be07 100644--- a/Aetheris.Kernel.Core.Tests/Step242/Step242UnsupportedSurfaceForHolesRegressionTests.cs+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242UnsupportedSurfaceForHolesRegressionTests.cs@@ -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.PlanarCurveFlatteningUnsupported",- "Face 18 planar curve flattening does not support curve kind 'Ellipse3'.")]+ "Viewer.Tessellation.CylinderTrimAxialSpanDegenerate",+ "Face 29 cylindrical trim loop 54 has 1 coedges, angular span")]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 e0c0db5a..2ac71e48 100644--- a/Aetheris.Kernel.Core/Brep/Tessellation/BrepDisplayTessellator.cs+++ b/Aetheris.Kernel.Core/Brep/Tessellation/BrepDisplayTessellator.cs@@ -1893,6 +1893,19 @@ public static class BrepDisplayTessellatorAppendUniquePoint(flattened, point);}+ break;+ case CurveGeometryKind.Ellipse3:+ var ellipsePointsResult = SamplePlanarEllipse(body, coedge, curve.Ellipse3!.Value, segmentStart, segmentEnd, plane, faceId);+ if (!ellipsePointsResult.IsSuccess)+ {+ return KernelResult<IReadOnlyList<Point3D>>.Failure(ellipsePointsResult.Diagnostics);+ }++ foreach (var point in ellipsePointsResult.Value)+ {+ AppendUniquePoint(flattened, point);+ }+break;default:var curveKind = curve.UnsupportedKind ?? curve.Kind.ToString();@@ -1978,6 +1991,80 @@ public static class BrepDisplayTessellatorreturn KernelResult<IReadOnlyList<Point3D>>.Success(points);}+ private static KernelResult<IReadOnlyList<Point3D>> SamplePlanarEllipse(+ BrepBody body,+ Coedge coedge,+ Ellipse3Curve ellipse,+ Point3D start,+ Point3D end,+ PlaneSurface plane,+ FaceId faceId)+ {+ const double planeContainmentTolerance = 1e-7d;+ var normalAlignment = double.Abs(ellipse.Normal.ToVector().Dot(plane.Normal.ToVector()));+ var centerOffset = double.Abs((ellipse.Center - plane.Origin).Dot(plane.Normal.ToVector()));++ if (normalAlignment < 1d - 1e-7d || centerOffset > planeContainmentTolerance)+ {+ return KernelResult<IReadOnlyList<Point3D>>.Failure([+ CreateNotImplemented($"Face {faceId.Value} edge {coedge.EdgeId.Value} planar ellipse flattening requires the ellipse plane to match the face plane.", PlanarCurveFlatteningUnsupportedSource)]);+ }++ var trimResult = ResolvePlanarEllipseTrim(body, coedge, ellipse, start, end, plane, faceId);+ if (!trimResult.IsSuccess)+ {+ return KernelResult<IReadOnlyList<Point3D>>.Failure(trimResult.Diagnostics);+ }++ var trim = trimResult.Value;+ var segmentCount = ComputeEllipseSegmentCount(trim.Start, trim.End);+ var sampled = SampleEllipseCurve(ellipse, trim, segmentCount).ToArray();+ sampled[0] = start;+ sampled[^1] = end;++ var points = new List<Point3D>(sampled.Length - 1);+ for (var i = 1; i < sampled.Length; i++)+ {+ points.Add(sampled[i]);+ }++ return KernelResult<IReadOnlyList<Point3D>>.Success(points);+ }++ private static KernelResult<ParameterInterval> ResolvePlanarEllipseTrim(+ BrepBody body,+ Coedge coedge,+ Ellipse3Curve ellipse,+ Point3D start,+ Point3D end,+ PlaneSurface plane,+ FaceId faceId)+ {+ if (body.Bindings.TryGetEdgeBinding(coedge.EdgeId, out var binding) && binding.TrimInterval is ParameterInterval trim)+ {+ return KernelResult<ParameterInterval>.Success(coedge.IsReversed+ ? new ParameterInterval(trim.End, trim.Start)+ : trim);+ }++ var startAngle = AngleOnEllipse(ellipse, start);+ var endAngle = AngleOnEllipse(ellipse, end);+ var delta = NormalizeToSignedPi(endAngle - startAngle);+ if (double.Abs(delta) < 1e-9d)+ {+ return KernelResult<ParameterInterval>.Failure([+ CreateInvalidArgument($"Face {faceId.Value} planar ellipse flattening detected a degenerate ellipse trim.", PlanarCurveFlatteningFailedSource)]);+ }++ var orientation = ellipse.Normal.ToVector().Dot(plane.Normal.ToVector());+ if (orientation < 0d)+ {+ delta = -delta;+ }++ return KernelResult<ParameterInterval>.Success(new ParameterInterval(startAngle, startAngle + delta));+ }+private static KernelResult<(double StartAngle, double Delta)> ResolveArcDelta(BrepBody body,Coedge coedge,@@ -2025,6 +2112,14 @@ public static class BrepDisplayTessellatorreturn double.Atan2(y, x);}+ private static double AngleOnEllipse(Ellipse3Curve ellipse, Point3D point)+ {+ var offset = point - ellipse.Center;+ var x = offset.Dot(ellipse.XAxis.ToVector()) / ellipse.MajorRadius;+ var y = offset.Dot(ellipse.YAxis.ToVector()) / ellipse.MinorRadius;+ return double.Atan2(y, x);+ }+private static double NormalizeToSignedPi(double angle){while (angle <= -double.Pi)diff --git a/testdata/step242/manifests/nist.v0.report.json b/testdata/step242/manifests/nist.v0.report.jsonindex dedb2520..6babe509 100644--- a/testdata/step242/manifests/nist.v0.report.json+++ b/testdata/step242/manifests/nist.v0.report.json@@ -294,9 +294,9 @@"status": "importFail","firstFailureLayer": "tessellator","firstDiagnostic": {- "code": "NotImplemented",- "source": "Viewer.Tessellation.PlanarCurveFlatteningUnsupported",- "messagePrefix": "Face 18 planar curve flattening does not support curve kind \u0027Ellipse3\u0027."+ "code": "InvalidArgument",+ "source": "Viewer.Tessellation.CylinderTrimAxialSpanDegenerate",+ "messagePrefix": "Face 29 cylindrical trim loop 54 has 1 coedges, angular span 6.1086523819801535, axial span 0, loop count 1; classified "},"diagnosticCount": 1,"exceptionEscaped": false,