projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://slackware.bholcomb.com/slackware/slackware-11.0/source/xap/xscreensaver/xscree...
[xscreensaver]
/
hacks
/
glx
/
extrusion-joinoffset.c
diff --git
a/hacks/glx/extrusion-joinoffset.c
b/hacks/glx/extrusion-joinoffset.c
index 12406b4f9029384b72bf664cd1d77d2ff7720e40..89a60e2cdf90107dbc9a0d6b3f5eb3ec42532243 100644
(file)
--- a/
hacks/glx/extrusion-joinoffset.c
+++ b/
hacks/glx/extrusion-joinoffset.c
@@
-2,18
+2,7
@@
/* cylinder drawing demo */
/* this demo demonstrates the various join styles */
/* cylinder drawing demo */
/* this demo demonstrates the various join styles */
-/* required include files */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <GL/gl.h>
-#include <GL/glut.h>
-#ifdef HAVE_GLE3
-#include <GL/gle.h>
-#else
-#include <GL/tube.h>
-#endif
+#include "extrusion.h"
/* ------------------------------------------------------- */
/* ------------------------------------------------------- */
@@
-101,6
+90,7
@@
void InitStuff_joinoffset (void)
static double up_vector[3] = {1.0, 0.0, 0.0};
static double up_vector[3] = {1.0, 0.0, 0.0};
+/* controls shape of object */
extern float lastx;
extern float lasty;
extern float lastx;
extern float lasty;
@@
-122,8
+112,10
@@
void DrawStuff_joinoffset (void)
/* set up some matrices so that the object spins with the mouse */
glPushMatrix ();
/* set up some matrices so that the object spins with the mouse */
glPushMatrix ();
- glTranslatef (0.0, 4.0, -80.0);
- glRotatef (0.5*lastx, 0.0, 1.0, 0.0);
+ glScalef (0.5, 0.5, 0.5);
+ glTranslatef (0, 4, 0);
+ /* glTranslatef (0.0, 4.0, -80.0); */
+ /* glRotatef (0.5*lastx, 0.0, 1.0, 0.0); */
gleExtrusion (cidx, moved_contour, contour_points, up_vector,
idx, points, colors);
gleExtrusion (cidx, moved_contour, contour_points, up_vector,
idx, points, colors);
@@
-134,8
+126,10
@@
void DrawStuff_joinoffset (void)
/* draw a seond copy, this time with the raw style, to compare
* things against */
glPushMatrix ();
/* draw a seond copy, this time with the raw style, to compare
* things against */
glPushMatrix ();
- glTranslatef (0.0, -4.0, -80.0);
- glRotatef (0.5*lastx, 0.0, 1.0, 0.0);
+ glScalef (0.5, 0.5, 0.5);
+ glTranslatef (0, -4, 0);
+ /* glTranslatef (0.0, -4.0, -80.0); */
+ /* glRotatef (0.5*lastx, 0.0, 1.0, 0.0); */
save_style = gleGetJoinStyle ();
style = save_style;
save_style = gleGetJoinStyle ();
style = save_style;