X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fstairs.c;h=10f96b5f55dffa674361d1d5b94c257dbeaebb7e;hb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;hp=e905cae4a76c51f85be59de8d2c96979ed2e320d;hpb=8eb2873d7054e705c4e83f22d18c40946a9e2529;p=xscreensaver diff --git a/hacks/glx/stairs.c b/hacks/glx/stairs.c index e905cae4..10f96b5f 100644 --- a/hacks/glx/stairs.c +++ b/hacks/glx/stairs.c @@ -1,9 +1,8 @@ /* -*- Mode: C; tab-width: 4 -*- */ /* stairs --- Infinite Stairs, and Escher-like scene. */ -#if !defined( lint ) && !defined( SABER ) +#if 0 static const char sccsid[] = "@(#)stairs.c 4.07 97/11/24 xlockmore"; - #endif #undef DEBUG_LISTS @@ -58,17 +57,11 @@ static const char sccsid[] = "@(#)stairs.c 4.07 97/11/24 xlockmore"; * In real OpenGL, PseudoColor DO NOT support texture map (as far as I know). */ -#include - #ifdef STANDALONE -# define PROGCLASS "Stairs" -# define HACK_INIT init_stairs -# define HACK_DRAW draw_stairs -# define HACK_RESHAPE reshape_stairs -# define stairs_opts xlockmore_opts -# define DEFAULTS "*delay: 20000 \n" \ - "*showFPS: False \n" \ - "*wireframe: False \n" +# define DEFAULTS "*delay: 20000 \n" \ + "*showFPS: False \n" +# define refresh_stairs 0 +# define stairs_handle_event 0 # include "xlockmore.h" /* from the xscreensaver distribution */ #else /* !STANDALONE */ # include "xlock.h" /* from the xlockmore distribution */ @@ -77,10 +70,9 @@ static const char sccsid[] = "@(#)stairs.c 4.07 97/11/24 xlockmore"; #ifdef USE_GL -#include #include "e_textures.h" -ModeSpecOpt stairs_opts = +ENTRYPOINT ModeSpecOpt stairs_opts = {0, NULL, 0, NULL, NULL}; #ifdef USE_MODULES @@ -111,52 +103,34 @@ typedef struct { int sphere_position; int sphere_tick; GLXContext *glx_context; + GLuint objects; } stairsstruct; -static float front_shininess[] = -{60.0}; -static float front_specular[] = -{0.7, 0.7, 0.7, 1.0}; -static float ambient[] = -{0.0, 0.0, 0.0, 1.0}; -static float diffuse[] = -{1.0, 1.0, 1.0, 1.0}; -static float position0[] = -{1.0, 1.0, 1.0, 0.0}; -static float position1[] = -{-1.0, -1.0, 1.0, 0.0}; -static float lmodel_ambient[] = -{0.5, 0.5, 0.5, 1.0}; -static float lmodel_twoside[] = -{GL_TRUE}; +static const float front_shininess[] = {60.0}; +static const float front_specular[] = {0.7, 0.7, 0.7, 1.0}; +static const float ambient[] = {0.0, 0.0, 0.0, 1.0}; +static const float diffuse[] = {1.0, 1.0, 1.0, 1.0}; +static const float position0[] = {1.0, 1.0, 1.0, 0.0}; +static const float position1[] = {-1.0, -1.0, 1.0, 0.0}; +static const float lmodel_ambient[] = {0.5, 0.5, 0.5, 1.0}; +static const float lmodel_twoside[] = {GL_TRUE}; #if 0 -static float MaterialRed[] = -{0.7, 0.0, 0.0, 1.0}; -static float MaterialGreen[] = -{0.1, 0.5, 0.2, 1.0}; -static float MaterialBlue[] = -{0.0, 0.0, 0.7, 1.0}; -static float MaterialCyan[] = -{0.2, 0.5, 0.7, 1.0}; -static float MaterialMagenta[] = -{0.6, 0.2, 0.5, 1.0}; -static float MaterialGray[] = -{0.2, 0.2, 0.2, 1.0}; -static float MaterialGray5[] = -{0.5, 0.5, 0.5, 1.0}; -static float MaterialGray6[] = -{0.6, 0.6, 0.6, 1.0}; -static float MaterialGray8[] = -{0.8, 0.8, 0.8, 1.0}; +static const float MaterialRed[] = {0.7, 0.0, 0.0, 1.0}; +static const float MaterialGreen[] = {0.1, 0.5, 0.2, 1.0}; +static const float MaterialBlue[] = {0.0, 0.0, 0.7, 1.0}; +static const float MaterialCyan[] = {0.2, 0.5, 0.7, 1.0}; +static const float MaterialMagenta[] = {0.6, 0.2, 0.5, 1.0}; +static const float MaterialGray[] = {0.2, 0.2, 0.2, 1.0}; +static const float MaterialGray5[] = {0.5, 0.5, 0.5, 1.0}; +static const float MaterialGray6[] = {0.6, 0.6, 0.6, 1.0}; +static const float MaterialGray8[] = {0.8, 0.8, 0.8, 1.0}; #endif -static float MaterialYellow[] = -{0.7, 0.7, 0.0, 1.0}; -static float MaterialWhite[] = -{0.7, 0.7, 0.7, 1.0}; +static const float MaterialYellow[] = {0.7, 0.7, 0.0, 1.0}; +static const float MaterialWhite[] = {0.7, 0.7, 0.7, 1.0}; -static float positions[] = +static const float positions[] = { -2.5, 4.0, 0.0, /* First one is FUDGED :) */ -3.0, 3.25, 1.0, @@ -200,7 +174,6 @@ static float positions[] = #define SPHERE_TICKS 8 static stairsstruct *stairs = NULL; -static GLuint objects; #define ObjSphere 0 @@ -415,8 +388,8 @@ draw_stairs_internal(ModeInfo * mi) sp->sphere_position = 0; } -void -reshape_stairs(ModeInfo * mi, int width, int height) +ENTRYPOINT void +reshape_stairs (ModeInfo * mi, int width, int height) { stairsstruct *sp = &stairs[MI_SCREEN(mi)]; @@ -440,6 +413,7 @@ reshape_stairs(ModeInfo * mi, int width, int height) static void pinit(void) { + int status; glClearDepth(1.0); glClearColor(0.0, 0.0, 0.0, 1.0); @@ -465,8 +439,21 @@ pinit(void) glEnable(GL_CULL_FACE); glPixelStorei(GL_UNPACK_ALIGNMENT, 1); - gluBuild2DMipmaps(GL_TEXTURE_2D, 3, WoodTextureWidth, WoodTextureHeight, - GL_RGB, GL_UNSIGNED_BYTE, WoodTextureData); + + clear_gl_error(); + status = gluBuild2DMipmaps(GL_TEXTURE_2D, 3, + WoodTextureWidth, WoodTextureHeight, + GL_RGB, GL_UNSIGNED_BYTE, WoodTextureData); + if (status) + { + const char *s = (char *) gluErrorString (status); + fprintf (stderr, "%s: error mipmapping %dx%d texture: %s\n", + progname, WoodTextureWidth, WoodTextureHeight, + (s ? s : "(unknown)")); + exit (1); + } + check_gl_error("mipmapping"); + glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); @@ -477,8 +464,8 @@ pinit(void) glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, front_specular); } -void -init_stairs(ModeInfo * mi) +ENTRYPOINT void +init_stairs (ModeInfo * mi) { int screen = MI_SCREEN(mi); stairsstruct *sp; @@ -490,6 +477,10 @@ init_stairs(ModeInfo * mi) } sp = &stairs[screen]; sp->step = 0.0; + + /* make multiple screens rotate at slightly different rates. */ + sp->step -= frand(5.0); + sp->direction = LRAND() & 1; sp->sphere_position = NRAND(NPOSITIONS / 3) * 3; sp->sphere_tick = 0; @@ -498,16 +489,16 @@ init_stairs(ModeInfo * mi) reshape_stairs(mi, MI_WIDTH(mi), MI_HEIGHT(mi)); glDrawBuffer(GL_BACK); - if (!glIsList(objects)) - objects = glGenLists(1); + if (!glIsList(sp->objects)) + sp->objects = glGenLists(1); pinit(); } else { MI_CLEARWINDOW(mi); } } -void -draw_stairs(ModeInfo * mi) +ENTRYPOINT void +draw_stairs (ModeInfo * mi) { stairsstruct *sp = &stairs[MI_SCREEN(mi)]; @@ -550,8 +541,9 @@ draw_stairs(ModeInfo * mi) sp->step += 0.025; } -void -change_stairs(ModeInfo * mi) +#ifndef STANDALONE +ENTRYPOINT void +change_stairs (ModeInfo * mi) { stairsstruct *sp = &stairs[MI_SCREEN(mi)]; @@ -561,18 +553,25 @@ change_stairs(ModeInfo * mi) glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(sp->glx_context)); pinit(); } +#endif /* !STANDALONE */ -void -release_stairs(ModeInfo * mi) +ENTRYPOINT void +release_stairs (ModeInfo * mi) { if (stairs != NULL) { - (void) free((void *) stairs); - stairs = NULL; - } - if (glIsList(objects)) { - glDeleteLists(objects, 1); + int i; + for (i = 0; i < MI_NUM_SCREENS(mi); i++) { + stairsstruct *sp = &stairs[i]; + if (glIsList(sp->objects)) { + glDeleteLists(sp->objects, 1); + } + } + free(stairs); + stairs = NULL; } FreeAllGL(mi); } +XSCREENSAVER_MODULE ("Stairs", stairs) + #endif