Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel
Fix BrepBody Point3D namespace for .NET build
Yuechen Li11b3cea2bd26
diff --git a/Aetheris.Kernel.Core/Brep/BrepBody.cs b/Aetheris.Kernel.Core/Brep/BrepBody.csindex 67a6d21f..47776459 100644--- a/Aetheris.Kernel.Core/Brep/BrepBody.cs+++ b/Aetheris.Kernel.Core/Brep/BrepBody.cs@@ -1,4 +1,5 @@using Aetheris.Kernel.Core.Geometry;+using Aetheris.Kernel.Core.Math;using Aetheris.Kernel.Core.Topology;namespace Aetheris.Kernel.Core.Brep;@@ -8,11 +9,23 @@ namespace Aetheris.Kernel.Core.Brep;/// </summary>public sealed class BrepBody{+ private readonly IReadOnlyDictionary<VertexId, Point3D> _vertexPoints;+public BrepBody(TopologyModel topology, BrepGeometryStore geometry, BrepBindingModel bindings)+ : this(topology, geometry, bindings, vertexPoints: null)+ {+ }++ public BrepBody(+ TopologyModel topology,+ BrepGeometryStore geometry,+ BrepBindingModel bindings,+ IReadOnlyDictionary<VertexId, Point3D>? vertexPoints){Topology = topology;Geometry = geometry;Bindings = bindings;+ _vertexPoints = vertexPoints ?? new Dictionary<VertexId, Point3D>();}public TopologyModel Topology { get; }@@ -21,6 +34,8 @@ public sealed class BrepBodypublic BrepBindingModel Bindings { get; }+ public bool TryGetVertexPoint(VertexId vertexId, out Point3D point) => _vertexPoints.TryGetValue(vertexId, out point);+public bool TryGetEdgeCurveGeometry(EdgeId edgeId, out CurveGeometry? curve){curve = null;diff --git a/Aetheris.Kernel.Core/Brep/Tessellation/BrepDisplayTessellator.cs b/Aetheris.Kernel.Core/Brep/Tessellation/BrepDisplayTessellator.csindex 234032f1..935d5734 100644--- a/Aetheris.Kernel.Core/Brep/Tessellation/BrepDisplayTessellator.cs+++ b/Aetheris.Kernel.Core/Brep/Tessellation/BrepDisplayTessellator.cs@@ -2935,6 +2935,11 @@ public static class BrepDisplayTessellatorprivate static KernelResult<Point3D> GetVertexPoint(BrepBody body, VertexId vertexId){+ if (body.TryGetVertexPoint(vertexId, out var point))+ {+ return KernelResult<Point3D>.Success(point);+ }+foreach (var edge in body.Topology.Edges.OrderBy(e => e.Id.Value)){if (edge.StartVertexId != vertexId)@@ -2942,7 +2947,7 @@ public static class BrepDisplayTessellatorcontinue;}- var edgePoint = EvaluateEdgeEndpoint(body, edge.Id, useStart: true);+ var edgePoint = EvaluateEdgeEndpointFromTopologyTrim(body, edge.Id, useStart: true);if (edgePoint.IsSuccess){return KernelResult<Point3D>.Success(edgePoint.Value);@@ -2956,7 +2961,7 @@ public static class BrepDisplayTessellatorcontinue;}- var edgePoint = EvaluateEdgeEndpoint(body, edge.Id, useStart: false);+ var edgePoint = EvaluateEdgeEndpointFromTopologyTrim(body, edge.Id, useStart: false);if (edgePoint.IsSuccess){return KernelResult<Point3D>.Success(edgePoint.Value);@@ -2966,6 +2971,30 @@ public static class BrepDisplayTessellatorreturn KernelResult<Point3D>.Failure([CreateNotImplemented($"Vertex {vertexId.Value} cannot be resolved to a geometric point for tessellation.")]);}+ private static KernelResult<Point3D> EvaluateEdgeEndpointFromTopologyTrim(BrepBody body, EdgeId edgeId, bool useStart)+ {+ if (!body.TryGetEdgeCurveGeometry(edgeId, out var curve) || curve is null)+ {+ return KernelResult<Point3D>.Failure([CreateNotImplemented($"Edge {edgeId.Value} is missing bound curve geometry.")]);+ }++ if (!body.Bindings.TryGetEdgeBinding(edgeId, out var binding))+ {+ return KernelResult<Point3D>.Failure([CreateNotImplemented($"Edge {edgeId.Value} is missing curve binding.")]);+ }++ var interval = binding.TrimInterval ?? new ParameterInterval(0d, 1d);+ var parameter = useStart ? interval.Start : interval.End;+ return curve.Kind switch+ {+ CurveGeometryKind.Line3 => KernelResult<Point3D>.Success(curve.Line3!.Value.Evaluate(parameter)),+ CurveGeometryKind.Circle3 => KernelResult<Point3D>.Success(curve.Circle3!.Value.Evaluate(parameter)),+ CurveGeometryKind.BSpline3 => KernelResult<Point3D>.Success(curve.BSpline3!.Value.Evaluate(parameter)),+ CurveGeometryKind.Ellipse3 => KernelResult<Point3D>.Success(curve.Ellipse3!.Value.Evaluate(parameter)),+ _ => KernelResult<Point3D>.Failure([CreateNotImplemented($"Edge {edgeId.Value} endpoint evaluation does not support curve kind '{curve.UnsupportedKind ?? curve.Kind.ToString()}'.", PlanarCurveFlatteningUnsupportedSource)]),+ };+ }+private static KernelResult<Point3D> EvaluateEdgeEndpoint(BrepBody body, EdgeId edgeId, bool useStart){if (!body.TryGetEdgeCurveGeometry(edgeId, out var curve) || curve is null)diff --git a/Aetheris.Kernel.Core/Step242/Step242Importer.cs b/Aetheris.Kernel.Core/Step242/Step242Importer.csindex 467633fb..6988f797 100644--- a/Aetheris.Kernel.Core/Step242/Step242Importer.cs+++ b/Aetheris.Kernel.Core/Step242/Step242Importer.cs@@ -425,7 +425,7 @@ public static class Step242Importervar shellId = builder.AddShell(faceIds);builder.AddBody([shellId]);- var body = new BrepBody(builder.Model, geometry, bindings);+ var body = new BrepBody(builder.Model, geometry, bindings, vertexMap.Values.ToDictionary(entry => entry.VertexId, entry => entry.Point));var validation = BrepBindingValidator.Validate(body, requireAllEdgeAndFaceBindings: true);if (!validation.IsSuccess){