q3k
/
OctoPrint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix X-Ray view. Broken after Numpy update.

master
daid 2012-07-31 16:12:02 +02:00
parent 7d3058dfca
commit b65977a595
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cura/gui/opengl.py
View File

@ -216,6 +216,7 @@ def DrawSTL(mesh):
glCullFace(GL_FRONT)
glNormalPointer(GL_FLOAT, 0, mesh.invNormal)
glDrawArrays(GL_TRIANGLES, 0, mesh.vertexCount)
glCullFace(GL_BACK)
glDisableClientState(GL_VERTEX_ARRAY)
glDisableClientState(GL_NORMAL_ARRAY);

8
Cura/gui/preview3d.py
View File

@ -555,17 +555,17 @@ class PreviewGLCanvas(glcanvas.GLCanvas):
elif self.viewMode == "X-Ray":
glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE)
glDisable(GL_DEPTH_TEST)
glEnable(GL_STENCIL_TEST);
glEnable(GL_STENCIL_TEST)
glStencilFunc(GL_ALWAYS, 1, 1)
glStencilOp(GL_INCR, GL_INCR, GL_INCR)
self.drawModel(obj)
glStencilOp (GL_KEEP, GL_KEEP, GL_KEEP);
glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE)
glStencilFunc(GL_EQUAL, 0, 1);
glStencilFunc(GL_EQUAL, 0, 1)
glColor(1, 1, 1)
self.drawModel(obj)
glStencilFunc(GL_EQUAL, 1, 1);
glStencilFunc(GL_EQUAL, 1, 1)
glColor(1, 0, 0)
self.drawModel(obj)
@ -591,7 +591,7 @@ class PreviewGLCanvas(glcanvas.GLCanvas):
glEnd()
glPopMatrix()
glDisable(GL_STENCIL_TEST);
glDisable(GL_STENCIL_TEST)
glEnable(GL_DEPTH_TEST)
elif self.viewMode == "Normal":
glLightfv(GL_LIGHT0, GL_DIFFUSE, self.objColor[self.parent.objectList.index(obj)])