3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2nd attempt to fix opengl on ubuntu

Browse Source
This commit is contained in:
Enrico Turri 2018-06-27 12:05:23 +02:00
parent 5c32347449
commit 23d10fdadc
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
xs/src/slic3r/GUI/GLCanvas3D.cpp
View File

@ -1553,7 +1553,7 @@ bool GLCanvas3D::set_current()
if ((m_canvas != nullptr) && (m_context != nullptr)) if ((m_canvas != nullptr) && (m_context != nullptr))
// if (m_active && (m_canvas != nullptr) && (m_context != nullptr)) // if (m_active && (m_canvas != nullptr) && (m_context != nullptr))
{ {
std::cout << "set_current: " << (void*)m_canvas << " - " << (void*)m_context << std::endl; // std::cout << "set_current: " << (void*)m_canvas << " - " << (void*)m_context << std::endl;
return m_canvas->SetCurrent(*m_context); return m_canvas->SetCurrent(*m_context);
} }
return false; return false;
@ -1698,6 +1698,10 @@ void GLCanvas3D::set_bed_shape(const Pointfs& shape)
// Set the origin and size for painting of the coordinate system axes. // Set the origin and size for painting of the coordinate system axes.
m_axes.origin = Pointf3(0.0, 0.0, (coordf_t)GROUND_Z); m_axes.origin = Pointf3(0.0, 0.0, (coordf_t)GROUND_Z);
set_axes_length(0.3f * (float)m_bed.get_bounding_box().max_size()); set_axes_length(0.3f * (float)m_bed.get_bounding_box().max_size());
//###########################################################################################################################
m_dirty = true;
//###########################################################################################################################
} }
void GLCanvas3D::set_auto_bed_shape() void GLCanvas3D::set_auto_bed_shape()
@ -3059,7 +3063,10 @@ Point GLCanvas3D::get_local_mouse_position() const
bool GLCanvas3D::_is_shown_on_screen() const bool GLCanvas3D::_is_shown_on_screen() const
{ {
return (m_canvas != nullptr) ? m_active && m_canvas->IsShownOnScreen() : false; //#################################################################################################################
return (m_canvas != nullptr) ? m_canvas->IsShownOnScreen() : false;
// return (m_canvas != nullptr) ? m_active && m_canvas->IsShownOnScreen() : false;
//#################################################################################################################
} }
void GLCanvas3D::_force_zoom_to_bed() void GLCanvas3D::_force_zoom_to_bed()