3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-22 16:21:24 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp

Browse source
This commit is contained in:
Enrico Turri 2018-06-22 16:13:51 +02:00
commit ac0f3a6ef7
8 changed files with 30 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
xs/src/slic3r/GUI/3DScene.cpp
View file

@ -1855,6 +1855,11 @@ void _3DScene::set_active(wxGLCanvas* canvas, bool active)
s_canvas_mgr.set_active(canvas, active);
}
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);

1
xs/src/slic3r/GUI/3DScene.hpp
View file

@ -510,6 +510,7 @@ public:
static bool init(wxGLCanvas* canvas);
static void set_active(wxGLCanvas* canvas, bool active);
static void set_as_dirty(wxGLCanvas* canvas);
static unsigned int get_volumes_count(wxGLCanvas* canvas);
static void reset_volumes(wxGLCanvas* canvas);

5
xs/src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -1577,6 +1577,11 @@ void GLCanvas3D::set_active(bool active)
m_active = active;
}
void GLCanvas3D::set_as_dirty()
{
m_dirty = true;
}
unsigned int GLCanvas3D::get_volumes_count() const
{
return (unsigned int)m_volumes.volumes.size();

1
xs/src/slic3r/GUI/GLCanvas3D.hpp
View file

@ -465,6 +465,7 @@ public:
bool set_current();
void set_active(bool active);
void set_as_dirty();
unsigned int get_volumes_count() const;
void reset_volumes();

7
xs/src/slic3r/GUI/GLCanvas3DManager.cpp
View file

@ -219,6 +219,13 @@ void GLCanvas3DManager::set_active(wxGLCanvas* canvas, bool active)
it->second->set_active(active);
}
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);

1
xs/src/slic3r/GUI/GLCanvas3DManager.hpp
View file

@ -70,6 +70,7 @@ public:
bool init(wxGLCanvas* canvas);
void set_active(wxGLCanvas* canvas, bool active);
void set_as_dirty(wxGLCanvas* canvas);
unsigned int get_volumes_count(wxGLCanvas* canvas) const;
void reset_volumes(wxGLCanvas* canvas);