Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel
Merge coplanar orthogonal union boundary rectangles
Yuechen Li177d820987e6
diff --git a/Aetheris.Kernel.Core.Tests/Brep/Boolean/BrepBooleanTests.cs b/Aetheris.Kernel.Core.Tests/Brep/Boolean/BrepBooleanTests.csindex 27f70734..bb347bce 100644--- a/Aetheris.Kernel.Core.Tests/Brep/Boolean/BrepBooleanTests.cs+++ b/Aetheris.Kernel.Core.Tests/Brep/Boolean/BrepBooleanTests.cs@@ -121,6 +121,44 @@ public sealed class BrepBooleanTestsAssert.False(BrepBooleanBoxRecognition.TryRecognizeAxisAlignedBox(result.Value, ToleranceContext.Default, out _, out _));var validation = BrepBindingValidator.Validate(result.Value, requireAllEdgeAndFaceBindings: true);Assert.True(validation.IsSuccess);++ Assert.Single(FindPlanarFaces(result.Value, normalY: -1d, originY: 0d));+ Assert.Single(FindPlanarFaces(result.Value, normalY: 1d, originY: 4d));+ }++ [Fact]+ public void OrthogonalUnionBuilder_Merges_CoplanarExteriorRects_AndKeepsInteriorSuppressed()+ {+ var cells = new[]+ {+ new AxisAlignedBoxExtents(0d, 2d, 0d, 2d, 0d, 1d),+ new AxisAlignedBoxExtents(2d, 4d, 0d, 2d, 0d, 1d),+ };++ var body = BrepBooleanOrthogonalUnionBuilder.BuildFromCells(cells);+ Assert.True(body.IsSuccess);+ Assert.Equal(6, body.Value.Topology.Faces.Count());+ Assert.Single(FindPlanarFaces(body.Value, normalZ: -1d, originZ: 0d));+ Assert.Single(FindPlanarFaces(body.Value, normalZ: 1d, originZ: 1d));+ Assert.Empty(FindPlanarFaces(body.Value, normalX: 1d, originX: 2d));+ Assert.Empty(FindPlanarFaces(body.Value, normalX: -1d, originX: 2d));+ }++ [Fact]+ public void OrthogonalUnionBuilder_LShapedPlaneRegion_IsRetiledDeterministicallyWithoutRedundantSplits()+ {+ var cells = new[]+ {+ new AxisAlignedBoxExtents(0d, 2d, 0d, 2d, 0d, 1d),+ new AxisAlignedBoxExtents(2d, 4d, 0d, 2d, 0d, 1d),+ new AxisAlignedBoxExtents(0d, 2d, 2d, 4d, 0d, 1d),+ };++ var body = BrepBooleanOrthogonalUnionBuilder.BuildFromCells(cells);+ Assert.True(body.IsSuccess);+ Assert.Equal(10, body.Value.Topology.Faces.Count());+ Assert.Equal(2, FindPlanarFaces(body.Value, normalZ: -1d, originZ: 0d).Count);+ Assert.Equal(2, FindPlanarFaces(body.Value, normalZ: 1d, originZ: 1d).Count);}[Fact]@@ -1376,6 +1414,26 @@ public sealed class BrepBooleanTests}}+ private static List<Face> FindPlanarFaces(BrepBody body, double? normalX = null, double? normalY = null, double? normalZ = null, double? originX = null, double? originY = null, double? originZ = null)+ => body.Topology.Faces+ .Where(face =>+ {+ if (!body.TryGetFaceSurfaceGeometry(face.Id, out var surface) || surface.Kind != SurfaceGeometryKind.Plane)+ {+ return false;+ }++ var plane = surface.Plane!.Value;+ var normal = plane.Normal.ToVector();+ return (normalX is null || System.Math.Abs(normal.X - normalX.Value) <= 1e-6d)+ && (normalY is null || System.Math.Abs(normal.Y - normalY.Value) <= 1e-6d)+ && (normalZ is null || System.Math.Abs(normal.Z - normalZ.Value) <= 1e-6d)+ && (originX is null || System.Math.Abs(plane.Origin.X - originX.Value) <= 1e-6d)+ && (originY is null || System.Math.Abs(plane.Origin.Y - originY.Value) <= 1e-6d)+ && (originZ is null || System.Math.Abs(plane.Origin.Z - originZ.Value) <= 1e-6d);+ })+ .ToList();+private static BrepBody CreateCone(double bottomRadius, double topRadius, double height){var frame = new ExtrudeFrame3D(diff --git a/Aetheris.Kernel.Core/Brep/Boolean/BrepBooleanOrthogonalUnionBuilder.cs b/Aetheris.Kernel.Core/Brep/Boolean/BrepBooleanOrthogonalUnionBuilder.csindex 68f86ce4..861e609f 100644--- a/Aetheris.Kernel.Core/Brep/Boolean/BrepBooleanOrthogonalUnionBuilder.cs+++ b/Aetheris.Kernel.Core/Brep/Boolean/BrepBooleanOrthogonalUnionBuilder.cs@@ -26,6 +26,7 @@ public static class BrepBooleanOrthogonalUnionBuilder}var faceRects = CollectBoundaryFaceRectangles(cells);+ faceRects = MergeCoplanarFaceRectangles(faceRects);if (faceRects.Count == 0){return KernelResult<BrepBody>.Failure([@@ -188,6 +189,108 @@ public static class BrepBooleanOrthogonalUnionBuilderreturn faces;}+ private static List<FaceRect> MergeCoplanarFaceRectangles(IReadOnlyList<FaceRect> faces)+ {+ var merged = new List<FaceRect>();+ foreach (var group in faces.GroupBy(face => new PlaneKey(face.Axis, face.Fixed, face.IsPositiveNormal)))+ {+ merged.AddRange(MergePlaneGroup(group.Key, group.ToArray()));+ }++ return merged;+ }++ private static IEnumerable<FaceRect> MergePlaneGroup(PlaneKey plane, IReadOnlyList<FaceRect> faces)+ {+ var aCoordinates = faces.SelectMany(face => new[] { face.MinA, face.MaxA }).Distinct().OrderBy(v => v).ToArray();+ var bCoordinates = faces.SelectMany(face => new[] { face.MinB, face.MaxB }).Distinct().OrderBy(v => v).ToArray();+ if (aCoordinates.Length < 2 || bCoordinates.Length < 2)+ {+ yield break;+ }++ var aIndex = new Dictionary<double, int>(aCoordinates.Length);+ for (var i = 0; i < aCoordinates.Length; i++)+ {+ aIndex[aCoordinates[i]] = i;+ }++ var bIndex = new Dictionary<double, int>(bCoordinates.Length);+ for (var i = 0; i < bCoordinates.Length; i++)+ {+ bIndex[bCoordinates[i]] = i;+ }++ var occupancy = new bool[aCoordinates.Length - 1, bCoordinates.Length - 1];+ foreach (var rect in faces)+ {+ var minA = aIndex[rect.MinA];+ var maxA = aIndex[rect.MaxA];+ var minB = bIndex[rect.MinB];+ var maxB = bIndex[rect.MaxB];+ for (var a = minA; a < maxA; a++)+ {+ for (var b = minB; b < maxB; b++)+ {+ occupancy[a, b] = true;+ }+ }+ }++ for (var b = 0; b < bCoordinates.Length - 1; b++)+ {+ for (var a = 0; a < aCoordinates.Length - 1; a++)+ {+ if (!occupancy[a, b])+ {+ continue;+ }++ var maxA = a + 1;+ while (maxA < aCoordinates.Length - 1 && occupancy[maxA, b])+ {+ maxA++;+ }++ var maxB = b + 1;+ var canGrow = true;+ while (canGrow && maxB < bCoordinates.Length - 1)+ {+ for (var fillA = a; fillA < maxA; fillA++)+ {+ if (!occupancy[fillA, maxB])+ {+ canGrow = false;+ break;+ }+ }++ if (canGrow)+ {+ maxB++;+ }+ }++ for (var fillA = a; fillA < maxA; fillA++)+ {+ for (var fillB = b; fillB < maxB; fillB++)+ {+ occupancy[fillA, fillB] = false;+ }+ }++ yield return new FaceRect(+ plane.Axis,+ plane.Fixed,+ aCoordinates[a],+ aCoordinates[maxA],+ bCoordinates[b],+ bCoordinates[maxB],+ plane.IsPositiveNormal);+ }+ }+ }+private static void TryAddFace(IReadOnlyList<AxisAlignedBoxExtents> cells, List<FaceRect> faces, CellKey cell, AxisKind axis, double fixedValue, bool isPositiveNormal){var coveredByNeighbor = cells.Any(other =>@@ -247,6 +350,8 @@ public static class BrepBooleanOrthogonalUnionBuilder=> new(extents.MinX, extents.MaxX, extents.MinY, extents.MaxY, extents.MinZ, extents.MaxZ);}+ private readonly record struct PlaneKey(AxisKind Axis, double Fixed, bool IsPositiveNormal);+private readonly record struct FaceRect(AxisKind Axis, double Fixed, double MinA, double MaxA, double MinB, double MaxB, bool IsPositiveNormal){public PointKey[] GetOrientedCorners()diff --git a/Aetheris.Kernel.Firmament.Tests/FirmamentBuildAndExportTests.cs b/Aetheris.Kernel.Firmament.Tests/FirmamentBuildAndExportTests.csindex 5d787add..6eb091d8 100644--- a/Aetheris.Kernel.Firmament.Tests/FirmamentBuildAndExportTests.cs+++ b/Aetheris.Kernel.Firmament.Tests/FirmamentBuildAndExportTests.cs@@ -403,7 +403,7 @@ public sealed class FirmamentBuildAndExportTestsAssert.Equal("add", build.Value.Export.ExportedFeatureKind);Assert.DoesNotContain("TRIANGULATED_FACE_SET", build.Value.Export.StepText, StringComparison.Ordinal);- Assert.True(CountOccurrences(build.Value.Export.StepText, "ADVANCED_FACE") > 6);+ Assert.Equal(10, CountOccurrences(build.Value.Export.StepText, "ADVANCED_FACE"));var sourceText = File.ReadAllText(fullSourcePath, Encoding.UTF8);Assert.Contains("ops[2]", sourceText, StringComparison.Ordinal);