X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fengine.c;h=77ebe21e4d4333c4ee77bce0fcfe4593e136a83d;hb=d5186197bc394e10a4402f7f6d23fbb14103bc50;hp=f8be3c493e5455f3bfb99e9096f3781ccfeb7112;hpb=c1b9b55ad8d59dc05ef55e316aebf5863e7dfa56;p=xscreensaver diff --git a/hacks/glx/engine.c b/hacks/glx/engine.c index f8be3c49..77ebe21e 100644 --- a/hacks/glx/engine.c +++ b/hacks/glx/engine.c @@ -24,7 +24,7 @@ #ifdef STANDALONE #define DEFAULTS "*delay: 30000 \n" \ "*showFPS: False \n" \ - "*titleFont: -*-helvetica-medium-r-normal-*-180-*\n" \ + "*titleFont: -*-helvetica-medium-r-normal-*-*-180-*-*-*-*-*-*\n" \ # define refresh_engine 0 # include "xlockmore.h" /* from the xscreensaver distribution */ @@ -32,7 +32,7 @@ # include "xlock.h" /* from the xlockmore distribution */ #endif /* !STANDALONE */ -#include "glxfonts.h" +#include "texfont.h" #include "rotator.h" #include "gltrackball.h" @@ -109,8 +109,7 @@ typedef struct { rotator *rot; trackball_state *trackball; Bool button_down_p; - XFontStruct *xfont; - GLuint font_dlist; + texture_font_data *font_data; char *engine_name; int engineType; int movepaused; @@ -280,13 +279,13 @@ static void make_tables(Engine *e) float f; f = ONEREV / (M_PI * 2); - for (i = 0 ; i <= TWOREV ; i++) { + for (i = 0 ; i < TWOREV ; i++) { e->sin_table[i] = sin(i/f); } - for (i = 0 ; i <= TWOREV ; i++) { + for (i = 0 ; i < TWOREV ; i++) { e->cos_table[i] = cos(i/f); } - for (i = 0 ; i <= TWOREV ; i++) { + for (i = 0 ; i < TWOREV ; i++) { e->tan_table[i] = tan(i/f); } } @@ -303,10 +302,8 @@ static int cylinder (Engine *e, GLfloat x, GLfloat y, GLfloat z, int b = 0; /* previous */ int angle, norm, step, sangle; float z1, y1, z2, y2, ex=0; - float y3, z3; - float Z1, Y1, Z2, Y2, xl, Y3, Z3; + float Z1, Y1, Z2, Y2, xl; GLfloat y2c[TWOREV], z2c[TWOREV]; - GLfloat ony, onz; /* previous normals */ int nsegs, tube = 0; glPushMatrix(); @@ -317,7 +314,6 @@ static int cylinder (Engine *e, GLfloat x, GLfloat y, GLfloat z, nsegs += 1; sangle = sang; angle = eang; - ony = onz = 0; z1 = e->cos_table[sangle]*outer+z; y1 = e->sin_table[sangle] * outer+y; Z1 = e->cos_table[sangle] * inner+z; Y1 = e->sin_table[sangle]*inner+y ; Z2 = z; @@ -330,15 +326,11 @@ static int cylinder (Engine *e, GLfloat x, GLfloat y, GLfloat z, for (a = sangle ; a <= angle || b <= angle ; a+= step) { y2=outer*(float)e->sin_table[a]+y; z2=outer*(float)e->cos_table[a]+z; - y3=outer*(float)e->sin_table[a+step]+y; - z3=outer*(float)e->cos_table[a+step]+z; if (endcaps) y2c[a] = y2; z2c[a] = z2; /* cache for later */ if (tube) { Y2=inner*(float)e->sin_table[a]+y; Z2=inner*(float)e->cos_table[a]+z; - Y3=inner*(float)e->sin_table[a+step]+y; - Z3=inner*(float)e->cos_table[a+step]+z; } glNormal3f(0, y1, z1); glVertex3f(x,y1,z1); @@ -538,6 +530,7 @@ static int makepiston(Engine *e) int polys = 0; GLfloat colour[] = {0.6, 0.6, 0.6, 1.0}; + if (e->piston_list) glDeleteLists(1, e->piston_list); e->piston_list = glGenLists(1); glNewList(e->piston_list, GL_COMPILE); glRotatef(90, 0, 0, 1); @@ -590,7 +583,7 @@ static int boom(Engine *e, GLfloat x, GLfloat y, int s) glLightfv(GL_LIGHT1, GL_POSITION, e->boom_lpos); glLightfv(GL_LIGHT1, GL_DIFFUSE, e->boom_red); glLightfv(GL_LIGHT1, GL_SPECULAR, e->boom_red); - glLighti(GL_LIGHT1, GL_LINEAR_ATTENUATION, 1.3); + glLightf(GL_LIGHT1, GL_LINEAR_ATTENUATION, 1.3); glLighti(GL_LIGHT1, GL_CONSTANT_ATTENUATION, 0); glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, e->boom_red); @@ -621,6 +614,7 @@ static int display(Engine *e) e->lookat[0], e->lookat[1], e->lookat[2], 0.0, 1.0, 0.0); glPushMatrix(); + glLightfv(GL_LIGHT0, GL_POSITION, lightpos); glLightfv(GL_LIGHT0, GL_SPECULAR, light_sp); glLightfv(GL_LIGHT0, GL_DIFFUSE, light_sp); @@ -630,9 +624,12 @@ static int display(Engine *e) get_position (e->rot, &x, &y, &z, !e->button_down_p); glTranslatef(x*16-9, y*14-7, z*16-10); } + if (spin) { double x, y, z; + gltrackball_rotate (e->trackball); + get_rotation(e->rot, &x, &y, &z, !e->button_down_p); glRotatef(x*ONEREV, 1.0, 0.0, 0.0); glRotatef(y*ONEREV, 0.0, 1.0, 0.0); @@ -651,7 +648,7 @@ static int display(Engine *e) /* init the ln[] matrix for speed */ if (e->ln_init == 0) { - for (e->ln_init = 0 ; e->ln_init < 730 ; e->ln_init++) { + for (e->ln_init = 0 ; e->ln_init < countof(e->sin_table) ; e->ln_init++) { zb = e->sin_table[e->ln_init]; yb = e->cos_table[e->ln_init]; /* y ordinate of piston */ @@ -777,6 +774,7 @@ static int makeshaft (Engine *e) float crankThick = 0.2; float crankDiam = 0.3; + if (e->shaft_list) glDeleteLists(1, e->shaft_list); e->shaft_list = glGenLists(1); glNewList(e->shaft_list, GL_COMPILE); @@ -894,15 +892,15 @@ ENTRYPOINT void init_engine(ModeInfo *mi) move ? wander_speed : 0, True); - e->trackball = gltrackball_init (); + e->trackball = gltrackball_init (True); } - if ((e->glx_context = init_GL(mi)) != NULL) { + if (!e->glx_context && /* re-initting breaks print_texture_label */ + (e->glx_context = init_GL(mi)) != NULL) { reshape_engine(mi, MI_WIDTH(mi), MI_HEIGHT(mi)); } else { MI_CLEARWINDOW(mi); } - glClearColor(0.0,0.0,0.0,0.0); glShadeModel(GL_SMOOTH); glPolygonMode(GL_FRONT_AND_BACK,GL_FILL); glEnable(GL_DEPTH_TEST); @@ -912,7 +910,8 @@ ENTRYPOINT void init_engine(ModeInfo *mi) make_tables(e); e->engineType = find_engine(which_engine); - e->engine_name = malloc(200); + if (!e->engine_name) + e->engine_name = malloc(200); sprintf (e->engine_name, "%s\n%s%d%s", engines[e->engineType].engineName, @@ -924,7 +923,9 @@ ENTRYPOINT void init_engine(ModeInfo *mi) e->shaft_polys = makeshaft(e); e->piston_polys = makepiston(e); - load_font (mi->dpy, "titleFont", &e->xfont, &e->font_dlist); + + if (!e->font_data) + e->font_data = load_texture_font (mi->dpy, "titleFont"); } ENTRYPOINT Bool @@ -935,36 +936,24 @@ engine_handle_event (ModeInfo *mi, XEvent *event) if (event->xany.type == ButtonPress && event->xbutton.button == Button1) { - e->button_down_p = True; - gltrackball_start (e->trackball, - event->xbutton.x, event->xbutton.y, - MI_WIDTH (mi), MI_HEIGHT (mi)); - e->movepaused = 1; return True; } else if (event->xany.type == ButtonRelease && event->xbutton.button == Button1) { - e->button_down_p = False; e->movepaused = 0; - return True; } - else if (event->xany.type == ButtonPress && - (event->xbutton.button == Button4 || - event->xbutton.button == Button5 || - event->xbutton.button == Button6 || - event->xbutton.button == Button7)) + + if (gltrackball_event_handler (event, e->trackball, + MI_WIDTH (mi), MI_HEIGHT (mi), + &e->button_down_p)) + return True; + else if (screenhack_event_helper (MI_DISPLAY(mi), MI_WINDOW(mi), event)) { - gltrackball_mousewheel (e->trackball, event->xbutton.button, 10, - !!event->xbutton.state); + which_engine = NULL; /* randomize */ + init_engine(mi); return True; } - else if (event->xany.type == MotionNotify && - e->button_down_p) { - gltrackball_track (e->trackball, - event->xmotion.x, event->xmotion.y, - MI_WIDTH (mi), MI_HEIGHT (mi)); - return True; - } + return False; } @@ -982,11 +971,11 @@ ENTRYPOINT void draw_engine(ModeInfo *mi) mi->polygon_count = display(e); + glColor3f (1, 1, 0); if (do_titles) - print_gl_string (mi->dpy, e->xfont, e->font_dlist, - mi->xgwa.width, mi->xgwa.height, - 10, mi->xgwa.height - 10, - e->engine_name, False); + print_texture_label (mi->dpy, e->font_data, + mi->xgwa.width, mi->xgwa.height, + 1, e->engine_name); if(mi->fps_p) do_fps(mi); glFinish();