| 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 */ |
| 722 |
|
static uint32 |
| 723 |
|
ambcorral(AMBHEMI *hp, FVECT uv[2], const double r0, const double r1) |
| 724 |
|
{ |
| 725 |
< |
uint32 flgs = 0; |
| 726 |
< |
int i, j; |
| 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); |
| 734 |
|
FVECT vec; |
| 735 |
|
double u, v; |
| 736 |
< |
double ang; |
| 736 |
> |
double ang, a1; |
| 737 |
|
int abp; |
| 738 |
< |
if (ap->d <= FTINY) |
| 739 |
< |
continue; |
| 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 |
|
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 |
< |
ang += 2.0*PI*(ang < 0); |
| 747 |
< |
ang *= 16./PI; |
| 745 |
< |
if ((ang < .5) | (ang >= 31.5)) |
| 746 |
< |
flgs |= 0x80000001; |
| 747 |
< |
else |
| 748 |
< |
flgs |= 3L<<(int)(ang-.5); |
| 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 |
|
return(flgs); |
| 750 |
|
} |
| 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)) { |
