From aaab549cfaf5eebefbee116f2b66eb970e4345cc Mon Sep 17 00:00:00 2001 From: Enrico Turri Date: Fri, 23 Nov 2018 15:05:43 +0100 Subject: [PATCH] Partial cleanup of obsolete methods --- src/slic3r/GUI/3DScene.cpp | 45 ------------------------- src/slic3r/GUI/3DScene.hpp | 13 -------- src/slic3r/GUI/GLCanvas3DManager.cpp | 49 ---------------------------- src/slic3r/GUI/GLCanvas3DManager.hpp | 12 ------- 4 files changed, 119 deletions(-) diff --git a/src/slic3r/GUI/3DScene.cpp b/src/slic3r/GUI/3DScene.cpp index a3ff45a6f..a593853bd 100644 --- a/src/slic3r/GUI/3DScene.cpp +++ b/src/slic3r/GUI/3DScene.cpp @@ -1841,21 +1841,11 @@ void _3DScene::point3_to_verts(const Vec3crd& point, double width, double height GUI::GLCanvas3DManager _3DScene::s_canvas_mgr; -void _3DScene::init_gl() -{ - s_canvas_mgr.init_gl(); -} - std::string _3DScene::get_gl_info(bool format_as_html, bool extensions) { return s_canvas_mgr.get_gl_info(format_as_html, extensions); } -bool _3DScene::use_VBOs() -{ - return s_canvas_mgr.use_VBOs(); -} - bool _3DScene::add_canvas(wxGLCanvas* canvas) { return s_canvas_mgr.add(canvas); @@ -1876,26 +1866,6 @@ bool _3DScene::init(wxGLCanvas* canvas) return s_canvas_mgr.init(canvas); } -void _3DScene::set_as_dirty(wxGLCanvas* canvas) -{ - s_canvas_mgr.set_as_dirty(canvas); -} - -unsigned int _3DScene::get_volumes_count(wxGLCanvas* canvas) -{ - return s_canvas_mgr.get_volumes_count(canvas); -} - -void _3DScene::reset_volumes(wxGLCanvas* canvas) -{ - s_canvas_mgr.reset_volumes(canvas); -} - -int _3DScene::check_volumes_outside_state(wxGLCanvas* canvas, const DynamicPrintConfig* config) -{ - return s_canvas_mgr.check_volumes_outside_state(canvas, config); -} - GUI::GLCanvas3D* _3DScene::get_canvas(wxGLCanvas* canvas) { return s_canvas_mgr.get_canvas(canvas); @@ -1926,21 +1896,6 @@ void _3DScene::set_color_by(wxGLCanvas* canvas, const std::string& value) s_canvas_mgr.set_color_by(canvas, value); } -bool _3DScene::is_layers_editing_enabled(wxGLCanvas* canvas) -{ - return s_canvas_mgr.is_layers_editing_enabled(canvas); -} - -bool _3DScene::is_layers_editing_allowed(wxGLCanvas* canvas) -{ - return s_canvas_mgr.is_layers_editing_allowed(canvas); -} - -bool _3DScene::is_reload_delayed(wxGLCanvas* canvas) -{ - return s_canvas_mgr.is_reload_delayed(canvas); -} - void _3DScene::enable_layers_editing(wxGLCanvas* canvas, bool enable) { s_canvas_mgr.enable_layers_editing(canvas, enable); diff --git a/src/slic3r/GUI/3DScene.hpp b/src/slic3r/GUI/3DScene.hpp index ddf98df52..940d627fa 100644 --- a/src/slic3r/GUI/3DScene.hpp +++ b/src/slic3r/GUI/3DScene.hpp @@ -584,9 +584,7 @@ class _3DScene static GUI::GLCanvas3DManager s_canvas_mgr; public: - static void init_gl(); static std::string get_gl_info(bool format_as_html, bool extensions); - static bool use_VBOs(); static bool add_canvas(wxGLCanvas* canvas); static bool remove_canvas(wxGLCanvas* canvas); @@ -594,12 +592,6 @@ public: static bool init(wxGLCanvas* canvas); - static void set_as_dirty(wxGLCanvas* canvas); - - static unsigned int get_volumes_count(wxGLCanvas* canvas); - static void reset_volumes(wxGLCanvas* canvas); - static int check_volumes_outside_state(wxGLCanvas* canvas, const DynamicPrintConfig* config); - static GUI::GLCanvas3D* get_canvas(wxGLCanvas* canvas); static void set_config(wxGLCanvas* canvas, DynamicPrintConfig* config); @@ -610,11 +602,6 @@ public: static void set_color_by(wxGLCanvas* canvas, const std::string& value); - static bool is_layers_editing_enabled(wxGLCanvas* canvas); - static bool is_layers_editing_allowed(wxGLCanvas* canvas); - - static bool is_reload_delayed(wxGLCanvas* canvas); - static void enable_layers_editing(wxGLCanvas* canvas, bool enable); static void enable_warning_texture(wxGLCanvas* canvas, bool enable); static void enable_legend_texture(wxGLCanvas* canvas, bool enable); diff --git a/src/slic3r/GUI/GLCanvas3DManager.cpp b/src/slic3r/GUI/GLCanvas3DManager.cpp index d3f38e292..76ca92e62 100644 --- a/src/slic3r/GUI/GLCanvas3DManager.cpp +++ b/src/slic3r/GUI/GLCanvas3DManager.cpp @@ -212,11 +212,6 @@ std::string GLCanvas3DManager::get_gl_info(bool format_as_html, bool extensions) return m_gl_info.to_string(format_as_html, extensions); } -bool GLCanvas3DManager::use_VBOs() const -{ - return m_use_VBOs; -} - bool GLCanvas3DManager::init(wxGLCanvas* canvas) { CanvasesMap::const_iterator it = _get_canvas(canvas); @@ -226,32 +221,6 @@ bool GLCanvas3DManager::init(wxGLCanvas* canvas) return false; } -void GLCanvas3DManager::set_as_dirty(wxGLCanvas* canvas) -{ - CanvasesMap::iterator it = _get_canvas(canvas); - if (it != m_canvases.end()) - it->second->set_as_dirty(); -} - -unsigned int GLCanvas3DManager::get_volumes_count(wxGLCanvas* canvas) const -{ - CanvasesMap::const_iterator it = _get_canvas(canvas); - return (it != m_canvases.end()) ? it->second->get_volumes_count() : 0; -} - -void GLCanvas3DManager::reset_volumes(wxGLCanvas* canvas) -{ - CanvasesMap::iterator it = _get_canvas(canvas); - if (it != m_canvases.end()) - it->second->reset_volumes(); -} - -int GLCanvas3DManager::check_volumes_outside_state(wxGLCanvas* canvas, const DynamicPrintConfig* config) const -{ - CanvasesMap::const_iterator it = _get_canvas(canvas); - return (it != m_canvases.end()) ? it->second->check_volumes_outside_state(config) : false; -} - GLCanvas3D* GLCanvas3DManager::get_canvas(wxGLCanvas* canvas) { CanvasesMap::const_iterator it = _get_canvas(canvas); @@ -293,24 +262,6 @@ void GLCanvas3DManager::set_color_by(wxGLCanvas* canvas, const std::string& valu it->second->set_color_by(value); } -bool GLCanvas3DManager::is_layers_editing_enabled(wxGLCanvas* canvas) const -{ - CanvasesMap::const_iterator it = _get_canvas(canvas); - return (it != m_canvases.end()) ? it->second->is_layers_editing_enabled() : false; -} - -bool GLCanvas3DManager::is_layers_editing_allowed(wxGLCanvas* canvas) const -{ - CanvasesMap::const_iterator it = _get_canvas(canvas); - return (it != m_canvases.end()) ? it->second->is_layers_editing_allowed() : false; -} - -bool GLCanvas3DManager::is_reload_delayed(wxGLCanvas* canvas) const -{ - CanvasesMap::const_iterator it = _get_canvas(canvas); - return (it != m_canvases.end()) ? it->second->is_reload_delayed() : false; -} - void GLCanvas3DManager::enable_layers_editing(wxGLCanvas* canvas, bool enable) { CanvasesMap::iterator it = _get_canvas(canvas); diff --git a/src/slic3r/GUI/GLCanvas3DManager.hpp b/src/slic3r/GUI/GLCanvas3DManager.hpp index 343250ccd..ddff40bc2 100644 --- a/src/slic3r/GUI/GLCanvas3DManager.hpp +++ b/src/slic3r/GUI/GLCanvas3DManager.hpp @@ -78,17 +78,10 @@ public: void init_gl(); std::string get_gl_info(bool format_as_html, bool extensions) const; - bool use_VBOs() const; bool layer_editing_allowed() const; bool init(wxGLCanvas* canvas); - void set_as_dirty(wxGLCanvas* canvas); - - unsigned int get_volumes_count(wxGLCanvas* canvas) const; - void reset_volumes(wxGLCanvas* canvas); - int check_volumes_outside_state(wxGLCanvas* canvas, const DynamicPrintConfig* config) const; - GLCanvas3D* get_canvas(wxGLCanvas* canvas); void set_config(wxGLCanvas* canvas, DynamicPrintConfig* config); @@ -99,11 +92,6 @@ public: void set_color_by(wxGLCanvas* canvas, const std::string& value); - bool is_layers_editing_enabled(wxGLCanvas* canvas) const; - bool is_layers_editing_allowed(wxGLCanvas* canvas) const; - - bool is_reload_delayed(wxGLCanvas* canvas) const; - void enable_layers_editing(wxGLCanvas* canvas, bool enable); void enable_warning_texture(wxGLCanvas* canvas, bool enable); void enable_legend_texture(wxGLCanvas* canvas, bool enable);