chiark / gitweb /
And even more comments
authornallath <nallath@gmail.com>
Thu, 6 Feb 2014 15:08:25 +0000 (16:08 +0100)
committernallath <nallath@gmail.com>
Thu, 6 Feb 2014 15:08:25 +0000 (16:08 +0100)
Cura/gui/sceneView.py

index 0059ba309a748d4af8694c236e9ec316de5a56d4..be9bf37534de1fd9fc6c99398805750e91786c63 100644 (file)
@@ -898,7 +898,7 @@ class SceneView(openglGui.glGuiPanel):
                        self._zoom = self._animZoom.getPosition()
                        if self._animZoom.isDone():
                                self._animZoom = None
-               if self._objectShader is None:
+               if self._objectShader is None: #TODO: add loading shaders from file(s)
                        if openglHelpers.hasShaderSupport():
                                self._objectShader = openglHelpers.GLShader("""
                                        varying float light_amount;
@@ -974,7 +974,7 @@ class SceneView(openglGui.glGuiPanel):
                                        gl_FragColor = vec4(gl_Color.xyz * light_amount, 1.0-intensity);
                                }
                                """)
-                       if self._objectShader is None or not self._objectShader.isValid():
+                       if self._objectShader is None or not self._objectShader.isValid(): #Could not make shader.
                                self._objectShader = openglHelpers.GLFakeShader()
                                self._objectOverhangShader = openglHelpers.GLFakeShader()
                                self._objectLoadShader = None
@@ -997,7 +997,7 @@ class SceneView(openglGui.glGuiPanel):
                                glColor4ub((n >> 16) & 0xFF, (n >> 8) & 0xFF, (n >> 0) & 0xFF, 0xFF)
                                self._renderObject(obj)
 
-               if self._mouseX > -1:
+               if self._mouseX > -1: # mouse has not passed over the opengl window.
                        glFlush()
                        n = glReadPixels(self._mouseX, self.GetSize().GetHeight() - 1 - self._mouseY, 1, 1, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8)[0][0] >> 8
                        if n < len(self._scene.objects()):