Merge lp:~hikiko/nux/nux.removed-projections-from-modelview into lp:nux

[Eleni Maria Stea]

glFrustrum should be performed in projection mode, otherwise the modelview matrix has projection elements and the lighting and 3d clipping planes of unity and other compiz plugins that load this modelview matrix are buggy.

glFrustrum should be performed in projection mode, otherwise the modelview matrix has projection elements and the lighting and 3d clipping planes of unity and other compiz plugins that load this modelview matrix are buggy.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:858
http://jenkins.qa.ubuntu.com/job/nux-ci/116/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-vivid-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-vivid-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-vivid-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/nux-ci/116/rebuild

review: Approve (continuous-integration)

[Stephen M. Webb (bregma)]

Setting the frustum on the modelview matrix is just crazy, It's surprising this bug made it this far.

review: Approve

=== modified file 'NuxGraphics/GraphicsEngine.cpp'
--- NuxGraphics/GraphicsEngine.cpp	2013-10-30 23:22:52 +0000
+++ NuxGraphics/GraphicsEngine.cpp	2015-03-30 15:23:28 +0000
@@ -830,8 +830,6 @@
 #ifndef NUX_OPENGLES_20
     CHECKGL(glMatrixMode(GL_PROJECTION));
     CHECKGL(glLoadIdentity());
-    CHECKGL(glMatrixMode(GL_MODELVIEW));
-    CHECKGL(glLoadIdentity());
     CHECKGL(glFrustum(
                 -1.0,     // left
                 1.0,      // right
@@ -840,6 +838,8 @@
                 0.1,    // near,
                 2000.0  // far
               ));
+    CHECKGL(glMatrixMode(GL_MODELVIEW));
+    CHECKGL(glLoadIdentity());
 #endif
   }