Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel
Add deterministic Circle3 sampling for tessellation and Step242 tests
Yuechen Lida999c6a0d41
diff --git a/Aetheris.Kernel.Core.Tests/Brep/Tessellation/BrepDisplayTessellatorTests.cs b/Aetheris.Kernel.Core.Tests/Brep/Tessellation/BrepDisplayTessellatorTests.csindex 4c61046d..4552f890 100644--- a/Aetheris.Kernel.Core.Tests/Brep/Tessellation/BrepDisplayTessellatorTests.cs+++ b/Aetheris.Kernel.Core.Tests/Brep/Tessellation/BrepDisplayTessellatorTests.cs@@ -145,7 +145,7 @@ public sealed class BrepDisplayTessellatorTestsAssert.Equal(2, circlePolylines.Length);Assert.All(circlePolylines, polyline =>{- Assert.Equal(13, polyline.Points.Count);+ Assert.Equal(37, polyline.Points.Count);AssertPointEqualWithinTolerance(polyline.Points[0], polyline.Points[^1], 12);Assert.True(polyline.EdgeId.IsValid);});diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242ImporterTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242ImporterTests.csindex 93dfa3f0..4a3905ee 100644--- a/Aetheris.Kernel.Core.Tests/Step242/Step242ImporterTests.cs+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242ImporterTests.cs@@ -3,6 +3,8 @@ using Aetheris.Kernel.Core.Brep;using Aetheris.Kernel.Core.Brep.Tessellation;using Aetheris.Kernel.Core.Diagnostics;using Aetheris.Kernel.Core.Geometry;+using Aetheris.Kernel.Core.Geometry.Curves;+using Aetheris.Kernel.Core.Math;using Aetheris.Kernel.Core.Step242;namespace Aetheris.Kernel.Core.Tests.Step242;@@ -257,6 +259,45 @@ public sealed class Step242ImporterTestsAssert.StartsWith("Inline ADVANCED_FACE.surface constructor 'CONICAL_SURFACE' has unsupported argument shape.", diagnostic.Message, StringComparison.Ordinal);}++ [Fact]+ public void Step242_CurveSampler_Circle3_SamplesArcDeterministically()+ {+ var circle = new Circle3Curve(Point3D.Origin, Direction3D.Create(new Vector3D(0d, 0d, 1d)), 2d, Direction3D.Create(new Vector3D(1d, 0d, 0d)));++ var forward = CurveSampler.SampleCircleArc(circle, 0d, double.Pi / 2d);+ var second = CurveSampler.SampleCircleArc(circle, 0d, double.Pi / 2d);+ var reversed = CurveSampler.SampleCircleArc(circle, double.Pi / 2d, -double.Pi / 2d);++ Assert.Equal(forward.Count, second.Count);+ Assert.Equal(13, forward.Count);+ Assert.True(((forward[0] - circle.Evaluate(0d)).LengthSquared) < 1e-12d);+ Assert.True(((forward[^1] - circle.Evaluate(double.Pi / 2d)).LengthSquared) < 1e-12d);++ for (var i = 0; i < forward.Count; i++)+ {+ Assert.True(((forward[i] - second[i]).LengthSquared) < 1e-12d);+ Assert.True(((forward[i] - reversed[^(i + 1)]).LengthSquared) < 1e-12d);+ }+ }++ [Fact]+ public void Step242_Molex0430200200_Import_NoCircle3LineOnlyError()+ {+ var text = LoadFixture("testdata/step242/tessellation-robustness/planar-rect-with-filleted-corners.step");++ var import = Step242Importer.ImportBody(text);+ Assert.True(import.IsSuccess);++ var tessellation = BrepDisplayTessellator.Tessellate(import.Value);+ Assert.True(tessellation.IsSuccess);++ Assert.DoesNotContain(import.Diagnostics, d => d.Message.Contains("Circle3", StringComparison.Ordinal));+ Assert.DoesNotContain(import.Diagnostics, d => d.Message.Contains("line edges only", StringComparison.OrdinalIgnoreCase));+ Assert.DoesNotContain(tessellation.Diagnostics, d => d.Message.Contains("Circle3", StringComparison.Ordinal));+ Assert.DoesNotContain(tessellation.Diagnostics, d => d.Message.Contains("line edges only", StringComparison.OrdinalIgnoreCase));+ }+private static string LoadFixture(string relativePath){var path = Path.Combine(Step242CorpusManifestRunner.RepoRoot(), relativePath.Replace('/', Path.DirectorySeparatorChar));diff --git a/Aetheris.Kernel.Core/Brep/Tessellation/BrepDisplayTessellator.cs b/Aetheris.Kernel.Core/Brep/Tessellation/BrepDisplayTessellator.csindex 1cf15f92..4084dadd 100644--- a/Aetheris.Kernel.Core/Brep/Tessellation/BrepDisplayTessellator.cs+++ b/Aetheris.Kernel.Core/Brep/Tessellation/BrepDisplayTessellator.cs@@ -465,7 +465,7 @@ public static class BrepDisplayTessellatorAppendUniquePoint(flattened, segmentEnd);break;case CurveGeometryKind.Circle3:- var arcPointsResult = SampleCircleArc(body, coedge, curve.Circle3!.Value, segmentStart, segmentEnd, plane, faceId, options);+ var arcPointsResult = SampleCircleArc(body, coedge, curve.Circle3!.Value, segmentStart, segmentEnd, plane, faceId);if (!arcPointsResult.IsSuccess){return KernelResult<IReadOnlyList<Point3D>>.Failure(arcPointsResult.Diagnostics);@@ -499,8 +499,7 @@ public static class BrepDisplayTessellatorPoint3D start,Point3D end,PlaneSurface plane,- FaceId faceId,- DisplayTessellationOptions options)+ FaceId faceId){var deltaResult = ResolveArcDelta(body, coedge, circle, start, end, plane, faceId);if (!deltaResult.IsSuccess)@@ -509,12 +508,11 @@ public static class BrepDisplayTessellator}var (startAngle, delta) = deltaResult.Value;- var segmentCount = System.Math.Clamp(System.Math.Max(8, (int)double.Ceiling(double.Abs(delta) / (10d * (double.Pi / 180d)))), 8, System.Math.Min(256, options.MaximumSegments));- var points = new List<Point3D>(segmentCount);- for (var i = 1; i <= segmentCount; i++)+ var samples = CurveSampler.SampleCircleArc(circle, startAngle, delta);+ var points = new List<Point3D>(samples.Count - 1);+ for (var i = 1; i < samples.Count; i++){- var t = (double)i / segmentCount;- points.Add(circle.Evaluate(startAngle + (delta * t)));+ points.Add(samples[i]);}return KernelResult<IReadOnlyList<Point3D>>.Success(points);@@ -658,22 +656,13 @@ public static class BrepDisplayTessellatorvar line = curve.Line3!.Value;return KernelResult<DisplayEdgePolyline>.Success(new DisplayEdgePolyline(edgeId,- [line.Evaluate(interval.Start), line.Evaluate(interval.End)],+ CurveSampler.SampleLine(line, interval),IsClosed: false));case CurveGeometryKind.Circle3:var circle = curve.Circle3!.Value;var delta = interval.End - interval.Start;- var fullCircleSegments = CalculateSegmentCount(2d * double.Pi, circle.Radius, options);- var segmentCount = System.Math.Max(1, (int)double.Ceiling(fullCircleSegments * (delta / (2d * double.Pi))));- segmentCount = System.Math.Clamp(segmentCount, 1, options.MaximumSegments);-- var points = new List<Point3D>(segmentCount + 1);- for (var i = 0; i <= segmentCount; i++)- {- var t = (double)i / segmentCount;- points.Add(circle.Evaluate(interval.Start + (delta * t)));- }+ var points = CurveSampler.SampleCircleArc(circle, interval.Start, delta);return KernelResult<DisplayEdgePolyline>.Success(new DisplayEdgePolyline(edgeId, points, IsClosed: delta >= (2d * double.Pi)));diff --git a/Aetheris.Kernel.Core/Brep/Tessellation/CurveSampler.cs b/Aetheris.Kernel.Core/Brep/Tessellation/CurveSampler.csnew file mode 100644index 00000000..64ba9417--- /dev/null+++ b/Aetheris.Kernel.Core/Brep/Tessellation/CurveSampler.cs@@ -0,0 +1,40 @@+using Aetheris.Kernel.Core.Geometry;+using Aetheris.Kernel.Core.Geometry.Curves;+using Aetheris.Kernel.Core.Math;++namespace Aetheris.Kernel.Core.Brep.Tessellation;++internal static class CurveSampler+{+ private const double AngularStepRadians = 10d * (double.Pi / 180d);+ private const int MinimumCircleSegments = 12;+ private const int MaximumCircleSegments = 360;++ public static IReadOnlyList<Point3D> SampleLine(Line3Curve line, ParameterInterval interval)+ => [line.Evaluate(interval.Start), line.Evaluate(interval.End)];++ public static IReadOnlyList<Point3D> SampleCircleArc(Circle3Curve circle, double startAngle, double delta)+ {+ var segmentCount = ResolveCircleSegmentCount(delta);+ var points = new List<Point3D>(segmentCount + 1);+ for (var i = 0; i <= segmentCount; i++)+ {+ var t = (double)i / segmentCount;+ points.Add(circle.Evaluate(startAngle + (delta * t)));+ }++ return points;+ }++ private static int ResolveCircleSegmentCount(double delta)+ {+ var absoluteDelta = double.Abs(delta);+ if (absoluteDelta <= 1e-12d)+ {+ return MinimumCircleSegments;+ }++ var segments = (int)double.Ceiling(absoluteDelta / AngularStepRadians);+ return System.Math.Clamp(segments, MinimumCircleSegments, MaximumCircleSegments);+ }+}