Update on the 3D preview, remove the boxed lines and make an "inside viewing" box.

diff --git a/Cura/gui/opengl.py b/Cura/gui/opengl.py
index 5ed7f4c9c1a396904654e491abbdc914d3594dc8..3399761138eacc3c5e01a80d80ef8372116558cf 100644 (file)
--- a/Cura/gui/opengl.py
+++ b/Cura/gui/opengl.py
@@ -59,6 +59,38 @@ def DrawMachine(machineSize):
                        glVertex3f(0, i, 0)\r
                        glVertex3f(machineSize.x, i, 0)\r
                glEnd()\r
+               \r
+               glEnable(GL_LINE_SMOOTH)\r
+               glEnable(GL_BLEND)\r
+               glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)\r
+               glHint(GL_LINE_SMOOTH_HINT, GL_DONT_CARE);\r
+\r
+               glColor3f(0.0,0.0,0.0)\r
+               glLineWidth(4)\r
+               glBegin(GL_LINE_LOOP)\r
+               glVertex3f(0, 0, 0)\r
+               glVertex3f(machineSize.x, 0, 0)\r
+               glVertex3f(machineSize.x, machineSize.y, 0)\r
+               glVertex3f(0, machineSize.y, 0)\r
+               glEnd()\r
+               \r
+               glLineWidth(2)\r
+               glBegin(GL_LINE_LOOP)\r
+               glVertex3f(0, 0, machineSize.z)\r
+               glVertex3f(machineSize.x, 0, machineSize.z)\r
+               glVertex3f(machineSize.x, machineSize.y, machineSize.z)\r
+               glVertex3f(0, machineSize.y, machineSize.z)\r
+               glEnd()\r
+               glBegin(GL_LINES)\r
+               glVertex3f(0, 0, 0)\r
+               glVertex3f(0, 0, machineSize.z)\r
+               glVertex3f(machineSize.x, 0, 0)\r
+               glVertex3f(machineSize.x, 0, machineSize.z)\r
+               glVertex3f(machineSize.x, machineSize.y, 0)\r
+               glVertex3f(machineSize.x, machineSize.y, machineSize.z)\r
+               glVertex3f(0, machineSize.y, 0)\r
+               glVertex3f(0, machineSize.y, machineSize.z)\r
+               glEnd()\r
        else:\r
                glDisable(GL_CULL_FACE)\r
                glEnable(GL_BLEND)\r
@@ -94,40 +126,43 @@ def DrawMachine(machineSize):
                                glVertex3f(x, min(y+10, machineSize.y), -0.01)\r
                glEnd()\r
                glEnable(GL_CULL_FACE)\r
-               glDisable(GL_BLEND)\r
-       \r
-       glEnable(GL_LINE_SMOOTH)\r
-       glEnable(GL_BLEND)\r
-       glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)\r
-       glHint(GL_LINE_SMOOTH_HINT, GL_DONT_CARE);\r
 \r
-       glColor3f(0.0,0.0,0.0)\r
-       glLineWidth(4)\r
-       glBegin(GL_LINE_LOOP)\r
-       glVertex3f(0, 0, 0)\r
-       glVertex3f(machineSize.x, 0, 0)\r
-       glVertex3f(machineSize.x, machineSize.y, 0)\r
-       glVertex3f(0, machineSize.y, 0)\r
-       glEnd()\r
-       \r
-       glLineWidth(2)\r
-       glBegin(GL_LINE_LOOP)\r
-       glVertex3f(0, 0, machineSize.z)\r
-       glVertex3f(machineSize.x, 0, machineSize.z)\r
-       glVertex3f(machineSize.x, machineSize.y, machineSize.z)\r
-       glVertex3f(0, machineSize.y, machineSize.z)\r
-       glEnd()\r
-       glBegin(GL_LINES)\r
-       glVertex3f(0, 0, 0)\r
-       glVertex3f(0, 0, machineSize.z)\r
-       glVertex3f(machineSize.x, 0, 0)\r
-       glVertex3f(machineSize.x, 0, machineSize.z)\r
-       glVertex3f(machineSize.x, machineSize.y, 0)\r
-       glVertex3f(machineSize.x, machineSize.y, machineSize.z)\r
-       glVertex3f(0, machineSize.y, 0)\r
-       glVertex3f(0, machineSize.y, machineSize.z)\r
-       glEnd()\r
+               glColor4ub(5,171,231,128)\r
+               glBegin(GL_QUADS)\r
+               glVertex3f(0, 0, machineSize.z)\r
+               glVertex3f(0, machineSize.y, machineSize.z)\r
+               glVertex3f(machineSize.x, machineSize.y, machineSize.z)\r
+               glVertex3f(machineSize.x, 0, machineSize.z)\r
+               glEnd()\r
+               \r
+               glColor4ub(5,171,231,192)\r
+               glBegin(GL_QUADS)\r
+               glVertex3f(0, 0, 0)\r
+               glVertex3f(0, 0, machineSize.z)\r
+               glVertex3f(machineSize.x, 0, machineSize.z)\r
+               glVertex3f(machineSize.x, 0, 0)\r
+\r
+               glVertex3f(0, machineSize.y, machineSize.z)\r
+               glVertex3f(0, machineSize.y, 0)\r
+               glVertex3f(machineSize.x, machineSize.y, 0)\r
+               glVertex3f(machineSize.x, machineSize.y, machineSize.z)\r
+               glEnd()\r
+\r
+               glColor4ub(5,171,231,255)\r
+               glBegin(GL_QUADS)\r
+               glVertex3f(0, 0, machineSize.z)\r
+               glVertex3f(0, 0, 0)\r
+               glVertex3f(0, machineSize.y, 0)\r
+               glVertex3f(0, machineSize.y, machineSize.z)\r
 \r
+               glVertex3f(machineSize.y, 0, 0)\r
+               glVertex3f(machineSize.y, 0, machineSize.z)\r
+               glVertex3f(machineSize.x, machineSize.y, machineSize.z)\r
+               glVertex3f(machineSize.x, machineSize.y, 0)\r
+               glEnd()\r
+\r
+               glDisable(GL_BLEND)\r
+       \r
        glPushMatrix()\r
        glTranslate(-5,-5,0)\r
        glLineWidth(2)\r