Skip to content

Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel

Fix additive boolean frame seam for placed unions

Yuechen Licdf6fb863932
diff --git a/Aetheris.Kernel.Firmament.Tests/D3PlacementSemanticsTruthExtractionTests.cs b/Aetheris.Kernel.Firmament.Tests/D3PlacementSemanticsTruthExtractionTests.cs
index 5334ddd7..b8c4513f 100644
--- a/Aetheris.Kernel.Firmament.Tests/D3PlacementSemanticsTruthExtractionTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/D3PlacementSemanticsTruthExtractionTests.cs
@@ -84,7 +84,7 @@ ops[1]:
}
[Fact]
- public void ProbeC_TwoBox_Additive_Union_Uses_Legacy_Boolean_Frames_Then_Applies_Boolean_Placement_To_Result()
+ public void ProbeC_TwoBox_Additive_Union_Uses_PublishedWorld_Primitive_Frames()
{
const string source = """
firmament:
@@ -139,12 +139,6 @@ ops[2]:
Assert.Equal(new Point3D(0d, 0d, 0d), publishedBaseBounds.Min);
Assert.Equal(new Point3D(60d, 20d, 10d), publishedBaseBounds.Max);
- var legacyBase = BrepPrimitives.CreateBox(60d, 20d, 10d);
- Assert.True(legacyBase.IsSuccess);
- var legacyBaseBounds = GetBounds(legacyBase.Value);
- Assert.Equal(new Point3D(-30d, -10d, -5d), legacyBaseBounds.Min);
- Assert.Equal(new Point3D(30d, 10d, 5d), legacyBaseBounds.Max);
-
var toolBody = FirmamentBooleanToolBodyFactory.CreateBody(addBoolean.Tool);
Assert.True(toolBody.IsSuccess);
var toolBounds = GetBounds(toolBody.Value);
@@ -157,16 +151,16 @@ ops[2]:
Assert.True(translation.IsSuccess);
Assert.Equal(new Vector3D(5d, 10d, 0d), translation.Value);
- var prePlacementUnion = BrepBoolean.Union(legacyBase.Value, toolBody.Value);
- Assert.True(prePlacementUnion.IsSuccess);
- var prePlacementBounds = GetBounds(prePlacementUnion.Value);
- Assert.Equal(new Point3D(-30d, -10d, -30d), prePlacementBounds.Min);
- Assert.Equal(new Point3D(30d, 10d, 30d), prePlacementBounds.Max);
+ var publishedToolBounds = (
+ Min: new Point3D(toolBounds.Min.X + translation.Value.X, toolBounds.Min.Y + translation.Value.Y, toolBounds.Min.Z + 30d + translation.Value.Z),
+ Max: new Point3D(toolBounds.Max.X + translation.Value.X, toolBounds.Max.Y + translation.Value.Y, toolBounds.Max.Z + 30d + translation.Value.Z));
+ Assert.Equal(new Point3D(0d, 0d, 0d), publishedToolBounds.Min);
+ Assert.Equal(new Point3D(10d, 20d, 60d), publishedToolBounds.Max);
var publishedBoolean = compilation.Compilation.Value.PrimitiveExecutionResult.ExecutedBooleans.Single(b => b.FeatureId == "bracket").Body;
var publishedBooleanBounds = GetBounds(publishedBoolean);
- Assert.Equal(new Point3D(-25d, 0d, -30d), publishedBooleanBounds.Min);
- Assert.Equal(new Point3D(35d, 20d, 30d), publishedBooleanBounds.Max);
+ Assert.Equal(new Point3D(0d, 0d, 0d), publishedBooleanBounds.Min);
+ Assert.Equal(new Point3D(60d, 20d, 60d), publishedBooleanBounds.Max);
}
[Fact]
diff --git a/Aetheris.Kernel.Firmament.Tests/FirmamentBuildAndExportTests.cs b/Aetheris.Kernel.Firmament.Tests/FirmamentBuildAndExportTests.cs
index e216813a..4b9edc07 100644
--- a/Aetheris.Kernel.Firmament.Tests/FirmamentBuildAndExportTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/FirmamentBuildAndExportTests.cs
@@ -446,6 +446,12 @@ public sealed class FirmamentBuildAndExportTests
Assert.Equal(60d, maxX - minX, 6);
Assert.Equal(20d, maxY - minY, 6);
Assert.Equal(60d, maxZ - minZ, 6);
+ Assert.Equal(0d, minX, 6);
+ Assert.Equal(60d, maxX, 6);
+ Assert.Equal(0d, minY, 6);
+ Assert.Equal(20d, maxY, 6);
+ Assert.Equal(0d, minZ, 6);
+ Assert.Equal(60d, maxZ, 6);
Assert.DoesNotContain("B_SPLINE", build.Value.Export.StepText, StringComparison.Ordinal);
Assert.DoesNotContain("TOROIDAL_SURFACE", build.Value.Export.StepText, StringComparison.Ordinal);
diff --git a/Aetheris.Kernel.Firmament/Execution/FirmamentPrimitiveExecutor.cs b/Aetheris.Kernel.Firmament/Execution/FirmamentPrimitiveExecutor.cs
index 932d90f3..e787bb69 100644
--- a/Aetheris.Kernel.Firmament/Execution/FirmamentPrimitiveExecutor.cs
+++ b/Aetheris.Kernel.Firmament/Execution/FirmamentPrimitiveExecutor.cs
@@ -124,10 +124,39 @@ internal static class FirmamentPrimitiveExecutor
return KernelResult<FirmamentPrimitiveExecutionResult>.Failure(toolResult.Diagnostics);
}
- var useSemanticToolPlacement = ShouldUseSemanticToolPlacement(boolean, baseBody, toolResult.Value);
+ var canUsePublishedFrameAdditiveExecution = boolean.Kind == FirmamentLoweredBooleanKind.Add
+ && boolean.Placement is not null;
+ var usedPublishedFrameAdditiveExecution = false;
+ var useSemanticToolPlacement = !canUsePublishedFrameAdditiveExecution
+ && ShouldUseSemanticToolPlacement(boolean, baseBody, toolResult.Value);
KernelResult<BrepBody> booleanResult;
- if (useSemanticToolPlacement)
+ if (canUsePublishedFrameAdditiveExecution)
+ {
+ if (!publishedBodiesByFeatureId.TryGetValue(boolean.PrimaryReferenceFeatureId, out var publishedBaseBody))
+ {
+ continue;
+ }
+
+ var placementResult = FirmamentPlacementResolver.ResolvePlacementTranslation(boolean, publishedBodiesByFeatureId);
+ if (!placementResult.IsSuccess)
+ {
+ return KernelResult<FirmamentPrimitiveExecutionResult>.Failure(placementResult.Diagnostics);
+ }
+
+ var translatedToolBody = TranslateBody(ApplyDefaultToolLocalFrame(boolean.Tool, toolResult.Value), placementResult.Value);
+ booleanResult = ExecuteBoolean(boolean.Kind, publishedBaseBody, translatedToolBody);
+
+ if (booleanResult.IsSuccess)
+ {
+ usedPublishedFrameAdditiveExecution = true;
+ }
+ else
+ {
+ booleanResult = ExecuteBoolean(boolean.Kind, baseBody, toolResult.Value);
+ }
+ }
+ else if (useSemanticToolPlacement)
{
var placementResult = FirmamentPlacementResolver.ResolvePlacementTranslation(boolean, publishedBodiesByFeatureId);
if (!placementResult.IsSuccess)
@@ -153,7 +182,7 @@ internal static class FirmamentPrimitiveExecutor
}
var placedBooleanBody = booleanResult.Value;
- if (!useSemanticToolPlacement)
+ if (!useSemanticToolPlacement && !usedPublishedFrameAdditiveExecution)
{
var placementResult = FirmamentPlacementResolver.ResolvePlacementTranslation(boolean, publishedBodiesByFeatureId);
if (!placementResult.IsSuccess)