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 786d0c755c8e878a62fdada6b42f8f1eeef2af54..89a60e2cdf90107dbc9a0d6b3f5eb3ec42532243 100644
(file)
--- a/
hacks/glx/extrusion-joinoffset.c
+++ b/
hacks/glx/extrusion-joinoffset.c
@@
-2,17
+2,14
@@
/* cylinder drawing demo */
/* this demo demonstrates the various join styles */
/* cylinder drawing demo */
/* this demo demonstrates the various join styles */
-/* required include files */
-#include <GL/gl.h>
-#include <GL/glut.h>
-#include <GL/tube.h>
+#include "extrusion.h"
/* ------------------------------------------------------- */
/* the arrays in which we will store the polyline */
#define NPTS 100
/* ------------------------------------------------------- */
/* the arrays in which we will store the polyline */
#define NPTS 100
-double points [NPTS][3];
-float colors [NPTS][3];
+
static
double points [NPTS][3];
+
static
float colors [NPTS][3];
static int idx = 0;
/* some utilities for filling that array */
static int idx = 0;
/* some utilities for filling that array */
@@
-32,8
+29,8
@@
static int idx = 0;
/* the arrays in which we will store the contour */
#define NCONTOUR 100
/* the arrays in which we will store the contour */
#define NCONTOUR 100
-double contour_points [NCONTOUR][2];
-int cidx = 0;
+
static
double contour_points [NCONTOUR][2];
+
static
int cidx = 0;
/* some utilities for filling that array */
#define C_PNT(x,y) { \
/* some utilities for filling that array */
#define C_PNT(x,y) { \
@@
-91,8
+88,9
@@
void InitStuff_joinoffset (void)
gleSetJoinStyle (TUBE_JN_ANGLE | TUBE_CONTOUR_CLOSED | TUBE_JN_CAP);
}
gleSetJoinStyle (TUBE_JN_ANGLE | TUBE_CONTOUR_CLOSED | TUBE_JN_CAP);
}
-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;
@@
-114,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);
@@
-126,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;