X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fextrusion-screw.c;h=0b90bec92722c30e9f09d16fc51e95b31bc141dc;hb=2d04c4f22466851aedb6ed0f2919d148f726b889;hp=16f12b1286cacdd7b9ec2296d9b255209d420109;hpb=c596d1306f5f92f7eab76224d3b049980a14adcb;p=xscreensaver

diff --git a/hacks/glx/extrusion-screw.c b/hacks/glx/extrusion-screw.c
index 16f12b12..0b90bec9 100644
--- a/hacks/glx/extrusion-screw.c
+++ b/hacks/glx/extrusion-screw.c
@@ -12,11 +12,19 @@
  */
 
 /* required include files */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <math.h>
 #include <stdlib.h>
 #include <GL/gl.h>
-#include <GL/glut.h>
+/*#include <GL/glut.h>*/
+#ifdef HAVE_GLE3
+#include <GL/gle.h>
+#else
 #include <GL/tube.h>
+#endif
 
 #ifndef NULL
 #define NULL ((void *) 0x0)
@@ -42,8 +50,8 @@
 
 #define NUM_PTS (25)
 
-double contour [NUM_PTS][2];
-double norms [NUM_PTS][2];
+static double contour [NUM_PTS][2];
+static double norms [NUM_PTS][2];
 
 static void init_contour (void)
 {
@@ -80,11 +88,9 @@ static void init_contour (void)
    
 /* =========================================================== */
 
+/* controls shape of object */
 extern float lastx;
 extern float lasty;
-extern float rot_x;
-extern float rot_y;
-extern float rot_z;
 
 void InitStuff_screw (void)
 {
@@ -109,12 +115,9 @@ void DrawStuff_screw (void) {
 
    /* set up some matrices so that the object spins with the mouse */
    glPushMatrix ();
-   glTranslatef (0.0, 0.0, -80.0);
-   glRotatef(rot_x, 1, 0, 0);
-   glRotatef(rot_y, 0, 1, 0);
-   glRotatef(rot_z, 0, 0, 1);
-/*     glRotatef (130.0, 0.0, 1.0, 0.0); */
-/*     glRotatef (65.0, 1.0, 0.0, 0.0); */
+   /* glTranslatef (0.0, 0.0, -80.0); */
+   /* glRotatef (130.0, 0.0, 1.0, 0.0); */
+   /* glRotatef (65.0, 1.0, 0.0, 0.0); */
 
    /* draw the brand and the handle */
    gleScrew (20, contour, norms,