60 |
|
RAY *r; |
61 |
|
{ |
62 |
|
RAY ar; |
63 |
< |
int hlist[4]; |
63 |
> |
int hlist[3]; |
64 |
> |
double spt[2]; |
65 |
|
double xd, yd, zd; |
66 |
|
double b2; |
67 |
|
double phi; |
68 |
|
register int i; |
69 |
|
|
70 |
< |
if (rayorigin(&ar, r, AMBIENT, 0.5) < 0) |
70 |
> |
if (rayorigin(&ar, r, AMBIENT, AVGREFL) < 0) |
71 |
|
return(-1); |
72 |
|
hlist[0] = r->rno; |
73 |
|
hlist[1] = dp->t; |
74 |
|
hlist[2] = dp->p; |
75 |
< |
hlist[3] = 0; |
76 |
< |
zd = sqrt((dp->t+urand(ilhash(hlist,4)+dp->n))/h->nt); |
77 |
< |
hlist[3] = 1; |
77 |
< |
phi = 2.0*PI * (dp->p+urand(ilhash(hlist,4)+dp->n))/h->np; |
75 |
> |
multisamp(spt, 2, urand(ilhash(hlist,3)+dp->n)); |
76 |
> |
zd = sqrt((dp->t + spt[0])/h->nt); |
77 |
> |
phi = 2.0*PI * (dp->p + spt[1])/h->np; |
78 |
|
xd = cos(phi) * zd; |
79 |
|
yd = sin(phi) * zd; |
80 |
|
zd = sqrt(1.0 - zd*zd); |
86 |
|
rayvalue(&ar); |
87 |
|
ndims--; |
88 |
|
addcolor(dp->v, ar.rcol); |
89 |
< |
if (ar.rt < FHUGE) |
89 |
> |
if (ar.rt > FTINY && ar.rt < FHUGE) |
90 |
|
dp->r += 1.0/ar.rt; |
91 |
|
/* (re)initialize error */ |
92 |
|
if (dp->n++) { |
100 |
|
|
101 |
|
|
102 |
|
double |
103 |
< |
doambient(acol, r, pg, dg) /* compute ambient component */ |
103 |
> |
doambient(acol, r, wt, pg, dg) /* compute ambient component */ |
104 |
|
COLOR acol; |
105 |
|
RAY *r; |
106 |
+ |
double wt; |
107 |
|
FVECT pg, dg; |
108 |
|
{ |
109 |
|
double b, d; |
117 |
|
/* initialize color */ |
118 |
|
setcolor(acol, 0.0, 0.0, 0.0); |
119 |
|
/* initialize hemisphere */ |
120 |
< |
inithemi(&hemi, r); |
120 |
> |
inithemi(&hemi, r, wt); |
121 |
|
ndivs = hemi.nt * hemi.np; |
122 |
|
if (ndivs == 0) |
123 |
|
return(0.0); |
124 |
|
/* set number of super-samples */ |
125 |
< |
ns = ambssamp * r->rweight + 0.5; |
125 |
> |
ns = ambssamp * wt + 0.5; |
126 |
|
if (ns > 0 || pg != NULL || dg != NULL) { |
127 |
|
div = (AMBSAMP *)malloc(ndivs*sizeof(AMBSAMP)); |
128 |
|
if (div == NULL) |
180 |
|
} |
181 |
|
addcolor(acol, dp->v); |
182 |
|
} |
183 |
< |
if (pg != NULL) |
184 |
< |
posgradient(pg, div, &hemi); |
185 |
< |
if (dg != NULL) |
186 |
< |
dirgradient(dg, div, &hemi); |
183 |
> |
b = bright(acol); |
184 |
> |
if (b > FTINY) { |
185 |
> |
b = ndivs/b; |
186 |
> |
if (pg != NULL) { |
187 |
> |
posgradient(pg, div, &hemi); |
188 |
> |
for (i = 0; i < 3; i++) |
189 |
> |
pg[i] *= b; |
190 |
> |
} |
191 |
> |
if (dg != NULL) { |
192 |
> |
dirgradient(dg, div, &hemi); |
193 |
> |
for (i = 0; i < 3; i++) |
194 |
> |
dg[i] *= b; |
195 |
> |
} |
196 |
> |
} else { |
197 |
> |
if (pg != NULL) |
198 |
> |
for (i = 0; i < 3; i++) |
199 |
> |
pg[i] = 0.0; |
200 |
> |
if (dg != NULL) |
201 |
> |
for (i = 0; i < 3; i++) |
202 |
> |
dg[i] = 0.0; |
203 |
> |
} |
204 |
|
free((char *)div); |
205 |
|
} |
206 |
|
b = 1.0/ndivs; |
207 |
|
scalecolor(acol, b); |
208 |
|
if (arad <= FTINY) |
191 |
– |
arad = FHUGE; |
192 |
– |
else |
193 |
– |
arad = (ndivs+ns)/arad; |
194 |
– |
if (arad > maxarad) |
209 |
|
arad = maxarad; |
210 |
< |
else if (arad < minarad) |
210 |
> |
else { |
211 |
> |
arad = (ndivs+ns)/arad; |
212 |
> |
if (arad > maxarad) |
213 |
> |
arad = maxarad; |
214 |
> |
} |
215 |
> |
if (pg != NULL) { /* reduce radius if gradient large */ |
216 |
> |
d = DOT(pg,pg); |
217 |
> |
if (d*arad*arad > 1.0) |
218 |
> |
arad = 1.0/sqrt(d); |
219 |
> |
} |
220 |
> |
if (arad < minarad) { |
221 |
|
arad = minarad; |
222 |
< |
arad /= sqrt(r->rweight); |
223 |
< |
return(arad); |
222 |
> |
if (pg != NULL && d*arad*arad > 1.0) { /* cap gradient */ |
223 |
> |
d = 1.0/arad/sqrt(d); |
224 |
> |
for (i = 0; i < 3; i++) |
225 |
> |
pg[i] *= d; |
226 |
> |
} |
227 |
> |
} |
228 |
> |
return(arad/sqrt(wt)); |
229 |
|
oopsy: |
230 |
|
if (div != NULL) |
231 |
|
free((char *)div); |
233 |
|
} |
234 |
|
|
235 |
|
|
236 |
< |
inithemi(hp, r) /* initialize sampling hemisphere */ |
236 |
> |
inithemi(hp, r, wt) /* initialize sampling hemisphere */ |
237 |
|
register AMBHEMI *hp; |
238 |
|
RAY *r; |
239 |
+ |
double wt; |
240 |
|
{ |
241 |
|
register int i; |
242 |
|
/* set number of divisions */ |
243 |
< |
hp->nt = sqrt(ambdiv * r->rweight * 0.5) + 0.5; |
244 |
< |
hp->np = 2 * hp->nt; |
243 |
> |
if (wt < (.25*PI)/ambdiv+FTINY) { |
244 |
> |
hp->nt = hp->np = 0; |
245 |
> |
return; /* zero samples */ |
246 |
> |
} |
247 |
> |
hp->nt = sqrt(ambdiv * wt / PI) + 0.5; |
248 |
> |
hp->np = PI * hp->nt + 0.5; |
249 |
|
/* make axes */ |
250 |
|
VCOPY(hp->uz, r->ron); |
251 |
|
hp->uy[0] = hp->uy[1] = hp->uy[2] = 0.0; |
272 |
|
dp = da; |
273 |
|
for (i = 0; i < hp->nt; i++) |
274 |
|
for (j = 0; j < hp->np; j++) { |
275 |
+ |
#ifdef DEBUG |
276 |
+ |
if (dp->t != i || dp->p != j) |
277 |
+ |
error(CONSISTENCY, |
278 |
+ |
"division order in comperrs"); |
279 |
+ |
#endif |
280 |
|
b = bright(dp[0].v); |
281 |
|
if (i > 0) { /* from above */ |
282 |
|
b2 = bright(dp[-hp->np].v) - b; |
314 |
|
posgradient(gv, da, hp) /* compute position gradient */ |
315 |
|
FVECT gv; |
316 |
|
AMBSAMP *da; /* assumes standard ordering */ |
317 |
< |
AMBHEMI *hp; |
317 |
> |
register AMBHEMI *hp; |
318 |
|
{ |
319 |
|
register int i, j; |
320 |
< |
double b, d; |
320 |
> |
double nextsine, lastsine, b, d; |
321 |
|
double mag0, mag1; |
322 |
|
double phi, cosp, sinp, xd, yd; |
323 |
|
register AMBSAMP *dp; |
326 |
|
for (j = 0; j < hp->np; j++) { |
327 |
|
dp = da + j; |
328 |
|
mag0 = mag1 = 0.0; |
329 |
+ |
lastsine = 0.0; |
330 |
|
for (i = 0; i < hp->nt; i++) { |
331 |
|
#ifdef DEBUG |
332 |
|
if (dp->t != i || dp->p != j) |
337 |
|
if (i > 0) { |
338 |
|
d = dp[-hp->np].r; |
339 |
|
if (dp[0].r > d) d = dp[0].r; |
340 |
< |
d *= 1.0 - sqrt((double)i/hp->nt); |
340 |
> |
/* sin(t)*cos(t)^2 */ |
341 |
> |
d *= lastsine * (1.0 - (double)i/hp->nt); |
342 |
|
mag0 += d*(b - bright(dp[-hp->np].v)); |
343 |
|
} |
344 |
+ |
nextsine = sqrt((double)(i+1)/hp->nt); |
345 |
|
if (j > 0) { |
346 |
|
d = dp[-1].r; |
347 |
|
if (dp[0].r > d) d = dp[0].r; |
348 |
< |
mag1 += d*(b - bright(dp[-1].v)); |
348 |
> |
mag1 += d * (nextsine - lastsine) * |
349 |
> |
(b - bright(dp[-1].v)); |
350 |
|
} else { |
351 |
|
d = dp[hp->np-1].r; |
352 |
|
if (dp[0].r > d) d = dp[0].r; |
353 |
< |
mag1 += d*(b - bright(dp[hp->np-1].v)); |
353 |
> |
mag1 += d * (nextsine - lastsine) * |
354 |
> |
(b - bright(dp[hp->np-1].v)); |
355 |
|
} |
356 |
|
dp += hp->np; |
357 |
+ |
lastsine = nextsine; |
358 |
|
} |
359 |
< |
if (hp->nt > 1) { |
315 |
< |
mag0 /= (double)hp->np; |
316 |
< |
mag1 /= (double)hp->nt; |
317 |
< |
} |
359 |
> |
mag0 *= 2.0*PI / hp->np; |
360 |
|
phi = 2.0*PI * (double)j/hp->np; |
361 |
|
cosp = cos(phi); sinp = sin(phi); |
362 |
|
xd += mag0*cosp - mag1*sinp; |
363 |
|
yd += mag0*sinp + mag1*cosp; |
364 |
|
} |
365 |
|
for (i = 0; i < 3; i++) |
366 |
< |
gv[i] = xd*hp->ux[i] + yd*hp->uy[i]; |
366 |
> |
gv[i] = (xd*hp->ux[i] + yd*hp->uy[i])/PI; |
367 |
|
} |
368 |
|
|
369 |
|
|
370 |
|
dirgradient(gv, da, hp) /* compute direction gradient */ |
371 |
|
FVECT gv; |
372 |
|
AMBSAMP *da; /* assumes standard ordering */ |
373 |
< |
AMBHEMI *hp; |
373 |
> |
register AMBHEMI *hp; |
374 |
|
{ |
375 |
|
register int i, j; |
376 |
|
double mag; |
387 |
|
error(CONSISTENCY, |
388 |
|
"division order in dirgradient"); |
389 |
|
#endif |
390 |
< |
mag += sqrt((i+.5)/hp->nt)*bright(dp->v); |
390 |
> |
/* tan(t) */ |
391 |
> |
mag += bright(dp->v)/sqrt(hp->nt/(i+.5) - 1.0); |
392 |
|
dp += hp->np; |
393 |
|
} |
394 |
|
phi = 2.0*PI * (j+.5)/hp->np + PI/2.0; |