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

Code cleanup

Browse source
This commit is contained in:
Enrico Turri 2018-06-22 16:11:00 +02:00
parent de540de9aa
commit c948ca647c
3 changed files with 5 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1901,6 +1901,10 @@ void GLCanvas3D::update_gizmos_data()
m_gizmos.set_angle_z(model_instance->rotation);
break;
}
default:
{
break;
}
}
}
}
@ -3813,7 +3817,7 @@ int GLCanvas3D::_get_first_selected_volume_id() const
{
int object_id = vol->select_group_id / 1000000;
// Objects with object_id >= 1000 have a specific meaning, for example the wipe tower proxy.
if (object_id < 10000)
if ((object_id < 10000) && (object_id < objects_count))
{
int volume_id = 0;
for (int i = 0; i < object_id; ++i)

18
xs/src/slic3r/GUI/GLTexture.cpp
View file

@ -136,29 +136,11 @@ void GLTexture::render_texture(unsigned int tex_id, float left, float right, flo
::glBindTexture(GL_TEXTURE_2D, (GLuint)tex_id);
//###############################################################################################################################
::glBegin(GL_TRIANGLES);
::glTexCoord2f(0.0f, 1.0f); ::glVertex2f(left, bottom);
::glTexCoord2f(1.0f, 1.0f); ::glVertex2f(right, bottom);
::glTexCoord2f(1.0f, 0.0f); ::glVertex2f(right, top);
::glTexCoord2f(1.0f, 0.0f); ::glVertex2f(right, top);
::glTexCoord2f(0.0f, 0.0f); ::glVertex2f(left, top);
::glTexCoord2f(0.0f, 1.0f); ::glVertex2f(left, bottom);
/*
::glBegin(GL_QUADS);
::glTexCoord2f(0.0f, 1.0f); ::glVertex2f(left, bottom);
::glTexCoord2f(1.0f, 1.0f); ::glVertex2f(right, bottom);
::glTexCoord2f(1.0f, 0.0f); ::glVertex2f(right, top);
::glTexCoord2f(0.0f, 0.0f); ::glVertex2f(left, top);
*/
// ::glTexCoord2f(0.0f, 1.0f); ::glVertex3f(left, bottom, 0.0f);
// ::glTexCoord2f(1.0f, 1.0f); ::glVertex3f(right, bottom, 0.0f);
// ::glTexCoord2f(1.0f, 0.0f); ::glVertex3f(right, top, 0.0f);
// ::glTexCoord2f(0.0f, 0.0f); ::glVertex3f(left, top, 0.0f);
//###############################################################################################################################
::glEnd();
::glBindTexture(GL_TEXTURE_2D, 0);