--- ray/src/hd/rhdisp2.c 1997/11/21 18:17:37 3.5 +++ ray/src/hd/rhdisp2.c 1997/12/16 11:57:32 3.16 @@ -12,8 +12,14 @@ static char SCCSid[] = "$SunId$ SGI"; #include "rhdisp.h" #include "rhdriver.h" +#ifndef MAXDIST +#define MAXDIST 42 /* maximum distance outside section */ +#endif + extern GCOORD *getviewcells(); +static VIEW dvw; /* current view corresponding to beam list */ + typedef struct { int hd; /* holodeck section number (-1 if inactive) */ int i[3]; /* voxel index (may be outside section) */ @@ -88,6 +94,8 @@ register struct beamcomp *cb1, *cb2; if (!cb1->wants) /* put orphans at the end, unsorted */ return(cb2->wants); + if (!cb2->wants) + return(-1); if ((c = cb1->bi - cb2->bi)) /* sort on beam index first */ return(c); return(cb1->hd - cb2->hd); /* use hd to resolve matches */ @@ -156,6 +164,68 @@ int adopt; } +cbeamadj(v, hr, vr) /* adjust our beam list */ +VIEW *v; +int hr, vr; +{ + PACKHEAD *pa, *pa2; + register PACKHEAD *pp; + int n, n2; + FVECT gp; + int igp[3], vcflgs; + register int i; + /* figure out center voxel(s) */ + n = -1; vcflgs = 0; + for (i = 0; i < 8 && voxel[i].hd >= 0; i++) { + if (voxel[i].hd != n) { + hdgrid(gp, hdlist[n=voxel[i].hd], v->vp); + igp[0] = gp[0]; igp[1] = gp[1]; igp[2] = gp[2]; + } + if (voxel[i].i[0] == igp[0] && voxel[i].i[1] == igp[1] && + voxel[i].i[2] == igp[2]) + vcflgs |= 1<hd = cbeam[ncbeams+i].hd; + pp->bi = cbeam[ncbeams+i].bi; + pp->nr = npixels(v, hr, vr, hdlist[pp->hd], pp->bi) + 1; + pp->nc = 0; + } + n = xcbeams - n2; + /* now sort list for deletions */ + cbeamsort(0); + pa2 = (PACKHEAD *)realloc((char *)pa2, (n+n2+xcbeams)*sizeof(PACKHEAD)); + if (n+n2+xcbeams && pa2 == NULL) + goto memerr; + pa = pa2 + n2; + for (i = xcbeams; i--; ) { + pp = pa + n++; + pp->hd = cbeam[ncbeams+i].hd; + pp->bi = cbeam[ncbeams+i].bi; + pp->nr = 0; + pp->nc = 0; + } + if (n) /* adjust the set */ + serv_request(DR_ADJSET, n*sizeof(PACKHEAD), (char *)pa); + if (n2) /* make secondary additions */ + serv_request(DR_ADDSET, n2*sizeof(PACKHEAD), (char *)pa2); + xcbeams = 0; /* clean up */ + free((char *)pa2); + return; +memerr: + error(SYSTEM, "out of memory in cbeamadj"); +} + + cbeamop(op, bl, n, v, hr, vr) /* update beams on server list */ int op; register struct beamcomp *bl; @@ -176,6 +246,7 @@ int hr, vr; pa[i].bi = bl[i].bi; pa[i].nr = v==NULL ? 0 : npixels(v, hr, vr, hdlist[bl[i].hd], bl[i].bi); + pa[i].nc = 0; } serv_request(op, n*sizeof(PACKHEAD), (char *)pa); free((char *)pa); @@ -257,6 +328,11 @@ FVECT vp; n++; } } + /* check for really stupid move */ + if (bestd > MAXDIST) { + error(COMMAND, "move past outer limits"); + return(0); + } /* warn of dangerous moves */ if (n < lastn && bestd >= lastd) error(WARNING, "moving outside holodeck section"); @@ -305,34 +381,59 @@ docell(gcp, cap) /* find beams corresponding to cell a GCOORD *gcp; register struct cellact *cap; { + register HOLO *hp = hdlist[voxel[cap->vi].hd]; FVECT org, dir[4]; - FVECT gp, cv[4], vc; + FVECT vgp, cgp, vc; + FVECT v1, v2; struct beamact bo; + int axmax, j; + double d, avmax; register int i; - /* compute cell vertices */ - hdcell(cv, hdlist[voxel[cap->vi].hd], gcp); - /* compute cell and voxel centers */ - for (i = 0; i < 3; i++) { - org[i] = 0.5*(cv[0][i] + cv[2][i]); - gp[i] = voxel[cap->vi].i[i] + 0.5; - } - hdworld(vc, hdlist[voxel[cap->vi].hd], gp); - /* compute voxel pyramid using vector trick */ - for (i = 0; i < 3; i++) { - dir[0][i] = vc[i] - cv[0][i]; /* to 3 */ - dir[2][i] = vc[i] - cv[3][i]; /* to 0 */ - if (gcp->w & 1) { /* watch vertex order! */ - dir[1][i] = vc[i] - cv[2][i]; /* to 1 */ - dir[3][i] = vc[i] - cv[1][i]; /* to 2 */ - } else { - dir[1][i] = vc[i] - cv[1][i]; /* to 2 */ - dir[3][i] = vc[i] - cv[2][i]; /* to 1 */ + /* compute cell center */ + cgp[gcp->w>>1] = gcp->w&1 ? hp->grid[gcp->w>>1] : 0 ; + cgp[((gcp->w>>1)+1)%3] = gcp->i[0] + .5; + cgp[((gcp->w>>1)+2)%3] = gcp->i[1] + .5; + hdworld(org, hp, cgp); + /* compute direction to voxel center */ + for (i = 3; i--; ) + vgp[i] = voxel[cap->vi].i[i] + .5; + hdworld(vc, hp, vgp); + for (i = 3; i--; ) + vc[i] -= org[i]; + /* compute maximum area axis */ + axmax = -1; avmax = 0; + for (i = 3; i--; ) { + d = vgp[i] - cgp[i]; + if (d < 0.) d = -d; + if (d > avmax) { + avmax = d; + axmax = i; } } +#ifdef DEBUG + if (axmax < 0.) + error(CONSISTENCY, "botched axis computation in docell"); +#endif + /* compute offset vectors */ + d = 0.5/hp->grid[j=(axmax+1)%3]; + for (i = 3; i--; ) + v1[i] = hp->xv[j][i] * d; + d = 0.5/hp->grid[j=(axmax+2)%3]; + if (DOT(hp->wn[axmax], vc) < 0.) + d = -d; /* reverse vertex ordering */ + for (i = 3; i--; ) + v2[i] = hp->xv[j][i] * d; + /* compute voxel pyramid */ + for (i = 3; i--; ) { + dir[0][i] = vc[i] - v1[i] - v2[i]; + dir[1][i] = vc[i] + v1[i] - v2[i]; + dir[2][i] = vc[i] + v1[i] + v2[i]; + dir[3][i] = vc[i] - v1[i] + v2[i]; + } /* visit beams for opposite cells */ copystruct(&bo.ca, cap); copystruct(&bo.gc, gcp); - return(visit_cells(org, dir, hdlist[voxel[cap->vi].hd], dobeam, &bo)); + return(visit_cells(org, dir, hp, dobeam, &bo)); } @@ -361,76 +462,83 @@ VIEW *vold, *vnew; struct cellact oca, nca; int ocnt, ncnt; int c; + GCOORD *ogcl, *ngcl; register GCOORD *ogcp, *ngcp; /* get old and new cell lists */ - ogcp = getviewcells(&ocnt, hdlist[voxel[voxi].hd], vold); - ngcp = getviewcells(&ncnt, hdlist[voxel[voxi].hd], vnew); + ogcp = ogcl = getviewcells(&ocnt, hdlist[voxel[voxi].hd], vold); + ngcp = ngcl = getviewcells(&ncnt, hdlist[voxel[voxi].hd], vnew); /* set up actions */ oca.vi = nca.vi = voxi; - oca.rev = nca.rev = 0; oca.add = 0; nca.add = 1; if ((oca.rev = ocnt < 0)) ocnt = -ocnt; if ((nca.rev = ncnt < 0)) ncnt = -ncnt; - /* add and delete cells in order */ - while (ocnt > 0 & ncnt > 0) - if ((c = cellcmp(ogcp, ngcp)) > 0) { /* new cell */ - netchange += docell(ngcp++, &nca); - ncnt--; - } else if (c < 0) { /* obsolete cell */ - netchange -= docell(ogcp++, &oca); - ocnt--; - } else { /* same cell? */ - if (oca.rev != nca.rev) /* not */ - netchange += docell(ngcp, &nca) - - docell(ogcp, &oca); - ogcp++; ocnt--; - ngcp++; ncnt--; - } + if (nca.rev == oca.rev) /* add and delete cells in order */ + while (ocnt > 0 & ncnt > 0) + if ((c = cellcmp(ogcp, ngcp)) > 0) { /* new cell */ + netchange += docell(ngcp++, &nca); + ncnt--; + } else if (c < 0) { /* old cell */ + netchange -= docell(ogcp++, &oca); + ocnt--; + } else { /* same cell */ + ogcp++; ocnt--; + ngcp++; ncnt--; + } /* take care of list tails */ for ( ; ncnt > 0; ncnt--) netchange += docell(ngcp++, &nca); for ( ; ocnt > 0; ocnt--) netchange -= docell(ogcp++, &oca); /* clean up */ - if (ogcp != NULL) free((char *)ogcp); - if (ngcp != NULL) free((char *)ngcp); + if (ogcl != NULL) free((char *)ogcl); + if (ngcl != NULL) free((char *)ngcl); return(netchange); } +int beam_sync() /* synchronize beams on server */ { cbeamop(DR_NEWSET, cbeam, ncbeams, &odev.v, odev.hres, odev.vres); + return(ncbeams); } -beam_view(vo, vn) /* change beam view */ -VIEW *vo, *vn; +beam_view(vn) /* change beam view (if advisable) */ +VIEW *vn; { struct cellact ca; VOXL vlnew[8]; int n, comn; - if (!vn->type) { /* clear our beam list */ + if (vn == NULL || !vn->type) { /* clear our beam list */ set_voxels(vlnew, 0); cbeamop(DR_DELSET, cbeam, ncbeams, NULL, 0, 0); ncbeams = 0; - return; + dvw.type = 0; + return(1); } /* find our new voxels */ n = get_voxels(vlnew, vn->vp); + if (dvw.type && !n) { + copystruct(vn, &dvw); /* cancel move */ + return(0); + } /* set the new voxels */ comn = set_voxels(vlnew, n); - if (!vo->type) + if (!dvw.type) comn = 0; ca.add = 1; /* update our beam list */ for (ca.vi = n; ca.vi--; ) if (comn & 1<