54 |
|
} |
55 |
|
|
56 |
|
|
57 |
– |
double |
57 |
|
divsample(dp, h, r) /* sample a division */ |
58 |
|
register AMBSAMP *dp; |
59 |
|
AMBHEMI *h; |
67 |
|
register int i; |
68 |
|
|
69 |
|
if (rayorigin(&ar, r, AMBIENT, 0.5) < 0) |
70 |
< |
return(0.0); |
70 |
> |
return(-1); |
71 |
|
hlist[0] = r->rno; |
72 |
|
hlist[1] = dp->t; |
73 |
|
hlist[2] = dp->p; |
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 < 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) |
182 |
> |
b = bright(acol); |
183 |
> |
if (b > FTINY) |
184 |
> |
b = ndivs/b; |
185 |
> |
else |
186 |
> |
b = 0.0; |
187 |
> |
if (pg != NULL) { |
188 |
|
posgradient(pg, div, &hemi); |
189 |
< |
if (dg != NULL) |
189 |
> |
for (i = 0; i < 3; i++) |
190 |
> |
pg[i] *= b; |
191 |
> |
} |
192 |
> |
if (dg != NULL) { |
193 |
|
dirgradient(dg, div, &hemi); |
194 |
+ |
for (i = 0; i < 3; i++) |
195 |
+ |
dg[i] *= b; |
196 |
+ |
} |
197 |
|
free((char *)div); |
198 |
|
} |
199 |
|
b = 1.0/ndivs; |
261 |
|
b2 *= b2 * 0.25; |
262 |
|
dp[0].k += b2; |
263 |
|
dp[-1].k += b2; |
264 |
< |
} |
265 |
< |
if (j == hp->np-1) { /* around */ |
258 |
< |
b2 = bright(dp[-(hp->np-1)].v) - b; |
264 |
> |
} else { /* around */ |
265 |
> |
b2 = bright(dp[hp->np-1].v) - b; |
266 |
|
b2 *= b2 * 0.25; |
267 |
|
dp[0].k += b2; |
268 |
< |
dp[-(hp->np-1)].k += b2; |
268 |
> |
dp[hp->np-1].k += b2; |
269 |
|
} |
270 |
|
dp++; |
271 |
|
} |
323 |
|
dp += hp->np; |
324 |
|
} |
325 |
|
if (hp->nt > 1) { |
326 |
< |
mag0 /= (double)(hp->nt-1); |
326 |
> |
mag0 /= (double)hp->np; |
327 |
|
mag1 /= (double)hp->nt; |
328 |
|
} |
329 |
|
phi = 2.0*PI * (double)j/hp->np; |
332 |
|
yd += mag0*sinp + mag1*cosp; |
333 |
|
} |
334 |
|
for (i = 0; i < 3; i++) |
335 |
< |
gv[i] = (xd*hp->ux[i] + yd*hp->uy[i])/hp->np; |
335 |
> |
gv[i] = (xd*hp->ux[i] + yd*hp->uy[i])/PI; |
336 |
|
} |
337 |
|
|
338 |
|
|
364 |
|
yd += mag * sin(phi); |
365 |
|
} |
366 |
|
for (i = 0; i < 3; i++) |
367 |
< |
gv[i] = (xd*hp->ux[i] + yd*hp->uy[i])/(hp->nt*hp->np); |
367 |
> |
gv[i] = (xd*hp->ux[i] + yd*hp->uy[i])*PI/(hp->nt*hp->np); |
368 |
|
} |