3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-21 13:47:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add call for render

Browse source
This commit is contained in:
Filip Sykala 2021-09-30 09:23:04 +02:00
parent 84f8ba9fb4
commit 6bd78aa9c4
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -5137,7 +5137,8 @@ void GLCanvas3D::_render_objects(GLVolumeCollection::ERenderType type)
GLGizmosManager::EType type = gm.get_current_type(); GLGizmosManager::EType type = gm.get_current_type();
if (type == GLGizmosManager::FdmSupports if (type == GLGizmosManager::FdmSupports
|| type == GLGizmosManager::Seam || type == GLGizmosManager::Seam
|| type == GLGizmosManager::MmuSegmentation) { || type == GLGizmosManager::MmuSegmentation
|| type == GLGizmosManager::Simplify ) {
shader->stop_using(); shader->stop_using();
gm.render_painter_gizmo(); gm.render_painter_gizmo();
shader->start_using(); shader->start_using();

4
src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
View file

@ -358,6 +358,10 @@ void GLGizmoSimplify::on_set_state()
} }
} }
void GLGizmoSimplify::render_painter_gizmo() const {
}
void GLGizmoSimplify::create_gui_cfg() { void GLGizmoSimplify::create_gui_cfg() {
if (m_gui_cfg.has_value()) return; if (m_gui_cfg.has_value()) return;
int space_size = m_imgui->calc_text_size(":MM").x; int space_size = m_imgui->calc_text_size(":MM").x;

5
src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp
View file

@ -4,6 +4,7 @@
// Include GLGizmoBase.hpp before I18N.hpp as it includes some libigl code, // Include GLGizmoBase.hpp before I18N.hpp as it includes some libigl code,
// which overrides our localization "L" macro. // which overrides our localization "L" macro.
#include "GLGizmoBase.hpp" #include "GLGizmoBase.hpp"
#include "GLGizmoPainterBase.hpp" // for render wireframe
#include "admesh/stl.h" // indexed_triangle_set #include "admesh/stl.h" // indexed_triangle_set
#include <thread> #include <thread>
#include <optional> #include <optional>
@ -16,7 +17,7 @@ class ModelVolume;
namespace GUI { namespace GUI {
class GLGizmoSimplify : public GLGizmoBase class GLGizmoSimplify : public GLGizmoPainterBase // GLGizmoBase
{ {
public: public:
GLGizmoSimplify(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id); GLGizmoSimplify(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id);
@ -31,6 +32,8 @@ protected:
virtual bool on_is_selectable() const override { return false; } virtual bool on_is_selectable() const override { return false; }
virtual void on_set_state() override; virtual void on_set_state() override;
// render wire frame
virtual void render_painter_gizmo() const override;
private: private:
void after_apply(); void after_apply();
void close(); void close();