X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fextrusion-helix3.c;h=7650f463d252894f165335970756d4b2f377ac86;hb=3f1091236d800c43a3124c44c7da54e53f205b13;hp=003e4bd666977ce5bca342715d5f6499afa4cdbf;hpb=93f25dc6827112d98b8b855ea85c8f5eb8123086;p=xscreensaver diff --git a/hacks/glx/extrusion-helix3.c b/hacks/glx/extrusion-helix3.c index 003e4bd6..7650f463 100644 --- a/hacks/glx/extrusion-helix3.c +++ b/hacks/glx/extrusion-helix3.c @@ -13,25 +13,11 @@ * Written by Linas Vepstas, March 1995 */ -/* required include files */ -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#ifdef HAVE_GLE3 -#include -#else -#include -#endif - -/* most recent mouse postion */ +#include "extrusion.h" + +/* controls shape of object */ extern float lastx; extern float lasty; -extern float rot_x; -extern float rot_y; -extern float rot_z; void InitStuff_helix3 (void) { @@ -45,12 +31,9 @@ void DrawStuff_helix3 (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 (220.0, 0.0, 1.0, 0.0); */ -/* glRotatef (65.0, 1.0, 0.0, 0.0); */ +/* glTranslatef (0.0, 0.0, -80.0); */ +/* glRotatef (220.0, 0.0, 1.0, 0.0); */ +/* glRotatef (65.0, 1.0, 0.0, 0.0); */ /* Phew. FINALLY, Draw the helix -- */ gleSetJoinStyle (TUBE_NORM_EDGE | TUBE_JN_ANGLE | TUBE_JN_CAP);