Add overhang view by using a shader.

diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py
index df87676dcbb16126d95d4bff8b57d8a86cba5614..eaeb4f2b0be8d92452da382131aa226bd4641c3c 100644 (file)
--- a/Cura/gui/sceneView.py
+++ b/Cura/gui/sceneView.py
@@ -97,7 +97,7 @@ class SceneView(openglGui.glGuiPanel):
                openglGui.glLabel(self.scaleForm, 'Uniform scale', (0,8))
                self.scaleUniform = openglGui.glCheckbox(self.scaleForm, True, (1,8), None)
 
-               self.viewSelection = openglGui.glComboButton(self, 'View mode', [7,11,15,23], ['Normal', 'Transparent', 'X-Ray', 'Layers'], (-1,0), self.OnViewChange)
+               self.viewSelection = openglGui.glComboButton(self, 'View mode', [7,19,11,15,23], ['Normal', 'Overhang', 'Transparent', 'X-Ray', 'Layers'], (-1,0), self.OnViewChange)
                self.layerSelect = openglGui.glSlider(self, 100, 0, 100, (-1,-2), lambda : self.QueueRefresh())
 
                self.notification = openglGui.glNotification(self, (0, 0))
@@ -139,11 +139,11 @@ class SceneView(openglGui.glGuiPanel):
                                self._thread.daemon = True
                                self._thread.start()
                                self.printButton.setBottomText('')
-                               self.viewSelection.setValue(3)
+                               self.viewSelection.setValue(4)
                                self.printButton.setDisabled(False)
                                self.OnViewChange()
                        else:
-                               if self.viewSelection.getValue() == 3:
+                               if self.viewSelection.getValue() == 4:
                                        self.viewSelection.setValue(0)
                                        self.OnViewChange()
                                self.loadScene([filename])
@@ -262,15 +262,17 @@ class SceneView(openglGui.glGuiPanel):
                        self.OnToolSelect(0)
 
        def OnViewChange(self):
-               if self.viewSelection.getValue() == 3:
+               if self.viewSelection.getValue() == 4:
                        self.viewMode = 'gcode'
                        if self._gcode is not None:
                                self.layerSelect.setRange(1, len(self._gcode.layerList) - 1)
                                self.layerSelect.setValue(len(self._gcode.layerList) - 1)
                        self._selectObject(None)
                elif self.viewSelection.getValue() == 1:
-                       self.viewMode = 'transparent'
+                       self.viewMode = 'overhang'
                elif self.viewSelection.getValue() == 2:
+                       self.viewMode = 'transparent'
+               elif self.viewSelection.getValue() == 3:
                        self.viewMode = 'xray'
                else:
                        self.viewMode = 'normal'
@@ -756,6 +758,36 @@ varying float light_amount;
 void main(void)
 {
        gl_FragColor = vec4(gl_Color.xyz * light_amount, gl_Color[3]);
+}
+                       """)
+                       self._objectOverhangShader = opengl.GLShader("""
+uniform float cosAngle;
+uniform mat3 rotMatrix;
+varying float light_amount;
+
+void main(void)
+{
+    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+    gl_FrontColor = gl_Color;
+
+       light_amount = abs(dot(normalize(gl_NormalMatrix * gl_Normal), normalize(gl_LightSource[0].position.xyz)));
+       light_amount += 0.2;
+       if (normalize(rotMatrix * gl_Normal).z < -cosAngle)
+       {
+               light_amount = -10;
+       }
+}
+                       ""","""
+varying float light_amount;
+
+void main(void)
+{
+       if (light_amount == -10)
+       {
+               gl_FragColor = vec4(1, 0, 0, gl_Color[3]);
+       }else{
+               gl_FragColor = vec4(gl_Color.xyz * light_amount, gl_Color[3]);
+       }
 }
                        """)
                        self._objectLoadShader = opengl.GLShader("""
@@ -864,7 +896,11 @@ void main(void)
                        glStencilFunc(GL_ALWAYS, 1, 1)
                        glStencilOp(GL_INCR, GL_INCR, GL_INCR)
 
-                       self._objectShader.bind()
+                       if self.viewMode == 'overhang':
+                               self._objectOverhangShader.bind()
+                               self._objectOverhangShader.setUniform('cosAngle', math.cos(math.radians(60)))
+                       else:
+                               self._objectShader.bind()
                        for obj in self._scene.objects():
                                if obj._loadAnim is not None:
                                        if obj._loadAnim.isDone():
@@ -891,6 +927,12 @@ void main(void)
                                        glStencilOp(GL_INCR, GL_INCR, GL_INCR)
                                        glEnable(GL_STENCIL_TEST)
 
+                               if self.viewMode == 'overhang':
+                                       if self._selectedObj == obj and self.tempMatrix is not None:
+                                               self._objectOverhangShader.setUniform('rotMatrix', obj.getMatrix() * self.tempMatrix)
+                                       else:
+                                               self._objectOverhangShader.setUniform('rotMatrix', obj.getMatrix())
+
                                if not self._scene.checkPlatform(obj):
                                        glColor4f(0.5 * brightness, 0.5 * brightness, 0.5 * brightness, 0.8 * brightness)
                                        self._renderObject(obj)

diff --git a/Cura/gui/util/opengl.py b/Cura/gui/util/opengl.py
index d5df4eaba494530646295ecf1d60ef835943fa1e..a9de759c599288c8f2d47d4ef1af81d0cc2f1926 100644 (file)
--- a/Cura/gui/util/opengl.py
+++ b/Cura/gui/util/opengl.py
@@ -62,7 +62,12 @@ class GLShader(GLReferenceCounter):
 
        def setUniform(self, name, value):
                if self._program is not None:
-                       glUniform1f(glGetUniformLocation(self._program, name), value)
+                       if type(value) is float:
+                               glUniform1f(glGetUniformLocation(self._program, name), value)
+                       elif type(value) is numpy.matrix:
+                               glUniformMatrix3fv(glGetUniformLocation(self._program, name), 1, False, value.getA().astype(numpy.float32))
+                       else:
+                               print 'Unknown type for setUniform: %s' % (str(type(value)))
 
        def isValid(self):
                return self._program is not None