Merge conflic solved

[cura.git] / Cura / gui / opengl.py

diff --git a/Cura/gui/opengl.py b/Cura/gui/opengl.py
index 54d0008d286877f9b3d37975988542b3e36e32f6..83bbc2a4d98831dce2d3c15a97e54e43a6b28d72 100644 (file)
--- a/Cura/gui/opengl.py
+++ b/Cura/gui/opengl.py
@@ -77,6 +77,31 @@ def DrawMachine(machineSize):
        glVertex3f(0, machineSize.y, machineSize.z)\r
        glEnd()\r
 \r
+def DrawBox(vMin, vMax):\r
+       glBegin(GL_LINE_LOOP)\r
+       glVertex3f(vMin.x, vMin.y, vMin.z)\r
+       glVertex3f(vMax.x, vMin.y, vMin.z)\r
+       glVertex3f(vMax.x, vMax.y, vMin.z)\r
+       glVertex3f(vMin.x, vMax.y, vMin.z)\r
+       glEnd()\r
+\r
+       glBegin(GL_LINE_LOOP)\r
+       glVertex3f(vMin.x, vMin.y, vMax.z)\r
+       glVertex3f(vMax.x, vMin.y, vMax.z)\r
+       glVertex3f(vMax.x, vMax.y, vMax.z)\r
+       glVertex3f(vMin.x, vMax.y, vMax.z)\r
+       glEnd()\r
+       glBegin(GL_LINES)\r
+       glVertex3f(vMin.x, vMin.y, vMin.z)\r
+       glVertex3f(vMin.x, vMin.y, vMax.z)\r
+       glVertex3f(vMax.x, vMin.y, vMin.z)\r
+       glVertex3f(vMax.x, vMin.y, vMax.z)\r
+       glVertex3f(vMax.x, vMax.y, vMin.z)\r
+       glVertex3f(vMax.x, vMax.y, vMax.z)\r
+       glVertex3f(vMin.x, vMax.y, vMin.z)\r
+       glVertex3f(vMin.x, vMax.y, vMax.z)\r
+       glEnd()\r
+\r
 def DrawSTL(mesh):\r
        for face in mesh.faces:\r
                glBegin(GL_TRIANGLES)\r