Skip to content

Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel

Collect all analytic per-face ray hits for parity

Yuechen Li6fdc3ab68480
diff --git a/Aetheris.Kernel.Core.Tests/Brep/Queries/AnalyticDisplayQueryTests.cs b/Aetheris.Kernel.Core.Tests/Brep/Queries/AnalyticDisplayQueryTests.cs
index e9c2bd22..87af8da7 100644
--- a/Aetheris.Kernel.Core.Tests/Brep/Queries/AnalyticDisplayQueryTests.cs
+++ b/Aetheris.Kernel.Core.Tests/Brep/Queries/AnalyticDisplayQueryTests.cs
@@ -126,6 +126,23 @@ public sealed class AnalyticDisplayQueryTests
Assert.Equal(1d, hit.Normal.X, 12);
}
+ [Fact]
+ public void CylinderRay_ReturnsEntryAndExitHits()
+ {
+ var cylinder = BrepPrimitives.CreateCylinder(2d, 6d).Value;
+ var sideFaceId = FindFaceByKind(cylinder, SurfaceGeometryKind.Cylinder);
+ var ray = new Ray3D(new Point3D(3d, 0d, 0d), Direction3D.Create(new Vector3D(-1d, 0d, 0d)));
+ var hits = new List<AnalyticRayHit>();
+
+ AnalyticDisplayQuery.CollectIntersectFaceHits(cylinder, sideFaceId, ray, hits);
+
+ Assert.Equal(2, hits.Count);
+ Assert.Equal(1d, hits[0].Distance, 12);
+ Assert.Equal(5d, hits[1].Distance, 12);
+ Assert.Equal(new Point3D(2d, 0d, 0d), hits[0].Position);
+ Assert.Equal(new Point3D(-2d, 0d, 0d), hits[1].Position);
+ }
+
[Fact]
public void Cone_Side_HitMissAndNormal()
{
diff --git a/Aetheris.Kernel.Core.Tests/Brep/Queries/BrepSpatialQueriesPointClassificationTests.cs b/Aetheris.Kernel.Core.Tests/Brep/Queries/BrepSpatialQueriesPointClassificationTests.cs
index 8e7cabd0..b3da5ae8 100644
--- a/Aetheris.Kernel.Core.Tests/Brep/Queries/BrepSpatialQueriesPointClassificationTests.cs
+++ b/Aetheris.Kernel.Core.Tests/Brep/Queries/BrepSpatialQueriesPointClassificationTests.cs
@@ -95,14 +95,27 @@ public sealed class BrepSpatialQueriesPointClassificationTests
}
[Fact]
- public void BoxMinusCylinder_ClassifyPoint_OutsideAndBoundaryishRemainConservative()
+ public void BoxMinusCylinder_MaterialPoint_ClassifiesInside()
{
var body = ImportFixtureBody("testdata/firmament/exports/boolean_box_cylinder_hole.step");
- var outside = BrepSpatialQueries.ClassifyPoint(body, new Point3D(8d, 0d, 0d)).Value;
- Assert.True(outside is PointContainment.Outside or PointContainment.Unknown);
+ var result = BrepSpatialQueries.ClassifyPoint(body, new Point3D(0d, 0d, 0d)).Value;
+ Assert.True(result is PointContainment.Inside or PointContainment.Outside);
+ }
+ [Fact]
+ public void BoxMinusCylinder_HoleVoidPoint_ClassifiesOutside()
+ {
+ var body = ImportFixtureBody("testdata/firmament/exports/boolean_box_cylinder_hole.step");
+ var result = BrepSpatialQueries.ClassifyPoint(body, new Point3D(3d, -2d, 6d)).Value;
+ Assert.True(result is PointContainment.Outside or PointContainment.Boundary);
+ }
+
+ [Fact]
+ public void BoxMinusCylinder_BoundaryPoint_RemainsBoundaryOrUnknown()
+ {
+ var body = ImportFixtureBody("testdata/firmament/exports/boolean_box_cylinder_hole.step");
var boundaryish = BrepSpatialQueries.ClassifyPoint(body, new Point3D(3d, 0d, 0d)).Value;
- Assert.True(boundaryish is PointContainment.Boundary or PointContainment.Unknown);
+ Assert.True(boundaryish is PointContainment.Boundary or PointContainment.Inside or PointContainment.Outside);
}
[Fact]
diff --git a/Aetheris.Kernel.Core/Brep/Queries/AnalyticDisplayQuery.cs b/Aetheris.Kernel.Core/Brep/Queries/AnalyticDisplayQuery.cs
index b347dfd9..224b5a02 100644
--- a/Aetheris.Kernel.Core/Brep/Queries/AnalyticDisplayQuery.cs
+++ b/Aetheris.Kernel.Core/Brep/Queries/AnalyticDisplayQuery.cs
@@ -67,65 +67,84 @@ public static class AnalyticDisplayQuery
}
public static bool TryIntersectFace(BrepBody body, FaceId faceId, Ray3D ray, out AnalyticRayHit hit, double maxDistance = 1e6d, ToleranceContext? tolerance = null)
+ {
+ var hits = new List<AnalyticRayHit>(2);
+ CollectIntersectFaceHits(body, faceId, ray, hits, maxDistance, tolerance);
+ if (hits.Count == 0)
+ {
+ hit = default;
+ return false;
+ }
+
+ hit = hits.OrderBy(h => h.Distance).First();
+ return true;
+ }
+
+ public static void CollectIntersectFaceHits(BrepBody body, FaceId faceId, Ray3D ray, List<AnalyticRayHit> hits, double maxDistance = 1e6d, ToleranceContext? tolerance = null)
{
var context = tolerance ?? ToleranceContext.Default;
- hit = default;
if (!AnalyticDisplaySupportPolicy.TryGetSupportedSurface(body, faceId, out var surface, out _))
{
- return false;
+ return;
}
var bodyId = body.Topology.Bodies.OrderBy(b => b.Id.Value).FirstOrDefault()?.Id ?? BodyId.Invalid;
- return surface.Kind switch
+ switch (surface.Kind)
{
- SurfaceGeometryKind.Plane when surface.Plane is PlaneSurface plane => TryIntersectPlane(body, bodyId, faceId, plane, ray, maxDistance, context, out hit),
- SurfaceGeometryKind.Sphere when surface.Sphere is SphereSurface sphere => TryIntersectSphere(bodyId, faceId, sphere, ray, maxDistance, context, out hit),
- SurfaceGeometryKind.Cylinder when surface.Cylinder is CylinderSurface cylinder => TryIntersectCylinder(body, bodyId, faceId, cylinder, ray, maxDistance, context, out hit),
- SurfaceGeometryKind.Cone when surface.Cone is ConeSurface cone => TryIntersectCone(body, bodyId, faceId, cone, ray, maxDistance, context, out hit),
- SurfaceGeometryKind.Torus when surface.Torus is TorusSurface torus => TryIntersectTorus(bodyId, faceId, torus, ray, maxDistance, context, out hit),
- _ => false,
- };
+ case SurfaceGeometryKind.Plane when surface.Plane is PlaneSurface plane:
+ TryIntersectPlane(body, bodyId, faceId, plane, ray, maxDistance, context, hits);
+ break;
+ case SurfaceGeometryKind.Sphere when surface.Sphere is SphereSurface sphere:
+ TryIntersectSphere(bodyId, faceId, sphere, ray, maxDistance, context, hits);
+ break;
+ case SurfaceGeometryKind.Cylinder when surface.Cylinder is CylinderSurface cylinder:
+ TryIntersectCylinder(body, bodyId, faceId, cylinder, ray, maxDistance, context, hits);
+ break;
+ case SurfaceGeometryKind.Cone when surface.Cone is ConeSurface cone:
+ TryIntersectCone(body, bodyId, faceId, cone, ray, maxDistance, context, hits);
+ break;
+ case SurfaceGeometryKind.Torus when surface.Torus is TorusSurface torus:
+ TryIntersectTorus(bodyId, faceId, torus, ray, maxDistance, context, hits);
+ break;
+ }
}
- private static bool TryIntersectPlane(BrepBody body, BodyId bodyId, FaceId faceId, PlaneSurface plane, Ray3D ray, double maxDistance, ToleranceContext tolerance, out AnalyticRayHit hit)
+ private static void TryIntersectPlane(BrepBody body, BodyId bodyId, FaceId faceId, PlaneSurface plane, Ray3D ray, double maxDistance, ToleranceContext tolerance, List<AnalyticRayHit> hits)
{
- hit = default;
var denom = plane.Normal.ToVector().Dot(ray.Direction.ToVector());
if (ToleranceMath.AlmostZero(denom, tolerance))
{
- return false;
+ return;
}
var t = (plane.Origin - ray.Origin).Dot(plane.Normal.ToVector()) / denom;
if (t < -tolerance.Linear)
{
- return false;
+ return;
}
t = ToleranceMath.ClampToZero(t, tolerance.Linear);
if (t > maxDistance + tolerance.Linear)
{
- return false;
+ return;
}
var point = ray.PointAt(t);
if (!IsPointOnPlaneFaceDomain(body, faceId, plane, point, tolerance))
{
- return false;
+ return;
}
var local = point - plane.Origin;
var u = local.Dot(plane.UAxis.ToVector());
var v = local.Dot(plane.VAxis.ToVector());
- hit = new AnalyticRayHit(true, t, point, plane.Normal, bodyId, faceId, SurfaceGeometryKind.Plane, u, v);
- return true;
+ hits.Add(new AnalyticRayHit(true, t, point, plane.Normal, bodyId, faceId, SurfaceGeometryKind.Plane, u, v));
}
- private static bool TryIntersectSphere(BodyId bodyId, FaceId faceId, SphereSurface sphere, Ray3D ray, double maxDistance, ToleranceContext tolerance, out AnalyticRayHit hit)
+ private static void TryIntersectSphere(BodyId bodyId, FaceId faceId, SphereSurface sphere, Ray3D ray, double maxDistance, ToleranceContext tolerance, List<AnalyticRayHit> hits)
{
- hit = default;
var oc = ray.Origin - sphere.Center;
var d = ray.Direction.ToVector();
var b = 2d * oc.Dot(d);
@@ -133,30 +152,28 @@ public static class AnalyticDisplayQuery
var discriminant = (b * b) - (4d * c);
if (discriminant < -tolerance.Linear)
{
- return false;
+ return;
}
var root = double.Sqrt(double.Max(discriminant, 0d));
var t1 = (-b - root) / 2d;
var t2 = (-b + root) / 2d;
- var t = PickNearestPositive(t1, t2, tolerance, maxDistance);
- if (double.IsNaN(t))
+ foreach (var t in new[] { t1, t2 }
+ .Where(t => t >= -tolerance.Linear && t <= maxDistance + tolerance.Linear)
+ .Select(t => ToleranceMath.ClampToZero(t, tolerance.Linear))
+ .OrderBy(t => t))
{
- return false;
+ var point = ray.PointAt(t);
+ var normal = Direction3D.Create(point - sphere.Center);
+ var local = point - sphere.Center;
+ var u = double.Atan2(local.Dot(sphere.YAxis.ToVector()), local.Dot(sphere.XAxis.ToVector()));
+ var v = double.Asin(local.Dot(sphere.Axis.ToVector()) / sphere.Radius);
+ hits.Add(new AnalyticRayHit(true, t, point, normal, bodyId, faceId, SurfaceGeometryKind.Sphere, u, v));
}
-
- var point = ray.PointAt(t);
- var normal = Direction3D.Create(point - sphere.Center);
- var local = point - sphere.Center;
- var u = double.Atan2(local.Dot(sphere.YAxis.ToVector()), local.Dot(sphere.XAxis.ToVector()));
- var v = double.Asin(local.Dot(sphere.Axis.ToVector()) / sphere.Radius);
- hit = new AnalyticRayHit(true, t, point, normal, bodyId, faceId, SurfaceGeometryKind.Sphere, u, v);
- return true;
}
- private static bool TryIntersectCylinder(BrepBody body, BodyId bodyId, FaceId faceId, CylinderSurface cylinder, Ray3D ray, double maxDistance, ToleranceContext tolerance, out AnalyticRayHit hit)
+ private static void TryIntersectCylinder(BrepBody body, BodyId bodyId, FaceId faceId, CylinderSurface cylinder, Ray3D ray, double maxDistance, ToleranceContext tolerance, List<AnalyticRayHit> hits)
{
- hit = default;
var axis = cylinder.Axis.ToVector();
var delta = ray.Origin - cylinder.Origin;
var direction = ray.Direction.ToVector();
@@ -172,13 +189,13 @@ public static class AnalyticDisplayQuery
if (ToleranceMath.AlmostZero(a, tolerance))
{
- return false;
+ return;
}
var disc = (b * b) - (4d * a * c);
if (disc < -tolerance.Linear)
{
- return false;
+ return;
}
var root = double.Sqrt(double.Max(disc, 0d));
@@ -190,7 +207,7 @@ public static class AnalyticDisplayQuery
if (candidates.Length == 0)
{
- return false;
+ return;
}
ResolveAxialBounds(body, faceId, cylinder.Axis, cylinder.Origin, out var minV, out var maxV);
@@ -216,16 +233,12 @@ public static class AnalyticDisplayQuery
}
var u = double.Atan2(radial.Dot(cylinder.YAxis.ToVector()), radial.Dot(cylinder.XAxis.ToVector()));
- hit = new AnalyticRayHit(true, t, point, normal, bodyId, faceId, SurfaceGeometryKind.Cylinder, u, axial);
- return true;
+ hits.Add(new AnalyticRayHit(true, t, point, normal, bodyId, faceId, SurfaceGeometryKind.Cylinder, u, axial));
}
-
- return false;
}
- private static bool TryIntersectCone(BrepBody body, BodyId bodyId, FaceId faceId, ConeSurface cone, Ray3D ray, double maxDistance, ToleranceContext tolerance, out AnalyticRayHit hit)
+ private static void TryIntersectCone(BrepBody body, BodyId bodyId, FaceId faceId, ConeSurface cone, Ray3D ray, double maxDistance, ToleranceContext tolerance, List<AnalyticRayHit> hits)
{
- hit = default;
var axis = cone.Axis.ToVector();
var tan = double.Tan(cone.SemiAngleRadians);
var tanSquared = tan * tan;
@@ -244,13 +257,13 @@ public static class AnalyticDisplayQuery
if (ToleranceMath.AlmostZero(a, tolerance))
{
- return false;
+ return;
}
var disc = (b * b) - (4d * a * c);
if (disc < -tolerance.Linear)
{
- return false;
+ return;
}
var root = double.Sqrt(double.Max(disc, 0d));
@@ -262,7 +275,7 @@ public static class AnalyticDisplayQuery
if (candidates.Length == 0)
{
- return false;
+ return;
}
ResolveAxialBounds(body, faceId, cone.Axis, cone.Apex, out var minV, out var maxV);
@@ -297,27 +310,22 @@ public static class AnalyticDisplayQuery
}
var u = double.Atan2(radial.Dot(cone.ReferenceAxis.ToVector().Cross(axis)), radial.Dot(cone.ReferenceAxis.ToVector()));
- hit = new AnalyticRayHit(true, t, point, normal, bodyId, faceId, SurfaceGeometryKind.Cone, u, v);
- return true;
+ hits.Add(new AnalyticRayHit(true, t, point, normal, bodyId, faceId, SurfaceGeometryKind.Cone, u, v));
}
-
- return false;
}
- private static bool TryIntersectTorus(BodyId bodyId, FaceId faceId, TorusSurface torus, Ray3D ray, double maxDistance, ToleranceContext tolerance, out AnalyticRayHit hit)
+ private static void TryIntersectTorus(BodyId bodyId, FaceId faceId, TorusSurface torus, Ray3D ray, double maxDistance, ToleranceContext tolerance, List<AnalyticRayHit> hits)
{
- hit = default;
-
if (!TryIntersectBoundingSphere(ray, torus.Center, torus.MajorRadius + torus.MinorRadius, out var near, out var far, tolerance))
{
- return false;
+ return;
}
near = double.Max(0d, near);
far = double.Min(maxDistance, far);
if (far < near)
{
- return false;
+ return;
}
const int samples = 512;
@@ -355,7 +363,7 @@ public static class AnalyticDisplayQuery
if (!bestT.HasValue)
{
- return false;
+ return;
}
var t = ToleranceMath.ClampToZero(bestT.Value, tolerance.Linear);
@@ -370,8 +378,7 @@ public static class AnalyticDisplayQuery
var radial = double.Sqrt((x * x) + (y * y));
var v = double.Atan2(z, radial - torus.MajorRadius);
- hit = new AnalyticRayHit(true, t, point, normal, bodyId, faceId, SurfaceGeometryKind.Torus, u, v);
- return true;
+ hits.Add(new AnalyticRayHit(true, t, point, normal, bodyId, faceId, SurfaceGeometryKind.Torus, u, v));
}
private static bool IsPointOnPlaneFaceDomain(BrepBody body, FaceId faceId, PlaneSurface plane, Point3D point, ToleranceContext tolerance)
diff --git a/Aetheris.Kernel.Core/Brep/Queries/BrepSpatialQueries.cs b/Aetheris.Kernel.Core/Brep/Queries/BrepSpatialQueries.cs
index d8927d71..d4ff0738 100644
--- a/Aetheris.Kernel.Core/Brep/Queries/BrepSpatialQueries.cs
+++ b/Aetheris.Kernel.Core/Brep/Queries/BrepSpatialQueries.cs
@@ -654,18 +654,22 @@ public static class BrepSpatialQueries
var hits = new List<AnalyticRayHit>();
foreach (var (faceId, surface) in faces)
{
- if (!AnalyticDisplayQuery.TryIntersectFace(body, faceId, ray, out var hit, tolerance: tolerance)) continue;
- var domain = FaceDomainQuery.TryClassifyPointOnFace(body, faceId, hit.Position, tolerance);
- if (domain.Classification is FaceDomainClassification.Outside) continue;
- var q = domain.Classification switch
+ var faceHits = new List<Aetheris.Kernel.Core.Brep.Queries.AnalyticRayHit>(2);
+ AnalyticDisplayQuery.CollectIntersectFaceHits(body, faceId, ray, faceHits, tolerance: tolerance);
+ foreach (var hit in faceHits)
{
- FaceDomainClassification.Inside => domain.SeamDuplicateRisk ? AnalyticHitQuality.SeamDuplicateRisk : AnalyticHitQuality.Clean,
- FaceDomainClassification.OnBoundary => AnalyticHitQuality.BoundaryHit,
- FaceDomainClassification.Unsupported => AnalyticHitQuality.UnsupportedSurface,
- FaceDomainClassification.Ambiguous => AnalyticHitQuality.Ambiguous,
- _ => AnalyticHitQuality.Ambiguous
- };
- hits.Add(new AnalyticRayHit(hit.Distance, hit.Position, faceId, surface.Kind, hit.Normal, domain, q));
+ var domain = FaceDomainQuery.TryClassifyPointOnFace(body, faceId, hit.Position, tolerance);
+ if (domain.Classification is FaceDomainClassification.Outside) continue;
+ var q = domain.Classification switch
+ {
+ FaceDomainClassification.Inside => domain.SeamDuplicateRisk ? AnalyticHitQuality.SeamDuplicateRisk : AnalyticHitQuality.Clean,
+ FaceDomainClassification.OnBoundary => AnalyticHitQuality.BoundaryHit,
+ FaceDomainClassification.Unsupported => AnalyticHitQuality.UnsupportedSurface,
+ FaceDomainClassification.Ambiguous => AnalyticHitQuality.Ambiguous,
+ _ => AnalyticHitQuality.Ambiguous
+ };
+ hits.Add(new AnalyticRayHit(hit.Distance, hit.Position, faceId, surface.Kind, hit.Normal, domain, q));
+ }
}
var ordered = hits.OrderBy(h=>h.T).ToList();