8 |
|
* for Irradiance Caching" by Schwarzhaupt, Wann Jensen, & Jarosz |
9 |
|
* from ACM SIGGRAPH Asia 2012 conference proceedings. |
10 |
|
* |
11 |
+ |
* Added book-keeping optimization to avoid calculations that would |
12 |
+ |
* cancel due to traversal both directions on edges that are adjacent |
13 |
+ |
* to same-valued triangles. This cuts about half of Hessian math. |
14 |
+ |
* |
15 |
|
* Declarations of external symbols in ambient.h |
16 |
|
*/ |
17 |
|
|
21 |
|
#include "ambient.h" |
22 |
|
#include "random.h" |
23 |
|
|
24 |
< |
#ifdef NEWAMB |
24 |
> |
#ifndef MINADIV |
25 |
> |
#define MINADIV 7 /* minimum # divisions in each dimension */ |
26 |
> |
#endif |
27 |
|
|
28 |
< |
extern void SDsquare2disk(double ds[2], double seedx, double seedy); |
28 |
> |
typedef struct { |
29 |
> |
FVECT p; /* intersection point */ |
30 |
> |
float d; /* reciprocal distance */ |
31 |
> |
SCOLOR v; /* hemisphere sample value */ |
32 |
> |
} AMBSAMP; /* sample value */ |
33 |
|
|
34 |
|
typedef struct { |
35 |
|
RAY *rp; /* originating ray sample */ |
26 |
– |
FVECT ux, uy; /* tangent axis unit vectors */ |
36 |
|
int ns; /* number of samples per axis */ |
37 |
< |
COLOR acoef; /* division contribution coefficient */ |
38 |
< |
struct s_ambsamp { |
39 |
< |
COLOR v; /* hemisphere sample value */ |
40 |
< |
FVECT p; /* intersection point */ |
41 |
< |
} sa[1]; /* sample array (extends struct) */ |
37 |
> |
int sampOK; /* acquired full sample set? */ |
38 |
> |
int atyp; /* RAMBIENT or TAMBIENT */ |
39 |
> |
SCOLOR acoef; /* division contribution coefficient */ |
40 |
> |
SCOLOR acol; /* accumulated color */ |
41 |
> |
FVECT onrm; /* oriented unperturbed surface normal */ |
42 |
> |
FVECT ux, uy; /* tangent axis unit vectors */ |
43 |
> |
AMBSAMP sa[1]; /* sample array (extends struct) */ |
44 |
|
} AMBHEMI; /* ambient sample hemisphere */ |
45 |
|
|
46 |
< |
#define ambsamp(h,i,j) (h)->sa[(i)*(h)->ns + (j)] |
46 |
> |
#define AI(h,i,j) ((i)*(h)->ns + (j)) |
47 |
> |
#define ambsam(h,i,j) (h)->sa[AI(h,i,j)] |
48 |
|
|
49 |
|
typedef struct { |
50 |
< |
FVECT r_i, r_i1, e_i, rI2_eJ2; |
51 |
< |
double nf, I1, I2; |
50 |
> |
FVECT r_i, r_i1, e_i, rcp, rI2_eJ2; |
51 |
> |
double I1, I2; |
52 |
|
} FFTRI; /* vectors and coefficients for Hessian calculation */ |
53 |
|
|
54 |
|
|
55 |
+ |
static int |
56 |
+ |
ambcollision( /* proposed direciton collides? */ |
57 |
+ |
AMBHEMI *hp, |
58 |
+ |
int i, |
59 |
+ |
int j, |
60 |
+ |
FVECT dv |
61 |
+ |
) |
62 |
+ |
{ |
63 |
+ |
double cos_thresh; |
64 |
+ |
int ii, jj; |
65 |
+ |
/* min. spacing = 1/4th division */ |
66 |
+ |
cos_thresh = (PI/4.)/(double)hp->ns; |
67 |
+ |
cos_thresh = 1. - .5*cos_thresh*cos_thresh; |
68 |
+ |
/* check existing neighbors */ |
69 |
+ |
for (ii = i-1; ii <= i+1; ii++) { |
70 |
+ |
if (ii < 0) continue; |
71 |
+ |
if (ii >= hp->ns) break; |
72 |
+ |
for (jj = j-1; jj <= j+1; jj++) { |
73 |
+ |
AMBSAMP *ap; |
74 |
+ |
FVECT avec; |
75 |
+ |
double dprod; |
76 |
+ |
if (jj < 0) continue; |
77 |
+ |
if (jj >= hp->ns) break; |
78 |
+ |
if ((ii==i) & (jj==j)) continue; |
79 |
+ |
ap = &ambsam(hp,ii,jj); |
80 |
+ |
if (ap->d <= .5/FHUGE) |
81 |
+ |
continue; /* no one home */ |
82 |
+ |
VSUB(avec, ap->p, hp->rp->rop); |
83 |
+ |
dprod = DOT(avec, dv); |
84 |
+ |
if (dprod >= cos_thresh*VLEN(avec)) |
85 |
+ |
return(1); /* collision */ |
86 |
+ |
} |
87 |
+ |
} |
88 |
+ |
return(0); /* nothing to worry about */ |
89 |
+ |
} |
90 |
+ |
|
91 |
+ |
|
92 |
+ |
static int |
93 |
+ |
ambsample( /* initial ambient division sample */ |
94 |
+ |
AMBHEMI *hp, |
95 |
+ |
int i, |
96 |
+ |
int j, |
97 |
+ |
int n |
98 |
+ |
) |
99 |
+ |
{ |
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 */ |
107 |
+ |
/* ambient coefficient for weight */ |
108 |
+ |
if (ambacc > FTINY) |
109 |
+ |
setscolor(ar.rcoef, AVGREFL, AVGREFL, AVGREFL); |
110 |
+ |
else |
111 |
+ |
copyscolor(ar.rcoef, hp->acoef); |
112 |
+ |
if (rayorigin(&ar, hp->atyp, hp->rp, ar.rcoef) < 0) |
113 |
+ |
return(0); |
114 |
+ |
if (ambacc > FTINY) { |
115 |
+ |
#ifdef SSKIPOPT |
116 |
+ |
ar.rsrc = -1; /* protect cache from source opt. */ |
117 |
+ |
ar.scorr = 1.f; |
118 |
+ |
#endif |
119 |
+ |
smultscolor(ar.rcoef, hp->acoef); |
120 |
+ |
scalescolor(ar.rcoef, 1./AVGREFL); |
121 |
+ |
} |
122 |
+ |
hlist[0] = hp->rp->rno; |
123 |
+ |
hlist[1] = AI(hp,i,j); |
124 |
+ |
hlist[2] = samplendx; |
125 |
+ |
multisamp(ss, 2, urand(ilhash(hlist,3)+n)); |
126 |
+ |
resample: |
127 |
+ |
square2disk(spt, (j+ss[1])/hp->ns, (i+ss[0])/hp->ns); |
128 |
+ |
zd = sqrt(1. - spt[0]*spt[0] - spt[1]*spt[1]); |
129 |
+ |
for (ii = 3; ii--; ) |
130 |
+ |
ar.rdir[ii] = spt[0]*hp->ux[ii] + |
131 |
+ |
spt[1]*hp->uy[ii] + |
132 |
+ |
zd*hp->onrm[ii]; |
133 |
+ |
checknorm(ar.rdir); |
134 |
+ |
/* avoid coincident samples */ |
135 |
+ |
if (!n && hp->ns >= 4 && ambcollision(hp, i, j, ar.rdir)) { |
136 |
+ |
ss[0] = frandom(); ss[1] = frandom(); |
137 |
+ |
goto resample; /* reject this sample */ |
138 |
+ |
} |
139 |
+ |
dimlist[ndims++] = AI(hp,i,j) + 90171; |
140 |
+ |
rayvalue(&ar); /* evaluate ray */ |
141 |
+ |
ndims--; |
142 |
+ |
zd = raydistance(&ar); |
143 |
+ |
if (zd <= FTINY) |
144 |
+ |
return(0); /* should never happen */ |
145 |
+ |
smultscolor(ar.rcol, ar.rcoef); /* apply coefficient */ |
146 |
+ |
if (zd*ap->d < 1.0) /* new/closer distance? */ |
147 |
+ |
ap->d = 1.0/zd; |
148 |
+ |
if (!n) { /* record first vertex & value */ |
149 |
+ |
if (zd > 10.0*thescene.cusize + 1000.) |
150 |
+ |
zd = 10.0*thescene.cusize + 1000.; |
151 |
+ |
VSUM(ap->p, ar.rorg, ar.rdir, zd); |
152 |
+ |
copyscolor(ap->v, ar.rcol); |
153 |
+ |
} else { /* else update recorded value */ |
154 |
+ |
sopscolor(hp->acol, -=, ap->v); |
155 |
+ |
zd = 1.0/(double)(n+1); |
156 |
+ |
scalescolor(ar.rcol, zd); |
157 |
+ |
zd *= (double)n; |
158 |
+ |
scalescolor(ap->v, zd); |
159 |
+ |
saddscolor(ap->v, ar.rcol); |
160 |
+ |
} |
161 |
+ |
saddscolor(hp->acol, ap->v); /* add to our sum */ |
162 |
+ |
return(1); |
163 |
+ |
} |
164 |
+ |
|
165 |
+ |
|
166 |
+ |
/* Estimate variance based on ambient division differences */ |
167 |
+ |
static float * |
168 |
+ |
getambdiffs(AMBHEMI *hp) |
169 |
+ |
{ |
170 |
+ |
const double normf = 1./(pbright(hp->acoef) + FTINY); |
171 |
+ |
float *earr = (float *)calloc(2*hp->ns*hp->ns, sizeof(float)); |
172 |
+ |
float *ep; |
173 |
+ |
AMBSAMP *ap; |
174 |
+ |
double b, b1, d2; |
175 |
+ |
int i, j; |
176 |
+ |
|
177 |
+ |
if (earr == NULL) /* out of memory? */ |
178 |
+ |
return(NULL); |
179 |
+ |
/* sum squared neighbor diffs */ |
180 |
+ |
ap = hp->sa; |
181 |
+ |
ep = earr + hp->ns*hp->ns; /* original estimates to scratch */ |
182 |
+ |
for (i = 0; i < hp->ns; i++) |
183 |
+ |
for (j = 0; j < hp->ns; j++, ap++, ep++) { |
184 |
+ |
b = pbright(ap[0].v); |
185 |
+ |
if (i) { /* from above */ |
186 |
+ |
b1 = pbright(ap[-hp->ns].v); |
187 |
+ |
d2 = b - b1; |
188 |
+ |
d2 *= d2*normf/(b + b1 + FTINY); |
189 |
+ |
ep[0] += d2; |
190 |
+ |
ep[-hp->ns] += d2; |
191 |
+ |
} |
192 |
+ |
if (!j) continue; |
193 |
+ |
/* from behind */ |
194 |
+ |
b1 = pbright(ap[-1].v); |
195 |
+ |
d2 = b - b1; |
196 |
+ |
d2 *= d2*normf/(b + b1 + FTINY); |
197 |
+ |
ep[0] += d2; |
198 |
+ |
ep[-1] += d2; |
199 |
+ |
if (!i) continue; |
200 |
+ |
/* diagonal */ |
201 |
+ |
b1 = pbright(ap[-hp->ns-1].v); |
202 |
+ |
d2 = b - b1; |
203 |
+ |
d2 *= d2*normf/(b + b1 + FTINY); |
204 |
+ |
ep[0] += d2; |
205 |
+ |
ep[-hp->ns-1] += d2; |
206 |
+ |
} |
207 |
+ |
/* correct for number of neighbors */ |
208 |
+ |
ep = earr + hp->ns*hp->ns; |
209 |
+ |
ep[0] *= 6./3.; |
210 |
+ |
ep[hp->ns-1] *= 6./3.; |
211 |
+ |
ep[(hp->ns-1)*hp->ns] *= 6./3.; |
212 |
+ |
ep[(hp->ns-1)*hp->ns + hp->ns-1] *= 6./3.; |
213 |
+ |
for (i = 1; i < hp->ns-1; i++) { |
214 |
+ |
ep[i*hp->ns] *= 6./5.; |
215 |
+ |
ep[i*hp->ns + hp->ns-1] *= 6./5.; |
216 |
+ |
} |
217 |
+ |
for (j = 1; j < hp->ns-1; j++) { |
218 |
+ |
ep[j] *= 6./5.; |
219 |
+ |
ep[(hp->ns-1)*hp->ns + j] *= 6./5.; |
220 |
+ |
} |
221 |
+ |
/* blur final map to reduce bias */ |
222 |
+ |
for (i = 0; i < hp->ns-1; i++) { |
223 |
+ |
float *ep2; |
224 |
+ |
ep = earr + i*hp->ns; |
225 |
+ |
ep2 = ep + hp->ns*hp->ns; |
226 |
+ |
for (j = 0; j < hp->ns-1; j++, ep++, ep2++) { |
227 |
+ |
ep[0] += .5*ep2[0] + .125*(ep2[1] + ep2[hp->ns]); |
228 |
+ |
ep[1] += .125*ep2[0]; |
229 |
+ |
ep[hp->ns] += .125*ep2[0]; |
230 |
+ |
} |
231 |
+ |
} |
232 |
+ |
return(earr); |
233 |
+ |
} |
234 |
+ |
|
235 |
+ |
|
236 |
+ |
/* Perform super-sampling on hemisphere (introduces bias) */ |
237 |
+ |
static void |
238 |
+ |
ambsupersamp(AMBHEMI *hp, int cnt) |
239 |
+ |
{ |
240 |
+ |
float *earr = getambdiffs(hp); |
241 |
+ |
double e2rem = 0; |
242 |
+ |
float *ep; |
243 |
+ |
int i, j, n, nss; |
244 |
+ |
|
245 |
+ |
if (earr == NULL) /* just skip calc. if no memory */ |
246 |
+ |
return; |
247 |
+ |
/* accumulate estimated variances */ |
248 |
+ |
for (ep = earr + hp->ns*hp->ns; ep > earr; ) |
249 |
+ |
e2rem += *--ep; |
250 |
+ |
ep = earr; /* perform super-sampling */ |
251 |
+ |
for (i = 0; i < hp->ns; i++) |
252 |
+ |
for (j = 0; j < hp->ns; j++) { |
253 |
+ |
if (e2rem <= FTINY) |
254 |
+ |
goto done; /* nothing left to do */ |
255 |
+ |
nss = *ep/e2rem*cnt + frandom(); |
256 |
+ |
for (n = 1; n <= nss && ambsample(hp,i,j,n); n++) |
257 |
+ |
if (!--cnt) goto done; |
258 |
+ |
e2rem -= *ep++; /* update remainder */ |
259 |
+ |
} |
260 |
+ |
done: |
261 |
+ |
free(earr); |
262 |
+ |
} |
263 |
+ |
|
264 |
+ |
|
265 |
|
static AMBHEMI * |
266 |
< |
inithemi( /* initialize sampling hemisphere */ |
267 |
< |
COLOR ac, |
266 |
> |
samp_hemi( /* sample indirect hemisphere */ |
267 |
> |
SCOLOR rcol, |
268 |
|
RAY *r, |
269 |
|
double wt |
270 |
|
) |
271 |
|
{ |
272 |
+ |
int backside = (wt < 0); |
273 |
|
AMBHEMI *hp; |
274 |
|
double d; |
275 |
< |
int n, i; |
275 |
> |
int n, i, j; |
276 |
> |
/* insignificance check */ |
277 |
> |
d = sintens(rcol); |
278 |
> |
if (d <= FTINY) |
279 |
> |
return(NULL); |
280 |
|
/* set number of divisions */ |
281 |
+ |
if (backside) wt = -wt; |
282 |
|
if (ambacc <= FTINY && |
283 |
< |
wt > (d = 0.8*intens(ac)*r->rweight/(ambdiv*minweight))) |
283 |
> |
wt > (d *= 0.8*r->rweight/(ambdiv*minweight + 1e-20))) |
284 |
|
wt = d; /* avoid ray termination */ |
285 |
|
n = sqrt(ambdiv * wt) + 0.5; |
286 |
< |
i = 1 + 5*(ambacc > FTINY); /* minimum number of samples */ |
287 |
< |
if (n < i) |
286 |
> |
i = 1 + (MINADIV-1)*(ambacc > FTINY); |
287 |
> |
if (n < i) /* use minimum number of samples? */ |
288 |
|
n = i; |
289 |
|
/* allocate sampling array */ |
290 |
< |
hp = (AMBHEMI *)malloc(sizeof(AMBHEMI) + |
63 |
< |
sizeof(struct s_ambsamp)*(n*n - 1)); |
290 |
> |
hp = (AMBHEMI *)malloc(sizeof(AMBHEMI) + sizeof(AMBSAMP)*(n*n - 1)); |
291 |
|
if (hp == NULL) |
292 |
< |
return(NULL); |
292 |
> |
error(SYSTEM, "out of memory in samp_hemi"); |
293 |
> |
|
294 |
> |
if (backside) { |
295 |
> |
hp->atyp = TAMBIENT; |
296 |
> |
hp->onrm[0] = -r->ron[0]; |
297 |
> |
hp->onrm[1] = -r->ron[1]; |
298 |
> |
hp->onrm[2] = -r->ron[2]; |
299 |
> |
} else { |
300 |
> |
hp->atyp = RAMBIENT; |
301 |
> |
VCOPY(hp->onrm, r->ron); |
302 |
> |
} |
303 |
|
hp->rp = r; |
304 |
|
hp->ns = n; |
305 |
+ |
scolorblack(hp->acol); |
306 |
+ |
memset(hp->sa, 0, sizeof(AMBSAMP)*n*n); |
307 |
+ |
hp->sampOK = 0; |
308 |
|
/* assign coefficient */ |
309 |
< |
copycolor(hp->acoef, ac); |
309 |
> |
copyscolor(hp->acoef, rcol); |
310 |
|
d = 1.0/(n*n); |
311 |
< |
scalecolor(hp->acoef, d); |
311 |
> |
scalescolor(hp->acoef, d); |
312 |
|
/* make tangent plane axes */ |
313 |
< |
hp->uy[0] = 0.1 - 0.2*frandom(); |
314 |
< |
hp->uy[1] = 0.1 - 0.2*frandom(); |
315 |
< |
hp->uy[2] = 0.1 - 0.2*frandom(); |
316 |
< |
for (i = 0; i < 3; i++) |
317 |
< |
if (r->ron[i] < 0.6 && r->ron[i] > -0.6) |
318 |
< |
break; |
319 |
< |
if (i >= 3) |
320 |
< |
error(CONSISTENCY, "bad ray direction in inithemi()"); |
321 |
< |
hp->uy[i] = 1.0; |
322 |
< |
VCROSS(hp->ux, hp->uy, r->ron); |
323 |
< |
normalize(hp->ux); |
324 |
< |
VCROSS(hp->uy, r->ron, hp->ux); |
325 |
< |
/* we're ready to sample */ |
326 |
< |
return(hp); |
313 |
> |
if (!getperpendicular(hp->ux, hp->onrm, 1)) |
314 |
> |
error(CONSISTENCY, "bad ray direction in samp_hemi"); |
315 |
> |
VCROSS(hp->uy, hp->onrm, hp->ux); |
316 |
> |
/* sample divisions */ |
317 |
> |
for (i = hp->ns; i--; ) |
318 |
> |
for (j = hp->ns; j--; ) |
319 |
> |
hp->sampOK += ambsample(hp, i, j, 0); |
320 |
> |
copyscolor(rcol, hp->acol); |
321 |
> |
if (!hp->sampOK) { /* utter failure? */ |
322 |
> |
free(hp); |
323 |
> |
return(NULL); |
324 |
> |
} |
325 |
> |
if (hp->sampOK < hp->ns*hp->ns) { |
326 |
> |
hp->sampOK *= -1; /* soft failure */ |
327 |
> |
return(hp); |
328 |
> |
} |
329 |
> |
if (hp->sampOK <= MINADIV*MINADIV) |
330 |
> |
return(hp); /* don't bother super-sampling */ |
331 |
> |
n = ambssamp*wt + 0.5; |
332 |
> |
if (n >= 4*hp->ns) { /* perform super-sampling? */ |
333 |
> |
ambsupersamp(hp, n); |
334 |
> |
copyscolor(rcol, hp->acol); |
335 |
> |
} |
336 |
> |
return(hp); /* all is well */ |
337 |
|
} |
338 |
|
|
339 |
|
|
340 |
< |
static struct s_ambsamp * |
341 |
< |
ambsample( /* sample an ambient direction */ |
342 |
< |
AMBHEMI *hp, |
93 |
< |
int i, |
94 |
< |
int j |
95 |
< |
) |
340 |
> |
/* Return brightness of farthest ambient sample */ |
341 |
> |
static double |
342 |
> |
back_ambval(AMBHEMI *hp, const int n1, const int n2, const int n3) |
343 |
|
{ |
344 |
< |
struct s_ambsamp *ap = &ambsamp(hp,i,j); |
345 |
< |
RAY ar; |
346 |
< |
double spt[2], zd; |
347 |
< |
int ii; |
101 |
< |
/* ambient coefficient for weight */ |
102 |
< |
if (ambacc > FTINY) |
103 |
< |
setcolor(ar.rcoef, AVGREFL, AVGREFL, AVGREFL); |
104 |
< |
else |
105 |
< |
copycolor(ar.rcoef, hp->acoef); |
106 |
< |
if (rayorigin(&ar, AMBIENT, hp->rp, ar.rcoef) < 0) |
107 |
< |
goto badsample; |
108 |
< |
if (ambacc > FTINY) { |
109 |
< |
multcolor(ar.rcoef, hp->acoef); |
110 |
< |
scalecolor(ar.rcoef, 1./AVGREFL); |
344 |
> |
if (hp->sa[n1].d <= hp->sa[n2].d) { |
345 |
> |
if (hp->sa[n1].d <= hp->sa[n3].d) |
346 |
> |
return(hp->sa[n1].v[0]); |
347 |
> |
return(hp->sa[n3].v[0]); |
348 |
|
} |
349 |
< |
/* generate hemispherical sample */ |
350 |
< |
SDsquare2disk(spt, (i+.1+.8*frandom())/hp->ns, |
351 |
< |
(j+.1+.8*frandom())/hp->ns ); |
115 |
< |
zd = sqrt(1. - spt[0]*spt[0] - spt[1]*spt[1]); |
116 |
< |
for (ii = 3; ii--; ) |
117 |
< |
ar.rdir[ii] = spt[0]*hp->ux[ii] + |
118 |
< |
spt[1]*hp->uy[ii] + |
119 |
< |
zd*hp->rp->ron[ii]; |
120 |
< |
checknorm(ar.rdir); |
121 |
< |
dimlist[ndims++] = i*hp->ns + j + 90171; |
122 |
< |
rayvalue(&ar); /* evaluate ray */ |
123 |
< |
ndims--; |
124 |
< |
if (ar.rt > 20.0*maxarad) /* limit vertex distance */ |
125 |
< |
ar.rt = 20.0*maxarad; |
126 |
< |
else if (ar.rt <= FTINY) /* should never happen! */ |
127 |
< |
goto badsample; |
128 |
< |
VSUM(ap->p, ar.rorg, ar.rdir, ar.rt); |
129 |
< |
multcolor(ar.rcol, ar.rcoef); /* apply coefficient */ |
130 |
< |
copycolor(ap->v, ar.rcol); |
131 |
< |
return(ap); |
132 |
< |
badsample: |
133 |
< |
setcolor(ap->v, 0., 0., 0.); |
134 |
< |
VCOPY(ap->p, hp->rp->rop); |
135 |
< |
return(NULL); |
349 |
> |
if (hp->sa[n2].d <= hp->sa[n3].d) |
350 |
> |
return(hp->sa[n2].v[0]); |
351 |
> |
return(hp->sa[n3].v[0]); |
352 |
|
} |
353 |
|
|
354 |
|
|
355 |
|
/* Compute vectors and coefficients for Hessian/gradient calcs */ |
356 |
|
static void |
357 |
< |
comp_fftri(FFTRI *ftp, FVECT ap0, FVECT ap1, FVECT rop) |
357 |
> |
comp_fftri(FFTRI *ftp, AMBHEMI *hp, const int n0, const int n1) |
358 |
|
{ |
359 |
< |
FVECT vcp; |
360 |
< |
double dot_e, dot_er, dot_r, dot_r1, J2; |
145 |
< |
int i; |
359 |
> |
double rdot_cp, dot_e, dot_er, rdot_r, rdot_r1, J2; |
360 |
> |
int ii; |
361 |
|
|
362 |
< |
VSUB(ftp->r_i, ap0, rop); |
363 |
< |
VSUB(ftp->r_i1, ap1, rop); |
364 |
< |
VSUB(ftp->e_i, ap1, ap0); |
365 |
< |
VCROSS(vcp, ftp->e_i, ftp->r_i); |
366 |
< |
ftp->nf = 1.0/DOT(vcp,vcp); |
362 |
> |
VSUB(ftp->r_i, hp->sa[n0].p, hp->rp->rop); |
363 |
> |
VSUB(ftp->r_i1, hp->sa[n1].p, hp->rp->rop); |
364 |
> |
VSUB(ftp->e_i, hp->sa[n1].p, hp->sa[n0].p); |
365 |
> |
VCROSS(ftp->rcp, ftp->r_i, ftp->r_i1); |
366 |
> |
rdot_cp = 1.0/DOT(ftp->rcp,ftp->rcp); |
367 |
|
dot_e = DOT(ftp->e_i,ftp->e_i); |
368 |
|
dot_er = DOT(ftp->e_i, ftp->r_i); |
369 |
< |
dot_r = DOT(ftp->r_i,ftp->r_i); |
370 |
< |
dot_r1 = DOT(ftp->r_i1,ftp->r_i1); |
371 |
< |
ftp->I1 = acos( DOT(ftp->r_i, ftp->r_i1) / sqrt(dot_r*dot_r1) ) * |
372 |
< |
sqrt( ftp->nf ); |
373 |
< |
ftp->I2 = ( DOT(ftp->e_i, ftp->r_i1)/dot_r1 - dot_er/dot_r + |
374 |
< |
dot_e*ftp->I1 )*0.5*ftp->nf; |
375 |
< |
J2 = 0.5/dot_e*( 1.0/dot_r - 1.0/dot_r1 ) - dot_er/dot_e*ftp->I2; |
376 |
< |
for (i = 3; i--; ) |
377 |
< |
ftp->rI2_eJ2[i] = ftp->I2*ftp->r_i[i] + J2*ftp->e_i[i]; |
369 |
> |
rdot_r = 1.0/DOT(ftp->r_i,ftp->r_i); |
370 |
> |
rdot_r1 = 1.0/DOT(ftp->r_i1,ftp->r_i1); |
371 |
> |
ftp->I1 = acos( DOT(ftp->r_i, ftp->r_i1) * sqrt(rdot_r*rdot_r1) ) * |
372 |
> |
sqrt( rdot_cp ); |
373 |
> |
ftp->I2 = ( DOT(ftp->e_i, ftp->r_i1)*rdot_r1 - dot_er*rdot_r + |
374 |
> |
dot_e*ftp->I1 )*0.5*rdot_cp; |
375 |
> |
J2 = ( 0.5*(rdot_r - rdot_r1) - dot_er*ftp->I2 ) / dot_e; |
376 |
> |
for (ii = 3; ii--; ) |
377 |
> |
ftp->rI2_eJ2[ii] = ftp->I2*ftp->r_i[ii] + J2*ftp->e_i[ii]; |
378 |
|
} |
379 |
|
|
380 |
|
|
395 |
|
static void |
396 |
|
comp_hessian(FVECT hess[3], FFTRI *ftp, FVECT nrm) |
397 |
|
{ |
398 |
< |
FVECT vcp; |
398 |
> |
FVECT ncp; |
399 |
|
FVECT m1[3], m2[3], m3[3], m4[3]; |
400 |
|
double d1, d2, d3, d4; |
401 |
|
double I3, J3, K3; |
405 |
|
d2 = 1.0/DOT(ftp->r_i1,ftp->r_i1); |
406 |
|
d3 = 1.0/DOT(ftp->e_i,ftp->e_i); |
407 |
|
d4 = DOT(ftp->e_i, ftp->r_i); |
408 |
< |
I3 = 0.25*ftp->nf*( DOT(ftp->e_i, ftp->r_i1)*d2*d2 - d4*d1*d1 + |
409 |
< |
3.0/d3*ftp->I2 ); |
408 |
> |
I3 = ( DOT(ftp->e_i, ftp->r_i1)*d2*d2 - d4*d1*d1 + 3.0/d3*ftp->I2 ) |
409 |
> |
/ ( 4.0*DOT(ftp->rcp,ftp->rcp) ); |
410 |
|
J3 = 0.25*d3*(d1*d1 - d2*d2) - d4*d3*I3; |
411 |
|
K3 = d3*(ftp->I2 - I3/d1 - 2.0*d4*J3); |
412 |
|
/* intermediate matrices */ |
413 |
< |
VCROSS(vcp, nrm, ftp->e_i); |
414 |
< |
compose_matrix(m1, vcp, ftp->rI2_eJ2); |
413 |
> |
VCROSS(ncp, nrm, ftp->e_i); |
414 |
> |
compose_matrix(m1, ncp, ftp->rI2_eJ2); |
415 |
|
compose_matrix(m2, ftp->r_i, ftp->r_i); |
416 |
|
compose_matrix(m3, ftp->e_i, ftp->e_i); |
417 |
|
compose_matrix(m4, ftp->r_i, ftp->e_i); |
418 |
< |
VCROSS(vcp, ftp->r_i, ftp->e_i); |
204 |
< |
d1 = DOT(nrm, vcp); |
418 |
> |
d1 = DOT(nrm, ftp->rcp); |
419 |
|
d2 = -d1*ftp->I2; |
420 |
|
d1 *= 2.0; |
421 |
|
for (i = 3; i--; ) /* final matrix sum */ |
445 |
|
/* Add to radiometric Hessian from the given triangle */ |
446 |
|
static void |
447 |
|
add2hessian(FVECT hess[3], FVECT ehess1[3], |
448 |
< |
FVECT ehess2[3], FVECT ehess3[3], COLORV v) |
448 |
> |
FVECT ehess2[3], FVECT ehess3[3], double v) |
449 |
|
{ |
450 |
|
int i, j; |
451 |
|
|
459 |
|
static void |
460 |
|
comp_gradient(FVECT grad, FFTRI *ftp, FVECT nrm) |
461 |
|
{ |
462 |
< |
FVECT vcp; |
462 |
> |
FVECT ncp; |
463 |
|
double f1; |
464 |
|
int i; |
465 |
|
|
466 |
< |
VCROSS(vcp, ftp->r_i, ftp->r_i1); |
467 |
< |
f1 = 2.0*DOT(nrm, vcp); |
254 |
< |
VCROSS(vcp, nrm, ftp->e_i); |
466 |
> |
f1 = 2.0*DOT(nrm, ftp->rcp); |
467 |
> |
VCROSS(ncp, nrm, ftp->e_i); |
468 |
|
for (i = 3; i--; ) |
469 |
< |
grad[i] = (0.5/PI)*( ftp->I1*vcp[i] + f1*ftp->rI2_eJ2[i] ); |
469 |
> |
grad[i] = (0.5/PI)*( ftp->I1*ncp[i] + f1*ftp->rI2_eJ2[i] ); |
470 |
|
} |
471 |
|
|
472 |
|
|
482 |
|
|
483 |
|
/* Add to displacement gradient from the given triangle */ |
484 |
|
static void |
485 |
< |
add2gradient(FVECT grad, FVECT egrad1, FVECT egrad2, FVECT egrad3, COLORV v) |
485 |
> |
add2gradient(FVECT grad, FVECT egrad1, FVECT egrad2, FVECT egrad3, double v) |
486 |
|
{ |
487 |
|
int i; |
488 |
|
|
491 |
|
} |
492 |
|
|
493 |
|
|
281 |
– |
/* Return brightness of furthest ambient sample */ |
282 |
– |
static COLORV |
283 |
– |
back_ambval(struct s_ambsamp *ap1, struct s_ambsamp *ap2, |
284 |
– |
struct s_ambsamp *ap3, FVECT orig) |
285 |
– |
{ |
286 |
– |
COLORV vback; |
287 |
– |
FVECT vec; |
288 |
– |
double d2, d2best; |
289 |
– |
|
290 |
– |
VSUB(vec, ap1->p, orig); |
291 |
– |
d2best = DOT(vec,vec); |
292 |
– |
vback = colval(ap1->v,CIEY); |
293 |
– |
VSUB(vec, ap2->p, orig); |
294 |
– |
d2 = DOT(vec,vec); |
295 |
– |
if (d2 > d2best) { |
296 |
– |
d2best = d2; |
297 |
– |
vback = colval(ap2->v,CIEY); |
298 |
– |
} |
299 |
– |
VSUB(vec, ap3->p, orig); |
300 |
– |
d2 = DOT(vec,vec); |
301 |
– |
if (d2 > d2best) |
302 |
– |
return(colval(ap3->v,CIEY)); |
303 |
– |
return(vback); |
304 |
– |
} |
305 |
– |
|
306 |
– |
|
494 |
|
/* Compute anisotropic radii and eigenvector directions */ |
495 |
< |
static int |
495 |
> |
static void |
496 |
|
eigenvectors(FVECT uv[2], float ra[2], FVECT hessian[3]) |
497 |
|
{ |
498 |
|
double hess2[2][2]; |
508 |
|
hess2[0][1] = DOT(uv[0], b); |
509 |
|
hess2[1][0] = DOT(uv[1], a); |
510 |
|
hess2[1][1] = DOT(uv[1], b); |
511 |
< |
/* compute eigenvalues */ |
512 |
< |
if ( quadratic(evalue, 1.0, -hess2[0][0]-hess2[1][1], |
513 |
< |
hess2[0][0]*hess2[1][1]-hess2[0][1]*hess2[1][0]) != 2 || |
514 |
< |
(evalue[0] = fabs(evalue[0])) <= FTINY*FTINY || |
515 |
< |
(evalue[1] = fabs(evalue[1])) <= FTINY*FTINY ) |
516 |
< |
error(INTERNAL, "bad eigenvalue calculation"); |
517 |
< |
|
511 |
> |
/* compute eigenvalue(s) */ |
512 |
> |
i = quadratic(evalue, 1.0, -hess2[0][0]-hess2[1][1], |
513 |
> |
hess2[0][0]*hess2[1][1]-hess2[0][1]*hess2[1][0]); |
514 |
> |
if (i == 1) /* double-root (circle) */ |
515 |
> |
evalue[1] = evalue[0]; |
516 |
> |
if (!i || ((evalue[0] = fabs(evalue[0])) <= FTINY*FTINY) | |
517 |
> |
((evalue[1] = fabs(evalue[1])) <= FTINY*FTINY) ) { |
518 |
> |
ra[0] = ra[1] = maxarad; |
519 |
> |
return; |
520 |
> |
} |
521 |
|
if (evalue[0] > evalue[1]) { |
522 |
|
ra[0] = sqrt(sqrt(4.0/evalue[0])); |
523 |
|
ra[1] = sqrt(sqrt(4.0/evalue[1])); |
575 |
|
} |
576 |
|
/* compute first row of edges */ |
577 |
|
for (j = 0; j < hp->ns-1; j++) { |
578 |
< |
comp_fftri(&fftr, ambsamp(hp,0,j).p, |
389 |
< |
ambsamp(hp,0,j+1).p, hp->rp->rop); |
578 |
> |
comp_fftri(&fftr, hp, AI(hp,0,j), AI(hp,0,j+1)); |
579 |
|
if (hessrow != NULL) |
580 |
< |
comp_hessian(hessrow[j], &fftr, hp->rp->ron); |
580 |
> |
comp_hessian(hessrow[j], &fftr, hp->onrm); |
581 |
|
if (gradrow != NULL) |
582 |
< |
comp_gradient(gradrow[j], &fftr, hp->rp->ron); |
582 |
> |
comp_gradient(gradrow[j], &fftr, hp->onrm); |
583 |
|
} |
584 |
|
/* sum each row of triangles */ |
585 |
|
for (i = 0; i < hp->ns-1; i++) { |
586 |
|
FVECT hesscol[3]; /* compute first vertical edge */ |
587 |
|
FVECT gradcol; |
588 |
< |
comp_fftri(&fftr, ambsamp(hp,i,0).p, |
400 |
< |
ambsamp(hp,i+1,0).p, hp->rp->rop); |
588 |
> |
comp_fftri(&fftr, hp, AI(hp,i,0), AI(hp,i+1,0)); |
589 |
|
if (hessrow != NULL) |
590 |
< |
comp_hessian(hesscol, &fftr, hp->rp->ron); |
590 |
> |
comp_hessian(hesscol, &fftr, hp->onrm); |
591 |
|
if (gradrow != NULL) |
592 |
< |
comp_gradient(gradcol, &fftr, hp->rp->ron); |
592 |
> |
comp_gradient(gradcol, &fftr, hp->onrm); |
593 |
|
for (j = 0; j < hp->ns-1; j++) { |
594 |
|
FVECT hessdia[3]; /* compute triangle contributions */ |
595 |
|
FVECT graddia; |
596 |
< |
COLORV backg; |
597 |
< |
backg = back_ambval(&ambsamp(hp,i,j), &ambsamp(hp,i,j+1), |
598 |
< |
&ambsamp(hp,i+1,j), hp->rp->rop); |
596 |
> |
double backg; |
597 |
> |
backg = back_ambval(hp, AI(hp,i,j), |
598 |
> |
AI(hp,i,j+1), AI(hp,i+1,j)); |
599 |
|
/* diagonal (inner) edge */ |
600 |
< |
comp_fftri(&fftr, ambsamp(hp,i,j+1).p, |
413 |
< |
ambsamp(hp,i+1,j).p, hp->rp->rop); |
600 |
> |
comp_fftri(&fftr, hp, AI(hp,i,j+1), AI(hp,i+1,j)); |
601 |
|
if (hessrow != NULL) { |
602 |
< |
comp_hessian(hessdia, &fftr, hp->rp->ron); |
602 |
> |
comp_hessian(hessdia, &fftr, hp->onrm); |
603 |
|
rev_hessian(hesscol); |
604 |
|
add2hessian(hessian, hessrow[j], hessdia, hesscol, backg); |
605 |
|
} |
606 |
< |
if (gradient != NULL) { |
607 |
< |
comp_gradient(graddia, &fftr, hp->rp->ron); |
606 |
> |
if (gradrow != NULL) { |
607 |
> |
comp_gradient(graddia, &fftr, hp->onrm); |
608 |
|
rev_gradient(gradcol); |
609 |
|
add2gradient(gradient, gradrow[j], graddia, gradcol, backg); |
610 |
|
} |
611 |
|
/* initialize edge in next row */ |
612 |
< |
comp_fftri(&fftr, ambsamp(hp,i+1,j+1).p, |
426 |
< |
ambsamp(hp,i+1,j).p, hp->rp->rop); |
612 |
> |
comp_fftri(&fftr, hp, AI(hp,i+1,j+1), AI(hp,i+1,j)); |
613 |
|
if (hessrow != NULL) |
614 |
< |
comp_hessian(hessrow[j], &fftr, hp->rp->ron); |
614 |
> |
comp_hessian(hessrow[j], &fftr, hp->onrm); |
615 |
|
if (gradrow != NULL) |
616 |
< |
comp_gradient(gradrow[j], &fftr, hp->rp->ron); |
616 |
> |
comp_gradient(gradrow[j], &fftr, hp->onrm); |
617 |
|
/* new column edge & paired triangle */ |
618 |
< |
backg = back_ambval(&ambsamp(hp,i,j+1), &ambsamp(hp,i+1,j+1), |
619 |
< |
&ambsamp(hp,i+1,j), hp->rp->rop); |
620 |
< |
comp_fftri(&fftr, ambsamp(hp,i,j+1).p, ambsamp(hp,i+1,j+1).p, |
435 |
< |
hp->rp->rop); |
618 |
> |
backg = back_ambval(hp, AI(hp,i+1,j+1), |
619 |
> |
AI(hp,i+1,j), AI(hp,i,j+1)); |
620 |
> |
comp_fftri(&fftr, hp, AI(hp,i,j+1), AI(hp,i+1,j+1)); |
621 |
|
if (hessrow != NULL) { |
622 |
< |
comp_hessian(hesscol, &fftr, hp->rp->ron); |
622 |
> |
comp_hessian(hesscol, &fftr, hp->onrm); |
623 |
|
rev_hessian(hessdia); |
624 |
|
add2hessian(hessian, hessrow[j], hessdia, hesscol, backg); |
625 |
|
if (i < hp->ns-2) |
626 |
|
rev_hessian(hessrow[j]); |
627 |
|
} |
628 |
|
if (gradrow != NULL) { |
629 |
< |
comp_gradient(gradcol, &fftr, hp->rp->ron); |
629 |
> |
comp_gradient(gradcol, &fftr, hp->onrm); |
630 |
|
rev_gradient(graddia); |
631 |
|
add2gradient(gradient, gradrow[j], graddia, gradcol, backg); |
632 |
|
if (i < hp->ns-2) |
640 |
|
|
641 |
|
if (ra != NULL) /* extract eigenvectors & radii */ |
642 |
|
eigenvectors(uv, ra, hessian); |
643 |
< |
if (pg != NULL) { /* tangential position gradient/PI */ |
644 |
< |
pg[0] = DOT(gradient, uv[0]) / PI; |
645 |
< |
pg[1] = DOT(gradient, uv[1]) / PI; |
643 |
> |
if (pg != NULL) { /* tangential position gradient */ |
644 |
> |
pg[0] = DOT(gradient, uv[0]); |
645 |
> |
pg[1] = DOT(gradient, uv[1]); |
646 |
|
} |
647 |
|
} |
648 |
|
|
651 |
|
static void |
652 |
|
ambdirgrad(AMBHEMI *hp, FVECT uv[2], float dg[2]) |
653 |
|
{ |
654 |
< |
struct s_ambsamp *ap; |
655 |
< |
double dgsum[2]; |
656 |
< |
int n; |
657 |
< |
FVECT vd; |
658 |
< |
double gfact; |
654 |
> |
AMBSAMP *ap; |
655 |
> |
double dgsum[2]; |
656 |
> |
int n; |
657 |
> |
FVECT vd; |
658 |
> |
double gfact; |
659 |
|
|
660 |
|
dgsum[0] = dgsum[1] = 0.0; /* sum values times -tan(theta) */ |
661 |
|
for (ap = hp->sa, n = hp->ns*hp->ns; n--; ap++) { |
662 |
|
/* use vector for azimuth + 90deg */ |
663 |
|
VSUB(vd, ap->p, hp->rp->rop); |
664 |
|
/* brightness over cosine factor */ |
665 |
< |
gfact = colval(ap->v,CIEY) / DOT(hp->rp->ron, vd); |
666 |
< |
/* -sine = -proj_radius/vd_length */ |
667 |
< |
dgsum[0] += DOT(uv[1], vd) * gfact; |
668 |
< |
dgsum[1] -= DOT(uv[0], vd) * gfact; |
665 |
> |
gfact = ap->v[0] / DOT(hp->onrm, vd); |
666 |
> |
/* sine = proj_radius/vd_length */ |
667 |
> |
dgsum[0] -= DOT(uv[1], vd) * gfact; |
668 |
> |
dgsum[1] += DOT(uv[0], vd) * gfact; |
669 |
|
} |
670 |
|
dg[0] = dgsum[0] / (hp->ns*hp->ns); |
671 |
|
dg[1] = dgsum[1] / (hp->ns*hp->ns); |
672 |
|
} |
673 |
|
|
674 |
|
|
675 |
+ |
/* Compute potential light leak direction flags for cache value */ |
676 |
+ |
static uint32 |
677 |
+ |
ambcorral(AMBHEMI *hp, FVECT uv[2], const double r0, const double r1) |
678 |
+ |
{ |
679 |
+ |
const double max_d = 1.0/(minarad*ambacc + 0.001); |
680 |
+ |
const double ang_res = 0.5*PI/hp->ns; |
681 |
+ |
const double ang_step = ang_res/((int)(16/PI*ang_res) + 1.01); |
682 |
+ |
double avg_d = 0; |
683 |
+ |
uint32 flgs = 0; |
684 |
+ |
FVECT vec; |
685 |
+ |
double u, v; |
686 |
+ |
double ang, a1; |
687 |
+ |
int i, j; |
688 |
+ |
/* don't bother for a few samples */ |
689 |
+ |
if (hp->ns < 8) |
690 |
+ |
return(0); |
691 |
+ |
/* check distances overhead */ |
692 |
+ |
for (i = hp->ns*3/4; i-- > hp->ns>>2; ) |
693 |
+ |
for (j = hp->ns*3/4; j-- > hp->ns>>2; ) |
694 |
+ |
avg_d += ambsam(hp,i,j).d; |
695 |
+ |
avg_d *= 4.0/(hp->ns*hp->ns); |
696 |
+ |
if (avg_d*r0 >= 1.0) /* ceiling too low for corral? */ |
697 |
+ |
return(0); |
698 |
+ |
if (avg_d >= max_d) /* insurance */ |
699 |
+ |
return(0); |
700 |
+ |
/* else circle around perimeter */ |
701 |
+ |
for (i = 0; i < hp->ns; i++) |
702 |
+ |
for (j = 0; j < hp->ns; j += !i|(i==hp->ns-1) ? 1 : hp->ns-1) { |
703 |
+ |
AMBSAMP *ap = &ambsam(hp,i,j); |
704 |
+ |
if ((ap->d <= FTINY) | (ap->d >= max_d)) |
705 |
+ |
continue; /* too far or too near */ |
706 |
+ |
VSUB(vec, ap->p, hp->rp->rop); |
707 |
+ |
u = DOT(vec, uv[0]); |
708 |
+ |
v = DOT(vec, uv[1]); |
709 |
+ |
if ((r0*r0*u*u + r1*r1*v*v) * ap->d*ap->d <= u*u + v*v) |
710 |
+ |
continue; /* occluder outside ellipse */ |
711 |
+ |
ang = atan2a(v, u); /* else set direction flags */ |
712 |
+ |
for (a1 = ang-ang_res; a1 <= ang+ang_res; a1 += ang_step) |
713 |
+ |
flgs |= 1L<<(int)(16/PI*(a1 + 2.*PI*(a1 < 0))); |
714 |
+ |
} |
715 |
+ |
return(flgs); |
716 |
+ |
} |
717 |
+ |
|
718 |
+ |
|
719 |
|
int |
720 |
|
doambient( /* compute ambient component */ |
721 |
< |
COLOR rcol, /* input/output color */ |
721 |
> |
SCOLOR rcol, /* input/output color */ |
722 |
|
RAY *r, |
723 |
< |
double wt, |
723 |
> |
double wt, /* negative for back side */ |
724 |
|
FVECT uv[2], /* returned (optional) */ |
725 |
|
float ra[2], /* returned (optional) */ |
726 |
|
float pg[2], /* returned (optional) */ |
727 |
< |
float dg[2] /* returned (optional) */ |
727 |
> |
float dg[2], /* returned (optional) */ |
728 |
> |
uint32 *crlp /* returned (optional) */ |
729 |
|
) |
730 |
|
{ |
731 |
< |
AMBHEMI *hp = inithemi(rcol, r, wt); |
732 |
< |
int cnt = 0; |
733 |
< |
FVECT my_uv[2]; |
734 |
< |
double d, acol[3]; |
735 |
< |
struct s_ambsamp *ap; |
736 |
< |
int i, j; |
507 |
< |
/* check/initialize */ |
508 |
< |
if (hp == NULL) |
509 |
< |
return(0); |
731 |
> |
AMBHEMI *hp = samp_hemi(rcol, r, wt); |
732 |
> |
FVECT my_uv[2]; |
733 |
> |
double d, K; |
734 |
> |
AMBSAMP *ap; |
735 |
> |
int i; |
736 |
> |
/* clear return values */ |
737 |
|
if (uv != NULL) |
738 |
|
memset(uv, 0, sizeof(FVECT)*2); |
739 |
|
if (ra != NULL) |
742 |
|
pg[0] = pg[1] = 0.0; |
743 |
|
if (dg != NULL) |
744 |
|
dg[0] = dg[1] = 0.0; |
745 |
< |
/* sample the hemisphere */ |
746 |
< |
acol[0] = acol[1] = acol[2] = 0.0; |
747 |
< |
for (i = hp->ns; i--; ) |
748 |
< |
for (j = hp->ns; j--; ) |
749 |
< |
if ((ap = ambsample(hp, i, j)) != NULL) { |
750 |
< |
addcolor(acol, ap->v); |
751 |
< |
++cnt; |
752 |
< |
} |
753 |
< |
if (!cnt) { |
527 |
< |
setcolor(rcol, 0.0, 0.0, 0.0); |
528 |
< |
free(hp); |
529 |
< |
return(0); /* no valid samples */ |
745 |
> |
if (crlp != NULL) |
746 |
> |
*crlp = 0; |
747 |
> |
if (hp == NULL) /* sampling falure? */ |
748 |
> |
return(0); |
749 |
> |
|
750 |
> |
if ((ra == NULL) & (pg == NULL) & (dg == NULL) || |
751 |
> |
(hp->sampOK < 0) | (hp->ns < MINADIV)) { |
752 |
> |
free(hp); /* Hessian not requested/possible */ |
753 |
> |
return(-1); /* value-only return value */ |
754 |
|
} |
755 |
< |
copycolor(rcol, acol); /* final indirect irradiance/PI */ |
756 |
< |
if (cnt < hp->ns*hp->ns || /* incomplete sampling? */ |
757 |
< |
(ra == NULL) & (pg == NULL) & (dg == NULL)) { |
758 |
< |
free(hp); |
759 |
< |
return(-1); /* no radius or gradient calc. */ |
755 |
> |
if ((d = scolor_mean(rcol)) > FTINY) { |
756 |
> |
d = 0.99*(hp->ns*hp->ns)/d; /* normalize avg. values */ |
757 |
> |
K = 0.01; |
758 |
> |
} else { /* or fall back on geometric Hessian */ |
759 |
> |
K = 1.0; |
760 |
> |
pg = NULL; |
761 |
> |
dg = NULL; |
762 |
> |
crlp = NULL; |
763 |
|
} |
764 |
< |
multcolor(acol, hp->acoef); /* normalize Y values */ |
538 |
< |
if ((d = bright(acol)) > FTINY) |
539 |
< |
d = 1.0/d; |
540 |
< |
else |
541 |
< |
d = 0.0; |
542 |
< |
ap = hp->sa; /* relative Y channel from here on... */ |
764 |
> |
ap = hp->sa; /* single channel from here on... */ |
765 |
|
for (i = hp->ns*hp->ns; i--; ap++) |
766 |
< |
colval(ap->v,CIEY) = bright(ap->v)*d + 0.0314; |
766 |
> |
ap->v[0] = scolor_mean(ap->v)*d + K; |
767 |
|
|
768 |
|
if (uv == NULL) /* make sure we have axis pointers */ |
769 |
|
uv = my_uv; |
774 |
|
ambdirgrad(hp, uv, dg); |
775 |
|
|
776 |
|
if (ra != NULL) { /* scale/clamp radii */ |
777 |
+ |
if (pg != NULL) { |
778 |
+ |
if (ra[0]*(d = fabs(pg[0])) > 1.0) |
779 |
+ |
ra[0] = 1.0/d; |
780 |
+ |
if (ra[1]*(d = fabs(pg[1])) > 1.0) |
781 |
+ |
ra[1] = 1.0/d; |
782 |
+ |
if (ra[0] > ra[1]) |
783 |
+ |
ra[0] = ra[1]; |
784 |
+ |
} |
785 |
|
if (ra[0] < minarad) { |
786 |
|
ra[0] = minarad; |
787 |
|
if (ra[1] < minarad) |
788 |
|
ra[1] = minarad; |
789 |
|
} |
790 |
< |
ra[0] *= d = 1.0/sqrt(sqrt(wt)); |
790 |
> |
ra[0] *= d = 1.0/sqrt(fabs(wt)); |
791 |
|
if ((ra[1] *= d) > 2.0*ra[0]) |
792 |
|
ra[1] = 2.0*ra[0]; |
793 |
|
if (ra[1] > maxarad) { |
795 |
|
if (ra[0] > maxarad) |
796 |
|
ra[0] = maxarad; |
797 |
|
} |
798 |
+ |
/* flag encroached directions */ |
799 |
+ |
if (crlp != NULL) /* XXX doesn't update with changes to ambacc */ |
800 |
+ |
*crlp = ambcorral(hp, uv, ra[0]*ambacc, ra[1]*ambacc); |
801 |
+ |
if (pg != NULL) { /* cap gradient if necessary */ |
802 |
+ |
d = pg[0]*pg[0]*ra[0]*ra[0] + pg[1]*pg[1]*ra[1]*ra[1]; |
803 |
+ |
if (d > 1.0) { |
804 |
+ |
d = 1.0/sqrt(d); |
805 |
+ |
pg[0] *= d; |
806 |
+ |
pg[1] *= d; |
807 |
+ |
} |
808 |
+ |
} |
809 |
|
} |
810 |
|
free(hp); /* clean up and return */ |
811 |
|
return(1); |
812 |
|
} |
572 |
– |
|
573 |
– |
|
574 |
– |
#else /* ! NEWAMB */ |
575 |
– |
|
576 |
– |
|
577 |
– |
void |
578 |
– |
inithemi( /* initialize sampling hemisphere */ |
579 |
– |
AMBHEMI *hp, |
580 |
– |
COLOR ac, |
581 |
– |
RAY *r, |
582 |
– |
double wt |
583 |
– |
) |
584 |
– |
{ |
585 |
– |
double d; |
586 |
– |
int i; |
587 |
– |
/* set number of divisions */ |
588 |
– |
if (ambacc <= FTINY && |
589 |
– |
wt > (d = 0.8*intens(ac)*r->rweight/(ambdiv*minweight))) |
590 |
– |
wt = d; /* avoid ray termination */ |
591 |
– |
hp->nt = sqrt(ambdiv * wt / PI) + 0.5; |
592 |
– |
i = ambacc > FTINY ? 3 : 1; /* minimum number of samples */ |
593 |
– |
if (hp->nt < i) |
594 |
– |
hp->nt = i; |
595 |
– |
hp->np = PI * hp->nt + 0.5; |
596 |
– |
/* set number of super-samples */ |
597 |
– |
hp->ns = ambssamp * wt + 0.5; |
598 |
– |
/* assign coefficient */ |
599 |
– |
copycolor(hp->acoef, ac); |
600 |
– |
d = 1.0/(hp->nt*hp->np); |
601 |
– |
scalecolor(hp->acoef, d); |
602 |
– |
/* make axes */ |
603 |
– |
VCOPY(hp->uz, r->ron); |
604 |
– |
hp->uy[0] = hp->uy[1] = hp->uy[2] = 0.0; |
605 |
– |
for (i = 0; i < 3; i++) |
606 |
– |
if (hp->uz[i] < 0.6 && hp->uz[i] > -0.6) |
607 |
– |
break; |
608 |
– |
if (i >= 3) |
609 |
– |
error(CONSISTENCY, "bad ray direction in inithemi"); |
610 |
– |
hp->uy[i] = 1.0; |
611 |
– |
fcross(hp->ux, hp->uy, hp->uz); |
612 |
– |
normalize(hp->ux); |
613 |
– |
fcross(hp->uy, hp->uz, hp->ux); |
614 |
– |
} |
615 |
– |
|
616 |
– |
|
617 |
– |
int |
618 |
– |
divsample( /* sample a division */ |
619 |
– |
AMBSAMP *dp, |
620 |
– |
AMBHEMI *h, |
621 |
– |
RAY *r |
622 |
– |
) |
623 |
– |
{ |
624 |
– |
RAY ar; |
625 |
– |
int hlist[3]; |
626 |
– |
double spt[2]; |
627 |
– |
double xd, yd, zd; |
628 |
– |
double b2; |
629 |
– |
double phi; |
630 |
– |
int i; |
631 |
– |
/* ambient coefficient for weight */ |
632 |
– |
if (ambacc > FTINY) |
633 |
– |
setcolor(ar.rcoef, AVGREFL, AVGREFL, AVGREFL); |
634 |
– |
else |
635 |
– |
copycolor(ar.rcoef, h->acoef); |
636 |
– |
if (rayorigin(&ar, AMBIENT, r, ar.rcoef) < 0) |
637 |
– |
return(-1); |
638 |
– |
if (ambacc > FTINY) { |
639 |
– |
multcolor(ar.rcoef, h->acoef); |
640 |
– |
scalecolor(ar.rcoef, 1./AVGREFL); |
641 |
– |
} |
642 |
– |
hlist[0] = r->rno; |
643 |
– |
hlist[1] = dp->t; |
644 |
– |
hlist[2] = dp->p; |
645 |
– |
multisamp(spt, 2, urand(ilhash(hlist,3)+dp->n)); |
646 |
– |
zd = sqrt((dp->t + spt[0])/h->nt); |
647 |
– |
phi = 2.0*PI * (dp->p + spt[1])/h->np; |
648 |
– |
xd = tcos(phi) * zd; |
649 |
– |
yd = tsin(phi) * zd; |
650 |
– |
zd = sqrt(1.0 - zd*zd); |
651 |
– |
for (i = 0; i < 3; i++) |
652 |
– |
ar.rdir[i] = xd*h->ux[i] + |
653 |
– |
yd*h->uy[i] + |
654 |
– |
zd*h->uz[i]; |
655 |
– |
checknorm(ar.rdir); |
656 |
– |
dimlist[ndims++] = dp->t*h->np + dp->p + 90171; |
657 |
– |
rayvalue(&ar); |
658 |
– |
ndims--; |
659 |
– |
multcolor(ar.rcol, ar.rcoef); /* apply coefficient */ |
660 |
– |
addcolor(dp->v, ar.rcol); |
661 |
– |
/* use rt to improve gradient calc */ |
662 |
– |
if (ar.rt > FTINY && ar.rt < FHUGE) |
663 |
– |
dp->r += 1.0/ar.rt; |
664 |
– |
/* (re)initialize error */ |
665 |
– |
if (dp->n++) { |
666 |
– |
b2 = bright(dp->v)/dp->n - bright(ar.rcol); |
667 |
– |
b2 = b2*b2 + dp->k*((dp->n-1)*(dp->n-1)); |
668 |
– |
dp->k = b2/(dp->n*dp->n); |
669 |
– |
} else |
670 |
– |
dp->k = 0.0; |
671 |
– |
return(0); |
672 |
– |
} |
673 |
– |
|
674 |
– |
|
675 |
– |
static int |
676 |
– |
ambcmp( /* decreasing order */ |
677 |
– |
const void *p1, |
678 |
– |
const void *p2 |
679 |
– |
) |
680 |
– |
{ |
681 |
– |
const AMBSAMP *d1 = (const AMBSAMP *)p1; |
682 |
– |
const AMBSAMP *d2 = (const AMBSAMP *)p2; |
683 |
– |
|
684 |
– |
if (d1->k < d2->k) |
685 |
– |
return(1); |
686 |
– |
if (d1->k > d2->k) |
687 |
– |
return(-1); |
688 |
– |
return(0); |
689 |
– |
} |
690 |
– |
|
691 |
– |
|
692 |
– |
static int |
693 |
– |
ambnorm( /* standard order */ |
694 |
– |
const void *p1, |
695 |
– |
const void *p2 |
696 |
– |
) |
697 |
– |
{ |
698 |
– |
const AMBSAMP *d1 = (const AMBSAMP *)p1; |
699 |
– |
const AMBSAMP *d2 = (const AMBSAMP *)p2; |
700 |
– |
int c; |
701 |
– |
|
702 |
– |
if ( (c = d1->t - d2->t) ) |
703 |
– |
return(c); |
704 |
– |
return(d1->p - d2->p); |
705 |
– |
} |
706 |
– |
|
707 |
– |
|
708 |
– |
double |
709 |
– |
doambient( /* compute ambient component */ |
710 |
– |
COLOR rcol, |
711 |
– |
RAY *r, |
712 |
– |
double wt, |
713 |
– |
FVECT pg, |
714 |
– |
FVECT dg |
715 |
– |
) |
716 |
– |
{ |
717 |
– |
double b, d=0; |
718 |
– |
AMBHEMI hemi; |
719 |
– |
AMBSAMP *div; |
720 |
– |
AMBSAMP dnew; |
721 |
– |
double acol[3]; |
722 |
– |
AMBSAMP *dp; |
723 |
– |
double arad; |
724 |
– |
int divcnt; |
725 |
– |
int i, j; |
726 |
– |
/* initialize hemisphere */ |
727 |
– |
inithemi(&hemi, rcol, r, wt); |
728 |
– |
divcnt = hemi.nt * hemi.np; |
729 |
– |
/* initialize */ |
730 |
– |
if (pg != NULL) |
731 |
– |
pg[0] = pg[1] = pg[2] = 0.0; |
732 |
– |
if (dg != NULL) |
733 |
– |
dg[0] = dg[1] = dg[2] = 0.0; |
734 |
– |
setcolor(rcol, 0.0, 0.0, 0.0); |
735 |
– |
if (divcnt == 0) |
736 |
– |
return(0.0); |
737 |
– |
/* allocate super-samples */ |
738 |
– |
if (hemi.ns > 0 || pg != NULL || dg != NULL) { |
739 |
– |
div = (AMBSAMP *)malloc(divcnt*sizeof(AMBSAMP)); |
740 |
– |
if (div == NULL) |
741 |
– |
error(SYSTEM, "out of memory in doambient"); |
742 |
– |
} else |
743 |
– |
div = NULL; |
744 |
– |
/* sample the divisions */ |
745 |
– |
arad = 0.0; |
746 |
– |
acol[0] = acol[1] = acol[2] = 0.0; |
747 |
– |
if ((dp = div) == NULL) |
748 |
– |
dp = &dnew; |
749 |
– |
divcnt = 0; |
750 |
– |
for (i = 0; i < hemi.nt; i++) |
751 |
– |
for (j = 0; j < hemi.np; j++) { |
752 |
– |
dp->t = i; dp->p = j; |
753 |
– |
setcolor(dp->v, 0.0, 0.0, 0.0); |
754 |
– |
dp->r = 0.0; |
755 |
– |
dp->n = 0; |
756 |
– |
if (divsample(dp, &hemi, r) < 0) { |
757 |
– |
if (div != NULL) |
758 |
– |
dp++; |
759 |
– |
continue; |
760 |
– |
} |
761 |
– |
arad += dp->r; |
762 |
– |
divcnt++; |
763 |
– |
if (div != NULL) |
764 |
– |
dp++; |
765 |
– |
else |
766 |
– |
addcolor(acol, dp->v); |
767 |
– |
} |
768 |
– |
if (!divcnt) { |
769 |
– |
if (div != NULL) |
770 |
– |
free((void *)div); |
771 |
– |
return(0.0); /* no samples taken */ |
772 |
– |
} |
773 |
– |
if (divcnt < hemi.nt*hemi.np) { |
774 |
– |
pg = dg = NULL; /* incomplete sampling */ |
775 |
– |
hemi.ns = 0; |
776 |
– |
} else if (arad > FTINY && divcnt/arad < minarad) { |
777 |
– |
hemi.ns = 0; /* close enough */ |
778 |
– |
} else if (hemi.ns > 0) { /* else perform super-sampling? */ |
779 |
– |
comperrs(div, &hemi); /* compute errors */ |
780 |
– |
qsort(div, divcnt, sizeof(AMBSAMP), ambcmp); /* sort divs */ |
781 |
– |
/* super-sample */ |
782 |
– |
for (i = hemi.ns; i > 0; i--) { |
783 |
– |
dnew = *div; |
784 |
– |
if (divsample(&dnew, &hemi, r) < 0) { |
785 |
– |
dp++; |
786 |
– |
continue; |
787 |
– |
} |
788 |
– |
dp = div; /* reinsert */ |
789 |
– |
j = divcnt < i ? divcnt : i; |
790 |
– |
while (--j > 0 && dnew.k < dp[1].k) { |
791 |
– |
*dp = *(dp+1); |
792 |
– |
dp++; |
793 |
– |
} |
794 |
– |
*dp = dnew; |
795 |
– |
} |
796 |
– |
if (pg != NULL || dg != NULL) /* restore order */ |
797 |
– |
qsort(div, divcnt, sizeof(AMBSAMP), ambnorm); |
798 |
– |
} |
799 |
– |
/* compute returned values */ |
800 |
– |
if (div != NULL) { |
801 |
– |
arad = 0.0; /* note: divcnt may be < nt*np */ |
802 |
– |
for (i = hemi.nt*hemi.np, dp = div; i-- > 0; dp++) { |
803 |
– |
arad += dp->r; |
804 |
– |
if (dp->n > 1) { |
805 |
– |
b = 1.0/dp->n; |
806 |
– |
scalecolor(dp->v, b); |
807 |
– |
dp->r *= b; |
808 |
– |
dp->n = 1; |
809 |
– |
} |
810 |
– |
addcolor(acol, dp->v); |
811 |
– |
} |
812 |
– |
b = bright(acol); |
813 |
– |
if (b > FTINY) { |
814 |
– |
b = 1.0/b; /* compute & normalize gradient(s) */ |
815 |
– |
if (pg != NULL) { |
816 |
– |
posgradient(pg, div, &hemi); |
817 |
– |
for (i = 0; i < 3; i++) |
818 |
– |
pg[i] *= b; |
819 |
– |
} |
820 |
– |
if (dg != NULL) { |
821 |
– |
dirgradient(dg, div, &hemi); |
822 |
– |
for (i = 0; i < 3; i++) |
823 |
– |
dg[i] *= b; |
824 |
– |
} |
825 |
– |
} |
826 |
– |
free((void *)div); |
827 |
– |
} |
828 |
– |
copycolor(rcol, acol); |
829 |
– |
if (arad <= FTINY) |
830 |
– |
arad = maxarad; |
831 |
– |
else |
832 |
– |
arad = (divcnt+hemi.ns)/arad; |
833 |
– |
if (pg != NULL) { /* reduce radius if gradient large */ |
834 |
– |
d = DOT(pg,pg); |
835 |
– |
if (d*arad*arad > 1.0) |
836 |
– |
arad = 1.0/sqrt(d); |
837 |
– |
} |
838 |
– |
if (arad < minarad) { |
839 |
– |
arad = minarad; |
840 |
– |
if (pg != NULL && d*arad*arad > 1.0) { /* cap gradient */ |
841 |
– |
d = 1.0/arad/sqrt(d); |
842 |
– |
for (i = 0; i < 3; i++) |
843 |
– |
pg[i] *= d; |
844 |
– |
} |
845 |
– |
} |
846 |
– |
if ((arad /= sqrt(wt)) > maxarad) |
847 |
– |
arad = maxarad; |
848 |
– |
return(arad); |
849 |
– |
} |
850 |
– |
|
851 |
– |
|
852 |
– |
void |
853 |
– |
comperrs( /* compute initial error estimates */ |
854 |
– |
AMBSAMP *da, /* assumes standard ordering */ |
855 |
– |
AMBHEMI *hp |
856 |
– |
) |
857 |
– |
{ |
858 |
– |
double b, b2; |
859 |
– |
int i, j; |
860 |
– |
AMBSAMP *dp; |
861 |
– |
/* sum differences from neighbors */ |
862 |
– |
dp = da; |
863 |
– |
for (i = 0; i < hp->nt; i++) |
864 |
– |
for (j = 0; j < hp->np; j++) { |
865 |
– |
#ifdef DEBUG |
866 |
– |
if (dp->t != i || dp->p != j) |
867 |
– |
error(CONSISTENCY, |
868 |
– |
"division order in comperrs"); |
869 |
– |
#endif |
870 |
– |
b = bright(dp[0].v); |
871 |
– |
if (i > 0) { /* from above */ |
872 |
– |
b2 = bright(dp[-hp->np].v) - b; |
873 |
– |
b2 *= b2 * 0.25; |
874 |
– |
dp[0].k += b2; |
875 |
– |
dp[-hp->np].k += b2; |
876 |
– |
} |
877 |
– |
if (j > 0) { /* from behind */ |
878 |
– |
b2 = bright(dp[-1].v) - b; |
879 |
– |
b2 *= b2 * 0.25; |
880 |
– |
dp[0].k += b2; |
881 |
– |
dp[-1].k += b2; |
882 |
– |
} else { /* around */ |
883 |
– |
b2 = bright(dp[hp->np-1].v) - b; |
884 |
– |
b2 *= b2 * 0.25; |
885 |
– |
dp[0].k += b2; |
886 |
– |
dp[hp->np-1].k += b2; |
887 |
– |
} |
888 |
– |
dp++; |
889 |
– |
} |
890 |
– |
/* divide by number of neighbors */ |
891 |
– |
dp = da; |
892 |
– |
for (j = 0; j < hp->np; j++) /* top row */ |
893 |
– |
(dp++)->k *= 1.0/3.0; |
894 |
– |
if (hp->nt < 2) |
895 |
– |
return; |
896 |
– |
for (i = 1; i < hp->nt-1; i++) /* central region */ |
897 |
– |
for (j = 0; j < hp->np; j++) |
898 |
– |
(dp++)->k *= 0.25; |
899 |
– |
for (j = 0; j < hp->np; j++) /* bottom row */ |
900 |
– |
(dp++)->k *= 1.0/3.0; |
901 |
– |
} |
902 |
– |
|
903 |
– |
|
904 |
– |
void |
905 |
– |
posgradient( /* compute position gradient */ |
906 |
– |
FVECT gv, |
907 |
– |
AMBSAMP *da, /* assumes standard ordering */ |
908 |
– |
AMBHEMI *hp |
909 |
– |
) |
910 |
– |
{ |
911 |
– |
int i, j; |
912 |
– |
double nextsine, lastsine, b, d; |
913 |
– |
double mag0, mag1; |
914 |
– |
double phi, cosp, sinp, xd, yd; |
915 |
– |
AMBSAMP *dp; |
916 |
– |
|
917 |
– |
xd = yd = 0.0; |
918 |
– |
for (j = 0; j < hp->np; j++) { |
919 |
– |
dp = da + j; |
920 |
– |
mag0 = mag1 = 0.0; |
921 |
– |
lastsine = 0.0; |
922 |
– |
for (i = 0; i < hp->nt; i++) { |
923 |
– |
#ifdef DEBUG |
924 |
– |
if (dp->t != i || dp->p != j) |
925 |
– |
error(CONSISTENCY, |
926 |
– |
"division order in posgradient"); |
927 |
– |
#endif |
928 |
– |
b = bright(dp->v); |
929 |
– |
if (i > 0) { |
930 |
– |
d = dp[-hp->np].r; |
931 |
– |
if (dp[0].r > d) d = dp[0].r; |
932 |
– |
/* sin(t)*cos(t)^2 */ |
933 |
– |
d *= lastsine * (1.0 - (double)i/hp->nt); |
934 |
– |
mag0 += d*(b - bright(dp[-hp->np].v)); |
935 |
– |
} |
936 |
– |
nextsine = sqrt((double)(i+1)/hp->nt); |
937 |
– |
if (j > 0) { |
938 |
– |
d = dp[-1].r; |
939 |
– |
if (dp[0].r > d) d = dp[0].r; |
940 |
– |
mag1 += d * (nextsine - lastsine) * |
941 |
– |
(b - bright(dp[-1].v)); |
942 |
– |
} else { |
943 |
– |
d = dp[hp->np-1].r; |
944 |
– |
if (dp[0].r > d) d = dp[0].r; |
945 |
– |
mag1 += d * (nextsine - lastsine) * |
946 |
– |
(b - bright(dp[hp->np-1].v)); |
947 |
– |
} |
948 |
– |
dp += hp->np; |
949 |
– |
lastsine = nextsine; |
950 |
– |
} |
951 |
– |
mag0 *= 2.0*PI / hp->np; |
952 |
– |
phi = 2.0*PI * (double)j/hp->np; |
953 |
– |
cosp = tcos(phi); sinp = tsin(phi); |
954 |
– |
xd += mag0*cosp - mag1*sinp; |
955 |
– |
yd += mag0*sinp + mag1*cosp; |
956 |
– |
} |
957 |
– |
for (i = 0; i < 3; i++) |
958 |
– |
gv[i] = (xd*hp->ux[i] + yd*hp->uy[i])*(hp->nt*hp->np)/PI; |
959 |
– |
} |
960 |
– |
|
961 |
– |
|
962 |
– |
void |
963 |
– |
dirgradient( /* compute direction gradient */ |
964 |
– |
FVECT gv, |
965 |
– |
AMBSAMP *da, /* assumes standard ordering */ |
966 |
– |
AMBHEMI *hp |
967 |
– |
) |
968 |
– |
{ |
969 |
– |
int i, j; |
970 |
– |
double mag; |
971 |
– |
double phi, xd, yd; |
972 |
– |
AMBSAMP *dp; |
973 |
– |
|
974 |
– |
xd = yd = 0.0; |
975 |
– |
for (j = 0; j < hp->np; j++) { |
976 |
– |
dp = da + j; |
977 |
– |
mag = 0.0; |
978 |
– |
for (i = 0; i < hp->nt; i++) { |
979 |
– |
#ifdef DEBUG |
980 |
– |
if (dp->t != i || dp->p != j) |
981 |
– |
error(CONSISTENCY, |
982 |
– |
"division order in dirgradient"); |
983 |
– |
#endif |
984 |
– |
/* tan(t) */ |
985 |
– |
mag += bright(dp->v)/sqrt(hp->nt/(i+.5) - 1.0); |
986 |
– |
dp += hp->np; |
987 |
– |
} |
988 |
– |
phi = 2.0*PI * (j+.5)/hp->np + PI/2.0; |
989 |
– |
xd += mag * tcos(phi); |
990 |
– |
yd += mag * tsin(phi); |
991 |
– |
} |
992 |
– |
for (i = 0; i < 3; i++) |
993 |
– |
gv[i] = xd*hp->ux[i] + yd*hp->uy[i]; |
994 |
– |
} |
995 |
– |
|
996 |
– |
#endif /* ! NEWAMB */ |