X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fengine.c;h=753eff6679dd53b196c53fd15bf31d937288ed46;hb=aa75c7476aeaa84cf3abc192b376a8b03c325213;hp=bd0803130d70269f8ead02df2b6b7af5227abaac;hpb=6f5482d73adb0165c0130bb47d852644ab0c4869;p=xscreensaver diff --git a/hacks/glx/engine.c b/hacks/glx/engine.c index bd080313..753eff66 100644 --- a/hacks/glx/engine.c +++ b/hacks/glx/engine.c @@ -24,7 +24,8 @@ #ifdef STANDALONE #define DEFAULTS "*delay: 30000 \n" \ "*showFPS: False \n" \ - "*titleFont: -*-helvetica-medium-r-normal-*-180-*\n" \ + "*suppressRotationAnimation: True\n" \ + "*titleFont: -*-helvetica-medium-r-normal-*-*-180-*-*-*-*-*-*\n" \ # define refresh_engine 0 # include "xlockmore.h" /* from the xscreensaver distribution */ @@ -32,7 +33,7 @@ # include "xlock.h" /* from the xlockmore distribution */ #endif /* !STANDALONE */ -#include "glxfonts.h" +#include "texfont.h" #include "rotator.h" #include "gltrackball.h" @@ -109,12 +110,7 @@ typedef struct { rotator *rot; trackball_state *trackball; Bool button_down_p; -# ifdef HAVE_GLBITMAP - XFontStruct *xfont; - GLuint font_dlist; -# else texture_font_data *font_data; -# endif char *engine_name; int engineType; int movepaused; @@ -284,13 +280,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); } } @@ -331,8 +327,10 @@ 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; - if (endcaps) - y2c[a] = y2; z2c[a] = z2; /* cache for later */ + 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; @@ -535,7 +533,8 @@ static int makepiston(Engine *e) int polys = 0; GLfloat colour[] = {0.6, 0.6, 0.6, 1.0}; - e->piston_list = glGenLists(1); + /* if (e->piston_list) glDeleteLists(1, e->piston_list); */ + if (! e->piston_list) e->piston_list = glGenLists(1); glNewList(e->piston_list, GL_COMPILE); glRotatef(90, 0, 0, 1); glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, colour); @@ -587,7 +586,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); @@ -602,8 +601,9 @@ static int boom(Engine *e, GLfloat x, GLfloat y, int s) return polys; } -static int display(Engine *e) +static int display(ModeInfo *mi) { + Engine *e = &engine[MI_SCREEN(mi)]; int polys = 0; GLfloat zb, yb; float rightSide; @@ -619,6 +619,15 @@ static int display(Engine *e) 0.0, 1.0, 0.0); glPushMatrix(); +# ifdef HAVE_MOBILE /* Keep it the same relative size when rotated. */ + { + GLfloat h = MI_HEIGHT(mi) / (GLfloat) MI_WIDTH(mi); + int o = (int) current_device_rotation(); + if (o != 0 && o != 180 && o != -180) + glScalef (1/h, 1/h, 1/h); + } +# endif + glLightfv(GL_LIGHT0, GL_POSITION, lightpos); glLightfv(GL_LIGHT0, GL_SPECULAR, light_sp); glLightfv(GL_LIGHT0, GL_DIFFUSE, light_sp); @@ -632,10 +641,7 @@ static int display(Engine *e) if (spin) { double x, y, z; - /* Do it twice because we don't track the device's orientation. */ - glRotatef( current_device_rotation(), 0, 0, 1); gltrackball_rotate (e->trackball); - glRotatef(-current_device_rotation(), 0, 0, 1); get_rotation(e->rot, &x, &y, &z, !e->button_down_p); glRotatef(x*ONEREV, 1.0, 0.0, 0.0); @@ -655,7 +661,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 */ @@ -781,7 +787,8 @@ static int makeshaft (Engine *e) float crankThick = 0.2; float crankDiam = 0.3; - e->shaft_list = glGenLists(1); + /* if (e->shaft_list) glDeleteLists(1, e->shaft_list); */ + if (! e->shaft_list) e->shaft_list = glGenLists(1); glNewList(e->shaft_list, GL_COMPILE); glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, blue); @@ -842,7 +849,8 @@ ENTRYPOINT void reshape_engine(ModeInfo *mi, int width, int height) glViewport(0,0,(GLint)width, (GLint) height); glMatrixMode(GL_PROJECTION); glLoadIdentity(); - glFrustum(-1.0,1.0,-1.0,1.0,1.5,70.0); +/* glFrustum(-1.0,1.0,-1.0,1.0,1.5,70.0);*/ + gluPerspective(40.0,((GLdouble)width)/height,1.5,70.0); glMatrixMode(GL_MODELVIEW); e->win_h = height; e->win_w = width; @@ -898,10 +906,11 @@ 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); @@ -915,7 +924,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, @@ -928,11 +938,8 @@ ENTRYPOINT void init_engine(ModeInfo *mi) e->shaft_polys = makeshaft(e); e->piston_polys = makepiston(e); -#ifdef HAVE_GLBITMAP - load_font (mi->dpy, "titleFont", &e->xfont, &e->font_dlist); -#else - e->font_data = load_texture_font (mi->dpy, "Font"); -#endif + if (!e->font_data) + e->font_data = load_texture_font (mi->dpy, "titleFont"); } ENTRYPOINT Bool @@ -943,36 +950,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; } @@ -988,19 +983,13 @@ ENTRYPOINT void draw_engine(ModeInfo *mi) glXMakeCurrent(disp, w, *(e->glx_context)); - mi->polygon_count = display(e); + mi->polygon_count = display(mi); glColor3f (1, 1, 0); if (do_titles) - print_gl_string (mi->dpy, -# ifdef HAVE_GLBITMAP - e->xfont, e->font_dlist, -# else - e->font_data, -# endif - 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();