54 |
|
} |
55 |
|
|
56 |
|
|
57 |
– |
double |
57 |
|
divsample(dp, h, r) /* sample a division */ |
58 |
|
register AMBSAMP *dp; |
59 |
|
AMBHEMI *h; |
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) |
71 |
< |
return(0.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; |
78 |
< |
phi = 2.0*PI * (dp->p+urand(ilhash(hlist,4)+dp->n))/h->np; |
75 |
> |
peano(spt, 2, urand(ilhash(hlist,3)+dp->n), .01); |
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.rot < FHUGE) |
90 |
< |
dp->r += 1.0/ar.rot; |
89 |
> |
if (ar.rt > FTINY && ar.rt < FHUGE) |
90 |
> |
dp->r += 1.0/ar.rt; |
91 |
|
/* (re)initialize error */ |
92 |
|
if (dp->n++) { |
93 |
|
b2 = bright(dp->v)/dp->n - bright(ar.rcol); |
95 |
|
dp->k = b2/(dp->n*dp->n); |
96 |
|
} else |
97 |
|
dp->k = 0.0; |
98 |
< |
return(ar.rot); |
98 |
> |
return(0); |
99 |
|
} |
100 |
|
|
101 |
|
|
138 |
|
setcolor(dp->v, 0.0, 0.0, 0.0); |
139 |
|
dp->r = 0.0; |
140 |
|
dp->n = 0; |
141 |
< |
if ((d = divsample(dp, &hemi, r)) == 0.0) |
141 |
> |
if (divsample(dp, &hemi, r) < 0) |
142 |
|
goto oopsy; |
143 |
|
if (div != NULL) |
144 |
|
dp++; |
148 |
|
} |
149 |
|
} |
150 |
|
if (ns > 0) { /* perform super-sampling */ |
151 |
< |
comperrs(div, hemi); /* compute errors */ |
151 |
> |
comperrs(div, &hemi); /* compute errors */ |
152 |
|
qsort(div, ndivs, sizeof(AMBSAMP), ambcmp); /* sort divs */ |
153 |
|
/* super-sample */ |
154 |
|
for (i = ns; i > 0; i--) { |
155 |
|
copystruct(&dnew, div); |
156 |
< |
if ((d = divsample(&dnew, &hemi)) == 0.0) |
156 |
> |
if (divsample(&dnew, &hemi, r) < 0) |
157 |
|
goto oopsy; |
159 |
– |
if (d < FHUGE) |
160 |
– |
arad += 1.0 / d; |
158 |
|
/* reinsert */ |
159 |
|
dp = div; |
160 |
|
j = ndivs < i ? ndivs : i; |
179 |
|
} |
180 |
|
addcolor(acol, dp->v); |
181 |
|
} |
182 |
< |
if (pg != NULL) |
183 |
< |
posgradient(pg, div, &hemi); |
184 |
< |
if (dg != NULL) |
185 |
< |
dirgradient(dg, div, &hemi); |
182 |
> |
b = bright(acol); |
183 |
> |
if (b > FTINY) { |
184 |
> |
b = ndivs/b; |
185 |
> |
if (pg != NULL) { |
186 |
> |
posgradient(pg, div, &hemi); |
187 |
> |
for (i = 0; i < 3; i++) |
188 |
> |
pg[i] *= b; |
189 |
> |
} |
190 |
> |
if (dg != NULL) { |
191 |
> |
dirgradient(dg, div, &hemi); |
192 |
> |
for (i = 0; i < 3; i++) |
193 |
> |
dg[i] *= b; |
194 |
> |
} |
195 |
> |
} else { |
196 |
> |
if (pg != NULL) |
197 |
> |
for (i = 0; i < 3; i++) |
198 |
> |
pg[i] = 0.0; |
199 |
> |
if (dg != NULL) |
200 |
> |
for (i = 0; i < 3; i++) |
201 |
> |
dg[i] = 0.0; |
202 |
> |
} |
203 |
|
free((char *)div); |
204 |
|
} |
205 |
|
b = 1.0/ndivs; |
213 |
|
else if (arad < minarad) |
214 |
|
arad = minarad; |
215 |
|
arad /= sqrt(r->rweight); |
216 |
+ |
if (pg != NULL) { /* clip pos. gradient if too large */ |
217 |
+ |
d = 4.0*DOT(pg,pg)*arad*arad; |
218 |
+ |
if (d > 1.0) { |
219 |
+ |
d = 1.0/sqrt(d); |
220 |
+ |
for (i = 0; i < 3; i++) |
221 |
+ |
pg[i] *= d; |
222 |
+ |
} |
223 |
+ |
} |
224 |
|
return(arad); |
225 |
|
oopsy: |
226 |
|
if (div != NULL) |
235 |
|
{ |
236 |
|
register int i; |
237 |
|
/* set number of divisions */ |
238 |
< |
hp->nt = sqrt(ambdiv * r->rweight * 0.5) + 0.5; |
239 |
< |
hp->np = 2 * hp->nt; |
238 |
> |
hp->nt = sqrt(ambdiv * r->rweight / PI) + 0.5; |
239 |
> |
hp->np = PI * hp->nt; |
240 |
|
/* make axes */ |
241 |
|
VCOPY(hp->uz, r->ron); |
242 |
|
hp->uy[0] = hp->uy[1] = hp->uy[2] = 0.0; |
263 |
|
dp = da; |
264 |
|
for (i = 0; i < hp->nt; i++) |
265 |
|
for (j = 0; j < hp->np; j++) { |
266 |
+ |
#ifdef DEBUG |
267 |
+ |
if (dp->t != i || dp->p != j) |
268 |
+ |
error(CONSISTENCY, |
269 |
+ |
"division order in comperrs"); |
270 |
+ |
#endif |
271 |
|
b = bright(dp[0].v); |
272 |
|
if (i > 0) { /* from above */ |
273 |
|
b2 = bright(dp[-hp->np].v) - b; |
280 |
|
b2 *= b2 * 0.25; |
281 |
|
dp[0].k += b2; |
282 |
|
dp[-1].k += b2; |
283 |
< |
} |
284 |
< |
if (j == hp->np-1) { /* around */ |
258 |
< |
b2 = bright(dp[-(hp->np-1)].v) - b; |
283 |
> |
} else { /* around */ |
284 |
> |
b2 = bright(dp[hp->np-1].v) - b; |
285 |
|
b2 *= b2 * 0.25; |
286 |
|
dp[0].k += b2; |
287 |
< |
dp[-(hp->np-1)].k += b2; |
287 |
> |
dp[hp->np-1].k += b2; |
288 |
|
} |
289 |
|
dp++; |
290 |
|
} |
342 |
|
dp += hp->np; |
343 |
|
} |
344 |
|
if (hp->nt > 1) { |
345 |
< |
mag0 /= (double)(hp->nt-1); |
345 |
> |
mag0 /= (double)hp->np; |
346 |
|
mag1 /= (double)hp->nt; |
347 |
|
} |
348 |
|
phi = 2.0*PI * (double)j/hp->np; |
351 |
|
yd += mag0*sinp + mag1*cosp; |
352 |
|
} |
353 |
|
for (i = 0; i < 3; i++) |
354 |
< |
gv[i] = (xd*hp->ux[i] + yd*hp->uy[i])/hp->np; |
354 |
> |
gv[i] = (xd*hp->ux[i] + yd*hp->uy[i])/PI; |
355 |
|
} |
356 |
|
|
357 |
|
|
383 |
|
yd += mag * sin(phi); |
384 |
|
} |
385 |
|
for (i = 0; i < 3; i++) |
386 |
< |
gv[i] = (xd*hp->ux[i] + yd*hp->uy[i])/(hp->nt*hp->np); |
386 |
> |
gv[i] = (xd*hp->ux[i] + yd*hp->uy[i])*PI/(hp->nt*hp->np); |
387 |
|
} |