diff --git a/src/libslic3r/CadDocument.cpp b/src/libslic3r/CadDocument.cpp index 5e8e560910..214dd3797b 100644 --- a/src/libslic3r/CadDocument.cpp +++ b/src/libslic3r/CadDocument.cpp @@ -44,6 +44,8 @@ #include #include // pattern: rotation axis (circular) #include +#include +#include #include #include #include @@ -670,6 +672,19 @@ int CadDocument::add_cut(const SketchPlane& plane, double offset, bool flip, return int(features.size()) - 1; } +int CadDocument::add_mirror(const SketchPlane& plane, int target_body, BooleanMode mode, + const std::string& name) +{ + CadFeature f; + f.type = CadFeatureType::Mirror; + f.name = name; + f.plane = plane; + f.target_body = target_body; + f.mode = mode; + features.push_back(f); + return int(features.size()) - 1; +} + int CadDocument::add_plane(int base, double offset, double angle_tilt, int axis, const std::string& name) { @@ -1625,11 +1640,59 @@ void CadDocument::apply_cut(std::vector& bodies, const CadFeature& f) c } } +void CadDocument::apply_mirror(std::vector& bodies, const CadFeature& f) const +{ + const int nb = int(bodies.size()); + if (nb == 0) throw std::runtime_error("mirror: no target body"); + const int tgt = (f.target_body >= 0 && f.target_body < nb) ? f.target_body : nb - 1; + if (tgt < 0 || bodies[tgt].shape.IsNull()) throw std::runtime_error("mirror: no target body"); + + const TopoDS_Shape& src = bodies[tgt].shape; + + gp_Trsf trsf; + trsf.SetMirror(gp_Ax2(gp_Pnt(f.plane.origin.x(), f.plane.origin.y(), f.plane.origin.z()), + gp_Dir(f.plane.normal.x(), f.plane.normal.y(), f.plane.normal.z()))); + BRepBuilderAPI_Transform xform(src, trsf, true /*copy*/); + if (!xform.IsDone()) throw std::runtime_error("mirror: transform failed"); + TopoDS_Shape mirrored = xform.Shape(); + + // A mirror reverses orientation — verify the result has positive volume. + { + GProp_GProps props; + BRepGProp::VolumeProperties(mirrored, props); + if (props.Mass() <= 0.0) { + // Flip orientation to get a valid forward solid. + mirrored.Reverse(); + BRepGProp::VolumeProperties(mirrored, props); + if (props.Mass() <= 0.0) + throw std::runtime_error("mirror: result has zero or negative volume"); + } + } + + switch (f.mode) { + case BooleanMode::Add: { + BRepAlgoAPI_Fuse fuse(src, mirrored); + if (!fuse.IsDone()) throw std::runtime_error("mirror fuse failed"); + bodies[tgt].shape = fuse.Shape(); + break; + } + case BooleanMode::New: { + if (!f.mirror_keep_original) + bodies.erase(bodies.begin() + tgt); // replace: the mirrored copy takes the source slot + bodies.push_back({mirrored, f.name.empty() ? std::string("Mirror") : f.name}); + break; + } + default: + throw std::runtime_error("mirror: mode must be New or Add"); + } +} + void CadDocument::route_feature(std::vector& bodies, const CadFeature& f) const { if (f.type == CadFeatureType::Plane) return; // datum plane: not part of the body pipeline if (f.type == CadFeatureType::Boolean) { apply_boolean(bodies, f); return; } // body-body op if (f.type == CadFeatureType::Cut) { apply_cut(bodies, f); return; } // plane-split body + if (f.type == CadFeatureType::Mirror) { apply_mirror(bodies, f); return; } // mirror body about plane // Resolve the target body: explicit target_body when valid, else the last body. const int t = (f.target_body >= 0 && f.target_body < int(bodies.size())) ? f.target_body : int(bodies.size()) - 1; diff --git a/src/libslic3r/CadDocument.hpp b/src/libslic3r/CadDocument.hpp index 73596ceb58..498b00d634 100644 --- a/src/libslic3r/CadDocument.hpp +++ b/src/libslic3r/CadDocument.hpp @@ -17,7 +17,7 @@ namespace Slic3r { -enum class CadFeatureType { Sketch, Extrude, Fillet, Chamfer, Hole, Thread, Shell, Revolve, Sweep, Pattern, Plane, Loft, Draft, Import, Boolean, Cut }; +enum class CadFeatureType { Sketch, Extrude, Fillet, Chamfer, Hole, Thread, Shell, Revolve, Sweep, Pattern, Plane, Loft, Draft, Import, Boolean, Cut, Mirror }; enum class SketchShape { Rectangle, Circle }; enum class PlaneType { Offset, Angle, Midplane, Tangent, TwoEdges, Coincident }; enum class BooleanMode { New, Add, Cut, Intersect }; @@ -202,6 +202,12 @@ struct CadFeature { bool cut_keep_upper{true}; // keep the +normal half bool cut_keep_lower{false}; // keep the -normal half (both => split into two bodies) + // Mirror: reflect a body about a plane. Reuses `plane` (mirror plane, as Cut does), + // `target_body` (body to mirror), and `mode` (New = separate mirrored copy, + // Add = fuse the mirror back into the source). mirror_keep_original decides whether + // the source body survives when mode is New. + bool mirror_keep_original{true}; + template void save(Archive& ar) const { std::string brep = (type == CadFeatureType::Import) ? brep_to_string(imported_solid) : std::string(); @@ -220,10 +226,11 @@ struct CadFeature { pattern_circular, pattern_count, pattern_spacing, pattern_dir, pattern_angle, plane_base, plane_offset, plane_angle_tilt, plane_axis, bool_tool_body, bool_keep_tool, bool_tolerance, bool_target_face, bool_tool_face, - cut_offset, cut_flip, cut_keep_upper, cut_keep_lower, - brep, - plane_type, plane_face_body, plane_face, plane_face2_body, plane_face2, - plane_edge_body, plane_edge, plane_edge2_body, plane_edge2, plane_u_size, plane_v_size); + cut_offset, cut_flip, cut_keep_upper, cut_keep_lower, + brep, + plane_type, plane_face_body, plane_face, plane_face2_body, plane_face2, + plane_edge_body, plane_edge, plane_edge2_body, plane_edge2, plane_u_size, plane_v_size, + mirror_keep_original); } template void load(Archive& ar) { @@ -246,7 +253,8 @@ struct CadFeature { cut_offset, cut_flip, cut_keep_upper, cut_keep_lower, brep, plane_type, plane_face_body, plane_face, plane_face2_body, plane_face2, - plane_edge_body, plane_edge, plane_edge2_body, plane_edge2, plane_u_size, plane_v_size); + plane_edge_body, plane_edge, plane_edge2_body, plane_edge2, plane_u_size, plane_v_size, + mirror_keep_original); imported_solid = brep_from_string(brep); } }; @@ -345,7 +353,9 @@ public: // its normal by `offset`, normal flipped iff `flip`). keep_upper/keep_lower select the // +normal / -normal half; both => the body is split into two coexisting bodies. int add_cut(const SketchPlane& plane, double offset, bool flip, - bool keep_upper, bool keep_lower, int target_body, const std::string& name); + bool keep_upper, bool keep_lower, int target_body, const std::string& name); + int add_mirror(const SketchPlane& plane, int target_body, BooleanMode mode, + const std::string& name); // Datum plane: derived from base (0=XY/1=XZ/2=YZ/3+N=Nth earlier datum), offset // along its normal, optional tilt about a base axis. Produces no solid. int add_plane(int base, double offset, double angle_tilt, int axis, @@ -435,6 +445,7 @@ private: // which works on a single result shape). Throws std::runtime_error on a failed op. void apply_boolean(std::vector& bodies, const CadFeature& f) const; void apply_cut(std::vector& bodies, const CadFeature& f) const; + void apply_mirror(std::vector& bodies, const CadFeature& f) const; // Undo/redo stacks of feature-list snapshots. checkpoint() pushes onto m_undo and // clears m_redo; undo()/redo() shuffle the current state between them. Capped so a diff --git a/src/slic3r/GUI/McpControl.cpp b/src/slic3r/GUI/McpControl.cpp index 048ed034f8..3ab59767e0 100644 --- a/src/slic3r/GUI/McpControl.cpp +++ b/src/slic3r/GUI/McpControl.cpp @@ -177,6 +177,13 @@ json describe_tools() json{{"name", "angle"}, {"type", "number"}, {"unit", "deg"}, {"default", 5}}, json{{"name", "body"}, {"type", "integer"}, {"default", -1}, {"description", "target body; omit for the last body"}}, })}}, + json{{"name", "mirror"}, {"summary", "Mirror a body about a base plane. mode=new creates a mirrored copy; mode=add fuses the mirror back into the source."}, + {"params", json::array({ + json{{"name", "plane"}, {"type", "string"}, {"enum", json::array({"XY", "XZ", "YZ"})}, {"default", "XZ"}}, + json{{"name", "mode"}, {"type", "string"}, {"enum", json::array({"new", "add"})}, {"default", "new"}}, + json{{"name", "keep_original"},{"type", "boolean"}, {"default", true}, {"description", "when mode=new, keep the source body"}}, + json{{"name", "body"}, {"type", "integer"}, {"default", -1}, {"description", "target body; omit for the last body"}}, + })}}, json{{"name", "query_topology"}, {"summary", "Measured faces (centroid/normal/cylinder) and edges (length/circle) of a body."}, {"params", json::array({ json{{"name", "body"}, {"type", "integer"}, {"default", 0}}, @@ -791,6 +798,23 @@ json action_draft(DesignPanel* panel, const json& params) return json{{"ok", ok}, {"draft_index", d}, {"bodies", int(doc.bodies.size())}, {"error", doc.error}}; } +json action_mirror(DesignPanel* panel, const json& params) +{ + std::string m_str = params.value("mode", std::string("new")); + BooleanMode m = (m_str == "add") ? BooleanMode::Add : BooleanMode::New; + CadDocument& doc = panel->mcp_doc(); + if (doc.bodies.empty()) throw std::runtime_error("no body to mirror"); + int bi = target_body_arg(params, doc); + bool keep = params.value("keep_original", true); + doc.checkpoint(); + int idx = doc.add_mirror(plane_from(params, doc), bi, m, "Mirror"); + doc.features[idx].mirror_keep_original = keep; + bool ok = doc.recompute(); + if (!ok) doc.undo(); + panel->mcp_after_change(); + return json{{"ok", ok}, {"mirror_index", idx}, {"bodies", int(doc.bodies.size())}, {"error", doc.error}}; +} + // Dispatch one parsed request ON THE MAIN THREAD. Returns a JSON-RPC reply string. std::string handle_on_main(const std::string& method, const json& params, const json& id) { @@ -817,6 +841,7 @@ std::string handle_on_main(const std::string& method, const json& params, const if (method == "pattern") return rpc_result(id, action_pattern(panel, params)); if (method == "shell") return rpc_result(id, action_shell(panel, params)); if (method == "draft") return rpc_result(id, action_draft(panel, params)); + if (method == "mirror") return rpc_result(id, action_mirror(panel, params)); return rpc_error(id, -32601, "Unknown method: " + method); } catch (const Standard_Failure& ex) { // OCCT errors are NOT std::exception return rpc_error(id, -32000, std::string("OCCT: ") + (ex.GetMessageString() ? ex.GetMessageString() : "failure")); diff --git a/tests/data/cad_recipe_v2.bin b/tests/data/cad_recipe_v2.bin index 437095ed39..1da9aa6129 100644 Binary files a/tests/data/cad_recipe_v2.bin and b/tests/data/cad_recipe_v2.bin differ diff --git a/tests/libslic3r/test_caddocument.cpp b/tests/libslic3r/test_caddocument.cpp index 4e7f6a2c70..09bba96188 100644 --- a/tests/libslic3r/test_caddocument.cpp +++ b/tests/libslic3r/test_caddocument.cpp @@ -1379,6 +1379,171 @@ TEST_CASE("cut splits a body with a plane", "[cut]") } } +TEST_CASE("mirror reflects a body about a plane", "[CadDocument]") +{ + using Catch::Matchers::WithinRel; + using Catch::Matchers::WithinAbs; + + auto make_box = [](CadDocument& doc, double w, double h, double d) { + int sk = doc.add_sketch(SketchShape::Rectangle, SketchPlane::XY(), w, h, 0, "Box"); + doc.add_extrude(sk, d, false, BooleanMode::New, "E"); + }; + + // --- New mode: 20x20x20 cube, mirror about XZ plane offset to x=30 --- + // The cube is in x=[-10,10]; the mirror is at x=30, so the mirrored cube + // is at x=[50,70]. Disjoint -> two bodies, equal volumes (8000 each). + SECTION("New mode: two disjoint bodies, equal volumes") { + CadDocument doc; + make_box(doc, 20.0, 20.0, 20.0); + REQUIRE(doc.recompute()); + REQUIRE(doc.error.empty()); + double v_orig = double(doc.display_mesh.volume()); + REQUIRE_THAT(v_orig, WithinRel(8000.0, 0.01)); + + doc.add_mirror(SketchPlane::XZ(), 0, BooleanMode::New, "Mirror1"); + REQUIRE(doc.recompute()); + REQUIRE(doc.error.empty()); + REQUIRE(doc.bodies.size() == 2); + + double v0 = double(SketchEngine::tessellate(doc.bodies[0].shape).volume()); + double v1 = double(SketchEngine::tessellate(doc.bodies[1].shape).volume()); + REQUIRE_THAT(v0, WithinRel(8000.0, 0.01)); + REQUIRE_THAT(v1, WithinRel(8000.0, 0.01)); + } + + // --- New mode with keep_original=false: the source body is replaced --- + SECTION("New mode, keep_original=false: source body removed") { + CadDocument doc; + make_box(doc, 20.0, 20.0, 20.0); + REQUIRE(doc.recompute()); + doc.add_mirror(SketchPlane::XZ(), 0, BooleanMode::New, "Mirror1"); + doc.features.back().mirror_keep_original = false; + REQUIRE(doc.recompute()); + REQUIRE(doc.error.empty()); + REQUIRE(doc.bodies.size() == 1); + double v = double(SketchEngine::tessellate(doc.bodies[0].shape).volume()); + REQUIRE_THAT(v, WithinRel(8000.0, 0.01)); + } + + // --- Add mode: L-shape, entirely on one side of the mirror plane -> 2x volume --- + // Build an L-shape completely in x>0: base 20x20x5 at x=[0,20] + wall 10x20x10 + // at x=[0,10] on top. Mirror about XZ at x=30 -> mirror at x=[40,60], disjoint. + SECTION("Add mode: asymmetric L-shape, disjoint halves -> 2x volume") { + CadDocument doc; + // Base: 20x20x5, shifted to x=10 so it's in x=[0,20] + CadFeature skb; + skb.type = CadFeatureType::Sketch; + skb.name = "Base"; + skb.plane = SketchPlane::XY(); + skb.imported_regions = {{ {Vec2d(0,-10), Vec2d(20,-10), Vec2d(20,10), Vec2d(0,10)} }}; + doc.features.push_back(skb); + int skb_idx = int(doc.features.size()) - 1; + CadFeature exb; + exb.type = CadFeatureType::Extrude; + exb.name = "EBase"; + exb.sketch_ref = skb_idx; + exb.distance = 5.0; + exb.mode = BooleanMode::New; + doc.features.push_back(exb); + + // Wall: 10x20x10 on top of the base, x=[0,10] + CadFeature skw; + skw.type = CadFeatureType::Sketch; + skw.name = "Wall"; + skw.plane = SketchPlane::XY(); + skw.plane.origin = Vec3d(0, 0, 5); + skw.imported_regions = {{ {Vec2d(0,-10), Vec2d(10,-10), Vec2d(10,10), Vec2d(0,10)} }}; + doc.features.push_back(skw); + int skw_idx = int(doc.features.size()) - 1; + CadFeature exw; + exw.type = CadFeatureType::Extrude; + exw.name = "EWall"; + exw.sketch_ref = skw_idx; + exw.distance = 10.0; + exw.mode = BooleanMode::Add; + exw.target_body = 0; + doc.features.push_back(exw); + + REQUIRE(doc.recompute()); + REQUIRE(doc.error.empty()); + const double v_l = double(doc.display_mesh.volume()); + + // Mirror about YZ at x=30 -> the mirror is entirely in x=[40,60], + // disjoint from the original in x=[0,20]. + SketchPlane mp = SketchPlane::YZ(); + mp.origin = Vec3d(30, 0, 0); + doc.add_mirror(mp, 0, BooleanMode::Add, "Mirror1"); + REQUIRE(doc.recompute()); + REQUIRE(doc.error.empty()); + REQUIRE(doc.bodies.size() == 1); + const double v_m = double(doc.display_mesh.volume()); + REQUIRE_THAT(v_m, WithinRel(2.0 * v_l, 0.02)); + } + + // --- Add mode with intersecting plane -> fused volume < 2x --- + // A 20x20x20 cube centred on the origin (so x=[-10,10]), mirrored about + // XZ plane at x=0. The mirror maps the cube onto itself exactly (symmetry). + // Fusing a cube with itself at the plane of symmetry produces the same cube + // -> volume == original, strictly less than 2x. + SECTION("Add mode: intersecting plane -> volume < 2x original") { + CadDocument doc; + make_box(doc, 20.0, 20.0, 20.0); + REQUIRE(doc.recompute()); + const double v_orig = double(doc.display_mesh.volume()); + REQUIRE_THAT(v_orig, WithinRel(8000.0, 0.01)); + + doc.add_mirror(SketchPlane::XZ(), 0, BooleanMode::Add, "Mirror1"); + REQUIRE(doc.recompute()); + REQUIRE(doc.error.empty()); + const double v_mir = double(doc.display_mesh.volume()); + REQUIRE(v_mir < v_orig * 1.9); + } + + // --- Invalid target body index --- + SECTION("invalid target body index -> error, no crash") { + CadDocument doc; + // No bodies in the document -> mirror must fail, not crash. + doc.features.push_back({CadFeatureType::Mirror, "BadMirror", true, + SketchShape::Rectangle, SketchPlane::XZ()}); + doc.features.back().mode = BooleanMode::New; + REQUIRE_FALSE(doc.recompute()); + REQUIRE_FALSE(doc.error.empty()); + } +} + +TEST_CASE("mirror serialization round-trip", "[CadDocument]") +{ + using Catch::Matchers::WithinRel; + + CadDocument doc; + int sk = doc.add_sketch(SketchShape::Rectangle, SketchPlane::XY(), 20, 20, 0, "Box"); + doc.add_extrude(sk, 20.0, false, BooleanMode::New, "E"); + REQUIRE(doc.recompute()); + + doc.add_mirror(SketchPlane::XZ(), 0, BooleanMode::New, "Mirror1"); + doc.features.back().mirror_keep_original = false; + REQUIRE(doc.recompute()); + REQUIRE(doc.error.empty()); + + auto blob = doc.serialize_recipe(); + REQUIRE_FALSE(blob.empty()); + + CadDocument doc2; + REQUIRE(doc2.deserialize_recipe(blob)); + REQUIRE(doc2.recompute()); + REQUIRE(doc2.error.empty()); + + REQUIRE(doc2.features.size() == doc.features.size()); + const auto& f1 = doc.features.back(); + const auto& f2 = doc2.features.back(); + REQUIRE(f2.type == CadFeatureType::Mirror); + REQUIRE(f2.mode == BooleanMode::New); + REQUIRE(f2.mirror_keep_original == false); + REQUIRE(f2.name == "Mirror1"); + + REQUIRE(doc2.bodies.size() == doc.bodies.size()); +} + TEST_CASE("mass properties: analytic cube", "[CadDocument]") { using Catch::Matchers::WithinRel; @@ -2014,6 +2179,10 @@ static CadDocument make_golden_doc_v1() doc.features.push_back(ex); } + // ---- Mirror: XZ plane, New mode, keep_original=false (distinctive non-defaults) ---- + doc.add_mirror(SketchPlane::XZ(), 0, BooleanMode::New, "Mirror_XZ"); + doc.features.back().mirror_keep_original = false; + return doc; } @@ -2226,6 +2395,13 @@ TEST_CASE("golden recipe v1 still deserialises", "[CadDocument]") REQUIRE(f.bool_target_face == 2); REQUIRE(f.bool_tool_face == 3); } + + // Mirror + if (f.type == CadFeatureType::Mirror && e.name == "Mirror_XZ") { + REQUIRE(f.mode == BooleanMode::New); + REQUIRE(f.mirror_keep_original == false); + REQUIRE(f.target_body == 0); + } } // --- Layer 2: geometry check (optional — only if the document recomputes) ---