--- ray/src/hd/rhpict2.c 1999/03/08 17:34:24 3.4 +++ ray/src/hd/rhpict2.c 2003/06/30 14:59:12 3.12 @@ -1,15 +1,15 @@ -/* Copyright (c) 1999 Silicon Graphics, Inc. */ - #ifndef lint -static char SCCSid[] = "$SunId$ SGI"; +static const char RCSid[] = "$Id: rhpict2.c,v 3.12 2003/06/30 14:59:12 schorsch Exp $"; #endif - /* * Rendering routines for rhpict. */ +#include + #include "holo.h" #include "view.h" +#include "random.h" #ifndef DEPS #define DEPS 0.02 /* depth epsilon */ @@ -21,7 +21,7 @@ static char SCCSid[] = "$SunId$ SGI"; #define MAXRAD 64 /* maximum kernel radius */ #endif #ifndef NNEIGH -#define NNEIGH 7 /* find this many neighbors */ +#define NNEIGH 5 /* find this many neighbors */ #endif #define NINF 16382 @@ -37,14 +37,14 @@ static char SCCSid[] = "$SunId$ SGI"; #define CLR4(f,i) FL4OP(f,i,&=~) #define TGL4(f,i) FL4OP(f,i,^=) #define FL4NELS(n) (((n)+0x1f)>>5) -#define CLR4ALL(f,n) bzero((char *)(f),FL4NELS(n)*sizeof(int4)) +#define CLR4ALL(f,n) memset((char *)(f),'\0',FL4NELS(n)*sizeof(int32)) #endif -static int4 *pixFlags; /* pixel occupancy flags */ +static int32 *pixFlags; /* pixel occupancy flags */ static float pixWeight[MAXRAD2]; /* pixel weighting function */ static short isqrttab[MAXRAD2]; /* integer square root table */ -#define isqrt(i2) ((int)isqrttab[(int)(i2)]) +#define isqrt(i2) (isqrttab[i2]) extern VIEW myview; /* current output view */ extern COLOR *mypixel; /* pixels being rendered */ @@ -63,7 +63,7 @@ register HDBEAMI *hb; double d, prox; COLOR col; int n; - register int4 p; + register int32 p; if (!hdbcoord(gc, hb->h, hb->b)) error(CONSISTENCY, "bad beam in render_beam"); @@ -111,22 +111,27 @@ register HDBEAMI *hb; int -kill_occl(h, v, nl, n) /* check for occlusion errors */ +kill_occl(h, v, nl, nd, n) /* check for occlusion errors */ int h, v; register short nl[NNEIGH][2]; +int nd[NNEIGH]; int n; { short forequad[2][2]; int d; - register int4 i, p; + register int i; + register int32 p; - if (n <= 0) + if (n <= 0) { +#ifdef DEBUG + error(WARNING, "neighborless sample in kill_occl"); +#endif return(1); + } p = v*hres + h; forequad[0][0] = forequad[0][1] = forequad[1][0] = forequad[1][1] = 0; for (i = n; i--; ) { - d = (h-nl[i][0])*(h-nl[i][0]) + (v-nl[i][1])*(v-nl[i][1]); - d = isqrt(d); + d = isqrt(nd[i]); if (mydepth[nl[i][1]*hres+nl[i][0]]*(1.+DEPS*d) < mydepth[p]) forequad[nl[i][0]=MAXRAD2, CONSISTENCY, "out of range neighbor"); maxr = isqrt(maxr2); for (v2 = 1; v2 <= maxr; v2++) @@ -166,8 +173,7 @@ int n; } ndis = 0; /* find discontinuities */ for (i = n; i--; ) { - r2 = (h-nl[i][0])*(h-nl[i][0]) + (v-nl[i][1])*(v-nl[i][1]); - r = isqrt(r2); + r = isqrt(nd[i]); d = mydepth[nl[i][1]*hres+nl[i][0]] / mydepth[p]; d = d>=1. ? d-1. : 1.-d; if (d > r*DEPS || bigdiff(mypixel[p], @@ -192,33 +198,70 @@ int n; } if (i >= 0) continue; /* outside edge */ addcolor(mypixel[v2*hres+h2], mykern[r2]); - myweight[v2*hres+h2] += pixWeight[r2] * - myweight[v*hres+h]; + myweight[v2*hres+h2] += pixWeight[r2] * myweight[p]; } } return(1); } -pixFlush() /* done with beams -- flush pixel values */ +int +random_samp(h, v, nl, nd, n, rf) /* gather samples randomly */ +int h, v; +register short nl[NNEIGH][2]; +int nd[NNEIGH]; +int n; +double *rf; { - reset_flags(); /* set occupancy flags */ - meet_neighbors(kill_occl); /* eliminate occlusion errors */ - reset_flags(); /* reset occupancy flags */ + float rnt[NNEIGH]; + double rvar; + register int32 p, pn; + register int ni; + + if (n <= 0) + return(1); + p = v*hres + h; + if (*rf <= FTINY) /* straight Voronoi regions */ + ni = 0; + else { /* weighted choice */ + DCHECK(nd[n-1]>=MAXRAD2, CONSISTENCY, "out of range neighbor"); + rnt[0] = pixWeight[nd[0]]; + for (ni = 1; ni < n; ni++) + rnt[ni] = rnt[ni-1] + pixWeight[nd[ni]]; + rvar = rnt[n-1]*pow(frandom(), 1. / *rf); + for (ni = 0; rvar > rnt[ni]+FTINY; ni++) + ; + } + pn = nl[ni][1]*hres + nl[ni][0]; + addcolor(mypixel[p], mypixel[pn]); + myweight[p] += myweight[pn]; + return(1); +} + + +pixFinish(ransamp) /* done with beams -- compute pixel values */ +double ransamp; +{ if (pixWeight[0] <= FTINY) init_wfunc(); /* initialize weighting function */ - meet_neighbors(grow_samp); /* grow valid samples over image */ - free((char *)pixFlags); /* free pixel flags */ + reset_flags(); /* set occupancy flags */ + meet_neighbors(1,kill_occl,NULL); /* identify occlusion errors */ + reset_flags(); /* reset occupancy flags */ + if (ransamp >= 0.) /* spread samples over image */ + meet_neighbors(0,random_samp,&ransamp); + else + meet_neighbors(1,smooth_samp,NULL); + free((void *)pixFlags); /* free pixel flags */ pixFlags = NULL; } reset_flags() /* allocate/set/reset occupancy flags */ { - register int4 p; + register int32 p; if (pixFlags == NULL) { - pixFlags = (int4 *)calloc(FL4NELS(hres*vres), sizeof(int4)); + pixFlags = (int32 *)calloc(FL4NELS(hres*vres), sizeof(int32)); CHECK(pixFlags==NULL, SYSTEM, "out of memory in reset_flags"); } else CLR4ALL(pixFlags, hres*vres); @@ -230,36 +273,32 @@ reset_flags() /* allocate/set/reset occupancy flags init_wfunc() /* initialize weighting function */ { - register int i, j; - register int4 r2; + register int r2; register double d; - for (i = 1; i <= MAXRAD; i++) - for (j = 0; j <= i; j++) { - r2 = i*i + j*j; - if (r2 >= MAXRAD2) break; - d = sqrt((double)r2); - pixWeight[r2] = G0NORM/d; - isqrttab[r2] = d + 0.99; - } + for (r2 = MAXRAD2; --r2; ) { + d = sqrt((double)r2); + pixWeight[r2] = G0NORM/d; + isqrttab[r2] = d + 0.99; + } pixWeight[0] = 1.; isqrttab[0] = 0; } int -findneigh(nl, h, v, rnl) /* find NNEIGH neighbors for pixel */ +findneigh(nl, nd, h, v, rnl) /* find NNEIGH neighbors for pixel */ short nl[NNEIGH][2]; +int nd[NNEIGH]; int h, v; register short (*rnl)[NNEIGH]; { int nn = 0; - int4 d, nd[NNEIGH]; - int n, hoff; + int d, n, hoff; register int h2, n2; nd[NNEIGH-1] = MAXRAD2; - for (hoff = 1; hoff < hres; hoff = (hoff<0) - hoff) { + for (hoff = 0; hoff < hres; hoff = (hoff<=0) - hoff) { h2 = h + hoff; if (h2 < 0 | h2 >= hres) continue; @@ -267,7 +306,7 @@ register short (*rnl)[NNEIGH]; break; for (n = 0; n < NNEIGH && rnl[h2][n] < NINF; n++) { d = (h2-h)*(h2-h) + (v-rnl[h2][n])*(v-rnl[h2][n]); - if (d >= nd[NNEIGH-1]) + if (d == 0 | d >= nd[NNEIGH-1]) continue; if (nn < NNEIGH) /* insert neighbor */ nn++; @@ -288,10 +327,13 @@ register short (*rnl)[NNEIGH]; } -meet_neighbors(nf) /* run through samples and their neighbors */ +meet_neighbors(occ, nf, dp) /* run through samples and their neighbors */ +int occ; int (*nf)(); +char *dp; { short ln[NNEIGH][2]; + int nd[NNEIGH]; int h, v, n, v2; register short (*rnl)[NNEIGH]; /* initialize bottom row list */ @@ -310,10 +352,12 @@ int (*nf)(); v = 0; /* do each row */ for ( ; ; ) { for (h = 0; h < hres; h++) { - if (!CHK4(pixFlags, v*hres+h)) - continue; /* no one home */ - n = findneigh(ln, h, v, rnl); - (*nf)(h, v, ln, n); /* call on neighbors */ + if (!CHK4(pixFlags, v*hres+h) != !occ) + continue; /* occupancy mismatch */ + /* find neighbors */ + n = findneigh(ln, nd, h, v, rnl); + /* call on neighbors */ + (*nf)(h, v, ln, nd, n, dp); } if (++v >= vres) /* reinitialize row list */ break; @@ -328,5 +372,5 @@ int (*nf)(); } } } - free((char *)rnl); /* free row list */ + free((void *)rnl); /* free row list */ }