| 23 |
|
|
| 24 |
|
#ifdef NEWAMB |
| 25 |
|
|
| 26 |
– |
/* #define AHEM_MARG 1.2 /* hem margin */ |
| 27 |
– |
|
| 26 |
|
extern void SDsquare2disk(double ds[2], double seedx, double seedy); |
| 27 |
|
|
| 28 |
|
/* vertex direction bit positions */ |
| 272 |
|
ambsupersamp(double acol[3], AMBHEMI *hp, int cnt) |
| 273 |
|
{ |
| 274 |
|
float *earr = getambdiffs(hp); |
| 275 |
< |
double e2sum = 0; |
| 275 |
> |
double e2sum = 0.0; |
| 276 |
|
AMBSAMP *ap; |
| 277 |
|
RAY ar; |
| 278 |
< |
COLOR asum; |
| 278 |
> |
double asum[3]; |
| 279 |
|
float *ep; |
| 280 |
|
int i, j, n; |
| 281 |
|
|
| 288 |
|
for (ap = hp->sa, i = 0; i < hp->ns; i++) |
| 289 |
|
for (j = 0; j < hp->ns; j++, ap++) { |
| 290 |
|
int nss = *ep/e2sum*cnt + frandom(); |
| 291 |
< |
setcolor(asum, 0., 0., 0.); |
| 291 |
> |
asum[0] = asum[1] = asum[2] = 0.0; |
| 292 |
|
for (n = 1; n <= nss; n++) { |
| 293 |
|
if (!getambsamp(&ar, hp, i, j, n)) { |
| 294 |
|
nss = n-1; |
| 299 |
|
if (nss) { /* update returned ambient value */ |
| 300 |
|
const double ssf = 1./(nss + 1); |
| 301 |
|
for (n = 3; n--; ) |
| 302 |
< |
acol[n] += ssf*colval(asum,n) + |
| 302 |
> |
acol[n] += ssf*asum[n] + |
| 303 |
|
(ssf - 1.)*colval(ap->v,n); |
| 304 |
|
} |
| 305 |
|
e2sum -= *ep++; /* update remainders */ |
| 718 |
|
} |
| 719 |
|
|
| 720 |
|
|
| 721 |
< |
/* Make sure radii don't extend beyond what we see in our periphery */ |
| 722 |
< |
static int |
| 723 |
< |
hem_radii(AMBHEMI *hp, FVECT uv[2], float ra[2]) |
| 721 |
> |
/* Compute potential light leak direction flags for cache value */ |
| 722 |
> |
static uint32 |
| 723 |
> |
ambcorral(AMBHEMI *hp, FVECT uv[2], const double r0, const double r1) |
| 724 |
|
{ |
| 725 |
< |
#ifdef AHEM_MARG |
| 726 |
< |
#define MAXDACCUM 47 |
| 727 |
< |
const double hemarg = AHEM_MARG*ambacc; /* hem margin */ |
| 728 |
< |
float radivisor2[MAXDACCUM+1]; |
| 729 |
< |
int i, j, k = hp->ns/10 + 1; /* around 5%ile */ |
| 732 |
< |
const int n2accum = (k < MAXDACCUM) ? k : MAXDACCUM ; |
| 733 |
< |
int na = 0; |
| 734 |
< |
double d; |
| 725 |
> |
const double max_d = 1.0/(minarad*ambacc + 0.001); |
| 726 |
> |
const double ang_res = 0.5*PI/(hp->ns-1); |
| 727 |
> |
const double ang_step = ang_res/((int)(16/PI*ang_res) + (1+FTINY)); |
| 728 |
> |
uint32 flgs = 0; |
| 729 |
> |
int i, j; |
| 730 |
|
/* circle around perimeter */ |
| 731 |
|
for (i = 0; i < hp->ns; i++) |
| 732 |
|
for (j = 0; j < hp->ns; j += !i|(i==hp->ns-1) ? 1 : hp->ns-1) { |
| 733 |
|
AMBSAMP *ap = &ambsam(hp,i,j); |
| 739 |
– |
double radiv2 = 0; |
| 734 |
|
FVECT vec; |
| 735 |
< |
if (ap->d <= FTINY) |
| 736 |
< |
continue; |
| 735 |
> |
double u, v; |
| 736 |
> |
double ang, a1; |
| 737 |
> |
int abp; |
| 738 |
> |
if ((ap->d <= FTINY) | (ap->d >= max_d)) |
| 739 |
> |
continue; /* too far or too near */ |
| 740 |
|
VSUB(vec, ap->p, hp->rp->rop); |
| 741 |
< |
for (k = 2; k--; ) { |
| 742 |
< |
d = ap->d * DOT(vec, uv[k]) * ra[k]; |
| 743 |
< |
radiv2 += d*d; |
| 744 |
< |
} |
| 745 |
< |
radiv2 *= hemarg*hemarg * ap->d * ap->d; |
| 746 |
< |
if (radiv2 <= 1.0) |
| 747 |
< |
continue; |
| 751 |
< |
/* insert in percentile list */ |
| 752 |
< |
for (k = na; k && radiv2 > radivisor2[k-1]; k--) |
| 753 |
< |
radivisor2[k] = radivisor2[k-1]; |
| 754 |
< |
radivisor2[k] = radiv2; |
| 755 |
< |
na += (na < n2accum); |
| 741 |
> |
u = DOT(vec, uv[0]) * ap->d; |
| 742 |
> |
v = DOT(vec, uv[1]) * ap->d; |
| 743 |
> |
if ((r0*r0*u*u + r1*r1*v*v) * ap->d*ap->d <= 1.0) |
| 744 |
> |
continue; /* occluder outside ellipse */ |
| 745 |
> |
ang = atan2a(v, u); /* else set direction flags */ |
| 746 |
> |
for (a1 = ang-.5*ang_res; a1 <= ang+.5*ang_res; a1 += ang_step) |
| 747 |
> |
flgs |= 1L<<(int)(16/PI*(a1 + 2.*PI*(a1 < 0))); |
| 748 |
|
} |
| 749 |
< |
if (na < n2accum) /* current radii are OK? */ |
| 758 |
< |
return(0); |
| 759 |
< |
/* else apply divisor */ |
| 760 |
< |
d = 1.0/sqrt(radivisor2[na-1]); |
| 761 |
< |
ra[0] *= d; |
| 762 |
< |
ra[1] *= d; |
| 763 |
< |
return(1); |
| 764 |
< |
#undef MAXDACCUM |
| 765 |
< |
#else |
| 766 |
< |
return(0); |
| 767 |
< |
#endif |
| 749 |
> |
return(flgs); |
| 750 |
|
} |
| 751 |
|
|
| 752 |
|
|
| 758 |
|
FVECT uv[2], /* returned (optional) */ |
| 759 |
|
float ra[2], /* returned (optional) */ |
| 760 |
|
float pg[2], /* returned (optional) */ |
| 761 |
< |
float dg[2] /* returned (optional) */ |
| 761 |
> |
float dg[2], /* returned (optional) */ |
| 762 |
> |
uint32 *crlp /* returned (optional) */ |
| 763 |
|
) |
| 764 |
|
{ |
| 765 |
|
AMBHEMI *hp = inithemi(rcol, r, wt); |
| 779 |
|
pg[0] = pg[1] = 0.0; |
| 780 |
|
if (dg != NULL) |
| 781 |
|
dg[0] = dg[1] = 0.0; |
| 782 |
+ |
if (crlp != NULL) |
| 783 |
+ |
*crlp = 0; |
| 784 |
|
/* sample the hemisphere */ |
| 785 |
|
acol[0] = acol[1] = acol[2] = 0.0; |
| 786 |
|
cnt = 0; |
| 801 |
|
return(-1); /* return value w/o Hessian */ |
| 802 |
|
} |
| 803 |
|
cnt = ambssamp*wt + 0.5; /* perform super-sampling? */ |
| 804 |
< |
if (cnt > 0) |
| 804 |
> |
if (cnt > 8) |
| 805 |
|
ambsupersamp(acol, hp, cnt); |
| 806 |
|
copycolor(rcol, acol); /* final indirect irradiance/PI */ |
| 807 |
|
if ((ra == NULL) & (pg == NULL) & (dg == NULL)) { |
| 837 |
|
if (ra[0] > ra[1]) |
| 838 |
|
ra[0] = ra[1]; |
| 839 |
|
} |
| 855 |
– |
hem_radii(hp, uv, ra); |
| 840 |
|
if (ra[0] < minarad) { |
| 841 |
|
ra[0] = minarad; |
| 842 |
|
if (ra[1] < minarad) |
| 850 |
|
if (ra[0] > maxarad) |
| 851 |
|
ra[0] = maxarad; |
| 852 |
|
} |
| 853 |
+ |
if (crlp != NULL) /* flag encroached directions */ |
| 854 |
+ |
*crlp = ambcorral(hp, uv, ra[0]*ambacc, ra[1]*ambacc); |
| 855 |
|
if (pg != NULL) { /* cap gradient if necessary */ |
| 856 |
|
d = pg[0]*pg[0]*ra[0]*ra[0] + pg[1]*pg[1]*ra[1]*ra[1]; |
| 857 |
|
if (d > 1.0) { |
