From: daid <daid303@gmail.com>
Date: Thu, 30 Aug 2012 13:01:05 +0000 (+0200)
Subject: Replace the line grid with a checkerboard pattern, this looks better and less like... 
X-Git-Tag: 13.03~362
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=10a828d00436f1e9a856845683db5b1ce53161ab;p=cura.git

Replace the line grid with a checkerboard pattern, this looks better and less like RepG
---

diff --git a/Cura/gui/opengl.py b/Cura/gui/opengl.py
index fd623262..8a5deae3 100644
--- a/Cura/gui/opengl.py
+++ b/Cura/gui/opengl.py
@@ -56,16 +56,38 @@ def DrawMachine(machineSize):
 	glVertex3f(machineSize.x, machineSize.y, 0)
 	glVertex3f(0, machineSize.y, 0)
 	glEnd()
-	glColor3f(0.7,0.7,0.7)
-	glLineWidth(2)
-	glBegin(GL_LINES)
-	for i in xrange(0, int(machineSize.x), 10):
-		glVertex3f(i, 0, 0)
-		glVertex3f(i, machineSize.y, 0)
-	for i in xrange(0, int(machineSize.y), 10):
-		glVertex3f(0, i, 0)
-		glVertex3f(machineSize.x, i, 0)
-	glEnd()
+	if False:
+		glColor3f(0.7,0.7,0.7)
+		glLineWidth(2)
+		glBegin(GL_LINES)
+		for i in xrange(0, int(machineSize.x), 10):
+			glVertex3f(i, 0, 0)
+			glVertex3f(i, machineSize.y, 0)
+		for i in xrange(0, int(machineSize.y), 10):
+			glVertex3f(0, i, 0)
+			glVertex3f(machineSize.x, i, 0)
+		glEnd()
+	else:
+		glColor4f(0.7,0.7,0.7,0.7)
+		glDisable(GL_CULL_FACE)
+		glEnable(GL_BLEND)
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)
+		glBegin(GL_QUADS)
+		for x in xrange(0, int(machineSize.x), 20):
+			for y in xrange(0, int(machineSize.y), 20):
+				glVertex3f(x, y, -0.01)
+				glVertex3f(min(x+10, machineSize.x), y, -0.01)
+				glVertex3f(min(x+10, machineSize.x), min(y+10, machineSize.y), -0.01)
+				glVertex3f(x, min(y+10, machineSize.y), -0.01)
+		for x in xrange(10, int(machineSize.x), 20):
+			for y in xrange(10, int(machineSize.y), 20):
+				glVertex3f(x, y, -0.01)
+				glVertex3f(min(x+10, machineSize.x), y, -0.01)
+				glVertex3f(min(x+10, machineSize.x), min(y+10, machineSize.y), -0.01)
+				glVertex3f(x, min(y+10, machineSize.y), -0.01)
+		glEnd()
+		glEnable(GL_CULL_FACE)
+		glDisable(GL_BLEND)
 	glLineWidth(1)
 	glBegin(GL_LINE_LOOP)
 	glVertex3f(0, 0, machineSize.z)
diff --git a/Cura/gui/preview3d.py b/Cura/gui/preview3d.py
index 2d53566e..d32992c9 100644
--- a/Cura/gui/preview3d.py
+++ b/Cura/gui/preview3d.py
@@ -486,7 +486,6 @@ class PreviewGLCanvas(glcanvas.GLCanvas):
 
 	def OnDraw(self):
 		machineSize = self.parent.machineSize
-		opengl.DrawMachine(machineSize)
 
 		if self.parent.gcode != None and self.parent.gcodeDirty:
 			if self.gcodeDisplayListCount < len(self.parent.gcode.layerList) or self.gcodeDisplayList == None:
@@ -633,6 +632,7 @@ class PreviewGLCanvas(glcanvas.GLCanvas):
 			glEnd()
 			glEnable(GL_DEPTH_TEST)
 		glFlush()
+		opengl.DrawMachine(machineSize)
 	
 	def drawModel(self, obj):
 		multiX = 1 #int(profile.getProfileSetting('model_multiply_x'))
diff --git a/Cura/gui/projectPlanner.py b/Cura/gui/projectPlanner.py
index 0f71ec88..29d47793 100644
--- a/Cura/gui/projectPlanner.py
+++ b/Cura/gui/projectPlanner.py
@@ -779,7 +779,6 @@ class PreviewGLCanvas(glcanvas.GLCanvas):
 
 	def OnDraw(self):
 		machineSize = self.parent.machineSize
-		opengl.DrawMachine(util3d.Vector3(machineSize[0], machineSize[1], machineSize[2]))
 		extraSizeMin, extraSizeMax = self.parent.getExtraHeadSize()
 
 		for item in self.parent.list:
@@ -868,6 +867,7 @@ class PreviewGLCanvas(glcanvas.GLCanvas):
 			
 			glPopMatrix()
 		
+		opengl.DrawMachine(util3d.Vector3(machineSize[0], machineSize[1], machineSize[2]))
 		glFlush()
 
 class ProjectSliceProgressWindow(wx.Frame):