-/* thebox --- 3D bouncing balls that explode */
+/* boxed --- 3D bouncing balls that explode */
-#if !defined( lint ) && !defined( SABER )
+#if 0
static const char sccsid[] = "@(#)boxed.c 0.9 01/09/26 xlockmore";
-
#endif
/*-
* as an OpenGL screensaver for the xscreensaver package.
* Lots of hardcoded values still in place. Also, there are some
* copy/paste leftovers from the gears hack. opts don't work.
+ *
+ * 2005: opts work. added options -balls, -ballsize, -explosion
+ *
*/
-#include <X11/Intrinsic.h>
#include "boxed.h"
/*
*/
#ifdef STANDALONE
-# define PROGCLASS "boxed"
-# define HACK_INIT init_boxed
-# define HACK_DRAW draw_boxed
-# define HACK_RESHAPE reshape_boxed
-# define boxed_opts xlockmore_opts
-# define DEFAULTS "*delay: 20000 \n" \
- "*showFPS: False \n" \
-
-# include "xlockmore.h" /* from the xscreensaver distribution */
+# define DEFAULTS "*delay: 20000 \n" \
+ "*showFPS: False \n" \
+ "*wireframe: False \n"
+
+# define refresh_boxed 0
+# define boxed_handle_event 0
+# include "xlockmore.h" /* from the xscreensaver distribution */
#else /* !STANDALONE */
-# include "xlock.h" /* from the xlockmore distribution */
+# include "xlock.h" /* from the xlockmore distribution */
#endif /* !STANDALONE */
#ifdef USE_GL
-#include <GL/glu.h>
+
+# define DEF_SPEED "0.5"
+# define DEF_BALLS "25"
+# define DEF_BALLSIZE "2.0"
+# define DEF_EXPLOSION "15.0"
+# define DEF_DECAY "0.1"
#undef countof
#define countof(x) (int)(sizeof((x))/sizeof((*x)))
#undef rnd
-#define rnd() ( ((float)random()) / ((float)RAND_MAX * 2.0) )
+#define rnd() (frand(1.0))
-/* #define DEF_PLANETARY "False"
+static GLfloat speed; /* jwz -- overall speed factor applied to all motion */
+static int cfg_balls;
+static GLfloat cfg_ballsize;
+static GLfloat cfg_explosion;
+static GLfloat cfg_decay;
-static int planetary;
static XrmOptionDescRec opts[] = {
- {"-planetary", ".gears.planetary", XrmoptionNoArg, (caddr_t) "true" },
- {"+planetary", ".gears.planetary", XrmoptionNoArg, (caddr_t) "false" },
+ {"-speed", ".boxed.speed", XrmoptionSepArg, 0},
+ {"-balls", ".boxed.balls", XrmoptionSepArg, 0},
+ {"-ballsize", ".boxed.ballsize", XrmoptionSepArg, 0},
+ {"-explosion", ".boxed.explosion", XrmoptionSepArg, 0},
+ {"-decay", ".boxed.decay", XrmoptionSepArg, 0},
};
static argtype vars[] = {
- {(caddr_t *) &planetary, "planetary", "Planetary", DEF_PLANETARY, t_Bool},
+ {&speed, "speed", "Speed", DEF_SPEED, t_Float},
+ {&cfg_balls, "balls", "Balls", DEF_BALLS, t_Int},
+ {&cfg_ballsize, "ballsize", "Ball Size", DEF_BALLSIZE, t_Float},
+ {&cfg_explosion, "explosion", "Explosion", DEF_EXPLOSION, t_Float},
+ {&cfg_decay, "decay", "Explosion Decay", DEF_DECAY, t_Float},
};
-*/
-/* ModeSpecOpts boxed_opts = {countof(opts), opts, countof(vars), vars, NULL}; */
-
-ModeSpecOpt boxed_opts = {0, NULL, 0, NULL, NULL};
+ENTRYPOINT ModeSpecOpt boxed_opts = {countof(opts), opts, countof(vars), vars, NULL};
#ifdef USE_MODULES
#define TRUE 1
#define FALSE 0
-/* rendering defines */
-
-/* box size */
-#define BOX_SIZE 20.0f
-
/* camera */
#define CAM_HEIGHT 100.0f
#define CAMDISTANCE_MIN 20.0
#define CAMDISTANCE_SPEED 1.5
/* rendering the sphere */
-#define MESH_SIZE 5
+#define MESH_SIZE 10
#define SPHERE_VERTICES (2+MESH_SIZE*MESH_SIZE*2)
#define SPHERE_INDICES ((MESH_SIZE*4 + MESH_SIZE*4*(MESH_SIZE-1))*3)
-#define EXPLOSION 10.0f
-#define MAXBALLS 50;
-#define NUMBALLS 12;
-#define BALLSIZE 3.0f;
-
/*
**-----------------------------------------------------------------------------
** Typedefs
vectorf loc;
vectorf dir;
BOOL far;
+ BOOL gone;
} tri;
typedef struct {
int lifetime;
float scalefac;
float explosion;
+ float decay;
vectorf color;
tri *tris;
GLint *indices;
int numballs;
float ballsize;
float explosion;
+ float decay;
BOOL textures;
BOOL transparent;
float camspeed;
float cam_x_speed, cam_z_speed, cam_y_speed;
boxed_config config;
float tic;
+ float camtic;
vectorf spherev[SPHERE_VERTICES];
GLint spherei[SPHERE_INDICES];
ballman bman;
triman *tman;
GLXContext *glx_context;
- GLint listobjects;
- GLint gllists[3];
+ GLuint listobjects;
+ GLuint gllists[3];
Window window;
BOOL stop;
char *tex1;
} boxedstruct;
-#define GLL_PATTERN 1
-#define GLL_BALL 2
-#define GLL_BOX 3
+#define GLL_PATTERN 0
+#define GLL_BALL 1
+#define GLL_BOX 2
/*
**----------------------------------------------------------------------------
* Input:
*/
-static void generatesphere(void)
+static void generatesphere(boxedstruct *gp)
{
float dj = M_PI/(MESH_SIZE+1.0f);
float di = M_PI/MESH_SIZE;
* vertices 0 and 1 are the north and south poles
*/
- spherei = boxed->spherei;
- spherev = boxed->spherev;
+ spherei = gp->spherei;
+ spherev = gp->spherev;
spherev[0].x = 0.0f; spherev[0].y =1.0f; spherev[0].z = 0.0f;
spherev[1].x = 0.0f; spherev[1].y =-1.0f; spherev[1].z = 0.0f;
* create fresh ball
*/
-void createball(ball *newball) {
+static void createball(ball *newball)
+{
float r=0.0f,g=0.0f,b=0.0f;
newball->loc.x = 5-10*rnd();
newball->loc.y = 35+20*rnd();
newball->loc.z = 5-10*rnd();
- newball->dir.x = 0.5f-rnd();
+ newball->dir.x = (0.5f-rnd()) * speed;
newball->dir.y = 0.0;
- newball->dir.z = 0.5-rnd();
+ newball->dir.z = (0.5-rnd()) * speed;
newball->offside = 0;
newball->bounced = FALSE;
- newball->radius = BALLSIZE;
- while (r+g+b < 1.7f ) {
+ newball->radius = cfg_ballsize;
+ while (r+g+b < 1.8f ) {
newball->color.x = r=rnd();
newball->color.y = g=rnd();
newball->color.z = b=rnd();
/* Update position of each ball */
-void updateballs(ballman *bman) {
+static void updateballs(ballman *bman)
+{
register int b,j;
vectorf dvect,richting,relspeed,influence;
GLfloat squaredist;
for (b=0;b<bman->num_balls;b++) {
+ GLfloat gravity = 0.30f * speed;
+
/* apply gravity */
- bman->balls[b].dir.y -= 0.15f;
+ bman->balls[b].dir.y -= gravity;
/* apply movement */
addvectors(&bman->balls[b].loc,&bman->balls[b].loc,&bman->balls[b].dir);
/* boundary check */
if (bman->balls[b].loc.y < bman->balls[b].radius) { /* ball onder bodem? (bodem @ y=0) */
- if ((bman->balls[b].loc.x < -100.0) ||
- (bman->balls[b].loc.x > 100.0) ||
- (bman->balls[b].loc.z < -100.0) ||
- (bman->balls[b].loc.z > 100.0)) {
+ if ((bman->balls[b].loc.x < -95.0) ||
+ (bman->balls[b].loc.x > 95.0) ||
+ (bman->balls[b].loc.z < -95.0) ||
+ (bman->balls[b].loc.z > 95.0)) {
if (bman->balls[b].loc.y < -1000.0)
createball(&bman->balls[b]);
} else {
* explode ball into triangles
*/
-void createtrisfromball(triman* tman, vectorf *spherev, GLint *spherei, int ind_num, ball *b) {
+static void createtrisfromball(triman* tman, vectorf *spherev, GLint *spherei, int ind_num, ball *b)
+{
int pos;
float explosion;
float scale;
for (i=0; i<(tman->num_tri); i++) {
tman->tris[i].far = FALSE;
+ tman->tris[i].gone = FALSE;
pos = i * 3;
/* kopieer elke poly apart naar een tri structure */
copyvector(&tman->vertices[pos+0],&spherev[spherei[pos+0]]);
scalevector(&tman->vertices[pos+1],&tman->vertices[pos+1],scale);
scalevector(&tman->vertices[pos+2],&tman->vertices[pos+2],scale);
+ tman->vertices[pos+0].x += avgdir.x;
+ tman->vertices[pos+0].y += avgdir.y;
+ tman->vertices[pos+0].z += avgdir.z;
+ tman->vertices[pos+1].x += avgdir.x;
+ tman->vertices[pos+1].y += avgdir.y;
+ tman->vertices[pos+1].z += avgdir.z;
+ tman->vertices[pos+2].x += avgdir.x;
+ tman->vertices[pos+2].y += avgdir.y;
+ tman->vertices[pos+2].z += avgdir.z;
+
/* bereken nieuwe richting */
scalevector(&tman->tris[i].dir,&avgdir,explosion);
- dvect.x = 0.1f - 0.2f*rnd();
- dvect.y = 0.15f - 0.3f*rnd();
- dvect.z = 0.1f - 0.2f*rnd();
+ dvect.x = (0.1f - 0.2f*rnd());
+ dvect.y = (0.15f - 0.3f*rnd());
+ dvect.z = (0.1f - 0.2f*rnd());
addvectors(&tman->tris[i].dir,&tman->tris[i].dir,&dvect);
}
}
* update position of each tri
*/
-void updatetris(triman *t) {
+static void updatetris(triman *t)
+{
int b;
-
+ GLfloat xd,zd;
+
for (b=0;b<t->num_tri;b++) {
+ /* the exploded triangles disappear over time */
+ if (rnd() < t->decay) { t->tris[b].gone = TRUE; }
/* apply gravity */
- t->tris[b].dir.y -= 0.1f;
+ t->tris[b].dir.y -= (0.1f * speed);
/* apply movement */
addvectors(&t->tris[b].loc,&t->tris[b].loc,&t->tris[b].dir);
/* boundary check */
if (t->tris[b].far) continue;
if (t->tris[b].loc.y < 0) { /* onder bodem ? */
- if ((t->tris[b].loc.x > -100.0f) &
- (t->tris[b].loc.x < 100.0f) &
- (t->tris[b].loc.z > -100.0f) &
- (t->tris[b].loc.z < 100.0f)) { /* in veld */
+ if ((t->tris[b].loc.x > -95.0f) &
+ (t->tris[b].loc.x < 95.0f) &
+ (t->tris[b].loc.z > -95.0f) &
+ (t->tris[b].loc.z < 95.0f)) { /* in veld */
t->tris[b].dir.y = -(t->tris[b].dir.y);
t->tris[b].loc.y = -t->tris[b].loc.y;
- scalevector(&t->tris[b].dir,&t->tris[b].dir,0.75f); /* dampening */
+ scalevector(&t->tris[b].dir,&t->tris[b].dir,0.80f); /* dampening */
}
else {
t->tris[b].far = TRUE;
}
}
- /* this should be replaced with code that determines
- * the correct wall the tri bounces in to. this code sucks.
- */
- if ((t->tris[b].loc.x > -21.0f) &
+ if ((t->tris[b].loc.x > -21.0f) &
(t->tris[b].loc.x < 21.0f) &
(t->tris[b].loc.z > -21.0f) &
(t->tris[b].loc.z < 21.0f)) { /* in box? */
+
+ xd = zd = 999.0f; /* big */
if ((t->tris[b].loc.x > -21.0f) &
(t->tris[b].loc.x < 0)) {
- t->tris[b].loc.x = -21.0f;
- t->tris[b].dir.x = -t->tris[b].dir.x;
+ xd = t->tris[b].loc.x + 21.0f;
}
if ((t->tris[b].loc.x < 21.0f) &
(t->tris[b].loc.x > 0)) {
- t->tris[b].loc.x = 21.0f;
- t->tris[b].dir.x = -t->tris[b].dir.x;
+ xd = 21.0f - t->tris[b].loc.x;
}
if ((t->tris[b].loc.z > -21.0f) &
(t->tris[b].loc.z < 0)) {
- t->tris[b].loc.z = -21.0f;
- t->tris[b].dir.z = -t->tris[b].dir.z;
+ zd = t->tris[b].loc.z + 21.0f;
}
if ((t->tris[b].loc.z < 21.0f) &
(t->tris[b].loc.z > 0)) {
- t->tris[b].loc.z = 21.0f;
- t->tris[b].dir.z = -t->tris[b].dir.z;
+ zd = 21.0f - t->tris[b].loc.z;
}
+ if (xd < zd) {
+ /* bounce x */
+ if (t->tris[b].dir.x < 0)
+ t->tris[b].loc.x += (21.0f - t->tris[b].loc.x);
+ else
+ t->tris[b].loc.x += (-21.0f - t->tris[b].loc.x);
+ t->tris[b].dir.x = -t->tris[b].dir.x;
+ } else {
+ /* bounce z */
+ if (t->tris[b].dir.z < 0)
+ t->tris[b].loc.z += (21.0f - t->tris[b].loc.z);
+ else
+ t->tris[b].loc.z += (-21.0f - t->tris[b].loc.z);
+ t->tris[b].dir.z = -t->tris[b].dir.z;
+ }
+
}
} /* end for b */
}
/*
* free memory allocated by a tri manager
*/
-void freetris(triman *t) {
+static void freetris(triman *t)
+{
if (!t) return;
if (t->tris) free(t->tris);
if (t->vertices) free(t->vertices);
/*
*load defaults in config structure
*/
-void setdefaultconfig(boxed_config *config) {
- config->numballs = NUMBALLS;
+static void setdefaultconfig(boxed_config *config)
+{
+ cfg_balls = MAX(3,MIN(40,cfg_balls));
+ cfg_ballsize = MAX(1.0f,MIN(5.0f,cfg_ballsize));
+ cfg_explosion = MAX(0.0f,MIN(50.0f,cfg_explosion));
+ cfg_decay = MAX(0.0f,MIN(1.0f,cfg_decay));
+
+ config->numballs = cfg_balls;
config->textures = TRUE;
config->transparent = FALSE;
- config->explosion = 25.0f;
- config->ballsize = BALLSIZE;
+ config->explosion = cfg_explosion;
+ config->decay = cfg_decay;
+ config->ballsize = cfg_ballsize;
config->camspeed = 35.0f;
}
/*
* draw bottom
*/
-static void drawfilledbox(boxedstruct *boxed)
+static void drawfilledbox(boxedstruct *boxed, int wire)
{
/* draws texture filled box,
top is drawn using the entire texture,
*/
/* front */
- glBegin(GL_QUADS);
+ glBegin(wire ? GL_LINE_LOOP : GL_QUADS);
glTexCoord2f(0,1);
glVertex3f(-1.0,1.0,1.0);
glTexCoord2f(1,1);
/*
* Draw ball
*/
-static void drawball(boxedstruct *gp, ball *b)
+static void drawball(boxedstruct *gp, ball *b, int wire)
{
int i,pos,cnt;
GLint *spherei = gp->spherei;
glMaterialfv(GL_FRONT, GL_EMISSION,col);
if (!gp->gllists[GLL_BALL]) {
- glNewList(gp->listobjects + GLL_BALL,GL_COMPILE_AND_EXECUTE);
+ glNewList(gp->listobjects + GLL_BALL,GL_COMPILE);
cnt = SPHERE_INDICES/3;
for (i=0; i<cnt; i++) {
pos = i * 3;
- glBegin(GL_TRIANGLES);
+ glBegin(wire ? GL_LINE_LOOP : GL_TRIANGLES);
glNormal3f(spherev[spherei[pos+0]].x,spherev[spherei[pos+0]].y,spherev[spherei[pos+0]].z);
glVertex3f(spherev[spherei[pos+0]].x,spherev[spherei[pos+0]].y,spherev[spherei[pos+0]].z);
glNormal3f(spherev[spherei[pos+1]].x,spherev[spherei[pos+1]].y,spherev[spherei[pos+1]].z);
/*
* Draw all triangles in triman
*/
-static void drawtriman(triman *t)
+static void drawtriman(triman *t, int wire)
{
int i,pos;
vectorf *spherev = t->vertices;
glMaterialfv(GL_FRONT, GL_EMISSION,col);
for (i=0; i<t->num_tri; i++) {
+ if (t->tris[i].gone == TRUE) { continue; }
pos = i*3;
glPushMatrix();
glTranslatef(t->tris[i].loc.x,t->tris[i].loc.y,t->tris[i].loc.z);
- glBegin(GL_TRIANGLES);
+ glBegin(wire ? GL_LINE_LOOP : GL_TRIANGLES);
glNormal3f(t->normals[i].x,t->normals[i].y,t->normals[i].z);
glVertex3f(spherev[pos+0].x,spherev[pos+0].y,spherev[pos+0].z);
glVertex3f(spherev[pos+1].x,spherev[pos+1].y,spherev[pos+1].z);
/*
* draw floor pattern
*/
-static void drawpattern(boxedstruct *boxed)
+static void drawpattern(boxedstruct *gp)
{
- if (!boxed->gllists[GLL_PATTERN]) {
- glNewList(boxed->listobjects + GLL_PATTERN,GL_COMPILE_AND_EXECUTE);
-
+ if (!gp->gllists[GLL_PATTERN]) {
+ glNewList(gp->listobjects + GLL_PATTERN, GL_COMPILE);
+
glBegin(GL_LINE_STRIP);
glVertex3f(-25.0f, 0.0f, 35.0f);
glVertex3f(-15.0f, 0.0f, 35.0f);
glVertex3f(-15.0f, 0.0f, 5.0f);
glVertex3f(-5.0f, 0.0f, 15.0f);
glEnd();
+
glEndList();
- boxed->gllists[GLL_PATTERN] = 1;
+ gp->gllists[GLL_PATTERN] = 1;
} else {
- glCallList(boxed->listobjects + GLL_PATTERN);
+ glCallList(gp->listobjects + GLL_PATTERN);
}
+
}
static void draw(ModeInfo * mi)
{
boxedstruct *gp = &boxed[MI_SCREEN(mi)];
+ int wire = MI_IS_WIREFRAME (mi);
vectorf v1;
GLfloat dcam;
int dx, dz;
glLoadIdentity();
gp->tic += 0.01f;
-
+ gp->camtic += 0.01f + 0.01f * sin(gp->tic * speed);
+
/* rotate camera around (0,0,0), looking at (0,0,0), up is (0,1,0) */
- dcam = CAMDISTANCE_MIN + (CAMDISTANCE_MAX - CAMDISTANCE_MIN) + (CAMDISTANCE_MAX - CAMDISTANCE_MIN)*cos(gp->tic/CAMDISTANCE_SPEED);
- v1.x = dcam * sin(gp->tic/gp->cam_x_speed);
- v1.z = dcam * cos(gp->tic/gp->cam_z_speed);
- v1.y = CAM_HEIGHT * sin(gp->tic/gp->cam_y_speed) + 1.02 * CAM_HEIGHT;
+ dcam = CAMDISTANCE_MIN + (CAMDISTANCE_MAX - CAMDISTANCE_MIN) + (CAMDISTANCE_MAX - CAMDISTANCE_MIN)*cos((gp->camtic/CAMDISTANCE_SPEED) * speed);
+ v1.x = dcam * sin((gp->camtic/gp->cam_x_speed) * speed);
+ v1.z = dcam * cos((gp->camtic/gp->cam_z_speed) * speed);
+ v1.y = CAM_HEIGHT * sin((gp->camtic/gp->cam_y_speed) * speed) + 1.02 * CAM_HEIGHT;
gluLookAt(v1.x,v1.y,v1.z,0.0,0.0,0.0,0.0,1.0,0.0);
- glLightfv(GL_LIGHT0, GL_AMBIENT, l0_ambient);
- glLightfv(GL_LIGHT0, GL_DIFFUSE, l0_diffuse);
- glLightfv(GL_LIGHT0, GL_SPECULAR, l0_specular);
- glLightfv(GL_LIGHT0, GL_POSITION, l0_position);
- glLightfv(GL_LIGHT1, GL_AMBIENT, l1_ambient);
- glLightfv(GL_LIGHT1, GL_DIFFUSE, l1_diffuse);
- glLightfv(GL_LIGHT1, GL_SPECULAR, l1_specular);
- glLightfv(GL_LIGHT1, GL_POSITION, l1_position);
- glEnable(GL_LIGHT0);
- glEnable(GL_LIGHT1);
+ if (!wire) {
+ glLightfv(GL_LIGHT0, GL_AMBIENT, l0_ambient);
+ glLightfv(GL_LIGHT0, GL_DIFFUSE, l0_diffuse);
+ glLightfv(GL_LIGHT0, GL_SPECULAR, l0_specular);
+ glLightfv(GL_LIGHT0, GL_POSITION, l0_position);
+ glLightfv(GL_LIGHT1, GL_AMBIENT, l1_ambient);
+ glLightfv(GL_LIGHT1, GL_DIFFUSE, l1_diffuse);
+ glLightfv(GL_LIGHT1, GL_SPECULAR, l1_specular);
+ glLightfv(GL_LIGHT1, GL_POSITION, l1_position);
+ glEnable(GL_LIGHT0);
+ glEnable(GL_LIGHT1);
- glFrontFace(GL_CW);
+ glFrontFace(GL_CW);
- glMaterialfv(GL_FRONT, GL_SPECULAR, black);
- glMaterialfv(GL_FRONT, GL_EMISSION, lblue);
- glMaterialfv(GL_FRONT,GL_AMBIENT,black);
- glMaterialf(GL_FRONT, GL_SHININESS, 5.0);
+ glMaterialfv(GL_FRONT, GL_SPECULAR, black);
+ glMaterialfv(GL_FRONT, GL_EMISSION, lblue);
+ glMaterialfv(GL_FRONT,GL_AMBIENT,black);
+ glMaterialf(GL_FRONT, GL_SHININESS, 5.0);
+ }
/* draw ground grid */
/* Set drawing mode for the boxes */
glEnable(GL_DEPTH_TEST);
- glEnable(GL_TEXTURE_2D);
+ if (!wire) glEnable(GL_TEXTURE_2D);
glPushMatrix();
glColor3f(1.0,1.0,1.0);
glScalef(20.0,0.25,20.0);
glTranslatef(0.0,2.0,0.0);
- drawfilledbox(gp);
+ drawfilledbox(gp, wire);
glPopMatrix();
glDisable(GL_TEXTURE_2D);
drawbox(gp);
glPopMatrix();
- glEnable(GL_LIGHTING);
+ if (!wire) {
+ glEnable(GL_LIGHTING);
- glMaterialfv(GL_FRONT, GL_DIFFUSE, dgray);
- glMaterialfv(GL_FRONT, GL_EMISSION, black); /* turn it off before painting the balls */
+ glMaterialfv(GL_FRONT, GL_DIFFUSE, dgray);
+ glMaterialfv(GL_FRONT, GL_EMISSION, black); /* turn it off before painting the balls */
+ }
/* move the balls and shrapnel */
updateballs(&gp->bman);
gp->bman.balls[i].justcreated = FALSE;
freetris(&gp->tman[i]);
}
- if ((gp->bman.balls[i].bounced) & (gp->tman[i].vertices == NULL)) {
- createtrisfromball(&gp->tman[i],gp->spherev,gp->spherei,SPHERE_INDICES,&gp->bman.balls[i]);
- }
- if (gp->bman.balls[i].bounced) {
- updatetris(&gp->tman[i]);
+ if (gp->bman.balls[i].bounced) {
+ if (gp->tman[i].vertices == NULL) {
+ createtrisfromball(&gp->tman[i],gp->spherev,gp->spherei,SPHERE_INDICES,&gp->bman.balls[i]);
+ } else {
+ updatetris(&gp->tman[i]);
+ }
glDisable(GL_CULL_FACE);
- drawtriman(&gp->tman[i]);
- glEnable(GL_CULL_FACE);
+ drawtriman(&gp->tman[i], wire);
+ if (!wire) glEnable(GL_CULL_FACE);
} else {
- drawball(gp, &gp->bman.balls[i]);
+ drawball(gp, &gp->bman.balls[i], wire);
}
}
/*
* new window size or exposure
*/
-void reshape_boxed(ModeInfo *mi, int width, int height)
+ENTRYPOINT void reshape_boxed(ModeInfo *mi, int width, int height)
{
GLfloat h = (GLfloat) height / (GLfloat) width;
pinit(ModeInfo * mi)
{
boxedstruct *gp = &boxed[MI_SCREEN(mi)];
+ int wire = MI_IS_WIREFRAME (mi);
ballman *bman;
int i,texpixels;
char *texpixeldata;
for(i=0;i<bman->num_balls;i++) {
gp->tman[i].explosion = (float) (((int)gp->config.explosion) / 15.0f );
+ gp->tman[i].decay = gp->config.decay;
gp->tman[i].vertices = NULL;
gp->tman[i].normals = NULL;
gp->tman[i].tris = NULL;
bman->balls[i].loc.y *= rnd();
}
- generatesphere();
+ generatesphere(gp);
- glEnable(GL_CULL_FACE);
- glEnable(GL_LIGHTING);
+ if (!wire) {
+ glEnable(GL_CULL_FACE);
+ glEnable(GL_LIGHTING);
+ }
/* define cam path */
gp->cam_x_speed = 1.0f/((float)gp->config.camspeed/50.0 + rnd()*((float)gp->config.camspeed/50.0));
gp->cam_y_speed = 1.0f/((float)gp->config.camspeed/250.0 + rnd()*((float)gp->config.camspeed/250.0));
if (rnd() < 0.5f) gp->cam_x_speed = -gp->cam_x_speed;
if (rnd() < 0.5f) gp->cam_z_speed = -gp->cam_z_speed;
+
+ /* define initial cam position */
+ gp->tic = gp->camtic = rnd() * 100.0f;
-
+ /* define tex1 (bottom plate) */
gp->tex1 = (char *)malloc(3*width*height*sizeof(GLuint));
texpixels = 256*256; /*width*height;*/
texpixeldata = header_data;
GL_RGB, GL_UNSIGNED_BYTE, gp->tex1);
if (i)
{
- const char *s = gluErrorString (i);
+ const char *s = (char *) gluErrorString (i);
fprintf (stderr, "%s: error mipmapping texture: %s\n",
progname, (s ? s : "(unknown)"));
exit (1);
-void
+ENTRYPOINT void
init_boxed(ModeInfo * mi)
{
int screen = MI_SCREEN(mi);
}
-void
+ENTRYPOINT void
draw_boxed(ModeInfo * mi)
{
boxedstruct *gp = &boxed[MI_SCREEN(mi)];
glXSwapBuffers(display, window);
}
-void
+ENTRYPOINT void
release_boxed(ModeInfo * mi)
{
+ int i;
+
if (boxed != NULL) {
int screen;
/* Display lists MUST be freed while their glXContext is current. */
glXMakeCurrent(MI_DISPLAY(mi), gp->window, *(gp->glx_context));
- /*if (glIsList(gp->gear1))
- glDeleteLists(gp->gear1, 1);
- if (glIsList(gp->gear2))
- glDeleteLists(gp->gear2, 1);
- if (glIsList(gp->gear3))
- glDeleteLists(gp->gear3, 1);
- if (glIsList(gp->gear_inner))
- glDeleteLists(gp->gear_inner, 1);
- if (glIsList(gp->gear_outer))
- glDeleteLists(gp->gear_outer, 1);
- */
+ if (glIsList(gp->listobjects))
+ glDeleteLists(gp->listobjects, 3);
- /* TODO
- * free all trimans
- * free all balls
- * free all sphere indices & vertices
- */
+ for (i=0;i<gp->bman.num_balls;i++) {
+ if (gp->bman.balls[i].bounced) freetris(&gp->tman[i]);
+ }
+ free (gp->bman.balls);
+ free (gp->tman);
+ free (gp->tex1);
+
}
}
}
+XSCREENSAVER_MODULE ("Boxed", boxed)
+
/*********************************************************/
#endif
projects / xscreensaver / blobdiff