Fixed the top down view light issue, made the project planner use the configured...

diff --git a/Cura/gui/opengl.py b/Cura/gui/opengl.py
index 29b3f0c909adcb5509240c2a58ce2509ff372f8a..8a61d16e0ebbde3abfe2e2b68bfbaeda3bb10ff0 100644 (file)
--- a/Cura/gui/opengl.py
+++ b/Cura/gui/opengl.py
@@ -41,7 +41,7 @@ def InitGL(window, view3D, zoom):
        if view3D:\r
                gluPerspective(45.0, aspect, 1.0, 1000.0)\r
        else:\r
-               glOrtho(-aspect, aspect, -1, 1, -1000.0, 1000.0)\r
+               glOrtho(-aspect * (zoom), aspect * (zoom), -1.0 * (zoom), 1.0 * (zoom), -1000.0, 1000.0)\r
 \r
        glMatrixMode(GL_MODELVIEW)\r
        glLoadIdentity()\r

diff --git a/Cura/gui/preview3d.py b/Cura/gui/preview3d.py
index 023720a21b26f9990f5dd0e4fab4c761335ca5ab..fb9df6433caba453275163258a01f9e5b9c618a6 100644 (file)
--- a/Cura/gui/preview3d.py
+++ b/Cura/gui/preview3d.py
@@ -544,8 +544,7 @@ class PreviewGLCanvas(glcanvas.GLCanvas):
                                if self.parent.objectsMaxV != None:\r
                                        glTranslate(0,0,-(self.parent.objectsMaxV[2]-self.parent.objectsMinV[2]) * profile.getProfileSettingFloat('model_scale') / 2)\r
                else:\r
-                       glScale(1.0/self.zoom, 1.0/self.zoom, 1.0)\r
-                       glTranslate(self.offsetX, self.offsetY, 0.0)\r
+                       glTranslate(self.offsetX, self.offsetY, 0)\r
 \r
                self.viewport = glGetIntegerv(GL_VIEWPORT);\r
                self.modelMatrix = glGetDoublev(GL_MODELVIEW_MATRIX);\r

diff --git a/Cura/gui/projectPlanner.py b/Cura/gui/projectPlanner.py
index 943eed5266530096e3ad015d1ced2072d6b85805..767ca07579a689aa9dd4c0b486a7a1b59cecb44b 100644 (file)
--- a/Cura/gui/projectPlanner.py
+++ b/Cura/gui/projectPlanner.py
@@ -722,7 +722,9 @@ class PreviewGLCanvas(glcanvas.GLCanvas):
                self.offsetY = 0\r
                self.view3D = False\r
                self.allowDrag = False\r
-       \r
+\r
+               self.objColor = profile.getPreferenceColour('model_colour')\r
+\r
        def OnMouseLeftDown(self,e):\r
                self.allowDrag = True\r
        \r
@@ -780,7 +782,6 @@ class PreviewGLCanvas(glcanvas.GLCanvas):
                        glRotate(-self.pitch, 1,0,0)\r
                        glRotate(self.yaw, 0,0,1)\r
                else:\r
-                       glScale(1.0/self.zoom, 1.0/self.zoom, 1.0)\r
                        glTranslate(self.offsetX, self.offsetY, 0.0)\r
                glTranslate(-self.parent.machineSize[0]/2, -self.parent.machineSize[1]/2, 0)\r
 \r
@@ -822,11 +823,11 @@ class PreviewGLCanvas(glcanvas.GLCanvas):
                        \r
                        if item.validPlacement:\r
                                if self.parent.selection == item:\r
-                                       glLightfv(GL_LIGHT0, GL_DIFFUSE,  [1.0, 0.9, 0.7, 1.0])\r
-                                       glLightfv(GL_LIGHT0, GL_AMBIENT,  [0.2, 0.3, 0.2, 0.0])\r
+                                       glLightfv(GL_LIGHT0, GL_DIFFUSE,  map(lambda x: x + 0.2, self.objColor))\r
+                                       glLightfv(GL_LIGHT0, GL_AMBIENT,  map(lambda x: x / 2, self.objColor))\r
                                else:\r
-                                       glLightfv(GL_LIGHT0, GL_DIFFUSE,  [1.0, 0.8, 0.6, 1.0])\r
-                                       glLightfv(GL_LIGHT0, GL_AMBIENT,  [0.2, 0.1, 0.1, 0.0])\r
+                                       glLightfv(GL_LIGHT0, GL_DIFFUSE,  self.objColor)\r
+                                       glLightfv(GL_LIGHT0, GL_AMBIENT,  map(lambda x: x / 2, self.objColor))\r
                        else:\r
                                if self.parent.selection == item:\r
                                        glLightfv(GL_LIGHT0, GL_DIFFUSE,  [1.0, 0.0, 0.0, 0.0])\r