100 |
|
AMBSAMP *ap = &ambsam(hp,i,j); |
101 |
|
RAY ar; |
102 |
|
int hlist[3], ii; |
103 |
+ |
double ss[2]; |
104 |
|
RREAL spt[2]; |
105 |
|
double zd; |
106 |
|
/* generate hemispherical sample */ |
116 |
|
scalescolor(ar.rcoef, 1./AVGREFL); |
117 |
|
} |
118 |
|
hlist[0] = hp->rp->rno; |
119 |
< |
hlist[1] = j; |
120 |
< |
hlist[2] = i; |
121 |
< |
multisamp(spt, 2, urand(ilhash(hlist,3)+n)); |
119 |
> |
hlist[1] = AI(hp,i,j); |
120 |
> |
hlist[2] = samplendx; |
121 |
> |
multisamp(ss, 2, urand(ilhash(hlist,3)+n)); |
122 |
|
resample: |
123 |
< |
square2disk(spt, (j+spt[1])/hp->ns, (i+spt[0])/hp->ns); |
123 |
> |
square2disk(spt, (j+ss[1])/hp->ns, (i+ss[0])/hp->ns); |
124 |
|
zd = sqrt(1. - spt[0]*spt[0] - spt[1]*spt[1]); |
125 |
|
for (ii = 3; ii--; ) |
126 |
|
ar.rdir[ii] = spt[0]*hp->ux[ii] + |
128 |
|
zd*hp->onrm[ii]; |
129 |
|
checknorm(ar.rdir); |
130 |
|
/* avoid coincident samples */ |
131 |
< |
if (!n && ambcollision(hp, i, j, ar.rdir)) { |
132 |
< |
spt[0] = frandom(); spt[1] = frandom(); |
131 |
> |
if (!n && hp->ns >= 4 && ambcollision(hp, i, j, ar.rdir)) { |
132 |
> |
ss[0] = frandom(); ss[1] = frandom(); |
133 |
|
goto resample; /* reject this sample */ |
134 |
|
} |
135 |
|
dimlist[ndims++] = AI(hp,i,j) + 90171; |
163 |
|
static float * |
164 |
|
getambdiffs(AMBHEMI *hp) |
165 |
|
{ |
166 |
< |
const double normf = 1./bright(hp->acoef); |
167 |
< |
float *earr = (float *)calloc(hp->ns*hp->ns, sizeof(float)); |
166 |
> |
const double normf = 1./(pbright(hp->acoef) + FTINY); |
167 |
> |
float *earr = (float *)calloc(2*hp->ns*hp->ns, sizeof(float)); |
168 |
|
float *ep; |
169 |
|
AMBSAMP *ap; |
170 |
|
double b, b1, d2; |
199 |
|
ep[-hp->ns-1] += d2; |
200 |
|
} |
201 |
|
/* correct for number of neighbors */ |
202 |
< |
earr[0] *= 8./3.; |
203 |
< |
earr[hp->ns-1] *= 8./3.; |
204 |
< |
earr[(hp->ns-1)*hp->ns] *= 8./3.; |
205 |
< |
earr[(hp->ns-1)*hp->ns + hp->ns-1] *= 8./3.; |
202 |
> |
earr[0] *= 6./3.; |
203 |
> |
earr[hp->ns-1] *= 6./3.; |
204 |
> |
earr[(hp->ns-1)*hp->ns] *= 6./3.; |
205 |
> |
earr[(hp->ns-1)*hp->ns + hp->ns-1] *= 6./3.; |
206 |
|
for (i = 1; i < hp->ns-1; i++) { |
207 |
< |
earr[i*hp->ns] *= 8./5.; |
208 |
< |
earr[i*hp->ns + hp->ns-1] *= 8./5.; |
207 |
> |
earr[i*hp->ns] *= 6./5.; |
208 |
> |
earr[i*hp->ns + hp->ns-1] *= 6./5.; |
209 |
|
} |
210 |
|
for (j = 1; j < hp->ns-1; j++) { |
211 |
< |
earr[j] *= 8./5.; |
212 |
< |
earr[(hp->ns-1)*hp->ns + j] *= 8./5.; |
211 |
> |
earr[j] *= 6./5.; |
212 |
> |
earr[(hp->ns-1)*hp->ns + j] *= 6./5.; |
213 |
|
} |
214 |
+ |
/* blur map to reduce bias */ |
215 |
+ |
memcpy(earr+hp->ns*hp->ns, earr, hp->ns*hp->ns*sizeof(float)); |
216 |
+ |
for (i = 0; i < hp->ns-1; i++) { |
217 |
+ |
float *ep2; |
218 |
+ |
ep = earr + i*hp->ns; |
219 |
+ |
ep2 = ep + hp->ns*hp->ns; |
220 |
+ |
for (j = 0; j < hp->ns-1; j++, ep++, ep2++) { |
221 |
+ |
ep[0] += .125*(ep2[1] + ep2[hp->ns]) - .5*ep2[0]; |
222 |
+ |
ep[1] += .125*ep2[0]; |
223 |
+ |
ep[hp->ns] += .125*ep2[0]; |
224 |
+ |
} |
225 |
+ |
} |
226 |
|
return(earr); |
227 |
|
} |
228 |
|
|
274 |
|
/* set number of divisions */ |
275 |
|
if (backside) wt = -wt; |
276 |
|
if (ambacc <= FTINY && |
277 |
< |
wt > (d *= 0.8*r->rweight/(ambdiv*minweight))) |
277 |
> |
wt > (d *= 0.8*r->rweight/(ambdiv*minweight + 1e-20))) |
278 |
|
wt = d; /* avoid ray termination */ |
279 |
|
n = sqrt(ambdiv * wt) + 0.5; |
280 |
|
i = 1 + (MINADIV-1)*(ambacc > FTINY); |
323 |
|
if (hp->sampOK <= MINADIV*MINADIV) |
324 |
|
return(hp); /* don't bother super-sampling */ |
325 |
|
n = ambssamp*wt + 0.5; |
326 |
< |
if (n > 8) { /* perform super-sampling? */ |
326 |
> |
if (n >= 4*hp->ns) { /* perform super-sampling? */ |
327 |
|
ambsupersamp(hp, n); |
328 |
|
copyscolor(rcol, hp->acol); |
329 |
|
} |