X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fcubenetic.c;h=3f92a545323d2e93fa5b6680cf8a8cca36913a1b;hb=4ade52359b6eba3621566dac79793a33aa4c915f;hp=43e46ce76220acfca1380edea42f24edc0156c23;hpb=447db08c956099b3b183886729108bf5b364c4b8;p=xscreensaver diff --git a/hacks/glx/cubenetic.c b/hacks/glx/cubenetic.c index 43e46ce7..3f92a545 100644 --- a/hacks/glx/cubenetic.c +++ b/hacks/glx/cubenetic.c @@ -1,4 +1,4 @@ -/* cubenetic, Copyright (c) 2002-2004 Jamie Zawinski +/* cubenetic, Copyright (c) 2002-2008 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -9,31 +9,13 @@ * implied warranty. */ -#include - -extern XtAppContext app; - -#define PROGCLASS "Cubenetic" -#define HACK_INIT init_cube -#define HACK_DRAW draw_cube -#define HACK_RESHAPE reshape_cube -#define HACK_HANDLE_EVENT cube_handle_event -#define EVENT_MASK PointerMotionMask -#define ccs_opts xlockmore_opts - -#define DEF_SPIN "XYZ" -#define DEF_WANDER "True" -#define DEF_TEXTURE "True" - -#define DEF_WAVE_COUNT "3" -#define DEF_WAVE_SPEED "80" -#define DEF_WAVE_RADIUS "512" - #define DEFAULTS "*delay: 20000 \n" \ "*count: 5 \n" \ "*showFPS: False \n" \ "*wireframe: False \n" \ +# define refresh_cube 0 +# define release_cube 0 #undef countof #define countof(x) (sizeof((x))/sizeof((*x))) @@ -45,7 +27,14 @@ extern XtAppContext app; #ifdef USE_GL /* whole file */ -#include + +#define DEF_SPIN "XYZ" +#define DEF_WANDER "True" +#define DEF_TEXTURE "True" + +#define DEF_WAVES "3" +#define DEF_WAVE_SPEED "80" +#define DEF_WAVE_RADIUS "512" typedef struct { int color; @@ -78,6 +67,7 @@ typedef struct { GLuint cube_list; GLuint texture_id; + int cube_polys; int ncubes; cube *cubes; waves *waves; @@ -118,23 +108,25 @@ static argtype vars[] = { {&do_spin, "spin", "Spin", DEF_SPIN, t_String}, {&do_wander, "wander", "Wander", DEF_WANDER, t_Bool}, {&do_texture, "texture", "Texture", DEF_TEXTURE, t_Bool}, - {&wave_count, "waves", "Waves", DEF_WAVE_COUNT, t_Int}, + {&wave_count, "waves", "Waves", DEF_WAVES, t_Int}, {&wave_speed, "waveSpeed", "WaveSpeed", DEF_WAVE_SPEED, t_Int}, {&wave_radius,"waveRadius","WaveRadius", DEF_WAVE_RADIUS,t_Int}, }; -ModeSpecOpt ccs_opts = {countof(opts), opts, countof(vars), vars, NULL}; +ENTRYPOINT ModeSpecOpt cube_opts = {countof(opts), opts, countof(vars), vars, NULL}; -static void +static int unit_cube (Bool wire) { + int polys = 0; glBegin (wire ? GL_LINE_LOOP : GL_QUADS); /* front */ glNormal3f (0, 0, 1); glTexCoord2f(1, 0); glVertex3f ( 0.5, -0.5, 0.5); glTexCoord2f(0, 0); glVertex3f ( 0.5, 0.5, 0.5); glTexCoord2f(0, 1); glVertex3f (-0.5, 0.5, 0.5); glTexCoord2f(1, 1); glVertex3f (-0.5, -0.5, 0.5); + polys++; glEnd(); glBegin (wire ? GL_LINE_LOOP : GL_QUADS); /* back */ @@ -143,6 +135,7 @@ unit_cube (Bool wire) glTexCoord2f(0, 1); glVertex3f (-0.5, 0.5, -0.5); glTexCoord2f(1, 1); glVertex3f ( 0.5, 0.5, -0.5); glTexCoord2f(1, 0); glVertex3f ( 0.5, -0.5, -0.5); + polys++; glEnd(); glBegin (wire ? GL_LINE_LOOP : GL_QUADS); /* left */ @@ -151,6 +144,7 @@ unit_cube (Bool wire) glTexCoord2f(1, 0); glVertex3f (-0.5, 0.5, -0.5); glTexCoord2f(0, 0); glVertex3f (-0.5, -0.5, -0.5); glTexCoord2f(0, 1); glVertex3f (-0.5, -0.5, 0.5); + polys++; glEnd(); glBegin (wire ? GL_LINE_LOOP : GL_QUADS); /* right */ @@ -159,9 +153,10 @@ unit_cube (Bool wire) glTexCoord2f(1, 0); glVertex3f ( 0.5, 0.5, -0.5); glTexCoord2f(0, 0); glVertex3f ( 0.5, 0.5, 0.5); glTexCoord2f(0, 1); glVertex3f ( 0.5, -0.5, 0.5); + polys++; glEnd(); - if (wire) return; + if (wire) return polys; glBegin (wire ? GL_LINE_LOOP : GL_QUADS); /* top */ glNormal3f (0, 1, 0); @@ -169,6 +164,7 @@ unit_cube (Bool wire) glTexCoord2f(0, 1); glVertex3f ( 0.5, 0.5, -0.5); glTexCoord2f(1, 1); glVertex3f (-0.5, 0.5, -0.5); glTexCoord2f(1, 0); glVertex3f (-0.5, 0.5, 0.5); + polys++; glEnd(); glBegin (wire ? GL_LINE_LOOP : GL_QUADS); /* bottom */ @@ -177,14 +173,16 @@ unit_cube (Bool wire) glTexCoord2f(0, 0); glVertex3f (-0.5, -0.5, -0.5); glTexCoord2f(0, 1); glVertex3f ( 0.5, -0.5, -0.5); glTexCoord2f(1, 1); glVertex3f ( 0.5, -0.5, 0.5); + polys++; glEnd(); + return polys; } /* Window management, etc */ -void +ENTRYPOINT void reshape_cube (ModeInfo *mi, int width, int height) { GLfloat h = (GLfloat) height / (GLfloat) width; @@ -309,8 +307,6 @@ init_texture (ModeInfo *mi) glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - glTexGeni (GL_S, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR); - glTexGeni (GL_T, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR); glTexEnvf (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); check_gl_error("texture initialization"); @@ -337,7 +333,7 @@ shuffle_texture (ModeInfo *mi) } -Bool +ENTRYPOINT Bool cube_handle_event (ModeInfo *mi, XEvent *event) { cube_configuration *cc = &ccs[MI_SCREEN(mi)]; @@ -359,7 +355,9 @@ cube_handle_event (ModeInfo *mi, XEvent *event) } else if (event->xany.type == ButtonPress && (event->xbutton.button == Button4 || - event->xbutton.button == Button5)) + event->xbutton.button == Button5 || + event->xbutton.button == Button6 || + event->xbutton.button == Button7)) { gltrackball_mousewheel (cc->trackball, event->xbutton.button, 10, !!event->xbutton.state); @@ -378,7 +376,7 @@ cube_handle_event (ModeInfo *mi, XEvent *event) } -void +ENTRYPOINT void init_cube (ModeInfo *mi) { int i; @@ -402,9 +400,9 @@ init_cube (ModeInfo *mi) if (!wire) { - static GLfloat pos[4] = {1.0, 0.5, 1.0, 0.0}; - static GLfloat amb[4] = {0.2, 0.2, 0.2, 1.0}; - static GLfloat dif[4] = {1.0, 1.0, 1.0, 1.0}; + static const GLfloat pos[4] = {1.0, 0.5, 1.0, 0.0}; + static const GLfloat amb[4] = {0.2, 0.2, 0.2, 1.0}; + static const GLfloat dif[4] = {1.0, 1.0, 1.0, 1.0}; glLightfv(GL_LIGHT0, GL_POSITION, pos); glLightfv(GL_LIGHT0, GL_AMBIENT, amb); @@ -428,6 +426,7 @@ init_cube (ModeInfo *mi) if (*s == 'x' || *s == 'X') spinx = True; else if (*s == 'y' || *s == 'Y') spiny = True; else if (*s == 'z' || *s == 'Z') spinz = True; + else if (*s == '0') ; else { fprintf (stderr, @@ -459,7 +458,7 @@ init_cube (ModeInfo *mi) H[2] = ((H[1] + shift) < 360) ? (H[1]+shift) : (H[1] + shift - 360); S[0] = S[1] = S[2] = 1.0; V[0] = V[1] = V[2] = 1.0; - make_color_loop(0, 0, + make_color_loop(0, 0, 0, H[0], S[0], V[0], H[1], S[1], V[1], H[2], S[2], V[2], @@ -500,7 +499,7 @@ init_cube (ModeInfo *mi) cc->cube_list = glGenLists (1); glNewList (cc->cube_list, GL_COMPILE); - unit_cube (wire); + cc->cube_polys = unit_cube (wire); glEndList (); } @@ -528,7 +527,7 @@ shuffle_cubes (ModeInfo *mi) } -void +ENTRYPOINT void draw_cube (ModeInfo *mi) { cube_configuration *cc = &ccs[MI_SCREEN(mi)]; @@ -539,6 +538,9 @@ draw_cube (ModeInfo *mi) if (!cc->glx_context) return; + mi->polygon_count = 0; + glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(cc->glx_context)); + glShadeModel(GL_FLAT); glEnable(GL_DEPTH_TEST); @@ -558,7 +560,10 @@ draw_cube (ModeInfo *mi) (y - 0.5) * 6, (z - 0.5) * 15); + /* Do it twice because we don't track the device's orientation. */ + glRotatef( current_device_rotation(), 0, 0, 1); gltrackball_rotate (cc->trackball); + glRotatef(-current_device_rotation(), 0, 0, 1); get_rotation (cc->rot, &x, &y, &z, !cc->button_down_p); glRotatef (x * 360, 1.0, 0.0, 0.0); @@ -584,6 +589,7 @@ draw_cube (ModeInfo *mi) glScalef (cube->w, cube->h, cube->d); glMaterialfv (GL_FRONT, GL_AMBIENT_AND_DIFFUSE, color); glCallList (cc->cube_list); + mi->polygon_count += cc->cube_polys; glPopMatrix (); } @@ -599,4 +605,6 @@ draw_cube (ModeInfo *mi) glXSwapBuffers(dpy, window); } +XSCREENSAVER_MODULE_2 ("Cubenetic", cubenetic, cube) + #endif /* USE_GL */