Merge lp:~mc-return/compiz/compiz.merge-fix1117311-gears-cylinders-not-rendered-correctly into lp:compiz/0.9.9

[MC Return]

Cube Gears plugin:
Fixed the rendering of the inner cylinders by rendering them first.

(LP: #1117311)

There is still a minor rendering problem left. I do not
recall, if the same happened with Compiz 0.9.7 versions,
but currently all gears are rendered on top of each other
and do not care, which gear is in front...
Should also be fixed sooner or later...

[Sam Spilsbury (smspillaz)]

review: Approve

=== modified file 'plugins/gears/src/gears.cpp'
--- plugins/gears/src/gears.cpp	2013-02-02 23:01:02 +0000
+++ plugins/gears/src/gears.cpp	2013-02-06 13:26:22 +0000
@@ -48,6 +48,21 @@
 
     da = 2.0 * M_PI / teeth / 4.0;
 
+    glShadeModel (GL_SMOOTH);
+
+    /* draw inside radius cylinder */
+    glBegin (GL_QUAD_STRIP);
+
+    for (i = 0; i <= teeth; i++)
+    {
+	angle = i * 2.0 * M_PI / teeth;
+	glNormal3f (-cos (angle), -sin (angle), 0.0);
+	glVertex3f (r0 * cos (angle), r0 * sin (angle), -width * 0.5);
+	glVertex3f (r0 * cos (angle), r0 * sin (angle), width * 0.5);
+    }
+
+    glEnd();
+
     glShadeModel (GL_FLAT);
 
     glNormal3f (0.0, 0.0, 1.0);
@@ -172,21 +187,6 @@
     glVertex3f (r1 * cos (0), r1 * sin (0), -width * 0.5);
 
     glEnd();
-
-    glShadeModel (GL_SMOOTH);
-
-    /* draw inside radius cylinder */
-    glBegin (GL_QUAD_STRIP);
-
-    for (i = 0; i <= teeth; i++)
-    {
-	angle = i * 2.0 * M_PI / teeth;
-	glNormal3f (-cos (angle), -sin (angle), 0.0);
-	glVertex3f (r0 * cos (angle), r0 * sin (angle), -width * 0.5);
-	glVertex3f (r0 * cos (angle), r0 * sin (angle), width * 0.5);
-    }
-
-    glEnd();
 }
 
 void