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

SLA slices preview - wip 5

Browse source
This commit is contained in:
Enrico Turri 2018-11-28 09:28:07 +01:00
parent e4da00c195
commit 0a47bc1c5c
2 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3764,12 +3764,6 @@ void GLCanvas3D::render()
_camera_tranform(); _camera_tranform();
if (m_use_clipping_planes)
{
::glClipPlane(GL_CLIP_PLANE0, (GLdouble*)m_clipping_planes[0].get_data());
::glClipPlane(GL_CLIP_PLANE1, (GLdouble*)m_clipping_planes[1].get_data());
}
GLfloat position_cam[4] = { 1.0f, 0.0f, 1.0f, 0.0f }; GLfloat position_cam[4] = { 1.0f, 0.0f, 1.0f, 0.0f };
::glLightfv(GL_LIGHT1, GL_POSITION, position_cam); ::glLightfv(GL_LIGHT1, GL_POSITION, position_cam);
GLfloat position_top[4] = { -0.5f, -0.5f, 1.0f, 0.0f }; GLfloat position_top[4] = { -0.5f, -0.5f, 1.0f, 0.0f };
@ -5725,7 +5719,9 @@ void GLCanvas3D::_render_objects() const
{ {
if (m_use_clipping_planes) if (m_use_clipping_planes)
{ {
::glClipPlane(GL_CLIP_PLANE0, (GLdouble*)m_clipping_planes[0].get_data());
::glEnable(GL_CLIP_PLANE0); ::glEnable(GL_CLIP_PLANE0);
::glClipPlane(GL_CLIP_PLANE1, (GLdouble*)m_clipping_planes[1].get_data());
::glEnable(GL_CLIP_PLANE1); ::glEnable(GL_CLIP_PLANE1);
} }

4
src/slic3r/GUI/GUI_Preview.cpp
View file

@ -670,8 +670,8 @@ void Preview::on_sliders_scroll_changed(wxEvent& event)
} }
else if (tech == ptSLA) else if (tech == ptSLA)
{ {
m_canvas->set_clipping_plane(0, GLCanvas3D::ClippingPlane(Vec3d(0.0, 0.0, 1.0), m_slider->GetLowerValueD() - 1e-6)); m_canvas->set_clipping_plane(0, GLCanvas3D::ClippingPlane(Vec3d::UnitZ(), -(m_slider->GetLowerValueD() - 1e-6)));
m_canvas->set_clipping_plane(1, GLCanvas3D::ClippingPlane(Vec3d(0.0, 0.0, -1.0), m_slider->GetHigherValueD() + 1e-6)); m_canvas->set_clipping_plane(1, GLCanvas3D::ClippingPlane(-Vec3d::UnitZ(), m_slider->GetHigherValueD() + 1e-6));
m_canvas->set_use_clipping_planes(m_slider->GetHigherValue() != 0); m_canvas->set_use_clipping_planes(m_slider->GetHigherValue() != 0);
m_canvas_widget->Refresh(); m_canvas_widget->Refresh();
} }