--- ray/src/hd/rhd_ogl.c 1999/01/05 18:16:17 3.15 +++ ray/src/hd/rhd_ogl.c 2004/02/12 18:55:50 3.25 @@ -1,9 +1,6 @@ -/* Copyright (c) 1999 Silicon Graphics, Inc. */ - #ifndef lint -static char SCCSid[] = "$SunId$ SGI"; +static const char RCSid[] = "$Id: rhd_ogl.c,v 3.25 2004/02/12 18:55:50 greg Exp $"; #endif - /* * OpenGL driver for holodeck display. * Based on GLX driver using T-mesh. @@ -20,16 +17,18 @@ static char SCCSid[] = "$SunId$ SGI"; #endif #endif -#include "standard.h" -#include +#include #include #include #ifdef STEREO #include #endif +#include "standard.h" #include "rhd_odraw.h" +#include "rhdisp.h" +#include "paths.h" #ifdef DOBJ #include "rhdobj.h" #endif @@ -115,14 +114,36 @@ static int inpresflags; /* input result flags */ static int viewflags; /* what's happening with view */ +/* static int resizewindow(), getevent(), getkey(), moveview(), wipeclean(), xferdepth(), freedepth(), setglortho(), setglpersp(), getframe(), getmove(), fixwindow(), mytmflags(); static double getdistance(); +*/ +static void checkglerr(char *where); +static void xferdepth(void); +static void freedepth(void); +static double getdistance(int dx, int dy, FVECT direc); +static int mytmflags(void); +static void getevent(void); +static void draw3dline(register FVECT wp[2]); +static void draw_grids(int fore); +static int moveview(int dx, int dy, int mov, int orb); +static void getframe(XButtonPressedEvent *ebut); +static void getmove(XButtonPressedEvent *ebut); +static void getkey(register XKeyPressedEvent *ekey); +static void fixwindow(register XExposeEvent *eexp); +static void resizewindow(register XConfigureEvent *ersz); +static void waitabit(void); +static void setglpersp(void); +static void setglortho(void); +static void wipeclean(void); + #ifdef STEREO -static int pushright(), popright(); +static void pushright(void); +static void popright(void); #endif extern int gmPortals; /* GL portal list id */ @@ -130,6 +151,7 @@ extern int gmPortals; /* GL portal list id */ extern time_t time(); +extern void dev_open(id) /* initialize GLX driver */ char *id; { @@ -246,7 +268,7 @@ char *id; setstereobuf(STEREO_BUFFER_LEFT); #endif checkglerr("setting rendering parameters"); - copystruct(&odev.v, &stdview); + odev.v = stdview; odev.v.type = VT_PER; viewflags = VWSTEADY; /* view starts static */ /* map the window */ @@ -261,7 +283,8 @@ char *id; } -dev_close() /* close our display and free resources */ +extern void +dev_close(void) /* close our display and free resources */ { #ifdef DOBJ dobj_cleanup(); @@ -283,7 +306,8 @@ dev_close() /* close our display and free resources } -dev_clear() /* clear our representation */ +extern void +dev_clear(void) /* clear our representation */ { viewflags |= VWCHANGE; /* pretend our view has changed */ wipeclean(); /* clean off display and samples */ @@ -292,12 +316,11 @@ dev_clear() /* clear our representation */ } -int -dev_view(nv) /* assign new driver view */ -register VIEW *nv; +extern int +dev_view( /* assign new driver view */ + register VIEW *nv +) { - double d; - if (nv->type != VT_PER || /* check view legality */ nv->horiz > 160. || nv->vert > 160.) { error(COMMAND, "illegal view type/angle"); @@ -333,11 +356,11 @@ register VIEW *nv; XResizeWindow(ourdisplay, gwind, odev.hres, odev.vres); dev_input(); /* get resize event */ } - copystruct(&odev.v, nv); /* setview() already called */ + odev.v = *nv; /* setview() already called */ viewflags |= VWCHANGE; } #ifdef STEREO - copystruct(&vwright, nv); + vwright = *nv; d = eyesepdist / sqrt(nv->hn2); VSUM(vwright.vp, nv->vp, nv->hvec, d); /* setview(&vwright); -- Unnecessary */ @@ -347,12 +370,12 @@ register VIEW *nv; } -dev_section(gfn, pfn) /* add octree for geometry rendering */ -char *gfn, *pfn; +extern void +dev_section( /* add octree for geometry rendering */ + char *gfn, + char *pfn +) { - extern char *index(); - char *cp; - if (gfn == NULL) { gmEndGeom(); gmEndPortal(); @@ -372,8 +395,11 @@ char *gfn, *pfn; } -dev_auxcom(cmd, args) /* process an auxiliary command */ -char *cmd, *args; +extern void +dev_auxcom( /* process an auxiliary command */ + char *cmd, + char *args +) { #ifdef DOBJ int vischange; @@ -391,10 +417,11 @@ char *cmd, *args; } -VIEW * -dev_auxview(n, hvres) /* return nth auxiliary view */ -int n; -int hvres[2]; +extern VIEW * +dev_auxview( /* return nth auxiliary view */ + int n, + int hvres[2] +) { hvres[0] = odev.hres; hvres[1] = odev.vres; if (n == 0) @@ -407,8 +434,8 @@ int hvres[2]; } -int -dev_input() /* get X11 input */ +extern int +dev_input(void) /* get X11 input */ { inpresflags = 0; @@ -423,9 +450,12 @@ dev_input() /* get X11 input */ } -dev_value(c, d, p) /* add a pixel value to our texture */ -COLR c; -FVECT d, p; +extern void +dev_value( /* add a pixel value to our texture */ + COLR c, + FVECT d, + FVECT p +) { #ifdef DOBJ if (dobj_lightsamp != NULL) { /* in light source sampling */ @@ -439,8 +469,8 @@ FVECT d, p; } -int -dev_flush() /* flush output as appropriate */ +extern int +dev_flush(void) /* flush output as appropriate */ { int ndrawn; @@ -486,8 +516,10 @@ dev_flush() /* flush output as appropriate */ } -checkglerr(where) /* check for GL or GLU error */ -char *where; +static void +checkglerr( /* check for GL or GLU error */ + char *where +) { register GLenum errcode; @@ -499,8 +531,8 @@ char *where; } -static -xferdepth() /* load and clear depth buffer */ +static void +xferdepth(void) /* load and clear depth buffer */ { register GLfloat *dbp; register GLubyte *pbuf; @@ -558,41 +590,45 @@ xferdepth() /* load and clear depth buffer */ glClear(GL_DEPTH_BUFFER_BIT); /* clear system depth buffer */ odDepthMap(0, depthbuffer); /* transfer depth data */ if (pbuf != NULL) - free((char *)pbuf); /* free our portal buffer */ + free((void *)pbuf); /* free our portal buffer */ } -static -freedepth() /* free recorded depth buffer */ +static void +freedepth(void) /* free recorded depth buffer */ { if (depthbuffer == NULL) return; #ifdef STEREO odDepthMap(1, NULL); - free((char *)depthright); + free((void *)depthright); depthright = NULL; #endif odDepthMap(0, NULL); - free((char *)depthbuffer); + free((void *)depthbuffer); depthbuffer = NULL; } static double -getdistance(dx, dy, direc) /* distance from fore plane along view ray */ -int dx, dy; -FVECT direc; +getdistance( /* distance from fore plane along view ray */ + int dx, + int dy, + FVECT direc +) { GLfloat gldepth; double dist; - if (dx<0 | dx>=odev.hres | dy<0 | dy>=odev.vres) + if ((dx<0) | (dx>=odev.hres) | (dy<0) | (dy>=odev.vres)) return(FHUGE); if (depthbuffer != NULL) dist = depthbuffer[dy*odev.hres + dx]; else { glReadPixels(dx,dy, 1,1, GL_DEPTH_COMPONENT, GL_FLOAT, &gldepth); + if (gldepth <= FTINY) + return (FHUGE); /* call failed */ dist = mapdepth(gldepth); } if (dist >= .99*FHUGE) @@ -602,8 +638,8 @@ FVECT direc; #ifdef STEREO -static -pushright() /* push on right view & buffer */ +static void +pushright(void) /* push on right view & buffer */ { double d; @@ -619,8 +655,8 @@ pushright() /* push on right view & buffer */ } -static -popright() /* pop off right view & buffer */ +static void +popright(void) /* pop off right view & buffer */ { if (viewflags & VWPERSP) { glMatrixMode(GL_MODELVIEW); @@ -632,7 +668,7 @@ popright() /* pop off right view & buffer */ static int -mytmflags() /* figure out tone mapping flags */ +mytmflags(void) /* figure out tone mapping flags */ { extern char *progname; register char *cp, *tail; @@ -656,8 +692,8 @@ mytmflags() /* figure out tone mapping flags */ } -static -getevent() /* get next event */ +static void +getevent(void) /* get next event */ { XNextEvent(ourdisplay, levptr(XEvent)); switch (levptr(XEvent)->type) { @@ -687,18 +723,20 @@ getevent() /* get next event */ } -static -draw3dline(wp) /* draw 3d line in world coordinates */ -register FVECT wp[2]; +static void +draw3dline( /* draw 3d line in world coordinates */ + register FVECT wp[2] +) { glVertex3d(wp[0][0], wp[0][1], wp[0][2]); glVertex3d(wp[1][0], wp[1][1], wp[1][2]); } -static -draw_grids(fore) /* draw holodeck section grids */ -int fore; +static void +draw_grids( /* draw holodeck section grids */ + int fore +) { glPushAttrib(GL_LIGHTING_BIT|GL_ENABLE_BIT); glDisable(GL_LIGHTING); @@ -714,16 +752,19 @@ int fore; } -static -moveview(dx, dy, mov, orb) /* move our view */ -int dx, dy, mov, orb; +static int +moveview( /* move our view */ + int dx, + int dy, + int mov, + int orb +) { VIEW nv; FVECT odir, v1, wip; double d, d1; - register int li; /* start with old view */ - copystruct(&nv, &odev.v); + nv = odev.v; /* orient our motion */ if (viewray(v1, odir, &odev.v, (dx+.5)/odev.hres, (dy+.5)/odev.vres) < -FTINY) @@ -769,9 +810,10 @@ int dx, dy, mov, orb; } -static -getframe(ebut) /* get focus frame */ -XButtonPressedEvent *ebut; +static void +getframe( /* get focus frame */ + XButtonPressedEvent *ebut +) { int startx = ebut->x, starty = ebut->y; int endx, endy; @@ -779,7 +821,7 @@ XButtonPressedEvent *ebut; XMaskEvent(ourdisplay, ButtonReleaseMask, levptr(XEvent)); endx = levptr(XButtonReleasedEvent)->x; endy = levptr(XButtonReleasedEvent)->y; - if (endx == startx | endy == starty) { + if ((endx == startx) | (endy == starty)) { XBell(ourdisplay, 0); return; } @@ -792,10 +834,21 @@ XButtonPressedEvent *ebut; } -static -getmove(ebut) /* get view change */ -XButtonPressedEvent *ebut; +static void +waitabit(void) /* pause a moment */ { + struct timespec ts; + ts.tv_sec = 0; + ts.tv_nsec = 100000000L; + nanosleep(&ts, NULL); +} + + +static void +getmove( /* get view change */ + XButtonPressedEvent *ebut +) +{ int movdir = MOVDIR(ebut->button); int movorb = MOVORB(ebut->state); int ndrawn; @@ -809,6 +862,8 @@ XButtonPressedEvent *ebut; setglpersp(); /* start us off in perspective */ while (!XCheckMaskEvent(ourdisplay, ButtonReleaseMask, levptr(XEvent))) { + /* pause so as not to move too fast */ + waitabit(); /* get cursor position */ if (!XQueryPointer(ourdisplay, gwind, &rootw, &childw, &rootx, &rooty, &wx, &wy, &statemask)) @@ -847,8 +902,8 @@ XButtonPressedEvent *ebut; } -static -setglpersp() /* set perspective view in GL */ +static void +setglpersp(void) /* set perspective view in GL */ { double d, xmin, xmax, ymin, ymax; GLfloat vec[4]; @@ -868,8 +923,8 @@ setglpersp() /* set perspective view in GL */ dev_zmin = odev.v.vfore; if (odev.v.vaft > FTINY) dev_zmax = odev.v.vaft; - if (dev_zmin < dev_zmax/100.) - dev_zmin = dev_zmax/100.; + if (dev_zmin*500. < dev_zmax) + dev_zmin = dev_zmax/500.; setzrat(); xmax = dev_zmin * tan(PI/180./2. * odev.v.horiz); xmin = -xmax; @@ -909,8 +964,8 @@ setglpersp() /* set perspective view in GL */ } -static -setglortho() /* set up orthographic view for cone drawing */ +static void +setglortho(void) /* set up orthographic view for cone drawing */ { glDrawBuffer(GL_FRONT); /* use single-buffer mode */ /* set view matrix */ @@ -926,8 +981,8 @@ setglortho() /* set up orthographic view for cone dr } -static -wipeclean() /* prepare for redraw */ +static void +wipeclean(void) /* prepare for redraw */ { glDrawBuffer(GL_BACK); /* use double-buffer mode */ glReadBuffer(GL_BACK); @@ -945,13 +1000,14 @@ wipeclean() /* prepare for redraw */ viewflags &= ~VWCHANGE; /* change noted */ } else if (viewflags & VWSTEADY) odRedrawAll(); - setglpersp(&odev.v); /* reset view & clipping planes */ + setglpersp(); /* reset view & clipping planes */ } -static -getkey(ekey) /* get input key */ -register XKeyPressedEvent *ekey; +static void +getkey( /* get input key */ + register XKeyPressedEvent *ekey +) { Window rootw, childw; int rootx, rooty, wx, wy; @@ -1032,13 +1088,14 @@ register XKeyPressedEvent *ekey; } -static -fixwindow(eexp) /* repair damage to window */ -register XExposeEvent *eexp; +static void +fixwindow( /* repair damage to window */ + register XExposeEvent *eexp +) { int xmin, ymin, xmax, ymax; - if (odev.hres == 0 | odev.vres == 0) { /* first exposure */ + if ((odev.hres == 0) | (odev.vres == 0)) { /* first exposure */ resizewindow((XConfigureEvent *)eexp); return; } @@ -1077,9 +1134,10 @@ register XExposeEvent *eexp; } -static -resizewindow(ersz) /* resize window */ -register XConfigureEvent *ersz; +static void +resizewindow( /* resize window */ + register XConfigureEvent *ersz +) { glViewport(0, 0, ersz->width, ersz->height);