--- ray/src/hd/rhd_ogl.c 1998/12/22 12:59:17 3.9 +++ ray/src/hd/rhd_ogl.c 2004/01/01 11:21:55 3.24 @@ -1,9 +1,6 @@ -/* Copyright (c) 1998 Silicon Graphics, Inc. */ - #ifndef lint -static char SCCSid[] = "$SunId$ SGI"; +static const char RCSid[] = "$Id: rhd_ogl.c,v 3.24 2004/01/01 11:21:55 schorsch Exp $"; #endif - /* * OpenGL driver for holodeck display. * Based on GLX driver using T-mesh. @@ -20,16 +17,17 @@ 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" #ifdef DOBJ #include "rhdobj.h" #endif @@ -37,8 +35,18 @@ static char SCCSid[] = "$SunId$ SGI"; #include "x11icon.h" #ifndef RAYQLEN -#define RAYQLEN 50000 /* max. rays to queue before flush */ +#define RAYQLEN 0 /* max. rays to queue before flush */ #endif +#ifndef MINWIDTH +#define MINWIDTH 480 /* minimum graphics window width */ +#define MINHEIGHT 400 /* minimum graphics window height */ +#endif +#ifndef VIEWDIST +#define VIEWDIST 356 /* assumed viewing distance (mm) */ +#endif +#ifndef BORWIDTH +#define BORWIDTH 5 /* border width */ +#endif #ifndef FEQ #define FEQ(a,b) ((a)-(b) <= FTINY && (a)-(b) >= -FTINY) @@ -60,13 +68,6 @@ static char SCCSid[] = "$SunId$ SGI"; #define MOVDEG (-5) /* degrees to orbit CW/down /frame */ #define MOVORB(s) ((s)&ShiftMask ? 1 : (s)&ControlMask ? -1 : 0) -#define MINWIDTH 480 /* minimum graphics window width */ -#define MINHEIGHT 400 /* minimum graphics window height */ - -#define VIEWDIST 356 /* assumed viewing distance (mm) */ - -#define BORWIDTH 5 /* border width */ - #define setstereobuf(bid) (glXWaitGL(), \ XSGISetStereoBuffer(ourdisplay, gwind, bid), \ glXWaitX()) @@ -112,14 +113,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 */ @@ -127,6 +150,7 @@ extern int gmPortals; /* GL portal list id */ extern time_t time(); +extern void dev_open(id) /* initialize GLX driver */ char *id; { @@ -231,6 +255,8 @@ char *id; glDisable(GL_CULL_FACE); glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, GL_TRUE); glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); + glPixelStorei(GL_PACK_ALIGNMENT, 1); + glPixelStorei(GL_UNPACK_ALIGNMENT, 1); /* figure out sensible view */ pwidth = (double)DisplayWidthMM(ourdisplay, ourscreen) / DisplayWidth(ourdisplay, ourscreen); @@ -241,14 +267,14 @@ 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 */ XMapWindow(ourdisplay, gwind); dev_input(); /* sets size and view angles */ if (!odInit(DisplayWidth(ourdisplay,ourscreen) * - DisplayHeight(ourdisplay,ourscreen) / 4)) + DisplayHeight(ourdisplay,ourscreen) / 3)) error(SYSTEM, "insufficient memory for value storage"); odev.name = id; odev.firstuse = 1; /* can't recycle samples */ @@ -256,7 +282,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(); @@ -278,19 +305,21 @@ dev_close() /* close our display and free resources } -dev_clear() /* clear our representation */ +extern void +dev_clear(void) /* clear our representation */ { - wipeclean(); + viewflags |= VWCHANGE; /* pretend our view has changed */ + wipeclean(); /* clean off display and samples */ + dev_flush(); /* redraw geometry & get depth */ rayqleft = 0; /* hold off update */ } -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"); @@ -326,26 +355,26 @@ register VIEW *nv; XResizeWindow(ourdisplay, gwind, odev.hres, odev.vres); dev_input(); /* get resize event */ } - copystruct(&odev.v, nv); /* setview() already called */ -#ifdef STEREO - copystruct(&vwright, nv); - d = eyesepdist / sqrt(nv->hn2); - VSUM(vwright.vp, nv->vp, nv->hvec, d); - /* setview(&vwright); -- Unnecessary */ -#endif + odev.v = *nv; /* setview() already called */ viewflags |= VWCHANGE; } +#ifdef STEREO + vwright = *nv; + d = eyesepdist / sqrt(nv->hn2); + VSUM(vwright.vp, nv->vp, nv->hvec, d); + /* setview(&vwright); -- Unnecessary */ +#endif wipeclean(); return(1); } -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(); @@ -365,22 +394,33 @@ 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 - if (dobj_command(cmd, args) >= 0) + int vischange; + + if ((vischange = dobj_command(cmd, args)) >= 0) { + if (vischange) { + imm_mode = beam_sync(1) > 0; + dev_clear(); + } return; + } #endif sprintf(errmsg, "%s: unknown command", cmd); error(COMMAND, errmsg); } -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) @@ -393,8 +433,8 @@ int hvres[2]; } -int -dev_input() /* get X11 input */ +extern int +dev_input(void) /* get X11 input */ { inpresflags = 0; @@ -409,9 +449,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 */ @@ -425,8 +468,8 @@ FVECT d, p; } -int -dev_flush() /* flush output as appropriate */ +extern int +dev_flush(void) /* flush output as appropriate */ { int ndrawn; @@ -472,8 +515,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; @@ -485,8 +530,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; @@ -502,28 +547,27 @@ xferdepth() /* load and clear depth buffer */ } /* allocate alpha buffer for portals */ if (gmPortals) - pbuf = (GLubyte *)malloc(odev.hres*odev.vres * - (4*sizeof(GLubyte))); + pbuf = (GLubyte *)malloc(odev.hres*odev.vres*sizeof(GLubyte)); else pbuf = NULL; #ifdef STEREO - setstereobuf(STEREO_BUFFER_RIGHT); + pushright(); glReadPixels(0, 0, odev.hres, odev.vres, GL_DEPTH_COMPONENT, GL_FLOAT, depthright); if (pbuf != NULL) { glClear(GL_COLOR_BUFFER_BIT); gmDrawPortals(0xff, -1, -1, -1); glReadPixels(0, 0, odev.hres, odev.vres, - GL_RGBA, GL_UNSIGNED_BYTE, pbuf); + GL_RED, GL_UNSIGNED_BYTE, pbuf); } for (dbp = depthright + odev.hres*odev.vres; dbp-- > depthright; ) - if (pbuf != NULL && pbuf[4*(dbp-depthright)]&0x40) + if (pbuf != NULL && pbuf[dbp-depthright]&0x40) *dbp = FHUGE; else *dbp = mapdepth(*dbp); glClear(GL_DEPTH_BUFFER_BIT); - setstereobuf(STEREO_BUFFER_LEFT); odDepthMap(1, depthright); + popright(); #endif /* read back depth buffer */ glReadPixels(0, 0, odev.hres, odev.vres, @@ -532,51 +576,58 @@ xferdepth() /* load and clear depth buffer */ glClear(GL_COLOR_BUFFER_BIT); /* find portals */ gmDrawPortals(0xff, -1, -1, -1); glReadPixels(0, 0, odev.hres, odev.vres, - GL_RGBA, GL_UNSIGNED_BYTE, pbuf); + GL_RED, GL_UNSIGNED_BYTE, pbuf); +#ifdef DEBUG + glXSwapBuffers(ourdisplay, gwind); +#endif } for (dbp = depthbuffer + odev.hres*odev.vres; dbp-- > depthbuffer; ) - if (pbuf != NULL && pbuf[4*(dbp-depthbuffer)]&0x40) + if (pbuf != NULL && pbuf[dbp-depthbuffer]&0x40) *dbp = FHUGE; else *dbp = mapdepth(*dbp); 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) @@ -586,8 +637,8 @@ FVECT direc; #ifdef STEREO -static -pushright() /* push on right view & buffer */ +static void +pushright(void) /* push on right view & buffer */ { double d; @@ -603,8 +654,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); @@ -616,7 +667,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; @@ -640,8 +691,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) { @@ -671,18 +722,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); @@ -698,16 +751,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) @@ -753,9 +809,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; @@ -763,7 +820,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; } @@ -776,10 +833,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; @@ -790,9 +858,11 @@ XButtonPressedEvent *ebut; XNoOp(ourdisplay); /* makes sure we're not idle */ viewflags &= ~VWSTEADY; /* flag moving view */ - setglpersp(&odev.v); /* start us off in perspective */ + 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)) @@ -831,9 +901,8 @@ XButtonPressedEvent *ebut; } -static -setglpersp(vp) /* set perspective view in GL */ -register VIEW *vp; +static void +setglpersp(void) /* set perspective view in GL */ { double d, xmin, xmax, ymin, ymax; GLfloat vec[4]; @@ -845,7 +914,7 @@ register VIEW *vp; dev_zmax = 100.; } else { dev_zmin = 0.5*depthlim[0]; - dev_zmax = 1.75*depthlim[1]; + dev_zmax = 1.25*depthlim[1]; if (dev_zmin > dev_zmax/5.) dev_zmin = dev_zmax/5.; } @@ -853,8 +922,8 @@ register VIEW *vp; 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; @@ -894,8 +963,8 @@ register VIEW *vp; } -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 */ @@ -911,8 +980,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); @@ -928,14 +997,16 @@ wipeclean() /* prepare for redraw */ (VWCHANGE|VWSTEADY)) { /* clear samples if new */ odClean(); viewflags &= ~VWCHANGE; /* change noted */ - } - setglpersp(&odev.v); /* reset view & clipping planes */ + } else if (viewflags & VWSTEADY) + odRedrawAll(); + 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; @@ -979,7 +1050,7 @@ register XKeyPressedEvent *ekey; inpresflags |= DFL(DC_RESUME); return; case CTRL('R'): /* redraw screen */ - odRemap(0); + odRemap(0); /* new tone mapping */ glClear(GL_DEPTH_BUFFER_BIT); #ifdef STEREO setstereobuf(STEREO_BUFFER_RIGHT); @@ -989,15 +1060,13 @@ register XKeyPressedEvent *ekey; return; case CTRL('L'): /* refresh from server */ if (inpresflags & DFL(DC_REDRAW)) - return; + return; /* already called */ XRaiseWindow(ourdisplay, gwind); - XFlush(ourdisplay); - sleep(1); - wipeclean(); /* fresh display */ - odRemap(1); /* fresh tone mapping */ - dev_flush(); /* draw octrees */ + XFlush(ourdisplay); /* raise up window */ + sleep(1); /* wait for restacking */ + dev_clear(); /* clear buffer and samples */ + odRemap(1); /* start fresh histogram */ inpresflags |= DFL(DC_REDRAW); /* resend values from server */ - rayqleft = 0; /* hold off update */ return; case 'K': /* kill rtrace process(es) */ inpresflags |= DFL(DC_KILL); @@ -1018,18 +1087,26 @@ 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; } xmin = eexp->x; xmax = eexp->x + eexp->width; ymin = odev.vres - eexp->y - eexp->height; ymax = odev.vres - eexp->y; + + if (xmin <= 0 && xmax >= odev.hres-1 && + ymin <= 0 && ymax >= odev.vres) { + DCHECK(eexp->count, WARNING, "multiple clear in fixwindow"); + wipeclean(); /* make sure we're go */ + return; + } /* clear portion of depth */ glPushAttrib(GL_DEPTH_BUFFER_BIT|GL_COLOR_BUFFER_BIT); glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); @@ -1056,9 +1133,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);