--- ray/src/hd/rhdisp2.c 1998/12/10 10:45:55 3.28 +++ ray/src/hd/rhdisp2.c 2004/01/01 11:21:55 3.37 @@ -1,9 +1,6 @@ -/* Copyright (c) 1998 Silicon Graphics, Inc. */ - #ifndef lint -static char SCCSid[] = "$SunId$ SGI"; +static const char RCSid[] = "$Id: rhdisp2.c,v 3.37 2004/01/01 11:21:55 schorsch Exp $"; #endif - /* * Holodeck beam tracking for display process */ @@ -11,52 +8,41 @@ static char SCCSid[] = "$SunId$ SGI"; #include "rholo.h" #include "rhdisp.h" #include "rhdriver.h" -#include "random.h" -#ifndef MAXDIST -#define MAXDIST 42 /* maximum distance outside section */ -#endif -#ifndef NVSAMPS -#define NVSAMPS 16384 /* number of ray samples per view */ -#endif #ifndef MEYERNG -#define MEYERNG 0.1 /* target mean eye range (rel. to grid) */ +#define MEYERNG 0.2 /* target mean eye range (rel. to grid) */ #endif -#ifndef MAXTODO -#define MAXTODO 3 /* maximum sections to look at */ -#endif -#ifndef MAXDRAT -#define MAXDRAT 3.0 /* maximum distance ratio btwn. cand. sect. */ -#endif #define CBEAMBLK 1024 /* cbeam allocation block size */ -static struct beamcomp { - int hd; /* holodeck section number */ - int bi; /* beam index */ - int4 nr; /* number of samples desired */ -} *cbeam = NULL; /* current beam list */ - -VIEWPOINT cureye; /* current eye position */ - +static PACKHEAD *cbeam = NULL; /* current beam list */ static int ncbeams = 0; /* number of sorted beams in cbeam */ static int xcbeams = 0; /* extra (unregistered) beams past ncbeams */ static int maxcbeam = 0; /* size of cbeam array */ +VIEWPOINT cureye; /* current eye position */ -int -newcbeam() /* allocate new entry at end of cbeam array */ +static int newcbeam(void); +static int cbeamcmp(const void *cb1, const void *cb2); +static int cbeamcmp2(const void *cb1, const void *cb2); +static int findcbeam(int hd, int bi); +static int getcbeam(int hd, int bi); +static void cbeamsort(int adopt); + + +static int +newcbeam(void) /* allocate new entry at end of cbeam array */ { int i; if ((i = ncbeams + xcbeams++) >= maxcbeam) { /* grow array */ maxcbeam += CBEAMBLK; if (cbeam == NULL) - cbeam = (struct beamcomp *)malloc( - maxcbeam*sizeof(struct beamcomp) ); + cbeam = (PACKHEAD *)malloc( + maxcbeam*sizeof(PACKHEAD) ); else - cbeam = (struct beamcomp *)realloc( (char *)cbeam, - maxcbeam*sizeof(struct beamcomp) ); + cbeam = (PACKHEAD *)realloc((void *)cbeam, + maxcbeam*sizeof(PACKHEAD) ); if (cbeam == NULL) error(SYSTEM, "out of memory in newcbeam"); } @@ -64,56 +50,63 @@ newcbeam() /* allocate new entry at end of cbeam arra } -int -cbeamcmp(cb1, cb2) /* compare two cbeam entries for sort: keep orphans */ -register struct beamcomp *cb1, *cb2; +static int +cbeamcmp( /* compare two cbeam entries for sort: keep orphans */ + const void *cb1, + const void *cb2 +) { register int c; - if ((c = cb1->bi - cb2->bi)) /* sort on beam index first */ + if ((c = ((PACKHEAD*)cb1)->bi - ((PACKHEAD*)cb2)->bi)) /* sort on beam index first */ return(c); - return(cb1->hd - cb2->hd); /* use hd to resolve matches */ + return(((PACKHEAD*)cb1)->hd - ((PACKHEAD*)cb2)->hd); /* use hd to resolve matches */ } -int -cbeamcmp2(cb1, cb2) /* compare two cbeam entries for sort: no orphans */ -register struct beamcomp *cb1, *cb2; +static int +cbeamcmp2( /* compare two cbeam entries for sort: no orphans */ + const void *cb1, + const void *cb2 +) { register int c; - if (!cb1->nr) /* put orphans at the end, unsorted */ - return(cb2->nr); - if (!cb2->nr) + if (!((PACKHEAD*)cb1)->nr) /* put orphans at the end, unsorted */ + return(((PACKHEAD*)cb2)->nr); + if (!((PACKHEAD*)cb2)->nr) return(-1); - if ((c = cb1->bi - cb2->bi)) /* sort on beam index first */ + if ((c = ((PACKHEAD*)cb1)->bi - ((PACKHEAD*)cb2)->bi)) /* sort on beam index first */ return(c); - return(cb1->hd - cb2->hd); /* use hd to resolve matches */ + return(((PACKHEAD*)cb1)->hd - ((PACKHEAD*)cb2)->hd); /* use hd to resolve matches */ } -int -findcbeam(hd, bi) /* find the specified beam in our sorted list */ -int hd, bi; +static int +findcbeam( /* find the specified beam in our sorted list */ + int hd, + int bi +) { - struct beamcomp cb; - register struct beamcomp *p; + PACKHEAD cb; + register PACKHEAD *p; if (ncbeams <= 0) return(-1); - cb.hd = hd; cb.bi = bi; cb.nr = 0; - p = (struct beamcomp *)bsearch((char *)&cb, (char *)cbeam, ncbeams, - sizeof(struct beamcomp), cbeamcmp); + cb.hd = hd; cb.bi = bi; cb.nr = cb.nc = 0; + p = (PACKHEAD *)bsearch((char *)&cb, (char *)cbeam, ncbeams, + sizeof(PACKHEAD), cbeamcmp); if (p == NULL) return(-1); return(p - cbeam); } -int -getcbeam(hd, bi) /* get the specified beam, allocating as necessary */ -register int hd; -int bi; +static int +getcbeam( /* get the specified beam, allocating as necessary */ + register int hd, + int bi +) { register int n; /* first, look in sorted list */ @@ -124,25 +117,27 @@ int bi; if (cbeam[n].bi == bi && cbeam[n].hd == hd) return(n); /* check legality */ - if (hd < 0 | hd >= HDMAX || hdlist[hd] == NULL) + if ((hd < 0) | (hd >= HDMAX) || hdlist[hd] == NULL) error(INTERNAL, "illegal holodeck number in getcbeam"); - if (bi < 1 | bi > nbeams(hdlist[hd])) + if ((bi < 1) | (bi > nbeams(hdlist[hd]))) error(INTERNAL, "illegal beam index in getcbeam"); n = newcbeam(); /* allocate and assign */ - cbeam[n].nr = 0; cbeam[n].hd = hd; cbeam[n].bi = bi; + cbeam[n].hd = hd; cbeam[n].bi = bi; cbeam[n].nr = cbeam[n].nc = 0; return(n); } -cbeamsort(adopt) /* sort our beam list, possibly turning out orphans */ -int adopt; +static void +cbeamsort( /* sort our beam list, possibly turning out orphans */ + int adopt +) { register int i; if (!(ncbeams += xcbeams)) return; xcbeams = 0; - qsort((char *)cbeam, ncbeams, sizeof(struct beamcomp), + qsort((char *)cbeam, ncbeams, sizeof(PACKHEAD), adopt ? cbeamcmp : cbeamcmp2); if (adopt) return; @@ -154,111 +149,13 @@ int adopt; } -cbeamop(op, bl, n) /* update beams on server list */ -int op; -register struct beamcomp *bl; -int n; +extern void +beam_init( /* clear beam list for new view(s) */ + int fresh +) { - register PACKHEAD *pa; register int i; - if (n <= 0) - return; - pa = (PACKHEAD *)malloc(n*sizeof(PACKHEAD)); - if (pa == NULL) - error(SYSTEM, "out of memory in cbeamop"); - for (i = 0; i < n; i++) { - pa[i].hd = bl[i].hd; - pa[i].bi = bl[i].bi; - pa[i].nr = bl[i].nr; - pa[i].nc = 0; - } - serv_request(op, n*sizeof(PACKHEAD), (char *)pa); - free((char *)pa); -} - - -int -comptodo(tdl, vw) /* compute holodeck sections in view */ -int tdl[MAXTODO+1]; -VIEW *vw; -{ - int n = 0; - FVECT gp, dv; - double dist2[MAXTODO+1], thisdist2; - register int i, j; - /* find closest MAXTODO sections */ - for (i = 0; hdlist[i]; i++) { - hdgrid(gp, hdlist[i], vw->vp); - for (j = 0; j < 3; j++) - if (gp[j] < 0.) - dv[j] = -gp[j]; - else if (gp[j] > hdlist[i]->grid[j]) - dv[j] = gp[j] - hdlist[i]->grid[j]; - else - dv[j] = 0.; - thisdist2 = DOT(dv,dv); - for (j = n; j > 0 && thisdist2 < dist2[j-1]; j--) { - tdl[j] = tdl[j-1]; - dist2[j] = dist2[j-1]; - } - tdl[j] = i; - dist2[j] = thisdist2; - if (n < MAXTODO) - n++; - } - /* watch for bad move */ - if (n && dist2[0] > MAXDIST*MAXDIST) { - error(COMMAND, "move past outer limits"); - return(0); - } - /* avoid big differences */ - for (j = 1; j < n; j++) - if (dist2[j] > MAXDRAT*MAXDRAT*dist2[j-1]) - n = j; - tdl[n] = -1; - return(n); -} - - -addview(hd, vw, hres, vres) /* add view for section */ -int hd; -VIEW *vw; -int hres, vres; -{ - int sampquant; - int h, v, shr, svr; - GCOORD gc[2]; - FVECT rorg, rdir; - /* compute sampling grid */ - if (hres|vres && hres*vres <= NVSAMPS) { - shr = hres; svr = vres; - sampquant = 1; - } else { - shr = sqrt(NVSAMPS/viewaspect(vw)) + .5; - svr = (NVSAMPS + shr/2)/shr; - sampquant = (hres*vres + shr*svr/2)/(shr*svr); - } - /* intersect sample rays with section */ - for (v = svr; v--; ) - for (h = shr; h--; ) { - if (viewray(rorg, rdir, vw, (v+frandom())/svr, - (h+frandom())/shr) < -FTINY) - continue; - if (hdinter(gc, NULL, NULL, hdlist[hd], rorg, rdir) - >= FHUGE) - continue; - cbeam[getcbeam(hd,hdbindex(hdlist[hd],gc))].nr += - sampquant; - } -} - - -beam_init(fresh) /* clear beam list for new view(s) */ -int fresh; -{ - register int i; - if (fresh) /* discard old beams? */ ncbeams = xcbeams = 0; else /* else clear sample requests */ @@ -268,58 +165,129 @@ int fresh; } -beam_view(vn, hr, vr) /* add beam view (if advisable) */ -VIEW *vn; -int hr, vr; +extern int16 * +beam_view( /* add beam view (if advisable) */ + VIEW *vn, + int hr, + int vr +) { - int todo[MAXTODO+1], n; - double hdgsiz, d; + int16 *slist; + BEAMLIST blist; + double eravg, d; register HOLO *hp; - register int i; - /* sort our list */ + register int i, n; + /* compute beams for view */ + slist = viewbeams(vn, hr, vr, &blist); + if (*slist < 0) { + error(COMMAND, "no sections visible from this view"); + return(NULL); + } + /* sort current beam list */ cbeamsort(1); - /* add view to nearby sections */ - if (!(n = comptodo(todo, vn))) - return(0); - for (i = 0; i < n; i++) - addview(todo[i], vn, hr, vr); - if (MEYERNG <= FTINY || vn->type == VT_PAR) - return(1); - hdgsiz = 0.; /* compute mean grid size */ - for (i = 0; i < n; i++) { - hp = hdlist[todo[i]]; - hdgsiz += 1./3. / VLEN(hp->wg[0]) + - 1./3. / VLEN(hp->wg[1]) + - 1./3. / VLEN(hp->wg[2]) ; + /* add new beams to list */ + for (i = blist.nb; i--; ) { + n = getcbeam(blist.bl[i].hd, blist.bl[i].bi); + if (blist.bl[i].nr > cbeam[n].nr) + cbeam[n].nr = blist.bl[i].nr; } - hdgsiz /= (double)n; + free((void *)blist.bl); /* free list */ + if (MEYERNG <= FTINY) + return(slist); + /* compute average eye range */ + eravg = 0.; + for (n = 0; slist[n] >= 0; n++) { + hp = hdlist[slist[n]]; + eravg += MEYERNG/3. / VLEN(hp->wg[0]) + + MEYERNG/3. / VLEN(hp->wg[1]) + + MEYERNG/3. / VLEN(hp->wg[2]) ; + } + eravg /= (double)n; /* add to current eye position */ if (cureye.rng <= FTINY) { VCOPY(cureye.vpt, vn->vp); - cureye.rng = MEYERNG * hdgsiz; - } else if ((d = sqrt(dist2(vn->vp,cureye.vpt))) + MEYERNG*hdgsiz > - cureye.rng) { + cureye.rng = eravg; + } else if ((d = sqrt(dist2(vn->vp,cureye.vpt))) + eravg > cureye.rng) { for (i = 3; i--; ) cureye.vpt[i] = 0.5*(cureye.vpt[i] + vn->vp[i]); - cureye.rng = 0.5*(cureye.rng + MEYERNG*hdgsiz + d); + cureye.rng = 0.5*(cureye.rng + eravg + d); } - return(1); + return(slist); } -int -beam_sync(all) /* update beam list on server */ -int all; +extern int +beam_sync( /* update beam list on server */ + int all +) { /* set new eye position */ serv_request(DR_VIEWPOINT, sizeof(VIEWPOINT), (char *)&cureye); /* sort list (put orphans at end) */ cbeamsort(all < 0); /* send beam request */ - if (all) - cbeamop(DR_NEWSET, cbeam, ncbeams); - else - cbeamop(DR_ADJSET, cbeam, ncbeams+xcbeams); + if (all) { + if (ncbeams > 0) + serv_request(DR_NEWSET, + ncbeams*sizeof(PACKHEAD), (char *)cbeam); + } else { + if (ncbeams+xcbeams > 0) + serv_request(DR_ADJSET, + (ncbeams+xcbeams)*sizeof(PACKHEAD), (char *)cbeam); + } xcbeams = 0; /* truncate our list */ return(ncbeams); +} + + +extern void +gridlines( /* run through holodeck section grid lines */ + void (*f)(FVECT wp[2]) +) +{ + register int hd, w, i; + int g0, g1; + FVECT wp[2], mov; + double d; + /* do each wall on each section */ + for (hd = 0; hdlist[hd] != NULL; hd++) + for (w = 0; w < 6; w++) { + g0 = hdwg0[w]; + g1 = hdwg1[w]; + d = 1.0/hdlist[hd]->grid[g0]; + mov[0] = d * hdlist[hd]->xv[g0][0]; + mov[1] = d * hdlist[hd]->xv[g0][1]; + mov[2] = d * hdlist[hd]->xv[g0][2]; + if (w & 1) { + VSUM(wp[0], hdlist[hd]->orig, + hdlist[hd]->xv[w>>1], 1.); + VSUM(wp[0], wp[0], mov, 1.); + } else + VCOPY(wp[0], hdlist[hd]->orig); + VSUM(wp[1], wp[0], hdlist[hd]->xv[g1], 1.); + for (i = hdlist[hd]->grid[g0]; ; ) { /* g0 lines */ + (*f)(wp); + if (!--i) break; + wp[0][0] += mov[0]; wp[0][1] += mov[1]; + wp[0][2] += mov[2]; wp[1][0] += mov[0]; + wp[1][1] += mov[1]; wp[1][2] += mov[2]; + } + d = 1.0/hdlist[hd]->grid[g1]; + mov[0] = d * hdlist[hd]->xv[g1][0]; + mov[1] = d * hdlist[hd]->xv[g1][1]; + mov[2] = d * hdlist[hd]->xv[g1][2]; + if (w & 1) + VSUM(wp[0], hdlist[hd]->orig, + hdlist[hd]->xv[w>>1], 1.); + else + VSUM(wp[0], hdlist[hd]->orig, mov, 1.); + VSUM(wp[1], wp[0], hdlist[hd]->xv[g0], 1.); + for (i = hdlist[hd]->grid[g1]; ; ) { /* g1 lines */ + (*f)(wp); + if (!--i) break; + wp[0][0] += mov[0]; wp[0][1] += mov[1]; + wp[0][2] += mov[2]; wp[1][0] += mov[0]; + wp[1][1] += mov[1]; wp[1][2] += mov[2]; + } + } }