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

Refactored previous commit

Browse source
This commit is contained in:
Lukas Matena 2018-09-26 14:37:25 +02:00
parent 10393ba834
commit ce5c03c894
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
xs/src/slic3r/GUI/GLGizmo.cpp
View file

@ -1615,9 +1615,12 @@ void GLGizmoSlaSupports::on_render(const BoundingBoxf3& box) const
g.color[2] = 0.f;
}
render_grabbers(dragged_offset);
render_tooltip_texture();
::glPushMatrix();
::glTranslatef((GLfloat)dragged_offset(0), (GLfloat)dragged_offset(1), (GLfloat)dragged_offset(2));
render_grabbers();
::glPopMatrix();
render_tooltip_texture();
::glDisable(GL_BLEND);
}
@ -1629,10 +1632,10 @@ void GLGizmoSlaSupports::on_render_for_picking(const BoundingBoxf3& box) const
m_grabbers[i].color[1] = 1.0f;
m_grabbers[i].color[2] = picking_color_component(i);
}
render_grabbers(Vec3d::Zero(), true);
render_grabbers(true);
}
void GLGizmoSlaSupports::render_grabbers(const Vec3d& dragged_offset, bool picking) const
void GLGizmoSlaSupports::render_grabbers(bool picking) const
{
for (int i = 0; i < (int)m_grabbers.size(); ++i)
{
@ -1651,12 +1654,12 @@ void GLGizmoSlaSupports::render_grabbers(const Vec3d& dragged_offset, bool picki
::glEnable(GL_LIGHTING);
::glColor3f((GLfloat)render_color[0], (GLfloat)render_color[1], (GLfloat)render_color[2]);
::glPushMatrix();
Vec3d center = m_model_object->instances.front()->world_matrix() * m_grabbers[i].center + dragged_offset;
Vec3d center = m_model_object->instances.front()->world_matrix() * m_grabbers[i].center;
::glTranslatef((GLfloat)center(0), (GLfloat)center(1), (GLfloat)center(2));
GLUquadricObj *quadric;
quadric = ::gluNewQuadric();
::gluQuadricDrawStyle(quadric, GLU_FILL );
::gluSphere( quadric , 0.5f, 36 , 18 );
::gluSphere( quadric , 0.75f, 36 , 18 );
::gluDeleteQuadric(quadric);
::glPopMatrix();
if (!picking)

2
xs/src/slic3r/GUI/GLGizmo.hpp
View file

@ -439,7 +439,7 @@ private:
void on_update(const Linef3& mouse_ray, const Point* mouse_pos);
void on_render(const BoundingBoxf3& box) const;
void on_render_for_picking(const BoundingBoxf3& box) const;
void render_grabbers(const Vec3d& dragged_offset, bool picking = false) const;
void render_grabbers(bool picking = false) const;
void render_tooltip_texture() const;
bool is_mesh_update_necessary() const;
void update_mesh();