--- ray/src/hd/rhd_glx.c 1998/08/21 11:38:21 3.21 +++ ray/src/hd/rhd_glx.c 1998/12/18 11:56:09 3.25 @@ -21,7 +21,6 @@ static char SCCSid[] = "$SunId$ SGI"; #endif #include "standard.h" -#include "rhd_sample.h" #include #include @@ -29,6 +28,8 @@ static char SCCSid[] = "$SunId$ SGI"; #ifdef STEREO #include #endif + +#include "rhd_sample.h" #ifdef DOBJ #include "rhdobj.h" #endif @@ -36,7 +37,7 @@ static char SCCSid[] = "$SunId$ SGI"; #include "x11icon.h" #ifndef RAYQLEN -#define RAYQLEN 250 /* max. rays to queue before flush */ +#define RAYQLEN 1024 /* max. rays to queue before flush */ #endif #ifndef FEQ @@ -45,6 +46,8 @@ static char SCCSid[] = "$SunId$ SGI"; #define GAMMA 1.4 /* default gamma correction */ +#define FRAMESTATE(s) (((s)&(ShiftMask|ControlMask))==(ShiftMask|ControlMask)) + #define MOVPCT 7 /* percent distance to move /frame */ #define MOVDIR(b) ((b)==Button1 ? 1 : (b)==Button2 ? 0 : -1) #define MOVDEG (-5) /* degrees to orbit CW/down /frame */ @@ -74,7 +77,11 @@ static char SCCSid[] = "$SunId$ SGI"; struct driver odev; /* global device driver structure */ +char odev_args[64]; /* command arguments */ + +#ifdef STEREO static VIEW vwright; /* right eye view */ +#endif static int rayqleft = 0; /* rays left to queue before flush */ @@ -99,7 +106,7 @@ static int inpresflags; /* input result flags */ static int headlocked = 0; /* lock vertical motion */ static int resizewindow(), getevent(), getkey(), moveview(), wipeclean(), - setglpersp(), getmove(), fixwindow(), mytmflags(); + setglpersp(), getframe(), getmove(), fixwindow(), mytmflags(); #ifdef STEREO static int pushright(), popright(); @@ -124,7 +131,7 @@ char *id; XSizeHints oursizhints; /* check for unsupported stereo */ #ifdef NOSTEREO - error(USER, "stereo display driver unavailable"); + error(INTERNAL, "stereo display driver unavailable"); #endif /* open display server */ ourdisplay = XOpenDisplay(NULL); @@ -216,6 +223,7 @@ char *id; pheight *= 2.; setstereobuf(STEREO_BUFFER_LEFT); #endif + checkglerr("setting rendering parameters"); copystruct(&odev.v, &stdview); odev.v.type = VT_PER; /* map the window */ @@ -272,46 +280,53 @@ register VIEW *nv; nv->vert = odev.v.vert; return(0); } - if (nv != &odev.v && /* resize window? */ - (!FEQ(nv->horiz,odev.v.horiz) || - !FEQ(nv->vert,odev.v.vert))) { - int dw = DisplayWidth(ourdisplay,ourscreen); - int dh = DisplayHeight(ourdisplay,ourscreen); + if (nv != &odev.v) { + /* resize window? */ + if (!FEQ(nv->horiz,odev.v.horiz) || + !FEQ(nv->vert,odev.v.vert)) { + int dw = DisplayWidth(ourdisplay,ourscreen); + int dh = DisplayHeight(ourdisplay,ourscreen); - dw -= 25; /* for window frame */ - dh -= 50; + dw -= 25; /* for window frame */ + dh -= 50; #ifdef STEREO - dh /= 2; + dh /= 2; #endif - odev.hres = 2.*VIEWDIST/pwidth * - tan(PI/180./2.*nv->horiz); - odev.vres = 2.*VIEWDIST/pheight * - tan(PI/180./2.*nv->vert); - if (odev.hres > dw) { - odev.vres = dw * odev.vres / odev.hres; - odev.hres = dw; + odev.hres = 2.*VIEWDIST/pwidth * + tan(PI/180./2.*nv->horiz); + odev.vres = 2.*VIEWDIST/pheight * + tan(PI/180./2.*nv->vert); + if (odev.hres > dw) { + odev.vres = dw * odev.vres / odev.hres; + odev.hres = dw; + } + if (odev.vres > dh) { + odev.hres = dh * odev.hres / odev.vres; + odev.vres = dh; + } + XResizeWindow(ourdisplay, gwind, odev.hres, odev.vres); + dev_input(); /* get resize event */ } - if (odev.vres > dh) { - odev.hres = dh * odev.hres / odev.vres; - odev.vres = dh; - } - XResizeWindow(ourdisplay, gwind, odev.hres, odev.vres); - dev_input(); /* get resize event */ - } - copystruct(&odev.v, nv); /* setview() already called */ - setglpersp(&odev.v); + 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 */ + copystruct(&vwright, nv); + d = eyesepdist / sqrt(nv->hn2); + VSUM(vwright.vp, nv->vp, nv->hvec, d); + /* setview(&vwright); -- Unnecessary */ #endif - checkglerr("setting view"); + } wipeclean(); return(1); } +dev_section(ofn) /* add octree for geometry rendering */ +char *ofn; +{ + /* unimplemented */ +} + + dev_auxcom(cmd, args) /* process an auxiliary command */ char *cmd, *args; { @@ -367,8 +382,7 @@ FVECT d, p; return; } #endif - smNewSamp(c, d, p); /* add to display representation */ - if (p != NULL) { + if (p != NULL) { /* add depth to our range */ depth = (p[0] - odev.v.vp[0])*d[0] + (p[1] - odev.v.vp[1])*d[1] + (p[2] - odev.v.vp[2])*d[2]; @@ -379,6 +393,7 @@ FVECT d, p; maxdpth = depth; } } + smNewSamp(c, d, p); /* add to display representation */ if (!--rayqleft) dev_flush(); /* flush output */ } @@ -387,22 +402,22 @@ FVECT d, p; int dev_flush() /* flush output */ { + if (mapped) { #ifdef STEREO - pushright(); /* update right eye */ - glClear(GL_DEPTH_BUFFER_BIT); - smUpdate(&vwright, 100); + pushright(); /* update right eye */ + smUpdate(&vwright, 100); #ifdef DOBJ - dobj_render(); /* usually in foreground */ + dobj_render(); /* usually in foreground */ #endif - popright(); /* update left eye */ - glClear(GL_DEPTH_BUFFER_BIT); + popright(); /* update left eye */ #endif - smUpdate(&odev.v, 100); + smUpdate(&odev.v, 100); + checkglerr("rendering mesh"); #ifdef DOBJ - dobj_render(); + dobj_render(); #endif - glFlush(); /* flush OGL */ - checkglerr("flushing display"); + glFlush(); /* flush OGL */ + } rayqleft = RAYQLEN; /* flush X11 and return # pending */ return(odev.inpready = XPending(ourdisplay)); @@ -433,6 +448,7 @@ pushright() /* push on right view */ glPushMatrix(); d = -eyesepdist / sqrt(odev.v.hn2); glTranslated(d*odev.v.hvec[0], d*odev.v.hvec[1], d*odev.v.hvec[2]); + checkglerr("setting right view"); } @@ -485,7 +501,10 @@ getevent() /* get next event */ getkey(levptr(XKeyPressedEvent)); break; case ButtonPress: - getmove(levptr(XButtonPressedEvent)); + if (FRAMESTATE(levptr(XButtonPressedEvent)->state)) + getframe(levptr(XButtonPressedEvent)); + else + getmove(levptr(XButtonPressedEvent)); break; } } @@ -501,16 +520,17 @@ register FVECT wp[2]; static -draw_grids() /* draw holodeck section grids */ +draw_grids(fore) /* draw holodeck section grids */ +int fore; { - static BYTE gridrgba[4] = {0x0, 0xff, 0xff, 0x00}; - - if (!mapped) - return; - glColor4ub(gridrgba[0], gridrgba[1], gridrgba[2], gridrgba[3]); + if (fore) + glColor4ub(0, 255, 255, 0); + else + glColor4ub(0, 0, 0, 0); glBegin(GL_LINES); /* draw each grid line */ gridlines(draw3dline); glEnd(); + checkglerr("drawing grid lines"); } @@ -524,30 +544,37 @@ int dx, dy, mov, orb; register int li; /* start with old view */ copystruct(&nv, &odev.v); - /* change view direction */ + /* orient our motion */ if (viewray(v1, odir, &odev.v, (dx+.5)/odev.hres, (dy+.5)/odev.vres) < -FTINY) return(0); /* outside view */ - if (mov | orb) { + if (mov | orb) { /* moving relative to geometry */ #ifdef DOBJ d = dobj_trace(NULL, v1, odir); /* check objects */ - /* is holodeck in front? */ - if ((li = smFindSamp(v1, odir)) >= 0 && - (rsL.wp[li][0] - nv.vp[0])*odir[0] + - (rsL.wp[li][1] - nv.vp[1])*odir[1] + - (rsL.wp[li][2] - nv.vp[2])*odir[2] < d) + /* check holodeck */ + if ((li = smFindSamp(v1, odir)) >= 0) { VCOPY(wip, rsL.wp[li]); - else if (d < .99*FHUGE) /* object is closer */ - VSUM(wip, nv.vp, odir, d); - else /* nothing visible */ - return(0); + if (d < .99*FHUGE && d*d <= dist2(v1, wip)) + li = -1; /* object is closer */ + } else if (d >= .99*FHUGE) + return(0); /* nothing visible */ + if (li < 0) + VSUM(wip, v1, odir, d); /* else get object point */ #else if ((li = smFindSamp(v1, odir)) < 0) return(0); /* not on window */ VCOPY(wip, rsL.wp[li]); #endif - VSUM(odir, wip, nv.vp, -1.); - } else +#ifdef DEBUG + fprintf(stderr, "moveview: hit %s at (%f,%f,%f) (t=%f)\n", + li < 0 ? "object" : "mesh", + wip[0], wip[1], wip[2], + (wip[0]-odev.v.vp[0])*odir[0] + + (wip[1]-odev.v.vp[1])*odir[1] + + (wip[2]-odev.v.vp[2])*odir[2]); +#endif + VSUM(odir, wip, odev.v.vp, -1.); + } else /* panning with constant viewpoint */ VCOPY(nv.vdir, odir); if (orb && mov) { /* orbit left/right */ spinvector(odir, odir, nv.vup, d=MOVDEG*PI/180.*mov); @@ -566,7 +593,7 @@ int dx, dy, mov, orb; } if (!mov ^ !orb && headlocked) { /* restore head height */ VSUM(v1, odev.v.vp, nv.vp, -1.); - d = DOT(v1, odev.v.vup); + d = DOT(v1, nv.vup); VSUM(nv.vp, nv.vp, odev.v.vup, d); } if (setview(&nv) != NULL) @@ -578,6 +605,29 @@ int dx, dy, mov, orb; static +getframe(ebut) /* get focus frame */ +XButtonPressedEvent *ebut; +{ + int startx = ebut->x, starty = ebut->y; + int endx, endy; + + XMaskEvent(ourdisplay, ButtonReleaseMask, levptr(XEvent)); + endx = levptr(XButtonReleasedEvent)->x; + endy = levptr(XButtonReleasedEvent)->y; + if (endx == startx | endy == starty) { + XBell(ourdisplay, 0); + return; + } + if (endx < startx) {register int c = endx; endx = startx; startx = c;} + if (endy < starty) {register int c = endy; endy = starty; starty = c;} + sprintf(odev_args, "%.3f %.3f %.3f %.3f", + (startx+.5)/odev.hres, 1.-(endy+.5)/odev.vres, + (endx+.5)/odev.hres, 1.-(starty+.5)/odev.vres); + inpresflags |= DFL(DC_FOCUS); +} + + +static getmove(ebut) /* get view change */ XButtonPressedEvent *ebut; { @@ -590,40 +640,43 @@ XButtonPressedEvent *ebut; int rootx, rooty, wx, wy; unsigned int statemask; - XNoOp(ourdisplay); + XNoOp(ourdisplay); /* makes sure we're not idle */ lasttime = time(0); nframes = 0; while (!XCheckMaskEvent(ourdisplay, ButtonReleaseMask, levptr(XEvent))) { - + /* get cursor position */ if (!XQueryPointer(ourdisplay, gwind, &rootw, &childw, &rootx, &rooty, &wx, &wy, &statemask)) break; /* on another screen */ + draw_grids(0); /* clear old grid lines */ +#ifdef STEREO + pushright(); draw_grids(0); popright(); +#endif + /* compute view motion */ if (!moveview(wx, odev.vres-1-wy, movdir, movorb)) { sleep(1); lasttime++; - continue; + continue; /* cursor in bad place */ } + draw_grids(1); /* redraw grid */ #ifdef STEREO pushright(); - glClear(GL_COLOR_BUFFER_BIT); - draw_grids(); + draw_grids(1); smUpdate(&vwright, qlevel); #ifdef DOBJ dobj_render(); #endif popright(); #endif - glClear(GL_COLOR_BUFFER_BIT); - draw_grids(); + /* redraw mesh */ smUpdate(&odev.v, qlevel); #ifdef DOBJ - dobj_render(); + dobj_render(); /* redraw object */ #endif glFlush(); - checkglerr("moving view"); - nframes++; + nframes++; /* figure out good quality level */ thistime = time(0); if (thistime - lasttime >= 3 || nframes > (int)(3*3*TARGETFPS)) { @@ -657,20 +710,20 @@ register VIEW *vp; double d, xmin, xmax, ymin, ymax; if (mindpth >= maxdpth) { - dev_zmin = 0.1; + dev_zmin = 1.; dev_zmax = 100.; } else { dev_zmin = 0.5*mindpth; dev_zmax = 1.5*maxdpth; - if (dev_zmin > dev_zmax/100.) - dev_zmin = dev_zmax/100.; + if (dev_zmin > dev_zmax/5.) + dev_zmin = dev_zmax/5.; } if (odev.v.vfore > FTINY) dev_zmin = odev.v.vfore; if (odev.v.vaft > FTINY) dev_zmax = odev.v.vaft; - if (dev_zmin < dev_zmax/5000.) - dev_zmin = dev_zmax/5000.; + if (dev_zmin < dev_zmax/100.) + dev_zmin = dev_zmax/100.; xmax = dev_zmin * tan(PI/180./2. * odev.v.horiz); xmin = -xmax; d = odev.v.hoff * (xmax - xmin); @@ -688,19 +741,22 @@ register VIEW *vp; odev.v.vp[1] + odev.v.vdir[1], odev.v.vp[2] + odev.v.vdir[2], odev.v.vup[0], odev.v.vup[1], odev.v.vup[2]); + checkglerr("setting perspective view"); } static wipeclean() /* prepare for redraw */ { + /* clear depth buffer */ #ifdef STEREO setstereobuf(STEREO_BUFFER_RIGHT); glClear(GL_DEPTH_BUFFER_BIT); setstereobuf(STEREO_BUFFER_LEFT); #endif glClear(GL_DEPTH_BUFFER_BIT); - smClean(); + smClean(); /* reset drawing routines */ + setglpersp(&odev.v); /* reset view & clipping planes */ } @@ -708,6 +764,9 @@ static getkey(ekey) /* get input key */ register XKeyPressedEvent *ekey; { + Window rootw, childw; + int rootx, rooty, wx, wy; + unsigned int statemask; int n; char buf[8]; @@ -730,6 +789,18 @@ register XKeyPressedEvent *ekey; case 'v': /* spit out view */ inpresflags |= DFL(DC_GETVIEW); return; + case 'f': /* frame view position */ + if (!XQueryPointer(ourdisplay, gwind, &rootw, &childw, + &rootx, &rooty, &wx, &wy, &statemask)) + return; /* on another screen */ + sprintf(odev_args, "%.4f %.4f", (wx+.5)/odev.hres, + 1.-(wy+.5)/odev.vres); + inpresflags |= DFL(DC_FOCUS); + return; + case 'F': /* unfocus */ + odev_args[0] = '\0'; + inpresflags |= DFL(DC_FOCUS); + return; case '\n': case '\r': /* resume computation */ inpresflags |= DFL(DC_RESUME); @@ -740,13 +811,14 @@ register XKeyPressedEvent *ekey; case CTRL('L'): /* refresh from server */ if (inpresflags & DFL(DC_REDRAW)) return; + setglpersp(&odev.v); /* reset clipping planes */ glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - glDisable(GL_DEPTH_TEST); - draw_grids(); + glDisable(GL_DEPTH_TEST); /* so grids will clear */ + draw_grids(1); #ifdef STEREO pushright(); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - draw_grids(); + draw_grids(1); popright(); #endif glEnable(GL_DEPTH_TEST);