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, rcp, rI2_eJ2; |
39 |
> |
double I1, I2; |
40 |
|
} FFTRI; /* vectors and coefficients for Hessian calculation */ |
41 |
|
|
42 |
|
|
70 |
|
d = 1.0/(n*n); |
71 |
|
scalecolor(hp->acoef, d); |
72 |
|
/* make tangent plane axes */ |
73 |
< |
hp->uy[0] = 0.1 - 0.2*frandom(); |
74 |
< |
hp->uy[1] = 0.1 - 0.2*frandom(); |
75 |
< |
hp->uy[2] = 0.1 - 0.2*frandom(); |
76 |
< |
for (i = 0; i < 3; i++) |
77 |
< |
if (r->ron[i] < 0.6 && r->ron[i] > -0.6) |
78 |
< |
break; |
79 |
< |
if (i >= 3) |
73 |
> |
hp->uy[0] = hp->uy[1] = hp->uy[2] = 0; |
74 |
> |
for (i = 3; i--; ) |
75 |
> |
if ((0.6 < r->ron[i]) & (r->ron[i] < 0.6)) |
76 |
> |
hp->uy[i] = 0.1+frandom(); |
77 |
> |
if (DOT(hp->uy,hp->uy) <= FTINY) |
78 |
|
error(CONSISTENCY, "bad ray direction in inithemi()"); |
81 |
– |
hp->uy[i] = 1.0; |
79 |
|
VCROSS(hp->ux, hp->uy, r->ron); |
80 |
|
normalize(hp->ux); |
81 |
|
VCROSS(hp->uy, r->ron, hp->ux); |
100 |
|
setcolor(ar.rcoef, AVGREFL, AVGREFL, AVGREFL); |
101 |
|
else |
102 |
|
copycolor(ar.rcoef, hp->acoef); |
103 |
< |
if (rayorigin(&ar, AMBIENT, hp->rp, ar.rcoef) < 0) { |
104 |
< |
setcolor(ap->v, 0., 0., 0.); |
108 |
< |
VCOPY(ap->p, hp->rp->rop); |
109 |
< |
return(NULL); /* no sample taken */ |
110 |
< |
} |
103 |
> |
if (rayorigin(&ar, AMBIENT, hp->rp, ar.rcoef) < 0) |
104 |
> |
goto badsample; |
105 |
|
if (ambacc > FTINY) { |
106 |
|
multcolor(ar.rcoef, hp->acoef); |
107 |
|
scalecolor(ar.rcoef, 1./AVGREFL); |
118 |
|
dimlist[ndims++] = i*hp->ns + j + 90171; |
119 |
|
rayvalue(&ar); /* evaluate ray */ |
120 |
|
ndims--; |
121 |
+ |
/* limit vertex distance */ |
122 |
+ |
if (ar.rt > 10.0*thescene.cusize) |
123 |
+ |
ar.rt = 10.0*thescene.cusize; |
124 |
+ |
else if (ar.rt <= FTINY) /* should never happen! */ |
125 |
+ |
goto badsample; |
126 |
+ |
VSUM(ap->p, ar.rorg, ar.rdir, ar.rt); |
127 |
|
multcolor(ar.rcol, ar.rcoef); /* apply coefficient */ |
128 |
|
copycolor(ap->v, ar.rcol); |
129 |
– |
if (ar.rt > 20.0*maxarad) /* limit vertex distance */ |
130 |
– |
VSUM(ap->p, ar.rorg, ar.rdir, 20.0*maxarad); |
131 |
– |
else |
132 |
– |
VCOPY(ap->p, ar.rop); |
129 |
|
return(ap); |
130 |
+ |
badsample: |
131 |
+ |
setcolor(ap->v, 0., 0., 0.); |
132 |
+ |
VCOPY(ap->p, hp->rp->rop); |
133 |
+ |
return(NULL); |
134 |
|
} |
135 |
|
|
136 |
|
|
137 |
|
/* Compute vectors and coefficients for Hessian/gradient calcs */ |
138 |
|
static void |
139 |
< |
comp_fftri(FFTRI *ftp, float ap0[3], float ap1[3], FVECT rop) |
139 |
> |
comp_fftri(FFTRI *ftp, FVECT ap0, FVECT ap1, FVECT rop) |
140 |
|
{ |
141 |
< |
FVECT v1; |
142 |
< |
double dot_e, dot_er, dot_r, dot_r1; |
141 |
> |
double rdot_cp, dot_e, dot_er, rdot_r, rdot_r1, J2; |
142 |
> |
int i; |
143 |
|
|
144 |
|
VSUB(ftp->r_i, ap0, rop); |
145 |
|
VSUB(ftp->r_i1, ap1, rop); |
146 |
|
VSUB(ftp->e_i, ap1, ap0); |
147 |
< |
VCROSS(v1, ftp->e_i, ftp->r_i); |
148 |
< |
ftp->nf = 1.0/DOT(v1,v1); |
147 |
> |
VCROSS(ftp->rcp, ftp->r_i, ftp->r_i1); |
148 |
> |
rdot_cp = 1.0/DOT(ftp->rcp,ftp->rcp); |
149 |
|
dot_e = DOT(ftp->e_i,ftp->e_i); |
150 |
|
dot_er = DOT(ftp->e_i, ftp->r_i); |
151 |
< |
dot_r = DOT(ftp->r_i,ftp->r_i); |
152 |
< |
dot_r1 = DOT(ftp->r_i1,ftp->r_i1); |
153 |
< |
ftp->I1 = acos( DOT(ftp->r_i, ftp->r_i1) / sqrt(dot_r*dot_r1) ) * |
154 |
< |
sqrt( ftp->nf ); |
155 |
< |
ftp->I2 = ( DOT(ftp->e_i, ftp->r_i1)/dot_r1 - dot_er/dot_r + |
156 |
< |
dot_e*ftp->I1 )*0.5*ftp->nf; |
157 |
< |
ftp->J2 = 0.5/dot_e*( 1.0/dot_r - 1.0/dot_r1 ) - |
158 |
< |
dot_er/dot_e*ftp->I2; |
151 |
> |
rdot_r = 1.0/DOT(ftp->r_i,ftp->r_i); |
152 |
> |
rdot_r1 = 1.0/DOT(ftp->r_i1,ftp->r_i1); |
153 |
> |
ftp->I1 = acos( DOT(ftp->r_i, ftp->r_i1) * sqrt(rdot_r*rdot_r1) ) * |
154 |
> |
sqrt( rdot_cp ); |
155 |
> |
ftp->I2 = ( DOT(ftp->e_i, ftp->r_i1)*rdot_r1 - dot_er*rdot_r + |
156 |
> |
dot_e*ftp->I1 )*0.5*rdot_cp; |
157 |
> |
J2 = ( 0.5*(rdot_r - rdot_r1) - dot_er*ftp->I2 ) / dot_e; |
158 |
> |
for (i = 3; i--; ) |
159 |
> |
ftp->rI2_eJ2[i] = ftp->I2*ftp->r_i[i] + J2*ftp->e_i[i]; |
160 |
|
} |
161 |
|
|
162 |
|
|
177 |
|
static void |
178 |
|
comp_hessian(FVECT hess[3], FFTRI *ftp, FVECT nrm) |
179 |
|
{ |
180 |
< |
FVECT v1, v2; |
180 |
> |
FVECT ncp; |
181 |
|
FVECT m1[3], m2[3], m3[3], m4[3]; |
182 |
|
double d1, d2, d3, d4; |
183 |
|
double I3, J3, K3; |
187 |
|
d2 = 1.0/DOT(ftp->r_i1,ftp->r_i1); |
188 |
|
d3 = 1.0/DOT(ftp->e_i,ftp->e_i); |
189 |
|
d4 = DOT(ftp->e_i, ftp->r_i); |
190 |
< |
I3 = 0.25*ftp->nf*( DOT(ftp->e_i, ftp->r_i1)*d2*d2 - d4*d1*d1 + |
191 |
< |
3.0/d3*ftp->I2 ); |
190 |
> |
I3 = ( DOT(ftp->e_i, ftp->r_i1)*d2*d2 - d4*d1*d1 + 3.0/d3*ftp->I2 ) |
191 |
> |
/ ( 4.0*DOT(ftp->rcp,ftp->rcp) ); |
192 |
|
J3 = 0.25*d3*(d1*d1 - d2*d2) - d4*d3*I3; |
193 |
|
K3 = d3*(ftp->I2 - I3/d1 - 2.0*d4*J3); |
194 |
|
/* intermediate matrices */ |
195 |
< |
VCROSS(v1, nrm, ftp->e_i); |
196 |
< |
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); |
195 |
> |
VCROSS(ncp, nrm, ftp->e_i); |
196 |
> |
compose_matrix(m1, ncp, ftp->rI2_eJ2); |
197 |
|
compose_matrix(m2, ftp->r_i, ftp->r_i); |
198 |
|
compose_matrix(m3, ftp->e_i, ftp->e_i); |
199 |
|
compose_matrix(m4, ftp->r_i, ftp->e_i); |
200 |
< |
VCROSS(v1, ftp->r_i, ftp->e_i); |
202 |
< |
d1 = DOT(nrm, v1); |
200 |
> |
d1 = DOT(nrm, ftp->rcp); |
201 |
|
d2 = -d1*ftp->I2; |
202 |
|
d1 *= 2.0; |
203 |
|
for (i = 3; i--; ) /* final matrix sum */ |
205 |
|
hess[i][j] = m1[i][j] + d1*( I3*m2[i][j] + K3*m3[i][j] + |
206 |
|
2.0*J3*m4[i][j] ); |
207 |
|
hess[i][j] += d2*(i==j); |
208 |
< |
hess[i][j] *= -1.0/PI; |
208 |
> |
hess[i][j] *= 1.0/PI; |
209 |
|
} |
210 |
|
} |
211 |
|
|
241 |
|
static void |
242 |
|
comp_gradient(FVECT grad, FFTRI *ftp, FVECT nrm) |
243 |
|
{ |
244 |
< |
FVECT vcp; |
244 |
> |
FVECT ncp; |
245 |
|
double f1; |
246 |
|
int i; |
247 |
|
|
248 |
< |
VCROSS(vcp, ftp->r_i, ftp->r_i1); |
249 |
< |
f1 = 2.0*DOT(nrm, vcp); |
252 |
< |
VCROSS(vcp, nrm, ftp->e_i); |
248 |
> |
f1 = 2.0*DOT(nrm, ftp->rcp); |
249 |
> |
VCROSS(ncp, nrm, ftp->e_i); |
250 |
|
for (i = 3; i--; ) |
251 |
< |
grad[i] = (0.5/PI)*( ftp->I1*vcp[i] + |
255 |
< |
f1*(ftp->I2*ftp->r_i[i] + ftp->J2*ftp->e_i[i]) ); |
251 |
> |
grad[i] = (-0.5/PI)*( ftp->I1*ncp[i] + f1*ftp->rI2_eJ2[i] ); |
252 |
|
} |
253 |
|
|
254 |
|
|
319 |
|
/* compute eigenvalues */ |
320 |
|
if ( quadratic(evalue, 1.0, -hess2[0][0]-hess2[1][1], |
321 |
|
hess2[0][0]*hess2[1][1]-hess2[0][1]*hess2[1][0]) != 2 || |
322 |
< |
(evalue[0] = fabs(evalue[0])) <= FTINY*FTINY || |
323 |
< |
(evalue[1] = fabs(evalue[1])) <= FTINY*FTINY ) |
322 |
> |
((evalue[0] = fabs(evalue[0])) <= FTINY*FTINY) | |
323 |
> |
((evalue[1] = fabs(evalue[1])) <= FTINY*FTINY) ) |
324 |
|
error(INTERNAL, "bad eigenvalue calculation"); |
325 |
|
|
326 |
|
if (evalue[0] > evalue[1]) { |
450 |
|
|
451 |
|
if (ra != NULL) /* extract eigenvectors & radii */ |
452 |
|
eigenvectors(uv, ra, hessian); |
453 |
< |
if (pg != NULL) { /* tangential position gradient/PI */ |
454 |
< |
pg[0] = DOT(gradient, uv[0]) / PI; |
455 |
< |
pg[1] = DOT(gradient, uv[1]) / PI; |
453 |
> |
if (pg != NULL) { /* tangential position gradient */ |
454 |
> |
pg[0] = DOT(gradient, uv[0]); |
455 |
> |
pg[1] = DOT(gradient, uv[1]); |
456 |
|
} |
457 |
|
} |
458 |
|
|
529 |
|
free(hp); |
530 |
|
return(-1); /* no radius or gradient calc. */ |
531 |
|
} |
532 |
< |
multcolor(acol, hp->acoef); /* normalize Y values */ |
533 |
< |
if ((d = bright(acol)) > FTINY) |
538 |
< |
d = 1.0/d; |
532 |
> |
if (bright(acol) > FTINY) /* normalize Y values */ |
533 |
> |
d = cnt/bright(acol); |
534 |
|
else |
535 |
|
d = 0.0; |
536 |
|
ap = hp->sa; /* relative Y channel from here on... */ |
537 |
|
for (i = hp->ns*hp->ns; i--; ap++) |
538 |
< |
colval(ap->v,CIEY) = bright(ap->v)*d + 0.0314; |
538 |
> |
colval(ap->v,CIEY) = bright(ap->v)*d + 0.01; |
539 |
|
|
540 |
|
if (uv == NULL) /* make sure we have axis pointers */ |
541 |
|
uv = my_uv; |
546 |
|
ambdirgrad(hp, uv, dg); |
547 |
|
|
548 |
|
if (ra != NULL) { /* scale/clamp radii */ |
549 |
+ |
if (pg != NULL) { |
550 |
+ |
if (ra[0]*(d = fabs(pg[0])) > 1.0) |
551 |
+ |
ra[0] = 1.0/d; |
552 |
+ |
if (ra[1]*(d = fabs(pg[1])) > 1.0) |
553 |
+ |
ra[1] = 1.0/d; |
554 |
+ |
if (ra[0] > ra[1]) |
555 |
+ |
ra[0] = ra[1]; |
556 |
+ |
} |
557 |
|
if (ra[0] < minarad) { |
558 |
|
ra[0] = minarad; |
559 |
|
if (ra[1] < minarad) |
566 |
|
ra[1] = maxarad; |
567 |
|
if (ra[0] > maxarad) |
568 |
|
ra[0] = maxarad; |
569 |
+ |
} |
570 |
+ |
if (pg != NULL) { /* cap gradient if necessary */ |
571 |
+ |
d = pg[0]*pg[0]*ra[0]*ra[0] + pg[1]*pg[1]*ra[1]*ra[1]; |
572 |
+ |
if (d > 1.0) { |
573 |
+ |
d = 1.0/sqrt(d); |
574 |
+ |
pg[0] *= d; |
575 |
+ |
pg[1] *= d; |
576 |
+ |
} |
577 |
|
} |
578 |
|
} |
579 |
|
free(hp); /* clean up and return */ |