--- ray/src/hd/rhd_qtree.c 1997/12/05 09:40:05 3.10 +++ ray/src/hd/rhd_qtree.c 1997/12/31 09:06:54 3.16 @@ -16,11 +16,12 @@ static char SCCSid[] = "$SunId$ SGI"; #endif /* maximum allowed angle difference (deg.) */ #ifndef MAXANG -#define MAXANG 20. +#define MAXANG 20 #endif +#if MAXANG>0 +#define MAXDIFF2 ( MAXANG*MAXANG * (PI*PI/180./180.)) +#endif -#define MAXDIFF2 (long)( MAXANG*MAXANG /90./90.*(1L<<15)*(1L<<15)) - #define abs(i) ((i) < 0 ? -(i) : (i)) RTREE qtrunk; /* our quadtree trunk */ @@ -28,14 +29,18 @@ double qtDepthEps = .05; /* epsilon to compare depths int qtMinNodesiz = 2; /* minimum node dimension (pixels) */ struct rleaves qtL; /* our pile of leaves */ +static int4 falleaves; /* our list of fallen leaves */ + +#define composted(li) (qtL.bl <= qtL.tl ? \ + ((li) < qtL.bl || (li) >= qtL.tl) : \ + ((li) < qtL.bl && (li) >= qtL.tl)) + #define TBUNDLESIZ 409 /* number of twigs in a bundle */ static RTREE **twigbundle; /* free twig blocks (NULL term.) */ static int nexttwig; /* next free twig */ -#define ungetleaf(li) (qtL.tl=(li)) /* dangerous if used improperly */ - static RTREE * newtwig() /* allocate a twig */ { @@ -88,21 +93,7 @@ int really; } -static int -newleaf() /* allocate a leaf from our pile */ -{ - int li; - - li = qtL.tl++; - if (qtL.tl >= qtL.nl) /* get next leaf in ring */ - qtL.tl = 0; - if (qtL.tl == qtL.bl) /* need to shake some free */ - qtCompost(LFREEPCT); - return(li); -} - - -#define LEAFSIZ (3*sizeof(float)+2*sizeof(short)+\ +#define LEAFSIZ (3*sizeof(float)+sizeof(int4)+\ sizeof(TMbright)+6*sizeof(BYTE)) int @@ -129,12 +120,13 @@ register int n; return(0); /* assign larger alignment types earlier */ qtL.wp = (float (*)[3])qtL.base; - qtL.wd = (short (*)[2])(qtL.wp + n); + qtL.wd = (int4 *)(qtL.wp + n); qtL.brt = (TMbright *)(qtL.wd + n); qtL.chr = (BYTE (*)[3])(qtL.brt + n); qtL.rgb = (BYTE (*)[3])(qtL.chr + n); qtL.nl = n; qtL.tml = qtL.bl = qtL.tl = 0; + falleaves = -1; return(n); } @@ -165,9 +157,7 @@ register RTREE *tp; tp->flgs &= ~BRF(i); } else if (tp->flgs & LFF(i)) { li = tp->k[i].li; - if (qtL.bl < qtL.tl ? - (li < qtL.bl || li >= qtL.tl) : - (li < qtL.bl && li >= qtL.tl)) + if (composted(li)) tp->flgs &= ~LFF(i); } } @@ -177,8 +167,8 @@ int qtCompost(pct) /* free up some leaves */ int pct; { + register int4 *fl; int nused, nclear, nmapped; - /* figure out how many leaves to clear */ nclear = qtL.nl * pct / 100; nused = qtL.tl - qtL.bl; @@ -189,6 +179,7 @@ int pct; if (nclear >= nused) { /* clear them all */ qtFreeTree(0); qtL.tml = qtL.bl = qtL.tl = 0; + falleaves = -1; return(nused); } /* else clear leaves from bottom */ @@ -197,71 +188,15 @@ int pct; qtL.bl += nclear; if (qtL.bl >= qtL.nl) qtL.bl -= qtL.nl; if (nmapped <= nclear) qtL.tml = qtL.bl; - shaketree(&qtrunk); + shaketree(&qtrunk); /* dereference composted leaves */ + for (fl = &falleaves; *fl >= 0; fl = qtL.wd + *fl) + while (composted(*fl)) + if ((*fl = qtL.wd[*fl]) < 0) + return(nclear); return(nclear); } -static -encodedir(pa, dv) /* encode a normalized direction vector */ -short pa[2]; -FVECT dv; -{ - pa[1] = 0; - if (dv[2] >= 1.) - pa[0] = (1L<<15)-1; - else if (dv[2] <= -1.) - pa[0] = -((1L<<15)-1); - else { - pa[0] = ((1L<<15)-1)/(PI/2.) * asin(dv[2]); - pa[1] = ((1L<<15)-1)/PI * atan2(dv[1], dv[0]); - } -} - - -#define ALTSHFT 5 -#define NALT (1<>(15-ALTSHFT)] - -static unsigned short azisftab[NALT]; - -static -azisftinit(alt) /* initialize azimuth scale factor table */ -int alt; -{ - register int i; - - for (i = NALT; i--; ) - azisftab[i] = 2.*(1L<<15) * cos(PI/2.*(i+.5)/NALT); - return(azisft(alt)); -} - -#define azisf(alt) (azisftab[0] ? azisft(alt) : azisftinit(alt)) >> 15 - -static long -dir2diff(pa1, pa2) /* relative distance^2 between directions */ -short pa1[2], pa2[2]; -{ - long altd2, azid2; - int alt; - - altd2 = pa1[0] - pa2[0]; /* get altitude difference^2 */ - altd2 *= altd2; - if (altd2 > MAXDIFF2) - return(altd2); /* too large already */ - azid2 = pa1[1] - pa2[1]; /* get adjusted azimuth difference^2 */ - if (azid2 < 0) azid2 = -azid2; - if (azid2 >= 1L<<15) { /* wrap sphere */ - azid2 -= 1L<<16; - if (azid2 < 0) azid2 = -azid2; - } - alt = (pa1[0]+pa2[0])/2; - azid2 = azid2*azisf(alt); /* evaluation order is important */ - azid2 *= azid2; - return(altd2 + azid2); -} - - int qtFindLeaf(x, y) /* find closest leaf to (x,y) */ int x, y; @@ -300,34 +235,38 @@ int x, y; static -addleaf(li) /* add a leaf to our tree */ -int li; +putleaf(li, drop) /* put a leaf in our tree */ +register int li; +int drop; { register RTREE *tp = &qtrunk; int x0=0, y0=0, x1=odev.hres, y1=odev.vres; - int lo = -1; - long d2; - short dc[2]; + register int lo = -1; + double d2; int x, y, mx, my; double z; - FVECT ip, wp; + FVECT ip, wp, vd; register int q; + /* check for dead leaf */ + if (!qtL.chr[li][1] && !(qtL.chr[li][0] | qtL.chr[li][2])) + return(0); /* compute leaf location in view */ VCOPY(wp, qtL.wp[li]); viewloc(ip, &odev.v, wp); if (ip[2] <= 0. || ip[0] < 0. || ip[0] >= 1. || ip[1] < 0. || ip[1] >= 1.) - return(0); /* behind or outside view */ + goto dropit; /* behind or outside view */ #ifdef DEBUG if (odev.v.type == VT_PAR | odev.v.vfore > FTINY) - error(INTERNAL, "bad view assumption in addleaf"); + error(INTERNAL, "bad view assumption in putleaf"); #endif for (q = 0; q < 3; q++) - wp[q] = (wp[q] - odev.v.vp[q])/ip[2]; - encodedir(dc, wp); /* compute pixel direction */ - d2 = dir2diff(dc, qtL.wd[li]); + vd[q] = (wp[q] - odev.v.vp[q])/ip[2]; + d2 = fdir2diff(qtL.wd[li], vd); +#ifdef MAXDIFF2 if (d2 > MAXDIFF2) - return(0); /* leaf dir. too far off */ + goto dropit; /* leaf dir. too far off */ +#endif x = ip[0] * odev.hres; y = ip[1] * odev.vres; z = ip[2]; @@ -348,7 +287,7 @@ int li; if (!(tp->flgs & LFF(q))) { /* found stem for leaf */ tp->k[q].li = li; tp->flgs |= CHLFF(q); - break; + return(1); } if (lo != tp->k[q].li) { /* check old leaf */ lo = tp->k[q].li; @@ -358,12 +297,13 @@ int li; /* is node minimum size? */ if (y1-y0 <= qtMinNodesiz || x1-x0 <= qtMinNodesiz) { if (z > (1.+qtDepthEps)*ip[2]) - return(0); /* old one closer */ + break; /* old one closer */ if (z >= (1.-qtDepthEps)*ip[2] && - dir2diff(dc, qtL.wd[lo]) < d2) - return(0); /* old one better */ - tp->k[q].li = li; /* else new one is */ + fdir2diff(qtL.wd[lo], vd) < d2) + break; /* old one better */ + tp->k[q].li = li; /* attach new */ tp->flgs |= CHF(q); + li = lo; /* drop old... */ break; } tp->flgs &= ~LFF(q); /* else grow tree */ @@ -374,10 +314,19 @@ int li; my = ip[1] * odev.vres; if (mx >= (x0 + x1) >> 1) q |= 01; if (my >= (y0 + y1) >> 1) q |= 02; + tp->flgs = CH_ANY|LFF(q); /* all new */ tp->k[q].li = lo; - tp->flgs |= LFF(q)|CH_ANY; /* all new */ } - return(1); /* done */ +dropit: + if (drop) + if (li+1 == (qtL.tl ? qtL.tl : qtL.nl)) + qtL.tl = li; /* special case */ + else { + qtL.chr[li][0] = qtL.chr[li][1] = qtL.chr[li][2] = 0; + qtL.wd[li] = falleaves; + falleaves = li; + } + return(li == lo); } @@ -386,13 +335,27 @@ COLR c; FVECT p, v; { register int li; - - li = newleaf(); + int mapit; + /* grab a leaf */ + if (!imm_mode && falleaves >= 0) { /* check for fallen leaves */ + li = falleaves; + falleaves = qtL.wd[li]; + mapit = qtL.tml <= qtL.tl ? + (li < qtL.tml || li >= qtL.tl) : + (li < qtL.tml && li >= qtL.tl) ; + } else { /* else allocate new one */ + li = qtL.tl++; + if (qtL.tl >= qtL.nl) /* next leaf in ring */ + qtL.tl = 0; + if (qtL.tl == qtL.bl) /* need to shake some free */ + qtCompost(LFREEPCT); + mapit = 0; /* we'll map it later */ + } VCOPY(qtL.wp[li], p); - encodedir(qtL.wd[li], v); + qtL.wd[li] = encodedir(v); tmCvColrs(&qtL.brt[li], qtL.chr[li], c, 1); - if (!addleaf(li)) - ungetleaf(li); + if (putleaf(li, 1) && mapit) + tmMapPixels(qtL.rgb+li, qtL.brt+li, qtL.chr+li, 1); } @@ -405,7 +368,7 @@ qtReplant() /* replant our tree using new view */ qtFreeTree(0); /* blow the old tree away */ /* regrow it in new place */ for (i = qtL.bl; i != qtL.tl; ) { - addleaf(i); + putleaf(i, 0); if (++i >= qtL.nl) i = 0; } }