35 |
|
#define ambsamp(h,i,j) (h)->sa[(i)*(h)->ns + (j)] |
36 |
|
|
37 |
|
typedef struct { |
38 |
< |
FVECT r_i, r_i1, e_i, rI2_eJ2; |
39 |
< |
double nf, I1, I2; |
38 |
> |
FVECT r_i, r_i1, e_i, rcp, rI2_eJ2; |
39 |
> |
double I1, I2; |
40 |
|
} FFTRI; /* vectors and coefficients for Hessian calculation */ |
41 |
|
|
42 |
|
|
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; |
124 |
> |
/* limit vertex distance */ |
125 |
> |
if (ar.rt > 10.0*thescene.cusize) |
126 |
> |
ar.rt = 10.0*thescene.cusize; |
127 |
|
else if (ar.rt <= FTINY) /* should never happen! */ |
128 |
|
goto badsample; |
129 |
|
VSUM(ap->p, ar.rorg, ar.rdir, ar.rt); |
141 |
|
static void |
142 |
|
comp_fftri(FFTRI *ftp, FVECT ap0, FVECT ap1, FVECT rop) |
143 |
|
{ |
144 |
< |
FVECT vcp; |
144 |
< |
double dot_e, dot_er, rdot_r, rdot_r1, J2; |
144 |
> |
double rdot_cp, dot_e, dot_er, rdot_r, rdot_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(vcp, ftp->e_i, ftp->r_i); |
151 |
< |
ftp->nf = 1.0/DOT(vcp,vcp); |
150 |
> |
VCROSS(ftp->rcp, ftp->r_i, ftp->r_i1); |
151 |
> |
rdot_cp = 1.0/DOT(ftp->rcp,ftp->rcp); |
152 |
|
dot_e = DOT(ftp->e_i,ftp->e_i); |
153 |
|
dot_er = DOT(ftp->e_i, ftp->r_i); |
154 |
|
rdot_r = 1.0/DOT(ftp->r_i,ftp->r_i); |
155 |
|
rdot_r1 = 1.0/DOT(ftp->r_i1,ftp->r_i1); |
156 |
|
ftp->I1 = acos( DOT(ftp->r_i, ftp->r_i1) * sqrt(rdot_r*rdot_r1) ) * |
157 |
< |
sqrt( ftp->nf ); |
157 |
> |
sqrt( rdot_cp ); |
158 |
|
ftp->I2 = ( DOT(ftp->e_i, ftp->r_i1)*rdot_r1 - dot_er*rdot_r + |
159 |
< |
dot_e*ftp->I1 )*0.5*ftp->nf; |
159 |
> |
dot_e*ftp->I1 )*0.5*rdot_cp; |
160 |
|
J2 = ( 0.5*(rdot_r - rdot_r1) - dot_er*ftp->I2 ) / dot_e; |
161 |
|
for (i = 3; i--; ) |
162 |
|
ftp->rI2_eJ2[i] = ftp->I2*ftp->r_i[i] + J2*ftp->e_i[i]; |
180 |
|
static void |
181 |
|
comp_hessian(FVECT hess[3], FFTRI *ftp, FVECT nrm) |
182 |
|
{ |
183 |
< |
FVECT vcp; |
183 |
> |
FVECT ncp; |
184 |
|
FVECT m1[3], m2[3], m3[3], m4[3]; |
185 |
|
double d1, d2, d3, d4; |
186 |
|
double I3, J3, K3; |
190 |
|
d2 = 1.0/DOT(ftp->r_i1,ftp->r_i1); |
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 ); |
193 |
> |
I3 = ( DOT(ftp->e_i, ftp->r_i1)*d2*d2 - d4*d1*d1 + 3.0/d3*ftp->I2 ) |
194 |
> |
/ ( 4.0*DOT(ftp->rcp,ftp->rcp) ); |
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(vcp, nrm, ftp->e_i); |
199 |
< |
compose_matrix(m1, vcp, ftp->rI2_eJ2); |
198 |
> |
VCROSS(ncp, nrm, ftp->e_i); |
199 |
> |
compose_matrix(m1, ncp, 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(vcp, ftp->r_i, ftp->e_i); |
204 |
< |
d1 = DOT(nrm, vcp); |
203 |
> |
d1 = DOT(nrm, ftp->rcp); |
204 |
|
d2 = -d1*ftp->I2; |
205 |
|
d1 *= 2.0; |
206 |
|
for (i = 3; i--; ) /* final matrix sum */ |
244 |
|
static void |
245 |
|
comp_gradient(FVECT grad, FFTRI *ftp, FVECT nrm) |
246 |
|
{ |
247 |
< |
FVECT vcp; |
247 |
> |
FVECT ncp; |
248 |
|
double f1; |
249 |
|
int i; |
250 |
|
|
251 |
< |
VCROSS(vcp, ftp->r_i, ftp->r_i1); |
252 |
< |
f1 = 2.0*DOT(nrm, vcp); |
254 |
< |
VCROSS(vcp, nrm, ftp->e_i); |
251 |
> |
f1 = 2.0*DOT(nrm, ftp->rcp); |
252 |
> |
VCROSS(ncp, nrm, ftp->e_i); |
253 |
|
for (i = 3; i--; ) |
254 |
< |
grad[i] = (-0.5/PI)*( ftp->I1*vcp[i] + f1*ftp->rI2_eJ2[i] ); |
254 |
> |
grad[i] = (-0.5/PI)*( ftp->I1*ncp[i] + f1*ftp->rI2_eJ2[i] ); |
255 |
|
} |
256 |
|
|
257 |
|
|
322 |
|
/* compute eigenvalues */ |
323 |
|
if ( quadratic(evalue, 1.0, -hess2[0][0]-hess2[1][1], |
324 |
|
hess2[0][0]*hess2[1][1]-hess2[0][1]*hess2[1][0]) != 2 || |
325 |
< |
(evalue[0] = fabs(evalue[0])) <= FTINY*FTINY || |
326 |
< |
(evalue[1] = fabs(evalue[1])) <= FTINY*FTINY ) |
325 |
> |
((evalue[0] = fabs(evalue[0])) <= FTINY*FTINY) | |
326 |
> |
((evalue[1] = fabs(evalue[1])) <= FTINY*FTINY) ) |
327 |
|
error(INTERNAL, "bad eigenvalue calculation"); |
328 |
|
|
329 |
|
if (evalue[0] > evalue[1]) { |
549 |
|
ambdirgrad(hp, uv, dg); |
550 |
|
|
551 |
|
if (ra != NULL) { /* scale/clamp radii */ |
552 |
+ |
if (pg != NULL) { |
553 |
+ |
if (ra[0]*(d = fabs(pg[0])) > 1.0) |
554 |
+ |
ra[0] = 1.0/d; |
555 |
+ |
if (ra[1]*(d = fabs(pg[1])) > 1.0) |
556 |
+ |
ra[1] = 1.0/d; |
557 |
+ |
if (ra[0] > ra[1]) |
558 |
+ |
ra[0] = ra[1]; |
559 |
+ |
} |
560 |
|
if (ra[0] < minarad) { |
561 |
|
ra[0] = minarad; |
562 |
|
if (ra[1] < minarad) |
569 |
|
ra[1] = maxarad; |
570 |
|
if (ra[0] > maxarad) |
571 |
|
ra[0] = maxarad; |
572 |
+ |
} |
573 |
+ |
if (pg != NULL) { /* cap gradient if necessary */ |
574 |
+ |
d = pg[0]*pg[0]*ra[0]*ra[0] + pg[1]*pg[1]*ra[1]*ra[1]; |
575 |
+ |
if (d > 1.0) { |
576 |
+ |
d = 1.0/sqrt(d); |
577 |
+ |
pg[0] *= d; |
578 |
+ |
pg[1] *= d; |
579 |
+ |
} |
580 |
|
} |
581 |
|
} |
582 |
|
free(hp); /* clean up and return */ |