mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-10 00:07:52 -06:00
Port Emboss & SVG gizmo from PrusaSlicer (#2819)
* Rework UI jobs to make them more understandable and flexible. * Update Orca specific jobs * Fix progress issue * Fix dark mode and window radius * Update cereal version from 1.2.2 to 1.3.0 (cherry picked from commit prusa3d/PrusaSlicer@057232a275) * Initial port of Emboss gizmo * Bump up CGAL version to 5.4 (cherry picked from commit prusa3d/PrusaSlicer@1bf9dee3e7) * Fix text rotation * Fix test dragging * Add text gizmo to right click menu * Initial port of SVG gizmo * Fix text rotation * Fix Linux build * Fix "from surface" * Fix -90 rotation * Fix icon path * Fix loading font with non-ascii name * Fix storing non-utf8 font descriptor in 3mf file * Fix filtering with non-utf8 characters * Emboss: Use Orca style input dialog * Fix build on macOS * Fix tooltip color in light mode * InputText: fixed incorrect padding when FrameBorder > 0. (ocornut/imgui#4794, ocornut/imgui#3781) InputTextMultiline: fixed vertical tracking with large values of FramePadding.y. (ocornut/imgui#3781, ocornut/imgui#4794) (cherry picked from commit ocornut/imgui@072caa4a90) (cherry picked from commit ocornut/imgui@bdd2a94315) * SVG: Use Orca style input dialog * Fix job progress update * Fix crash when select editing text in preview screen * Use Orca checkbox style * Fix issue that toolbar icons are kept regenerated * Emboss: Fix text & icon alignment * SVG: Fix text & icon alignment * Emboss: fix toolbar icon mouse hover state * Add a simple subtle outline effect by drawing back faces using wireframe mode * Disable selection outlines * Show outline in white if the model color is too dark * Make the outline algorithm more reliable * Enable cull face, which fix render on Linux * Fix `disable_cullface` * Post merge fix * Optimize selection rendering * Fix scale gizmo * Emboss: Fix text rotation if base object is scaled * Fix volume synchronize * Fix emboss rotation * Emboss: Fix advance toggle * Fix text position after reopened the project * Make font style preview darker * Make font style preview selector height shorter --------- Co-authored-by: tamasmeszaros <meszaros.q@gmail.com> Co-authored-by: ocornut <omarcornut@gmail.com> Co-authored-by: SoftFever <softfeverever@gmail.com>
This commit is contained in:
parent
7a8e1929ee
commit
933aa3050b
197 changed files with 27190 additions and 2454 deletions
|
@ -32,6 +32,7 @@
|
|||
#include "libslic3r/BoundingBox.hpp"
|
||||
#include "libslic3r/GCode/GCodeProcessor.hpp"
|
||||
#include "Jobs/Job.hpp"
|
||||
#include "Jobs/Worker.hpp"
|
||||
#include "Search.hpp"
|
||||
#include "PartPlate.hpp"
|
||||
#include "GUI_App.hpp"
|
||||
|
@ -302,8 +303,41 @@ public:
|
|||
void update(bool conside_update_flag = false, bool force_background_processing_update = false);
|
||||
//BBS
|
||||
void object_list_changed();
|
||||
void stop_jobs();
|
||||
bool is_any_job_running() const;
|
||||
|
||||
// Get the worker handling the UI jobs (arrange, fill bed, etc...)
|
||||
// Here is an example of starting up an ad-hoc job:
|
||||
// queue_job(
|
||||
// get_ui_job_worker(),
|
||||
// [](Job::Ctl &ctl) {
|
||||
// // Executed in the worker thread
|
||||
//
|
||||
// CursorSetterRAII cursor_setter{ctl};
|
||||
// std::string msg = "Running";
|
||||
//
|
||||
// ctl.update_status(0, msg);
|
||||
// for (int i = 0; i < 100; i++) {
|
||||
// usleep(100000);
|
||||
// if (ctl.was_canceled()) break;
|
||||
// ctl.update_status(i + 1, msg);
|
||||
// }
|
||||
// ctl.update_status(100, msg);
|
||||
// },
|
||||
// [](bool, std::exception_ptr &e) {
|
||||
// // Executed in UI thread after the work is done
|
||||
//
|
||||
// try {
|
||||
// if (e) std::rethrow_exception(e);
|
||||
// } catch (std::exception &e) {
|
||||
// BOOST_LOG_TRIVIAL(error) << e.what();
|
||||
// }
|
||||
// e = nullptr;
|
||||
// });
|
||||
// This would result in quick run of the progress indicator notification
|
||||
// from 0 to 100. Use replace_job() instead of queue_job() to cancel all
|
||||
// pending jobs.
|
||||
Worker& get_ui_job_worker();
|
||||
const Worker & get_ui_job_worker() const;
|
||||
|
||||
void select_view(const std::string& direction);
|
||||
//BBS: add no_slice logic
|
||||
void select_view_3D(const std::string& name, bool no_slice = true);
|
||||
|
@ -392,6 +426,7 @@ public:
|
|||
void clear_before_change_mesh(int obj_idx);
|
||||
void changed_mesh(int obj_idx);
|
||||
|
||||
void changed_object(ModelObject &object);
|
||||
void changed_object(int obj_idx);
|
||||
void changed_objects(const std::vector<size_t>& object_idxs);
|
||||
void schedule_background_process(bool schedule = true);
|
||||
|
@ -505,10 +540,6 @@ public:
|
|||
//BBS:
|
||||
void fill_color(int extruder_id);
|
||||
|
||||
//BBS:
|
||||
void edit_text();
|
||||
bool can_edit_text() const;
|
||||
|
||||
bool can_delete() const;
|
||||
bool can_delete_all() const;
|
||||
bool can_add_model() const;
|
||||
|
@ -724,6 +755,8 @@ public:
|
|||
wxMenu* plate_menu();
|
||||
wxMenu* object_menu();
|
||||
wxMenu* part_menu();
|
||||
wxMenu* text_part_menu();
|
||||
wxMenu* svg_part_menu();
|
||||
wxMenu* sla_object_menu();
|
||||
wxMenu* default_menu();
|
||||
wxMenu* instance_menu();
|
||||
|
@ -778,6 +811,7 @@ private:
|
|||
void cut_horizontal(size_t obj_idx, size_t instance_idx, double z, ModelObjectCutAttributes attributes);
|
||||
|
||||
friend class SuppressBackgroundProcessingUpdate;
|
||||
friend class PlaterDropTarget;
|
||||
};
|
||||
|
||||
class SuppressBackgroundProcessingUpdate
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue