From: Daid <daid303@gmail.com>
Date: Sun, 2 Sep 2012 12:25:38 +0000 (+0200)
Subject: Update on the 3D preview, remove the boxed lines and make an "inside viewing" box.
X-Git-Tag: 13.03~353
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b63fe566218a0dc14ce035c1b14be0c612a685ac;p=cura.git

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 5ed7f4c9..33997611 100644
--- a/Cura/gui/opengl.py
+++ b/Cura/gui/opengl.py
@@ -59,6 +59,38 @@ def DrawMachine(machineSize):
 			glVertex3f(0, i, 0)
 			glVertex3f(machineSize.x, i, 0)
 		glEnd()
+		
+		glEnable(GL_LINE_SMOOTH)
+		glEnable(GL_BLEND)
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)
+		glHint(GL_LINE_SMOOTH_HINT, GL_DONT_CARE);
+
+		glColor3f(0.0,0.0,0.0)
+		glLineWidth(4)
+		glBegin(GL_LINE_LOOP)
+		glVertex3f(0, 0, 0)
+		glVertex3f(machineSize.x, 0, 0)
+		glVertex3f(machineSize.x, machineSize.y, 0)
+		glVertex3f(0, machineSize.y, 0)
+		glEnd()
+		
+		glLineWidth(2)
+		glBegin(GL_LINE_LOOP)
+		glVertex3f(0, 0, machineSize.z)
+		glVertex3f(machineSize.x, 0, machineSize.z)
+		glVertex3f(machineSize.x, machineSize.y, machineSize.z)
+		glVertex3f(0, machineSize.y, machineSize.z)
+		glEnd()
+		glBegin(GL_LINES)
+		glVertex3f(0, 0, 0)
+		glVertex3f(0, 0, machineSize.z)
+		glVertex3f(machineSize.x, 0, 0)
+		glVertex3f(machineSize.x, 0, machineSize.z)
+		glVertex3f(machineSize.x, machineSize.y, 0)
+		glVertex3f(machineSize.x, machineSize.y, machineSize.z)
+		glVertex3f(0, machineSize.y, 0)
+		glVertex3f(0, machineSize.y, machineSize.z)
+		glEnd()
 	else:
 		glDisable(GL_CULL_FACE)
 		glEnable(GL_BLEND)
@@ -94,40 +126,43 @@ def DrawMachine(machineSize):
 				glVertex3f(x, min(y+10, machineSize.y), -0.01)
 		glEnd()
 		glEnable(GL_CULL_FACE)
-		glDisable(GL_BLEND)
-	
-	glEnable(GL_LINE_SMOOTH)
-	glEnable(GL_BLEND)
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)
-	glHint(GL_LINE_SMOOTH_HINT, GL_DONT_CARE);
 
-	glColor3f(0.0,0.0,0.0)
-	glLineWidth(4)
-	glBegin(GL_LINE_LOOP)
-	glVertex3f(0, 0, 0)
-	glVertex3f(machineSize.x, 0, 0)
-	glVertex3f(machineSize.x, machineSize.y, 0)
-	glVertex3f(0, machineSize.y, 0)
-	glEnd()
-	
-	glLineWidth(2)
-	glBegin(GL_LINE_LOOP)
-	glVertex3f(0, 0, machineSize.z)
-	glVertex3f(machineSize.x, 0, machineSize.z)
-	glVertex3f(machineSize.x, machineSize.y, machineSize.z)
-	glVertex3f(0, machineSize.y, machineSize.z)
-	glEnd()
-	glBegin(GL_LINES)
-	glVertex3f(0, 0, 0)
-	glVertex3f(0, 0, machineSize.z)
-	glVertex3f(machineSize.x, 0, 0)
-	glVertex3f(machineSize.x, 0, machineSize.z)
-	glVertex3f(machineSize.x, machineSize.y, 0)
-	glVertex3f(machineSize.x, machineSize.y, machineSize.z)
-	glVertex3f(0, machineSize.y, 0)
-	glVertex3f(0, machineSize.y, machineSize.z)
-	glEnd()
+		glColor4ub(5,171,231,128)
+		glBegin(GL_QUADS)
+		glVertex3f(0, 0, machineSize.z)
+		glVertex3f(0, machineSize.y, machineSize.z)
+		glVertex3f(machineSize.x, machineSize.y, machineSize.z)
+		glVertex3f(machineSize.x, 0, machineSize.z)
+		glEnd()
+		
+		glColor4ub(5,171,231,192)
+		glBegin(GL_QUADS)
+		glVertex3f(0, 0, 0)
+		glVertex3f(0, 0, machineSize.z)
+		glVertex3f(machineSize.x, 0, machineSize.z)
+		glVertex3f(machineSize.x, 0, 0)
+
+		glVertex3f(0, machineSize.y, machineSize.z)
+		glVertex3f(0, machineSize.y, 0)
+		glVertex3f(machineSize.x, machineSize.y, 0)
+		glVertex3f(machineSize.x, machineSize.y, machineSize.z)
+		glEnd()
+
+		glColor4ub(5,171,231,255)
+		glBegin(GL_QUADS)
+		glVertex3f(0, 0, machineSize.z)
+		glVertex3f(0, 0, 0)
+		glVertex3f(0, machineSize.y, 0)
+		glVertex3f(0, machineSize.y, machineSize.z)
 
+		glVertex3f(machineSize.y, 0, 0)
+		glVertex3f(machineSize.y, 0, machineSize.z)
+		glVertex3f(machineSize.x, machineSize.y, machineSize.z)
+		glVertex3f(machineSize.x, machineSize.y, 0)
+		glEnd()
+
+		glDisable(GL_BLEND)
+	
 	glPushMatrix()
 	glTranslate(-5,-5,0)
 	glLineWidth(2)