chiark / gitweb /
Fix timelaps recording support
[cura.git] / Cura / gui / opengl.py
index f553e27f9ea84bf96286a8b7c9138a2d07aefec4..fe1cf58353f53a5086ccaf6d8cb53c2023e80896 100644 (file)
@@ -337,12 +337,14 @@ def DrawGCodeLayer(layer):
                                c = retractColor\r
                        else:\r
                                c = moveColor\r
+               zOffset = 0.01\r
                if path.type == 'extrude':\r
                        if path.pathType == 'FILL':\r
                                c = fillColorCycle[fillCycle]\r
                                fillCycle = (fillCycle + 1) % len(fillColorCycle)\r
                        elif path.pathType == 'WALL-INNER':\r
                                c = innerWallColor\r
+                               zOffset = 0.02\r
                        elif path.pathType == 'SUPPORT':\r
                                c = supportColor\r
                        elif path.pathType == 'SKIRT':\r
@@ -375,10 +377,10 @@ def DrawGCodeLayer(layer):
 \r
                                glBegin(GL_QUADS)\r
                                glColor3fv(c)\r
-                               glVertex3f(vv0.x, vv0.y, vv0.z - 0.01)\r
-                               glVertex3f(vv1.x, vv1.y, vv1.z - 0.01)\r
-                               glVertex3f(vv3.x, vv3.y, vv3.z - 0.01)\r
-                               glVertex3f(vv2.x, vv2.y, vv2.z - 0.01)\r
+                               glVertex3f(vv0.x, vv0.y, vv0.z - zOffset)\r
+                               glVertex3f(vv1.x, vv1.y, vv1.z - zOffset)\r
+                               glVertex3f(vv3.x, vv3.y, vv3.z - zOffset)\r
+                               glVertex3f(vv2.x, vv2.y, vv2.z - zOffset)\r
                                glEnd()\r
                                if prevNormal != None:\r
                                        n = (normal + prevNormal)\r
@@ -387,15 +389,15 @@ def DrawGCodeLayer(layer):
                                        vv5 = v0 - n * lineWidth\r
                                        glBegin(GL_QUADS)\r
                                        glColor3fv(c)\r
-                                       glVertex3f(vv2.x, vv2.y, vv2.z)\r
-                                       glVertex3f(vv4.x, vv4.y, vv4.z)\r
-                                       glVertex3f(prevVv3.x, prevVv3.y, prevVv3.z)\r
-                                       glVertex3f(v0.x, v0.y, v0.z)\r
+                                       glVertex3f(vv2.x, vv2.y, vv2.z - zOffset)\r
+                                       glVertex3f(vv4.x, vv4.y, vv4.z - zOffset)\r
+                                       glVertex3f(prevVv3.x, prevVv3.y, prevVv3.z - zOffset)\r
+                                       glVertex3f(v0.x, v0.y, v0.z - zOffset)\r
                                        \r
-                                       glVertex3f(vv0.x, vv0.y, vv0.z)\r
-                                       glVertex3f(vv5.x, vv5.y, vv5.z)\r
-                                       glVertex3f(prevVv1.x, prevVv1.y, prevVv1.z)\r
-                                       glVertex3f(v0.x, v0.y, v0.z)\r
+                                       glVertex3f(vv0.x, vv0.y, vv0.z - zOffset)\r
+                                       glVertex3f(vv5.x, vv5.y, vv5.z - zOffset)\r
+                                       glVertex3f(prevVv1.x, prevVv1.y, prevVv1.z - zOffset)\r
+                                       glVertex3f(v0.x, v0.y, v0.z - zOffset)\r
                                        glEnd()\r
                                        \r
                                prevNormal = normal\r