mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-08 16:21:14 +00:00
Merge main into the Design tab follow-up
main moved the CAD docs into docs/HLSD/design-tab.md and the offer generator and atlas into scripts/CAD/ (#15803). - The four docs this branch had edited are deleted as on main. What the branch changes about the design goes into the HLSD doc: the right-click is judged by drift over the whole press, with no time budget; a Text feature stores its outlines as well as its string, font and height; a new section on how the Design canvas renders bodies (studio lighting through the shared phong shader, B-rep edge ribbons). - gen_offer_table.py keeps both main's atlas validation and this branch's L() markers on user-facing strings. - The Text verb's hint is now changed in scripts/CAD/tool_atlas.json as well, so `gen_offer_table.py --check` passes. - DesignPanel.cpp keeps the DesignTextDialog include and main's new path in the offer comment. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01QK4VgguuCAk2hZLWgcjJb9
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
#include "slic3r/GUI/CAD/DesignCanvas.hpp"
|
||||
#include "slic3r/GUI/CAD/DesignSketchTool.hpp"
|
||||
#include "slic3r/GUI/CAD/DesignTextDialog.hpp" // Text: font, height, live outline
|
||||
#include "slic3r/GUI/CAD/DesignOffer.hpp" // generated offer table — see docs/ux/tool_atlas.json
|
||||
#include "slic3r/GUI/CAD/DesignOffer.hpp" // generated offer table — see scripts/CAD/tool_atlas.json
|
||||
#include "libslic3r/CAD/GeometryEngine.hpp" // face_by_index for face-extrude gizmo anchor
|
||||
#include "libslic3r/TriangleMesh.hpp" // mesh import: STL/OBJ -> indexed_triangle_set
|
||||
#include "libslic3r/Format/OBJ.hpp"
|
||||
@@ -6106,7 +6106,7 @@ bool DesignPanel::sketch_plane_target(wxString& what) const
|
||||
// ---------------------------------------------------------------------------------------------
|
||||
// The object-driven offer (charter §4.1). Right-click the geometry and get a vertical list in the
|
||||
// ratified row order, with the verbs that do not apply DISABLED IN PLACE carrying their reason.
|
||||
// The rows come from DesignOffer.hpp, generated from docs/ux/tool_atlas.json — the same file the
|
||||
// The rows come from DesignOffer.hpp, generated from scripts/CAD/tool_atlas.json — the same file the
|
||||
// mockups are drawn from, so a drawing and the product cannot drift apart.
|
||||
// ---------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
Reference in New Issue
Block a user