Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel
Support handcrafted toroid circular seam topology in tessellation
Yuechen Li8a4076b50b24
diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242ImporterTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242ImporterTests.csindex bb61355f..58f56c75 100644--- a/Aetheris.Kernel.Core.Tests/Step242/Step242ImporterTests.cs+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242ImporterTests.cs@@ -382,6 +382,57 @@ public sealed class Step242ImporterTestsAssert.NotEmpty(tessellation.Value.FacePatches);}+ [Fact]+ public void Step242_HandcraftedToroidFixture_UsesCircularSeamTopology_AndTessellates()+ {+ var text = LoadFixture("testdata/step242/handcrafted/baseline/toroid.step");++ var import = Step242Importer.ImportBody(text);+ Assert.True(import.IsSuccess);++ var torusFace = Assert.Single(import.Value.Topology.Faces, face =>+ {+ Assert.True(import.Value.Bindings.TryGetFaceBinding(face.Id, out var binding));+ Assert.True(import.Value.Geometry.TryGetSurface(binding.SurfaceGeometryId, out var surface));+ return surface!.Kind == SurfaceGeometryKind.Torus;+ });++ var loopIds = import.Value.GetLoopIds(torusFace.Id);+ var loopId = Assert.Single(loopIds);+ var coedges = import.Value.GetCoedgeIds(loopId)+ .Select(id => import.Value.Topology.GetCoedge(id))+ .ToArray();++ Assert.Equal(4, coedges.Length);+ Assert.All(coedges, coedge => Assert.Equal(CurveGeometryKind.Circle3, import.Value.GetEdgeCurve(coedge.EdgeId).Kind));++ var seamUseCount = coedges.Count(coedge =>+ {+ var edge = import.Value.Topology.GetEdge(coedge.EdgeId);+ return edge.StartVertexId == edge.EndVertexId;+ });+ Assert.Equal(4, seamUseCount);+ Assert.Equal(2, coedges.Select(c => c.EdgeId).Distinct().Count());++ var tessellationA = BrepDisplayTessellator.Tessellate(import.Value);+ Assert.True(tessellationA.IsSuccess);+ Assert.DoesNotContain(tessellationA.Diagnostics,+ d => d.Message.Contains("two line seam uses and two circular trim uses", StringComparison.OrdinalIgnoreCase));++ var tessellationB = BrepDisplayTessellator.Tessellate(import.Value);+ Assert.True(tessellationB.IsSuccess);++ var patchA = Assert.Single(tessellationA.Value.FacePatches, p => p.FaceId == torusFace.Id);+ var patchB = Assert.Single(tessellationB.Value.FacePatches, p => p.FaceId == torusFace.Id);++ Assert.Equal(patchA.Positions.Count, patchB.Positions.Count);+ Assert.Equal(patchA.Normals.Count, patchB.Normals.Count);+ Assert.Equal(patchA.TriangleIndices.Count, patchB.TriangleIndices.Count);+ Assert.True(patchA.Positions.SequenceEqual(patchB.Positions));+ Assert.True(patchA.Normals.SequenceEqual(patchB.Normals));+ Assert.True(patchA.TriangleIndices.SequenceEqual(patchB.TriangleIndices));+ }+[Fact]public void Step242_NistFile_WithToroidalSurface_AdvancesPastToroidalBlocker(){diff --git a/Aetheris.Kernel.Core/Brep/Tessellation/BrepDisplayTessellator.cs b/Aetheris.Kernel.Core/Brep/Tessellation/BrepDisplayTessellator.csindex a86aa69f..73b7378a 100644--- a/Aetheris.Kernel.Core/Brep/Tessellation/BrepDisplayTessellator.cs+++ b/Aetheris.Kernel.Core/Brep/Tessellation/BrepDisplayTessellator.cs@@ -359,27 +359,73 @@ public static class BrepDisplayTessellatorif (coedges.Length != 4){- return KernelResult<(double, double, int, int)>.Failure([CreateNotImplemented($"Face {faceId.Value} curved tessellation supports the M11 seam loop layout with four coedges.")]);+ return KernelResult<(double, double, int, int)>.Failure([CreateNotImplemented($"Face {faceId.Value} curved tessellation supports four-coedge torus/revolved loop layouts. Observed: {DescribeRevolvedLoopTopology(body, coedges)}")]);}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();+ if (lineCoedges.Length == 2 && circleCoedges.Length == 2)+ {+ if (!body.Bindings.TryGetEdgeBinding(lineCoedges[0].EdgeId, out var seamBinding))+ {+ return KernelResult<(double, double, int, int)>.Failure([CreateNotImplemented($"Face {faceId.Value} seam edge is missing curve trim binding.")]);+ }++ var seamInterval = seamBinding.TrimInterval ?? new ParameterInterval(0d, 1d);+ var angularSegments = CalculateSegmentCount(2d * double.Pi, System.Math.Max(1e-6d, radiusHint), options);+ var axialSegments = System.Math.Max(1, System.Math.Clamp((int)double.Ceiling((seamInterval.End - seamInterval.Start) / options.ChordTolerance), 1, options.MaximumSegments));++ return KernelResult<(double, double, int, int)>.Success((seamInterval.Start, seamInterval.End, angularSegments, axialSegments));+ }- if (lineCoedges.Length != 2 || circleCoedges.Length != 2)+ var uniqueEdgeIds = coedges+ .Select(c => c.EdgeId)+ .Distinct()+ .ToArray();+ var allEdgeCurvesAreCircles = uniqueEdgeIds+ .Select(id => body.GetEdgeCurve(id).Kind)+ .All(kind => kind == CurveGeometryKind.Circle3);++ if (lineCoedges.Length == 0 && circleCoedges.Length == 4 && uniqueEdgeIds.Length == 2 && allEdgeCurvesAreCircles){- return KernelResult<(double, double, int, int)>.Failure([CreateNotImplemented($"Face {faceId.Value} curved tessellation requires two line seam uses and two circular trim uses.")]);+ var angularSegments = CalculateSegmentCount(2d * double.Pi, System.Math.Max(1e-6d, radiusHint), options);+ var axialSegments = CalculateSegmentCount(2d * double.Pi, System.Math.Max(1e-6d, radiusHint), options);+ return KernelResult<(double, double, int, int)>.Success((0d, 2d * double.Pi, angularSegments, axialSegments));}- if (!body.Bindings.TryGetEdgeBinding(lineCoedges[0].EdgeId, out var seamBinding))+ return KernelResult<(double, double, int, int)>.Failure([CreateNotImplemented($"Face {faceId.Value} curved tessellation does not support this torus/revolved boundary topology yet. Observed: {DescribeRevolvedLoopTopology(body, coedges)}")]);+ }++ private static string DescribeRevolvedLoopTopology(BrepBody body, IReadOnlyList<Coedge> coedges)+ {+ var lineUseCount = 0;+ var circleUseCount = 0;+ var seamUseCount = 0;++ foreach (var coedge in coedges){- return KernelResult<(double, double, int, int)>.Failure([CreateNotImplemented($"Face {faceId.Value} seam edge is missing curve trim binding.")]);+ var curve = body.GetEdgeCurve(coedge.EdgeId);+ if (curve.Kind == CurveGeometryKind.Line3)+ {+ lineUseCount++;+ }+ else if (curve.Kind == CurveGeometryKind.Circle3)+ {+ circleUseCount++;+ }++ var edge = body.Topology.GetEdge(coedge.EdgeId);+ if (edge.StartVertexId == edge.EndVertexId)+ {+ seamUseCount++;+ }}- var seamInterval = seamBinding.TrimInterval ?? new ParameterInterval(0d, 1d);- var angularSegments = CalculateSegmentCount(2d * double.Pi, System.Math.Max(1e-6d, radiusHint), options);- var axialSegments = System.Math.Max(1, System.Math.Clamp((int)double.Ceiling((seamInterval.End - seamInterval.Start) / options.ChordTolerance), 1, options.MaximumSegments));+ var edgeFamilies = coedges+ .Select(c => $"{c.EdgeId.Value}:{body.GetEdgeCurve(c.EdgeId).Kind}")+ .ToArray();- return KernelResult<(double, double, int, int)>.Success((seamInterval.Start, seamInterval.End, angularSegments, axialSegments));+ return $"loops=1 coedges={coedges.Count} lineUses={lineUseCount} circleUses={circleUseCount} seamEdgeUses={seamUseCount} edgeFamilies=[{string.Join(", ", edgeFamilies)}]";}private static DisplayFaceMeshPatch CreatePeriodicGridPatch(