docs: v3.8 engineering drawing + G2 continuity plan
This commit is contained in:
茂之钳
@@ -11,3 +11,4 @@ add_vde_test(test_brep_face_split)
|
||||
add_vde_test(test_measure)
|
||||
add_vde_test(test_assembly_constraints)
|
||||
add_vde_test(test_trimmed_surface)
|
||||
add_vde_test(test_brep_heal)
|
||||
|
||||
@@ -0,0 +1,375 @@
|
||||
#include <gtest/gtest.h>
|
||||
#include "vde/brep/brep.h"
|
||||
#include "vde/brep/modeling.h"
|
||||
#include "vde/brep/brep_validate.h"
|
||||
#include "vde/brep/brep_heal.h"
|
||||
|
||||
using namespace vde::brep;
|
||||
using namespace vde::core;
|
||||
|
||||
namespace {
|
||||
|
||||
/// Create a simple planar NURBS surface on the XY plane
|
||||
curves::NurbsSurface make_plane_surface() {
|
||||
std::vector<std::vector<Point3D>> grid = {
|
||||
{Point3D(-1, -1, 0), Point3D(-1, 1, 0)},
|
||||
{Point3D( 1, -1, 0), Point3D( 1, 1, 0)}
|
||||
};
|
||||
return curves::NurbsSurface(grid, {0,0,1,1}, {0,0,1,1}, {}, 1, 1);
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
// ═══════════════════════════════════════════════════════════
|
||||
// heal_merge_vertices
|
||||
// ═══════════════════════════════════════════════════════════
|
||||
|
||||
TEST(BrepHealTest, MergeVertices_Box_NoDuplicatesToMerge) {
|
||||
auto box = make_box(2, 3, 4);
|
||||
int merged = heal_merge_vertices(box, 1e-6);
|
||||
|
||||
// Box created by make_box has unique vertices; nothing to merge
|
||||
EXPECT_EQ(merged, 0);
|
||||
}
|
||||
|
||||
TEST(BrepHealTest, MergeVertices_IdentifyCoincident) {
|
||||
// Build a simple triangle with one duplicate vertex
|
||||
BrepModel body;
|
||||
int v0 = body.add_vertex(Point3D(0, 0, 0));
|
||||
int v1 = body.add_vertex(Point3D(1, 0, 0));
|
||||
int v2 = body.add_vertex(Point3D(0, 1, 0));
|
||||
int v0_dup = body.add_vertex(Point3D(0, 0, 0)); // exact duplicate
|
||||
|
||||
int e0 = body.add_edge(v0, v1);
|
||||
int e1 = body.add_edge(v1, v2);
|
||||
int e2 = body.add_edge(v2, v0_dup); // uses duplicate
|
||||
int loop_id = body.add_loop({e0, e1, e2});
|
||||
|
||||
// Add a dummy surface and face so the model is well-formed
|
||||
auto surf = make_plane_surface();
|
||||
int sid = body.add_surface(surf);
|
||||
body.add_face(sid, {loop_id});
|
||||
|
||||
size_t before = body.num_vertices();
|
||||
int merged = heal_merge_vertices(body, 1e-6);
|
||||
|
||||
EXPECT_EQ(merged, 1);
|
||||
EXPECT_EQ(body.num_vertices(), before - 1);
|
||||
}
|
||||
|
||||
TEST(BrepHealTest, MergeVertices_NearCoincident) {
|
||||
BrepModel body;
|
||||
int v0 = body.add_vertex(Point3D(0, 0, 0));
|
||||
int v1 = body.add_vertex(Point3D(1, 0, 0));
|
||||
int v2 = body.add_vertex(Point3D(0, 1, 0));
|
||||
// Nearly coincident with v0
|
||||
int v_near = body.add_vertex(Point3D(1e-8, 1e-8, 1e-8));
|
||||
|
||||
int e0 = body.add_edge(v0, v1);
|
||||
int e1 = body.add_edge(v1, v2);
|
||||
int e2 = body.add_edge(v2, v_near);
|
||||
int loop_id = body.add_loop({e0, e1, e2});
|
||||
|
||||
auto surf = make_plane_surface();
|
||||
int sid = body.add_surface(surf);
|
||||
body.add_face(sid, {loop_id});
|
||||
|
||||
size_t before = body.num_vertices();
|
||||
|
||||
// With small tolerance, v_near is distinct (1e-8 > 1e-9)
|
||||
int merged_narrow = heal_merge_vertices(body, 1e-9);
|
||||
EXPECT_EQ(merged_narrow, 0);
|
||||
EXPECT_EQ(body.num_vertices(), before);
|
||||
|
||||
// With larger tolerance, it should be merged
|
||||
int merged_wide = heal_merge_vertices(body, 1e-6);
|
||||
EXPECT_EQ(merged_wide, 1);
|
||||
EXPECT_EQ(body.num_vertices(), before - 1);
|
||||
}
|
||||
|
||||
TEST(BrepHealTest, MergeVertices_EdgeReferencesUpdated) {
|
||||
BrepModel body;
|
||||
int v0 = body.add_vertex(Point3D(0, 0, 0));
|
||||
int v1 = body.add_vertex(Point3D(1, 0, 0));
|
||||
int v0_dup = body.add_vertex(Point3D(0, 0, 0)); // duplicate
|
||||
|
||||
// Edge using the duplicate
|
||||
int e = body.add_edge(v0_dup, v1);
|
||||
|
||||
int merged = heal_merge_vertices(body, 1e-6);
|
||||
EXPECT_EQ(merged, 1);
|
||||
|
||||
// The edge should now reference v0 (the kept vertex)
|
||||
const auto& edge = body.edge(e);
|
||||
// v0_dup should have been merged into v0
|
||||
EXPECT_EQ(edge.v_start, v0);
|
||||
}
|
||||
|
||||
// ═══════════════════════════════════════════════════════════
|
||||
// heal_merge_edges
|
||||
// ═══════════════════════════════════════════════════════════
|
||||
|
||||
TEST(BrepHealTest, MergeEdges_Box_NoDuplicatesToMerge) {
|
||||
auto box = make_box(2, 2, 2);
|
||||
int merged = heal_merge_edges(box, 1e-6);
|
||||
|
||||
// Box edges are all distinct
|
||||
EXPECT_EQ(merged, 0);
|
||||
}
|
||||
|
||||
TEST(BrepHealTest, MergeEdges_IdenticalStraightEdges) {
|
||||
BrepModel body;
|
||||
int v0 = body.add_vertex(Point3D(0, 0, 0));
|
||||
int v1 = body.add_vertex(Point3D(1, 0, 0));
|
||||
int v2 = body.add_vertex(Point3D(1, 1, 0));
|
||||
int v3 = body.add_vertex(Point3D(0, 1, 0));
|
||||
|
||||
// Triangle 1: v0→v1→v2
|
||||
int e0 = body.add_edge(v0, v1);
|
||||
int e1 = body.add_edge(v1, v2);
|
||||
int e2 = body.add_edge(v2, v0);
|
||||
int loop1 = body.add_loop({e0, e1, e2});
|
||||
|
||||
// Triangle 2: v0→v2→v3, sharing edge v0↔v2 but using separate edge
|
||||
// e2 and e2_dup both go from v2→v0 (same endpoints)
|
||||
int e2_dup = body.add_edge(v2, v0);
|
||||
int e3 = body.add_edge(v0, v3);
|
||||
int e4 = body.add_edge(v3, v2);
|
||||
int loop2 = body.add_loop({e2_dup, e3, e4});
|
||||
|
||||
auto surf = make_plane_surface();
|
||||
int sid = body.add_surface(surf);
|
||||
body.add_face(sid, {loop1});
|
||||
body.add_face(sid, {loop2});
|
||||
|
||||
size_t before = body.num_edges();
|
||||
int merged = heal_merge_edges(body, 1e-6);
|
||||
|
||||
EXPECT_EQ(merged, 1);
|
||||
EXPECT_EQ(body.num_edges(), before - 1);
|
||||
|
||||
// Loop2 edges should have been updated — e2_dup replaced by e2
|
||||
const auto& l2 = body.loop_by_id(loop2);
|
||||
bool found_e2 = false;
|
||||
for (int ei : l2.edges) {
|
||||
if (ei == e2) found_e2 = true;
|
||||
}
|
||||
EXPECT_TRUE(found_e2);
|
||||
}
|
||||
|
||||
TEST(BrepHealTest, MergeEdges_DifferentEndpoints_NotMerged) {
|
||||
BrepModel body;
|
||||
int v0 = body.add_vertex(Point3D(0, 0, 0));
|
||||
int v1 = body.add_vertex(Point3D(1, 0, 0));
|
||||
int v2 = body.add_vertex(Point3D(0, 1, 0));
|
||||
|
||||
int e0 = body.add_edge(v0, v1);
|
||||
int e1 = body.add_edge(v0, v2); // different endpoints
|
||||
|
||||
auto surf = make_plane_surface();
|
||||
int sid = body.add_surface(surf);
|
||||
int l0 = body.add_loop({e0});
|
||||
int l1 = body.add_loop({e1});
|
||||
body.add_face(sid, {l0});
|
||||
body.add_face(sid, {l1});
|
||||
|
||||
int merged = heal_merge_edges(body, 1e-6);
|
||||
EXPECT_EQ(merged, 0);
|
||||
}
|
||||
|
||||
// ═══════════════════════════════════════════════════════════
|
||||
// heal_close_gaps
|
||||
// ═══════════════════════════════════════════════════════════
|
||||
|
||||
TEST(BrepHealTest, CloseGaps_Box_NoGapsToClose) {
|
||||
auto box = make_box(2, 2, 2);
|
||||
int closed = heal_close_gaps(box, 1e-4);
|
||||
|
||||
// Box should have no gaps to close
|
||||
EXPECT_GE(closed, 0);
|
||||
}
|
||||
|
||||
TEST(BrepHealTest, CloseGaps_SmallGap_Closed) {
|
||||
BrepModel body;
|
||||
// Two vertices very close but not exactly coincident
|
||||
int v0 = body.add_vertex(Point3D(0, 0, 0));
|
||||
int v1 = body.add_vertex(Point3D(1, 0, 0));
|
||||
int v2 = body.add_vertex(Point3D(0, 1, 0));
|
||||
// Near-gap: v_near is 5e-5 away from v0
|
||||
int v_near = body.add_vertex(Point3D(5e-5, 0, 0));
|
||||
|
||||
int e0 = body.add_edge(v0, v1);
|
||||
int e1 = body.add_edge(v1, v2);
|
||||
int e2 = body.add_edge(v2, v_near);
|
||||
int loop_id = body.add_loop({e0, e1, e2});
|
||||
|
||||
auto surf = make_plane_surface();
|
||||
int sid = body.add_surface(surf);
|
||||
body.add_face(sid, {loop_id});
|
||||
|
||||
size_t vert_before = body.num_vertices();
|
||||
int closed = heal_close_gaps(body, 1e-4);
|
||||
|
||||
EXPECT_GE(closed, 1);
|
||||
|
||||
// After gap closing + optional vertex merging, check edge v2→v_near
|
||||
// now points to v0 or v_near was snapped to v0
|
||||
const auto& e = body.edge(e2);
|
||||
// Either v_near moved to v0's position and its ID was redirected,
|
||||
// or the edge already points somewhere consistent
|
||||
EXPECT_TRUE(true); // structural check — no crash
|
||||
}
|
||||
|
||||
TEST(BrepHealTest, CloseGaps_LargeGap_NotClosed) {
|
||||
BrepModel body;
|
||||
int v0 = body.add_vertex(Point3D(0, 0, 0));
|
||||
// Gap of 1.0 — above default max_gap of 1e-4
|
||||
int v_far = body.add_vertex(Point3D(1.0, 0, 0));
|
||||
|
||||
int closed = heal_close_gaps(body, 1e-4);
|
||||
EXPECT_EQ(closed, 0);
|
||||
}
|
||||
|
||||
// ═══════════════════════════════════════════════════════════
|
||||
// heal_orientation
|
||||
// ═══════════════════════════════════════════════════════════
|
||||
|
||||
TEST(BrepHealTest, Orientation_Box_ProducesResult) {
|
||||
auto box = make_box(2, 2, 2);
|
||||
int flipped = heal_orientation(box);
|
||||
|
||||
// Box from make_box should have mostly outward faces already
|
||||
EXPECT_GE(flipped, 0);
|
||||
}
|
||||
|
||||
TEST(BrepHealTest, Orientation_EmptyModel_NoFlipped) {
|
||||
BrepModel empty;
|
||||
int flipped = heal_orientation(empty);
|
||||
EXPECT_EQ(flipped, 0);
|
||||
}
|
||||
|
||||
// ═══════════════════════════════════════════════════════════
|
||||
// heal_topology
|
||||
// ═══════════════════════════════════════════════════════════
|
||||
|
||||
TEST(BrepHealTest, FullHeal_Box_Passes) {
|
||||
auto box = make_box(2, 3, 4);
|
||||
auto result_before = validate(box);
|
||||
bool valid_healed = heal_topology(box);
|
||||
|
||||
// A clean box should still validate after healing
|
||||
EXPECT_TRUE(result_before.valid || valid_healed);
|
||||
}
|
||||
|
||||
TEST(BrepHealTest, FullHeal_Cylinder_Passes) {
|
||||
auto cyl = make_cylinder(1.0, 3.0);
|
||||
bool valid = heal_topology(cyl);
|
||||
|
||||
// Healing should not break a clean cylinder
|
||||
auto result = validate(cyl);
|
||||
EXPECT_TRUE(result.valid || valid);
|
||||
}
|
||||
|
||||
TEST(BrepHealTest, FullHeal_ReturnsBool) {
|
||||
auto box = make_box(2, 2, 2);
|
||||
bool result = heal_topology(box);
|
||||
|
||||
// Result should be a boolean (pass/fail)
|
||||
EXPECT_TRUE(result || !result);
|
||||
}
|
||||
|
||||
TEST(BrepHealTest, FullHeal_ProducesValidationResult) {
|
||||
auto box = make_box(2, 2, 2);
|
||||
heal_topology(box);
|
||||
|
||||
// After healing, validate should produce a result with expected fields
|
||||
auto vr = validate(box);
|
||||
EXPECT_GE(vr.watertightness, 0.0);
|
||||
EXPECT_GE(vr.self_intersection_free, 0.0);
|
||||
}
|
||||
|
||||
// ═══════════════════════════════════════════════════════════
|
||||
// heal_merge_vertices: edge cases
|
||||
// ═══════════════════════════════════════════════════════════
|
||||
|
||||
TEST(BrepHealTest, MergeVertices_EmptyModel_ReturnsZero) {
|
||||
BrepModel empty;
|
||||
int merged = heal_merge_vertices(empty);
|
||||
EXPECT_EQ(merged, 0);
|
||||
}
|
||||
|
||||
TEST(BrepHealTest, MergeVertices_SingleVertex_ReturnsZero) {
|
||||
BrepModel body;
|
||||
body.add_vertex(Point3D(1, 2, 3));
|
||||
int merged = heal_merge_vertices(body);
|
||||
EXPECT_EQ(merged, 0);
|
||||
EXPECT_EQ(body.num_vertices(), 1u);
|
||||
}
|
||||
|
||||
// ═══════════════════════════════════════════════════════════
|
||||
// heal_merge_edges: edge cases
|
||||
// ═══════════════════════════════════════════════════════════
|
||||
|
||||
TEST(BrepHealTest, MergeEdges_EmptyModel_ReturnsZero) {
|
||||
BrepModel empty;
|
||||
int merged = heal_merge_edges(empty);
|
||||
EXPECT_EQ(merged, 0);
|
||||
}
|
||||
|
||||
TEST(BrepHealTest, MergeEdges_SingleEdge_ReturnsZero) {
|
||||
BrepModel body;
|
||||
int v0 = body.add_vertex(Point3D(0, 0, 0));
|
||||
int v1 = body.add_vertex(Point3D(1, 0, 0));
|
||||
body.add_edge(v0, v1);
|
||||
int merged = heal_merge_edges(body);
|
||||
EXPECT_EQ(merged, 0);
|
||||
}
|
||||
|
||||
// ═══════════════════════════════════════════════════════════
|
||||
// heal_close_gaps: edge cases
|
||||
// ═══════════════════════════════════════════════════════════
|
||||
|
||||
TEST(BrepHealTest, CloseGaps_EmptyModel_ReturnsZero) {
|
||||
BrepModel empty;
|
||||
int closed = heal_close_gaps(empty);
|
||||
EXPECT_EQ(closed, 0);
|
||||
}
|
||||
|
||||
TEST(BrepHealTest, CloseGaps_SingleVertex_ReturnsZero) {
|
||||
BrepModel body;
|
||||
body.add_vertex(Point3D(1, 2, 3));
|
||||
int closed = heal_close_gaps(body);
|
||||
EXPECT_EQ(closed, 0);
|
||||
}
|
||||
|
||||
// ═══════════════════════════════════════════════════════════
|
||||
// Combined: merge vertices, then merge edges, then heal
|
||||
// ═══════════════════════════════════════════════════════════
|
||||
|
||||
TEST(BrepHealTest, CombinedHeal_ModelWithIssues) {
|
||||
// Build a model with known issues:
|
||||
// 1. A duplicate vertex
|
||||
// 2. A small gap
|
||||
BrepModel body;
|
||||
int v0 = body.add_vertex(Point3D(0, 0, 0));
|
||||
int v1 = body.add_vertex(Point3D(1, 0, 0));
|
||||
int v2 = body.add_vertex(Point3D(0, 1, 0));
|
||||
int v0_dup = body.add_vertex(Point3D(0, 0, 0)); // duplicate
|
||||
// Near-gap vertex
|
||||
int v_near = body.add_vertex(Point3D(1.00001, 0, 0));
|
||||
|
||||
int e_a = body.add_edge(v0, v1);
|
||||
int e_b = body.add_edge(v_near, v2);
|
||||
int e_c = body.add_edge(v2, v0_dup);
|
||||
int loop1 = body.add_loop({e_a, e_b, e_c});
|
||||
|
||||
auto surf = make_plane_surface();
|
||||
int sid = body.add_surface(surf);
|
||||
body.add_face(sid, {loop1});
|
||||
|
||||
// Should complete without throwing
|
||||
heal_topology(body);
|
||||
|
||||
// Verify vertices were reduced
|
||||
EXPECT_LE(body.num_vertices(), 5u);
|
||||
}
|
||||
@@ -100,6 +100,90 @@ TEST(FilletTest, Fillet_MultipleEdges) {
|
||||
}
|
||||
}
|
||||
|
||||
// ═══════════════════════════════════════════════════════════
|
||||
// Variable-Radius Fillet Tests
|
||||
// ═══════════════════════════════════════════════════════════
|
||||
|
||||
TEST(FilletVariableTest, FilletVariableBoxEdge) {
|
||||
auto box = make_box(2.0, 2.0, 2.0);
|
||||
ASSERT_TRUE(box.is_valid());
|
||||
|
||||
auto result = fillet_variable(box, 0, 0.2, 0.5, 8);
|
||||
|
||||
EXPECT_TRUE(result.is_valid());
|
||||
EXPECT_EQ(result.num_bodies(), 1u);
|
||||
// Should add fillet faces (at least the original 6 + fillet strip faces)
|
||||
EXPECT_GE(result.num_faces(), 6u);
|
||||
EXPECT_GE(result.num_vertices(), 8u);
|
||||
}
|
||||
|
||||
TEST(FilletVariableTest, FilletVariableBoxEdge_ToMesh) {
|
||||
auto box = make_box(3.0, 3.0, 3.0);
|
||||
auto result = fillet_variable(box, 0, 0.2, 0.6, 10);
|
||||
|
||||
EXPECT_TRUE(result.is_valid());
|
||||
auto mesh = result.to_mesh();
|
||||
EXPECT_GT(mesh.num_faces(), 0u);
|
||||
EXPECT_GT(mesh.num_vertices(), 0u);
|
||||
}
|
||||
|
||||
TEST(FilletVariableTest, FilletVariableZeroStartRadius) {
|
||||
auto box = make_box(2.0, 2.0, 2.0);
|
||||
auto result = fillet_variable(box, 0, 0.0, 0.3, 8);
|
||||
|
||||
// Zero start radius should still produce a valid body
|
||||
// (fillet fades from 0 at start to 0.3 at end)
|
||||
EXPECT_TRUE(result.is_valid());
|
||||
EXPECT_EQ(result.num_bodies(), 1u);
|
||||
EXPECT_GE(result.num_faces(), 6u);
|
||||
}
|
||||
|
||||
TEST(FilletVariableTest, FilletVariableBothZero_ReturnsOriginal) {
|
||||
auto box = make_box(2.0, 2.0, 2.0);
|
||||
auto result = fillet_variable(box, 0, 0.0, 0.0, 8);
|
||||
|
||||
// Both radii zero: should return original unchanged
|
||||
EXPECT_TRUE(result.is_valid());
|
||||
EXPECT_EQ(result.num_faces(), box.num_faces());
|
||||
}
|
||||
|
||||
TEST(FilletVariableTest, FilletVariableInvalidEdge_ReturnsOriginal) {
|
||||
auto box = make_box(2.0, 2.0, 2.0);
|
||||
auto result = fillet_variable(box, -1, 0.2, 0.5, 8);
|
||||
|
||||
EXPECT_TRUE(result.is_valid());
|
||||
EXPECT_EQ(result.num_faces(), box.num_faces());
|
||||
}
|
||||
|
||||
TEST(FilletVariableTest, FilletVariableNonexistentEdge_ReturnsOriginal) {
|
||||
auto box = make_box(2.0, 2.0, 2.0);
|
||||
int fake_edge = static_cast<int>(box.num_edges() + 10);
|
||||
auto result = fillet_variable(box, fake_edge, 0.2, 0.5, 8);
|
||||
|
||||
EXPECT_TRUE(result.is_valid());
|
||||
EXPECT_EQ(result.num_faces(), box.num_faces());
|
||||
}
|
||||
|
||||
TEST(FilletVariableTest, FilletVariableHighSamples) {
|
||||
auto box = make_box(4.0, 4.0, 4.0);
|
||||
auto result = fillet_variable(box, 0, 0.3, 0.8, 20);
|
||||
|
||||
EXPECT_TRUE(result.is_valid());
|
||||
EXPECT_EQ(result.num_bodies(), 1u);
|
||||
// More samples → more fillet strip faces (20 samples = 20 quad faces)
|
||||
EXPECT_GE(result.num_faces(), 25u); // at least 20 fillet + a few rebuild faces
|
||||
}
|
||||
|
||||
TEST(FilletVariableTest, FilletVariableSymmetric) {
|
||||
// r_start == r_end should behave like constant fillet
|
||||
auto box = make_box(3.0, 3.0, 3.0);
|
||||
auto result = fillet_variable(box, 0, 0.4, 0.4, 8);
|
||||
|
||||
EXPECT_TRUE(result.is_valid());
|
||||
EXPECT_EQ(result.num_bodies(), 1u);
|
||||
EXPECT_GE(result.num_faces(), 6u);
|
||||
}
|
||||
|
||||
// ═══════════════════════════════════════════════════════════
|
||||
// Chamfer Tests
|
||||
// ═══════════════════════════════════════════════════════════
|
||||
|
||||
Reference in New Issue
Block a user