--- ray/src/hd/rhd_ogl.c 1998/12/18 11:55:19 3.1 +++ ray/src/hd/rhd_ogl.c 2003/07/21 22:30:18 3.22 @@ -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.22 2003/07/21 22:30:18 schorsch Exp $"; #endif - /* * OpenGL driver for holodeck display. * Based on GLX driver using T-mesh. @@ -22,12 +19,12 @@ static char SCCSid[] = "$SunId$ SGI"; #include "standard.h" -#include #include #include #ifdef STEREO #include #endif +#include #include "rhd_odraw.h" #ifdef DOBJ @@ -37,13 +34,30 @@ static char SCCSid[] = "$SunId$ SGI"; #include "x11icon.h" #ifndef RAYQLEN -#define RAYQLEN 10240 /* 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) #endif +#define VWHEADLOCK 01 /* head position is locked flag */ +#define VWPERSP 02 /* perspective view is set */ +#define VWORTHO 04 /* orthographic view is set */ +#define VWCHANGE 010 /* view has changed */ +#define VWSTEADY 020 /* view is now steady */ +#define VWMAPPED 040 /* window is mapped */ + #define GAMMA 1.4 /* default gamma correction */ #define FRAMESTATE(s) (((s)&(ShiftMask|ControlMask))==(ShiftMask|ControlMask)) @@ -53,13 +67,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()) @@ -86,7 +93,6 @@ static int rayqleft = 0; /* rays left to queue before static XEvent currentevent; /* current event */ -static int mapped = 0; /* window is mapped? */ static unsigned long ourblack=0, ourwhite=~0; static Display *ourdisplay = NULL; /* our display */ @@ -104,14 +110,10 @@ static double dev_zrat; /* (1. - dev_zmin/dev_zmax) * static int inpresflags; /* input result flags */ -static int headlocked; /* lock vertical motion */ +static int viewflags; /* what's happening with view */ -static int isperspective; /* perspective/ortho view */ - -static int viewsteady; /* is view steady? */ - static int resizewindow(), getevent(), getkey(), moveview(), wipeclean(), - xferdepth(), setglortho(), + xferdepth(), freedepth(), setglortho(), setglpersp(), getframe(), getmove(), fixwindow(), mytmflags(); static double getdistance(); @@ -120,6 +122,8 @@ static double getdistance(); static int pushright(), popright(); #endif +extern int gmPortals; /* GL portal list id */ + extern time_t time(); @@ -128,9 +132,12 @@ char *id; { extern char *getenv(); static RGBPRIMS myprims = STDPRIMS; - static int atlBest[] = {GLX_RGBA, GLX_RED_SIZE,8, - GLX_GREEN_SIZE,8, GLX_BLUE_SIZE,8, - GLX_DEPTH_SIZE,15, None}; + static int atlBest[] = {GLX_RGBA, GLX_DOUBLEBUFFER, + GLX_RED_SIZE,8, GLX_GREEN_SIZE,8, + GLX_BLUE_SIZE,8, GLX_DEPTH_SIZE,15, None}; + static int atlOK[] = {GLX_RGBA, GLX_DOUBLEBUFFER, + GLX_RED_SIZE,4, GLX_GREEN_SIZE,4, + GLX_BLUE_SIZE,4, GLX_DEPTH_SIZE,15, None}; char *ev; double gamval = GAMMA; RGBPRIMP dpri = stdprims; @@ -143,8 +150,8 @@ char *id; #endif /* open display server */ ourdisplay = XOpenDisplay(NULL); - if (ourdisplay == NULL) - error(USER, "cannot open X-windows; DISPLAY variable set?\n"); + CHECK(ourdisplay==NULL, USER, + "cannot open X-windows; DISPLAY variable set?"); #ifdef STEREO switch (XSGIQueryStereoMode(ourdisplay, ourroot)) { case STEREO_TOP: @@ -152,7 +159,7 @@ char *id; break; case STEREO_OFF: error(USER, - "wrong video mode: run \"/usr/gfx/setmon -n STR_TOP\" first"); + "wrong video mode: run \"/usr/gfx/setmon -n STR_TOP\" first"); case X_STEREO_UNSUPPORTED: error(USER, "stereo mode not supported on this screen"); default: @@ -162,7 +169,8 @@ char *id; /* find a usable visual */ ourvinf = glXChooseVisual(ourdisplay, ourscreen, atlBest); if (ourvinf == NULL) - error(USER, "no suitable visuals available"); + ourvinf = glXChooseVisual(ourdisplay, ourscreen, atlOK); + CHECK(ourvinf==NULL, USER, "no suitable visuals available"); /* get a context */ gctx = glXCreateContext(ourdisplay, ourvinf, NULL, GL_TRUE); /* set gamma and tone mapping */ @@ -194,8 +202,7 @@ char *id; #endif BORWIDTH, ourvinf->depth, InputOutput, ourvinf->visual, CWBackPixel|CWBorderPixel|CWColormap|CWEventMask, &ourwinattr); - if (gwind == 0) - error(SYSTEM, "cannot create window\n"); + CHECK(gwind==0, SYSTEM, "cannot create window"); XStoreName(ourdisplay, gwind, id); /* set window manager hints */ ourxwmhints.flags = InputHint|IconPixmapHint; @@ -219,11 +226,13 @@ char *id; glXMakeCurrent(ourdisplay, gwind, gctx); glEnable(GL_DEPTH_TEST); glDepthFunc(GL_LEQUAL); - glDisable(GL_DITHER); + glClearColor(0, 0, 0, 0); glFrontFace(GL_CCW); 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); @@ -234,16 +243,14 @@ char *id; setstereobuf(STEREO_BUFFER_LEFT); #endif checkglerr("setting rendering parameters"); - copystruct(&odev.v, &stdview); + odev.v = stdview; odev.v.type = VT_PER; - headlocked = 0; /* free up head movement */ - viewsteady = 1; /* view starts static */ - isperspective = -1; /* but no view set, yet */ + 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) / 10)) + DisplayHeight(ourdisplay,ourscreen) / 3)) error(SYSTEM, "insufficient memory for value storage"); odev.name = id; odev.firstuse = 1; /* can't recycle samples */ @@ -256,6 +263,9 @@ dev_close() /* close our display and free resources #ifdef DOBJ dobj_cleanup(); #endif + freedepth(); + gmEndGeom(); + gmEndPortal(); odDone(); glXMakeCurrent(ourdisplay, None, NULL); glXDestroyContext(ourdisplay, gctx); @@ -272,7 +282,9 @@ dev_close() /* close our display and free resources dev_clear() /* 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 */ } @@ -318,36 +330,41 @@ 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); - d = eyesepdist / sqrt(nv->hn2); - VSUM(vwright.vp, nv->vp, nv->hvec, d); - /* setview(&vwright); -- Unnecessary */ + vwright = *nv; + d = eyesepdist / sqrt(nv->hn2); + VSUM(vwright.vp, nv->vp, nv->hvec, d); + /* setview(&vwright); -- Unnecessary */ #endif - } else - viewsteady = 1; wipeclean(); return(1); } -dev_section(ofn) /* add octree for geometry rendering */ -char *ofn; +dev_section(gfn, pfn) /* add octree for geometry rendering */ +char *gfn, *pfn; { - extern char *index(); char *cp; - if (ofn == NULL) - otEndOctree(); - else if (access(ofn, R_OK) == 0) - otNewOctree(ofn); + if (gfn == NULL) { + gmEndGeom(); + gmEndPortal(); + wipeclean(); /* new geometry, so redraw it */ + return; + } + if (access(gfn, R_OK) == 0) + gmNewGeom(gfn); #ifdef DEBUG else { - sprintf(errmsg, "cannot load octree \"%s\"", ofn); + sprintf(errmsg, "cannot load octree \"%s\"", gfn); error(WARNING, errmsg); } #endif + if (pfn != NULL) + gmNewPortal(pfn); } @@ -355,8 +372,15 @@ dev_auxcom(cmd, args) /* process an auxiliary command char *cmd, *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); @@ -416,41 +440,42 @@ dev_flush() /* flush output as appropriate */ { int ndrawn; - if (mapped && isperspective > 0) { + if ((viewflags&(VWMAPPED|VWPERSP)) == (VWMAPPED|VWPERSP)) { #ifdef STEREO pushright(); /* draw right eye */ - otDrawOctrees(); + ndrawn = gmDrawGeom(); #ifdef DOBJ - dobj_render(); + ndrawn += dobj_render(); #endif checkglerr("rendering right eye"); popright(); /* draw left eye */ #endif - ndrawn = otDrawOctrees(); + ndrawn = gmDrawGeom(); #ifdef DOBJ ndrawn += dobj_render(); #endif + glXSwapBuffers(ourdisplay, gwind); checkglerr("rendering base view"); } - if (mapped && viewsteady) { - if (isperspective) { /* first time after steady */ + if ((viewflags&(VWMAPPED|VWSTEADY|VWPERSP|VWORTHO)) == + (VWMAPPED|VWSTEADY|VWPERSP)) { + /* first time after steady */ + if (ndrawn) + xferdepth(); /* transfer and clear depth */ + setglortho(); /* set orthographic view */ + + } + if ((viewflags&(VWMAPPED|VWSTEADY|VWPERSP|VWORTHO)) == + (VWMAPPED|VWSTEADY|VWORTHO)) { + /* else update cones */ #ifdef STEREO - pushright(); - popright(); + pushright(); + odUpdate(1); /* draw right eye */ + popright(); #endif - if (ndrawn) - xferdepth(); /* transfer and clear depth */ - setglortho(); /* set orthographic view */ - } else { -#ifdef STEREO - pushright(); - odUpdate(1); /* draw right eye */ - popright(); -#endif - odUpdate(0); /* draw left eye */ - } + odUpdate(0); /* draw left eye */ + glFlush(); /* flush OpenGL */ } - glFlush(); /* flush OpenGL */ rayqleft = RAYQLEN; /* flush X11 and return # pending */ return(odev.inpready = XPending(ourdisplay)); @@ -474,36 +499,81 @@ static xferdepth() /* load and clear depth buffer */ { register GLfloat *dbp; + register GLubyte *pbuf; - if (depthbuffer == NULL) { + if (depthbuffer == NULL) { /* allocate private depth buffer */ #ifdef STEREO depthright = (GLfloat *)malloc( odev.hres*odev.vres*sizeof(GLfloat)); #endif depthbuffer = (GLfloat *)malloc( odev.hres*odev.vres*sizeof(GLfloat)); - if (depthbuffer == NULL) - error(SYSTEM, "out of memory in xferdepth"); + CHECK(depthbuffer==NULL, SYSTEM, "out of memory in xferdepth"); } + /* allocate alpha buffer for portals */ + if (gmPortals) + 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); - setstereobuf(STEREO_BUFFER_LEFT); + if (pbuf != NULL) { + glClear(GL_COLOR_BUFFER_BIT); + gmDrawPortals(0xff, -1, -1, -1); + glReadPixels(0, 0, odev.hres, odev.vres, + GL_RED, GL_UNSIGNED_BYTE, pbuf); + } for (dbp = depthright + odev.hres*odev.vres; dbp-- > depthright; ) - *dbp = mapdepth(*dbp); - odDepthMap(1, depthright); + if (pbuf != NULL && pbuf[dbp-depthright]&0x40) + *dbp = FHUGE; + else + *dbp = mapdepth(*dbp); glClear(GL_DEPTH_BUFFER_BIT); + odDepthMap(1, depthright); + popright(); #endif + /* read back depth buffer */ glReadPixels(0, 0, odev.hres, odev.vres, GL_DEPTH_COMPONENT, GL_FLOAT, depthbuffer); + if (pbuf != NULL) { + glClear(GL_COLOR_BUFFER_BIT); /* find portals */ + gmDrawPortals(0xff, -1, -1, -1); + glReadPixels(0, 0, odev.hres, odev.vres, + GL_RED, GL_UNSIGNED_BYTE, pbuf); +#ifdef DEBUG + glXSwapBuffers(ourdisplay, gwind); +#endif + } for (dbp = depthbuffer + odev.hres*odev.vres; dbp-- > depthbuffer; ) - *dbp = mapdepth(*dbp); + 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 */ - glClear(GL_DEPTH_BUFFER_BIT); /* clear system buffer */ + if (pbuf != NULL) + free((void *)pbuf); /* free our portal buffer */ } +static +freedepth() /* free recorded depth buffer */ +{ + if (depthbuffer == NULL) + return; +#ifdef STEREO + odDepthMap(1, NULL); + free((void *)depthright); + depthright = NULL; +#endif + odDepthMap(0, NULL); + free((void *)depthbuffer); + depthbuffer = NULL; +} + + static double getdistance(dx, dy, direc) /* distance from fore plane along view ray */ int dx, dy; @@ -534,7 +604,7 @@ pushright() /* push on right view & buffer */ double d; setstereobuf(STEREO_BUFFER_RIGHT); - if (isperspective > 0) { + if (viewflags & VWPERSP) { glMatrixMode(GL_MODELVIEW); glPushMatrix(); d = -eyesepdist / sqrt(odev.v.hn2); @@ -548,7 +618,7 @@ pushright() /* push on right view & buffer */ static popright() /* pop off right view & buffer */ { - if (isperspective > 0) { + if (viewflags & VWPERSP) { glMatrixMode(GL_MODELVIEW); glPopMatrix(); } @@ -591,10 +661,11 @@ getevent() /* get next event */ resizewindow(levptr(XConfigureEvent)); break; case UnmapNotify: - mapped = 0; + viewflags &= ~VWMAPPED; break; case MapNotify: - mapped = 1; + odRemap(0); + viewflags |= VWMAPPED; break; case Expose: fixwindow(levptr(XExposeEvent)); @@ -628,7 +699,7 @@ int fore; glPushAttrib(GL_LIGHTING_BIT|GL_ENABLE_BIT); glDisable(GL_LIGHTING); if (fore) - glColor3ub(0, 255, 255); + glColor3ub(4, 250, 250); else glColor3ub(0, 0, 0); glBegin(GL_LINES); /* draw each grid line */ @@ -648,7 +719,7 @@ int dx, dy, mov, orb; 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) @@ -681,7 +752,7 @@ int dx, dy, mov, orb; d = MOVPCT/100. * mov; VSUM(nv.vp, nv.vp, odir, d); } - if (!mov ^ !orb && headlocked) { /* restore head height */ + if (!mov ^ !orb && viewflags&VWHEADLOCK) { /* restore height */ VSUM(v1, odev.v.vp, nv.vp, -1.); d = DOT(v1, nv.vup); VSUM(nv.vp, nv.vp, odev.v.vup, d); @@ -689,7 +760,7 @@ int dx, dy, mov, orb; if (setview(&nv) != NULL) return(0); /* illegal view */ dev_view(&nv); - inpresflags |= DFL(DC_SETVIEW)|DFL(DC_REDRAW); + inpresflags |= DFL(DC_SETVIEW); return(1); } @@ -718,21 +789,34 @@ XButtonPressedEvent *ebut; static +waitabit() /* pause a moment */ +{ + struct timespec ts; + ts.tv_sec = 0; + ts.tv_nsec = 50000000; + nanosleep(&ts, NULL); +} + + +static getmove(ebut) /* get view change */ XButtonPressedEvent *ebut; { int movdir = MOVDIR(ebut->button); int movorb = MOVORB(ebut->state); + int ndrawn; Window rootw, childw; int rootx, rooty, wx, wy; unsigned int statemask; XNoOp(ourdisplay); /* makes sure we're not idle */ - viewsteady = 0; /* flag moving view */ - setglpersp(&odev.v); /* start us off in perspective */ + viewflags &= ~VWSTEADY; /* flag moving view */ + 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)) @@ -746,18 +830,20 @@ XButtonPressedEvent *ebut; #ifdef STEREO pushright(); draw_grids(1); - otDrawOctrees(); + ndrawn = gmDrawGeom(); #ifdef DOBJ - dobj_render(); + ndrawn += dobj_render(); #endif popright(); #endif /* redraw octrees */ - otDrawOctrees(); + ndrawn = gmDrawGeom(); #ifdef DOBJ - dobj_render(); /* redraw objects */ + ndrawn += dobj_render(); /* redraw objects */ #endif - glFlush(); + glXSwapBuffers(ourdisplay, gwind); + if (!ndrawn) + sleep(1); /* for reasonable interaction */ } if (!(inpresflags & DFL(DC_SETVIEW))) { /* do final motion */ movdir = MOVDIR(levptr(XButtonReleasedEvent)->button); @@ -765,24 +851,24 @@ XButtonPressedEvent *ebut; wy = levptr(XButtonReleasedEvent)->y; moveview(wx, odev.vres-1-wy, movdir, movorb); } + viewflags |= VWSTEADY; /* done goofing around */ } static -setglpersp(vp) /* set perspective view in GL */ -register VIEW *vp; +setglpersp() /* set perspective view in GL */ { double d, xmin, xmax, ymin, ymax; GLfloat vec[4]; double depthlim[2]; /* set depth limits */ - otDepthLimit(depthlim, odev.v.vp, odev.v.vdir); + gmDepthLimit(depthlim, odev.v.vp, odev.v.vdir); if (depthlim[0] >= depthlim[1]) { dev_zmin = 1.; dev_zmax = 100.; } else { dev_zmin = 0.5*depthlim[0]; - dev_zmax = 1.5*depthlim[1]; + dev_zmax = 1.25*depthlim[1]; if (dev_zmin > dev_zmax/5.) dev_zmin = dev_zmax/5.; } @@ -790,8 +876,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; @@ -811,7 +897,6 @@ register VIEW *vp; odev.v.vp[2] + odev.v.vdir[2], odev.v.vup[0], odev.v.vup[1], odev.v.vup[2]); checkglerr("setting perspective view"); - isperspective = 1; vec[0] = vec[1] = vec[2] = 0.; vec[3] = 1.; glLightModelfv(GL_LIGHT_MODEL_AMBIENT, vec); vec[0] = -odev.v.vdir[0]; @@ -827,47 +912,48 @@ register VIEW *vp; glEnable(GL_LIGHT0); glEnable(GL_LIGHTING); /* light our GL objects */ glShadeModel(GL_SMOOTH); + viewflags &= ~VWORTHO; + viewflags |= VWPERSP; } static setglortho() /* set up orthographic view for cone drawing */ { + glDrawBuffer(GL_FRONT); /* use single-buffer mode */ /* set view matrix */ glMatrixMode(GL_PROJECTION); glLoadIdentity(); glOrtho(0., (double)odev.hres, 0., (double)odev.vres, 0.001*OMAXDEPTH, 1.001*(-OMAXDEPTH)); checkglerr("setting orthographic view"); - isperspective = 0; glDisable(GL_LIGHTING); /* cones are constant color */ glShadeModel(GL_FLAT); + viewflags &= ~VWPERSP; + viewflags |= VWORTHO; } static wipeclean() /* prepare for redraw */ { - /* clear depth buffer */ + glDrawBuffer(GL_BACK); /* use double-buffer mode */ + glReadBuffer(GL_BACK); + /* clear buffers */ #ifdef STEREO setstereobuf(STEREO_BUFFER_RIGHT); - glClear(GL_DEPTH_BUFFER_BIT); + glClear(GL_DEPTH_BUFFER_BIT|GL_COLOR_BUFFER_BIT); setstereobuf(STEREO_BUFFER_LEFT); #endif - glClear(GL_DEPTH_BUFFER_BIT); - if (viewsteady) /* clear samples if steady */ + glClear(GL_DEPTH_BUFFER_BIT|GL_COLOR_BUFFER_BIT); + freedepth(); + if ((viewflags&(VWCHANGE|VWSTEADY)) == + (VWCHANGE|VWSTEADY)) { /* clear samples if new */ odClean(); - if (depthbuffer != NULL) { /* free recorded depth buffer */ -#ifdef STEREO - odDepthMap(1, NULL); - free((char *)depthright); - depthright = NULL; -#endif - odDepthMap(0, NULL); - free((char *)depthbuffer); - depthbuffer = NULL; - } - setglpersp(&odev.v); /* reset view & clipping planes */ + viewflags &= ~VWCHANGE; /* change noted */ + } else if (viewflags & VWSTEADY) + odRedrawAll(); + setglpersp(); /* reset view & clipping planes */ } @@ -886,10 +972,10 @@ register XKeyPressedEvent *ekey; return; switch (buf[0]) { case 'h': /* turn on height motion lock */ - headlocked = 1; + viewflags |= VWHEADLOCK; return; case 'H': /* turn off height motion lock */ - headlocked = 0; + viewflags &= ~VWHEADLOCK; return; case 'l': /* retrieve last view */ inpresflags |= DFL(DC_LASTVIEW); @@ -917,25 +1003,23 @@ register XKeyPressedEvent *ekey; inpresflags |= DFL(DC_RESUME); return; case CTRL('R'): /* redraw screen */ - odRemap(); - glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT); + odRemap(0); /* new tone mapping */ + glClear(GL_DEPTH_BUFFER_BIT); #ifdef STEREO setstereobuf(STEREO_BUFFER_RIGHT); - glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT); + glClear(GL_DEPTH_BUFFER_BIT); setstereobuf(STEREO_BUFFER_LEFT); #endif 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(); /* new 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); @@ -968,7 +1052,15 @@ register XExposeEvent *eexp; } 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); glDepthFunc(GL_ALWAYS); glBegin(GL_POLYGON); @@ -988,8 +1080,7 @@ register XExposeEvent *eexp; odRedraw(1, xmin, ymin, xmax, ymax); setstereobuf(STEREO_BUFFER_LEFT); #endif - glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); - glDepthFunc(GL_LEQUAL); + glPopAttrib(); odRedraw(0, xmin, ymin, xmax, ymax); } @@ -1009,5 +1100,6 @@ register XConfigureEvent *ersz; odev.v.horiz = 2.*180./PI * atan(0.5/VIEWDIST*pwidth*odev.hres); odev.v.vert = 2.*180./PI * atan(0.5/VIEWDIST*pheight*odev.vres); - inpresflags |= DFL(DC_SETVIEW)|DFL(DC_REDRAW); + inpresflags |= DFL(DC_SETVIEW); + viewflags |= VWCHANGE; }