28 |
|
COLOR acoef; /* division contribution coefficient */ |
29 |
|
struct s_ambsamp { |
30 |
|
COLOR v; /* hemisphere sample value */ |
31 |
< |
float p[3]; /* intersection point */ |
31 |
> |
FVECT p; /* intersection point */ |
32 |
|
} sa[1]; /* sample array (extends struct) */ |
33 |
|
} AMBHEMI; /* ambient sample hemisphere */ |
34 |
|
|
35 |
|
#define ambsamp(h,i,j) (h)->sa[(i)*(h)->ns + (j)] |
36 |
|
|
37 |
|
typedef struct { |
38 |
< |
FVECT r_i, r_i1, e_i; |
39 |
< |
double nf, I1, I2, J2; |
38 |
> |
FVECT r_i, r_i1, e_i, rI2_eJ2; |
39 |
> |
double nf, I1, I2; |
40 |
|
} FFTRI; /* vectors and coefficients for Hessian calculation */ |
41 |
|
|
42 |
|
|
96 |
|
{ |
97 |
|
struct s_ambsamp *ap = &ambsamp(hp,i,j); |
98 |
|
RAY ar; |
99 |
– |
int hlist[3]; |
99 |
|
double spt[2], zd; |
100 |
|
int ii; |
101 |
|
/* ambient coefficient for weight */ |
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 |
< |
setcolor(ap->v, 0., 0., 0.); |
109 |
< |
VCOPY(ap->p, hp->rp->rop); |
110 |
< |
return(NULL); /* no sample taken */ |
111 |
< |
} |
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); |
121 |
|
dimlist[ndims++] = i*hp->ns + j + 90171; |
122 |
|
rayvalue(&ar); /* evaluate ray */ |
123 |
|
ndims--; |
128 |
– |
multcolor(ar.rcol, ar.rcoef); /* apply coefficient */ |
129 |
– |
copycolor(ap->v, ar.rcol); |
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); |
136 |
|
} |
137 |
|
|
138 |
|
|
139 |
|
/* Compute vectors and coefficients for Hessian/gradient calcs */ |
140 |
|
static void |
141 |
< |
comp_fftri(FFTRI *ftp, float ap0[3], float ap1[3], FVECT rop) |
141 |
> |
comp_fftri(FFTRI *ftp, FVECT ap0, FVECT ap1, FVECT rop) |
142 |
|
{ |
143 |
< |
FVECT v1; |
144 |
< |
double dot_e, dot_er, dot_r, dot_r1; |
143 |
> |
FVECT vcp; |
144 |
> |
double dot_e, dot_er, dot_r, dot_r1, J2; |
145 |
> |
int i; |
146 |
|
|
147 |
|
VSUB(ftp->r_i, ap0, rop); |
148 |
|
VSUB(ftp->r_i1, ap1, rop); |
149 |
|
VSUB(ftp->e_i, ap1, ap0); |
150 |
< |
VCROSS(v1, ftp->e_i, ftp->r_i); |
151 |
< |
ftp->nf = 1.0/DOT(v1,v1); |
149 |
< |
VCROSS(v1, ftp->r_i, ftp->r_i1); |
150 |
< |
ftp->I1 = sqrt(DOT(v1,v1)*ftp->nf); |
150 |
> |
VCROSS(vcp, ftp->e_i, ftp->r_i); |
151 |
> |
ftp->nf = 1.0/DOT(vcp,vcp); |
152 |
|
dot_e = DOT(ftp->e_i,ftp->e_i); |
153 |
|
dot_er = DOT(ftp->e_i, ftp->r_i); |
154 |
|
dot_r = DOT(ftp->r_i,ftp->r_i); |
155 |
|
dot_r1 = DOT(ftp->r_i1,ftp->r_i1); |
156 |
+ |
ftp->I1 = acos( DOT(ftp->r_i, ftp->r_i1) / sqrt(dot_r*dot_r1) ) * |
157 |
+ |
sqrt( ftp->nf ); |
158 |
|
ftp->I2 = ( DOT(ftp->e_i, ftp->r_i1)/dot_r1 - dot_er/dot_r + |
159 |
|
dot_e*ftp->I1 )*0.5*ftp->nf; |
160 |
< |
ftp->J2 = 0.25*ftp->nf*( 1.0/dot_r - 1.0/dot_r1 ) - |
161 |
< |
dot_er/dot_e*ftp->I2; |
160 |
> |
J2 = 0.5/dot_e*( 1.0/dot_r - 1.0/dot_r1 ) - dot_er/dot_e*ftp->I2; |
161 |
> |
for (i = 3; i--; ) |
162 |
> |
ftp->rI2_eJ2[i] = ftp->I2*ftp->r_i[i] + J2*ftp->e_i[i]; |
163 |
|
} |
164 |
|
|
165 |
|
|
180 |
|
static void |
181 |
|
comp_hessian(FVECT hess[3], FFTRI *ftp, FVECT nrm) |
182 |
|
{ |
183 |
< |
FVECT v1, v2; |
183 |
> |
FVECT vcp; |
184 |
|
FVECT m1[3], m2[3], m3[3], m4[3]; |
185 |
|
double d1, d2, d3, d4; |
186 |
|
double I3, J3, K3; |
191 |
|
d3 = 1.0/DOT(ftp->e_i,ftp->e_i); |
192 |
|
d4 = DOT(ftp->e_i, ftp->r_i); |
193 |
|
I3 = 0.25*ftp->nf*( DOT(ftp->e_i, ftp->r_i1)*d2*d2 - d4*d1*d1 + |
194 |
< |
3.0*d3*ftp->I2 ); |
194 |
> |
3.0/d3*ftp->I2 ); |
195 |
|
J3 = 0.25*d3*(d1*d1 - d2*d2) - d4*d3*I3; |
196 |
|
K3 = d3*(ftp->I2 - I3/d1 - 2.0*d4*J3); |
197 |
|
/* intermediate matrices */ |
198 |
< |
VCROSS(v1, nrm, ftp->e_i); |
199 |
< |
for (j = 3; j--; ) |
196 |
< |
v2[j] = ftp->I2*ftp->r_i[j] + ftp->J2*ftp->e_i[j]; |
197 |
< |
compose_matrix(m1, v1, v2); |
198 |
> |
VCROSS(vcp, nrm, ftp->e_i); |
199 |
> |
compose_matrix(m1, vcp, ftp->rI2_eJ2); |
200 |
|
compose_matrix(m2, ftp->r_i, ftp->r_i); |
201 |
|
compose_matrix(m3, ftp->e_i, ftp->e_i); |
202 |
|
compose_matrix(m4, ftp->r_i, ftp->e_i); |
203 |
< |
VCROSS(v1, ftp->r_i, ftp->e_i); |
204 |
< |
d1 = DOT(nrm, v1); |
203 |
> |
VCROSS(vcp, ftp->r_i, ftp->e_i); |
204 |
> |
d1 = DOT(nrm, vcp); |
205 |
|
d2 = -d1*ftp->I2; |
206 |
|
d1 *= 2.0; |
207 |
|
for (i = 3; i--; ) /* final matrix sum */ |
253 |
|
f1 = 2.0*DOT(nrm, vcp); |
254 |
|
VCROSS(vcp, nrm, ftp->e_i); |
255 |
|
for (i = 3; i--; ) |
256 |
< |
grad[i] = (0.5/PI)*( ftp->I1*vcp[i] + |
255 |
< |
f1*(ftp->I2*ftp->r_i[i] + ftp->J2*ftp->e_i[i]) ); |
256 |
> |
grad[i] = (0.5/PI)*( ftp->I1*vcp[i] + f1*ftp->rI2_eJ2[i] ); |
257 |
|
} |
258 |
|
|
259 |
|
|
289 |
|
|
290 |
|
VSUB(vec, ap1->p, orig); |
291 |
|
d2best = DOT(vec,vec); |
292 |
< |
vback = ap1->v[CIEY]; |
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 = ap2->v[CIEY]; |
297 |
> |
vback = colval(ap2->v,CIEY); |
298 |
|
} |
299 |
|
VSUB(vec, ap3->p, orig); |
300 |
|
d2 = DOT(vec,vec); |
301 |
|
if (d2 > d2best) |
302 |
< |
return(ap3->v[CIEY]); |
302 |
> |
return(colval(ap3->v,CIEY)); |
303 |
|
return(vback); |
304 |
|
} |
305 |
|
|
329 |
|
error(INTERNAL, "bad eigenvalue calculation"); |
330 |
|
|
331 |
|
if (evalue[0] > evalue[1]) { |
332 |
< |
ra[0] = 1.0/sqrt(sqrt(evalue[0])); |
333 |
< |
ra[1] = 1.0/sqrt(sqrt(evalue[1])); |
332 |
> |
ra[0] = sqrt(sqrt(4.0/evalue[0])); |
333 |
> |
ra[1] = sqrt(sqrt(4.0/evalue[1])); |
334 |
|
slope1 = evalue[1]; |
335 |
|
} else { |
336 |
< |
ra[0] = 1.0/sqrt(sqrt(evalue[1])); |
337 |
< |
ra[1] = 1.0/sqrt(sqrt(evalue[0])); |
336 |
> |
ra[0] = sqrt(sqrt(4.0/evalue[1])); |
337 |
> |
ra[1] = sqrt(sqrt(4.0/evalue[0])); |
338 |
|
slope1 = evalue[0]; |
339 |
|
} |
340 |
|
/* compute unit eigenvectors */ |
455 |
|
|
456 |
|
if (ra != NULL) /* extract eigenvectors & radii */ |
457 |
|
eigenvectors(uv, ra, hessian); |
458 |
< |
if (pg != NULL) { /* project position gradient */ |
459 |
< |
pg[0] = DOT(gradient, uv[0]); |
460 |
< |
pg[1] = DOT(gradient, uv[1]); |
458 |
> |
if (pg != NULL) { /* tangential position gradient/PI */ |
459 |
> |
pg[0] = DOT(gradient, uv[0]) / PI; |
460 |
> |
pg[1] = DOT(gradient, uv[1]) / PI; |
461 |
|
} |
462 |
|
} |
463 |
|
|
467 |
|
ambdirgrad(AMBHEMI *hp, FVECT uv[2], float dg[2]) |
468 |
|
{ |
469 |
|
struct s_ambsamp *ap; |
470 |
+ |
double dgsum[2]; |
471 |
|
int n; |
472 |
|
FVECT vd; |
473 |
|
double gfact; |
474 |
|
|
475 |
< |
dg[0] = dg[1] = 0; |
475 |
> |
dgsum[0] = dgsum[1] = 0.0; /* sum values times -tan(theta) */ |
476 |
|
for (ap = hp->sa, n = hp->ns*hp->ns; n--; ap++) { |
477 |
|
/* use vector for azimuth + 90deg */ |
478 |
|
VSUB(vd, ap->p, hp->rp->rop); |
479 |
< |
/* brightness with tangent factor */ |
480 |
< |
gfact = ap->v[CIEY] / DOT(hp->rp->ron, vd); |
481 |
< |
/* sine = proj_radius/vd_length */ |
482 |
< |
dg[0] -= DOT(uv[1], vd) * gfact; |
483 |
< |
dg[1] += DOT(uv[0], vd) * gfact; |
479 |
> |
/* brightness over cosine factor */ |
480 |
> |
gfact = colval(ap->v,CIEY) / DOT(hp->rp->ron, vd); |
481 |
> |
/* -sine = -proj_radius/vd_length */ |
482 |
> |
dgsum[0] += DOT(uv[1], vd) * gfact; |
483 |
> |
dgsum[1] -= DOT(uv[0], vd) * gfact; |
484 |
|
} |
485 |
+ |
dg[0] = dgsum[0] / (hp->ns*hp->ns); |
486 |
+ |
dg[1] = dgsum[1] / (hp->ns*hp->ns); |
487 |
|
} |
488 |
|
|
489 |
|
|
528 |
|
free(hp); |
529 |
|
return(0); /* no valid samples */ |
530 |
|
} |
531 |
< |
d = 1.0 / cnt; /* final indirect irradiance/PI */ |
528 |
< |
acol[0] *= d; acol[1] *= d; acol[2] *= d; |
529 |
< |
copycolor(rcol, acol); |
531 |
> |
copycolor(rcol, acol); /* final indirect irradiance/PI */ |
532 |
|
if (cnt < hp->ns*hp->ns || /* incomplete sampling? */ |
533 |
|
(ra == NULL) & (pg == NULL) & (dg == NULL)) { |
534 |
|
free(hp); |
535 |
|
return(-1); /* no radius or gradient calc. */ |
536 |
|
} |
537 |
< |
d = 0.01 * bright(rcol); /* add in 1% before Hessian comp. */ |
538 |
< |
if (d < FTINY) d = FTINY; |
539 |
< |
ap = hp->sa; /* using Y channel from here on... */ |
537 |
> |
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... */ |
543 |
|
for (i = hp->ns*hp->ns; i--; ap++) |
544 |
< |
colval(ap->v,CIEY) = bright(ap->v) + d; |
544 |
> |
colval(ap->v,CIEY) = bright(ap->v)*d + 0.0314; |
545 |
|
|
546 |
|
if (uv == NULL) /* make sure we have axis pointers */ |
547 |
|
uv = my_uv; |
548 |
|
/* compute radii & pos. gradient */ |
549 |
|
ambHessian(hp, uv, ra, pg); |
550 |
+ |
|
551 |
|
if (dg != NULL) /* compute direction gradient */ |
552 |
|
ambdirgrad(hp, uv, dg); |
553 |
+ |
|
554 |
|
if (ra != NULL) { /* scale/clamp radii */ |
555 |
< |
d = sqrt(sqrt((4.0/PI)*bright(rcol)/wt)); |
556 |
< |
ra[0] *= d; |
555 |
> |
if (ra[0] < minarad) { |
556 |
> |
ra[0] = minarad; |
557 |
> |
if (ra[1] < minarad) |
558 |
> |
ra[1] = minarad; |
559 |
> |
} |
560 |
> |
ra[0] *= d = 1.0/sqrt(sqrt(wt)); |
561 |
|
if ((ra[1] *= d) > 2.0*ra[0]) |
562 |
|
ra[1] = 2.0*ra[0]; |
563 |
|
if (ra[1] > maxarad) { |