--- ray/src/hd/rhd_odraw.c 1998/12/20 20:37:53 3.2 +++ ray/src/hd/rhd_odraw.c 1998/12/24 08:12:57 3.8 @@ -14,7 +14,6 @@ static char SCCSid[] = "$SunId$ SGI"; #include #include -#include "random.h" #include "rhd_odraw.h" #ifndef DEPTHEPS @@ -58,9 +57,10 @@ int n; int nbytes, i, j, k, nextsamp, count, blockdiv; int res[2]; - if (odNViews) { /* deallocate view structures */ - for (i = 0; i < odNViews; i++) { + if (odNViews > 0) { /* deallocate view structures */ + for (i = odNViews; i--; ) { free((char *)odView[i].bmap); + free((char *)odView[i].pmap); if (odView[i].emap != NULL) free((char *)odView[i].emap); } @@ -109,8 +109,6 @@ int n; if (blockdiv < 8) blockdiv = 8; nextsamp = 0; count /= blockdiv*blockdiv; /* # blocks */ while (i--) { /* initialize each view */ - odView[i].emap = NULL; - odView[i].dmap = NULL; dev_auxview(i, res); odView[i].hhi = res[0]; odView[i].hlow = (res[0] + blockdiv/2) / blockdiv; @@ -118,6 +116,12 @@ int n; odView[i].vhi = res[1]; odView[i].vlow = (res[1] + blockdiv/2) / blockdiv; if (odView[i].vlow < 1) odView[i].vlow = 1; + odView[i].emap = NULL; + odView[i].dmap = NULL; + odView[i].pmap = (int4 *)calloc(FL4NELS(res[0]*res[1]), + sizeof(int4)); + if (odView[i].pmap == NULL) + return(0); j = odView[i].hlow*odView[i].vlow; odView[i].bmap = (struct ODblock *)malloc( j * sizeof(struct ODblock)); @@ -126,6 +130,7 @@ int n; DCHECK(count<=0 | nextsamp>=n, CONSISTENCY, "counter botch in odInit"); if (!i) count = j; + odView[i].sfirst = nextsamp; while (j--) { /* initialize blocks & free lists */ odView[i].bmap[j].pthresh = FHUGE; odView[i].bmap[j].first = k = nextsamp; @@ -137,6 +142,7 @@ int n; odS.nextfree(k-1) = ENDFREE; odView[i].bmap[j].nused = 0; } + odView[i].snext = nextsamp; } CLR4ALL(odS.redraw, odS.nsamp); /* clear redraw flags */ for (i = odS.nsamp; i--; ) { /* clear values */ @@ -179,7 +185,11 @@ double prox; if (prox > bp->pthresh) return(-1); /* worse than free list occupants */ /* check for duplicate pixel */ - for (i = bp->first+bp->nsamp; i-- > bp->first; ) + if (CHK4(odView[vn].pmap, vh*odView[vn].hhi + hh)) + i = bp->first + bp->nsamp; + else + i = -1; + while (i-- > bp->first) if (hh == odS.ip[i][0] && vh == odS.ip[i][1]) { /* found it! */ /* search free list for it */ if (i == bp->free) @@ -197,8 +207,12 @@ double prox; return(-1); /* previous sample is fine */ goto gotit; } + DCHECK(i>=-1, WARNING, "pixel in presence map not found in block"); if (bp->free != ENDFREE) { /* allocate from free list */ i = bp->free; + if (odS.ip[i][0] >= 0 & odS.ip[i][1] >= 0) + CLR4(odView[vn].pmap, odS.ip[i][1]*odView[vn].hhi + + odS.ip[i][0]); bp->free = odS.nextfree(i); bp->nused++; goto gotit; @@ -222,10 +236,12 @@ double prox; bp->nused--; } i = si[0]; /* use worst sample */ + CLR4(odView[vn].pmap, odS.ip[i][1]*odView[vn].hhi + odS.ip[i][0]); gotit: odS.ip[i][0] = hh; odS.ip[i][1] = vh; odS.closeness(i) = prox; + SET4(odView[vn].pmap, vh*odView[vn].hhi + hh); return(i); } @@ -301,6 +317,18 @@ int newhist; } +odRedrawAll() /* mark all samples for redraw */ +{ + register int i; + + if ((needmapping&(NEWMAP|NEWRGB)) == (NEWMAP|NEWRGB)) + return; /* will be called later, anyway */ + for (i = odS.nsamp; i--; ) + if (odS.ip[i][0] >= 0) + SET4(odS.redraw, i); +} + + odRedraw(vn, hmin, vmin, hmax, vmax) /* redraw view region */ int vn, hmin, vmin, hmax, vmax; { @@ -409,9 +437,7 @@ GLfloat *dm; odUpdate(vn) /* update this view */ int vn; { - int i, j; - register struct ODblock *bp; - register int k; + register int i, j; DCHECK(vn<0 | vn>=odNViews, CONSISTENCY, "bad view number in odUpdate"); @@ -420,39 +446,50 @@ int vn; if (needmapping & NEWMAP) { if (needmapping & NEWHIST) tmClearHisto(); + needmapping &= ~NEWHIST; if (tmAddHisto(odS.brt,odS.nsamp,1) != TM_E_OK) return; if (tmComputeMapping(0.,0.,0.) != TM_E_OK) return; - for (k = odS.nsamp; k--; ) /* redraw all */ - if (odS.ip[k][0] >= 0) - SET4(odS.redraw, k); + needmapping &= ~NEWMAP; + odRedrawAll(); /* redraw everything */ } if (tmMapPixels(odS.rgb,odS.brt,odS.chr,odS.nsamp) != TM_E_OK) return; - needmapping = 0; /* reset flag */ + needmapping &= ~NEWRGB; } - /* draw each block in view */ - for (j = odView[vn].vlow; j--; ) - for (i = 0; i < odView[vn].hlow; i++) { - /* get block */ - bp = odView[vn].bmap + j*odView[vn].hlow + i; - /* do quick, conservative flag check */ - for (k = (bp->first+bp->nsamp+31)>>5; - k-- > bp->first>>5; ) - if (odS.redraw[k]) - break; /* non-zero flag */ - if (k < bp->first>>5) - continue; /* no flags set */ - for (k = bp->nsamp; k--; ) /* sample by sample */ - if (CHK4(odS.redraw, bp->first+k)) { - odDrawBlockSamp(vn, i, j, bp->first+k); - CLR4(odS.redraw, bp->first+k); - } + /* this code segment was too slow */ +#if 0 + for (i = odView[vn].sfirst; i < odView[vn].snext; i++) + if (CHK4(odS.redraw, i)) { + odDrawSamp(vn, i); + CLR4(odS.redraw, i); } +#else + /* redraw samples at beginning */ + for (i = odView[vn].sfirst; i < odView[vn].sfirst+31; i++) + if (CHK4(odS.redraw, i)) { + odDrawSamp(vn, i); + CLR4(odS.redraw, i); + } + /* faster flag checks in middle */ + for (j = odView[vn].snext>>5; j-- > (odView[vn].sfirst+0x1f)>>5; ) + for (i = 0; odS.redraw[j]; i++) /* skips faster */ + if (odS.redraw[j] & 1L< 1, CONSISTENCY, "super-unary size in make_arms"); @@ -500,10 +537,9 @@ double sz; vrad = FANSIZE*sz*vp->vhi/vp->vlow; if (hrad*vrad < 2.25) hrad = vrad = 1.5; - phi0 = (2.*PI) * frandom(); dv = OMAXDEPTH*sz + 0.5; for (i = 0; i < na; i++) { - phi = phi0 + (2.*PI)*i/na; + phi = (2.*PI)*i/na; ar[i][0] = cp[0] + tcos(phi)*hrad + 0.5; ar[i][1] = cp[1] + tsin(phi)*vrad + 0.5; ar[i][2] = dv; @@ -556,15 +592,15 @@ register struct ODview *vp; n = rise + run; while (n--) /* run out arm, checking depth */ if (run2 > rise2) { - if (depthchange(vp, x, y, x+xstep, y)) - break; x += xstep; rise2 += rise; - } else { - if (depthchange(vp, x, y, x, y+ystep)) + if (depthchange(vp, x-xstep, y, x, y)) break; + } else { y += ystep; run2 += run; + if (depthchange(vp, x, y-ystep, x, y)) + break; } if (n < 0) /* found something? */ return; @@ -588,36 +624,48 @@ register int h, v; } -odDrawBlockSamp(vn, h, v, id) /* draw sample in view block */ -int vn, h, v; +static int +blockedge(vp, bi0, bi1) /* check for edge between blocks? */ +register struct ODview *vp; +register int bi0, bi1; +{ + if (bi1 == bi0) + return(0); /* same block */ + if (bi1 < 0) + return(1); /* end off view */ + if (CHK4(vp->emap, bi1)) + return(1); /* end block has edges */ + if (bi1 == bi0+1 || bi1 == bi0-1 || + bi1 == bi0+vp->hlow || bi1 == bi0-vp->hlow) + return(0); /* end in adjacent block -- no edges */ + return(1); /* conservative for rarer case */ +} + + +odDrawSamp(vn, id) /* draw view sample */ +int vn; register int id; { GLshort arm[MAXFAN][3]; - int narms, blockindex, bi1; + int narms, blockindex; register struct ODview *vp; double size; int home_edges; register int i; vp = odView + vn; - blockindex = v*vp->hlow + h; - DCHECK(odS.ip[id][0]*vp->hlow/vp->hhi != h | - odS.ip[id][1]*vp->vlow/vp->vhi != v, - CONSISTENCY, "bad sample position in odDrawBlockSamp"); + blockindex = getblock(vp, odS.ip[id][0], odS.ip[id][1]); + DCHECK(blockindex<0, CONSISTENCY, "bad sample handed to odDrawSamp"); DCHECK(vp->bmap[blockindex].nused <= 0, - CONSISTENCY, "bad in-use count in odDrawBlockSamp"); + CONSISTENCY, "bad in-use count in odDrawSamp"); /* create triangle fan */ size = 1./sqrt((double)vp->bmap[blockindex].nused); narms = make_arms(arm, odS.ip[id], vp, size); if (vp->emap != NULL) { /* check for edge collisions */ home_edges = CHK4(vp->emap, blockindex); for (i = 0; i < narms; i++) - /* the following test is flawed, because we could - * be passing through a block on a diagonal run */ - if (home_edges || - ( (bi1 = getblock(vp, arm[i][0], arm[i][1])) - != blockindex && - (bi1 < 0 || CHK4(vp->emap, bi1)) )) + if (home_edges || blockedge(vp, blockindex, + getblock(vp, arm[i][0], arm[i][1]))) clip_edge(arm[i], odS.ip[id], vp); } /* draw triangle fan */