PublicCodeMirror/OrcaSlicer-bambulab
1
0
Fork 0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-05-23 18:59:21 -07:00
Code Issues Packages Projects Releases Wiki Activity

3DScene layers editing mouse containment methods moved to c++

Browse Source
This commit is contained in:
Enrico Turri
2018-05-28 14:39:59 +02:00
parent 994222c317
commit aacdcd4add
8 changed files with 151 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
xs/src/slic3r/GUI/GLCanvas3DManager.cpp
View File

@@ -553,7 +553,7 @@ GLShader* GLCanvas3DManager::get_layers_editing_shader(wxGLCanvas* canvas)
float GLCanvas3DManager::get_layers_editing_cursor_z_relative(wxGLCanvas* canvas) const
{
CanvasesMap::const_iterator it = _get_canvas(canvas);
return (it != m_canvases.end()) ? it->second->get_layers_editing_cursor_z_relative(*it->second) : 0.0f;
return (it != m_canvases.end()) ? it->second->get_layers_editing_cursor_z_relative() : 0.0f;
}
int GLCanvas3DManager::get_layers_editing_first_selected_object_id(wxGLCanvas* canvas, unsigned int objects_count) const
@@ -562,6 +562,18 @@ int GLCanvas3DManager::get_layers_editing_first_selected_object_id(wxGLCanvas* c
return (it != m_canvases.end()) ? it->second->get_layers_editing_first_selected_object_id(objects_count) : 0.;
}
bool GLCanvas3DManager::bar_rect_contains(wxGLCanvas* canvas, float x, float y) const
{
CanvasesMap::const_iterator it = _get_canvas(canvas);
return (it != m_canvases.end()) ? it->second->bar_rect_contains(x, y) : false;
}
bool GLCanvas3DManager::reset_rect_contains(wxGLCanvas* canvas, float x, float y) const
{
CanvasesMap::const_iterator it = _get_canvas(canvas);
return (it != m_canvases.end()) ? it->second->reset_rect_contains(x, y) : false;
}
void GLCanvas3DManager::zoom_to_bed(wxGLCanvas* canvas)
{
CanvasesMap::iterator it = _get_canvas(canvas);