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 |
|
|
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.); |
108 |
< |
VCOPY(ap->p, hp->rp->rop); |
109 |
< |
return(NULL); /* no sample taken */ |
110 |
< |
} |
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--; |
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); |
130 |
|
multcolor(ar.rcol, ar.rcoef); /* apply coefficient */ |
131 |
|
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); |
132 |
|
return(ap); |
133 |
+ |
badsample: |
134 |
+ |
setcolor(ap->v, 0., 0., 0.); |
135 |
+ |
VCOPY(ap->p, hp->rp->rop); |
136 |
+ |
return(NULL); |
137 |
|
} |
138 |
|
|
139 |
|
|
140 |
|
/* Compute vectors and coefficients for Hessian/gradient calcs */ |
141 |
|
static void |
142 |
< |
comp_fftri(FFTRI *ftp, float ap0[3], float ap1[3], FVECT rop) |
142 |
> |
comp_fftri(FFTRI *ftp, FVECT ap0, FVECT ap1, FVECT rop) |
143 |
|
{ |
144 |
|
FVECT vcp; |
145 |
< |
double dot_e, dot_er, dot_r, dot_r1, J2; |
145 |
> |
double dot_e, dot_er, rdot_r, rdot_r1, J2; |
146 |
|
int i; |
147 |
|
|
148 |
|
VSUB(ftp->r_i, ap0, rop); |
152 |
|
ftp->nf = 1.0/DOT(vcp,vcp); |
153 |
|
dot_e = DOT(ftp->e_i,ftp->e_i); |
154 |
|
dot_er = DOT(ftp->e_i, ftp->r_i); |
155 |
< |
dot_r = DOT(ftp->r_i,ftp->r_i); |
156 |
< |
dot_r1 = DOT(ftp->r_i1,ftp->r_i1); |
157 |
< |
ftp->I1 = acos( DOT(ftp->r_i, ftp->r_i1) / sqrt(dot_r*dot_r1) ) * |
155 |
> |
rdot_r = 1.0/DOT(ftp->r_i,ftp->r_i); |
156 |
> |
rdot_r1 = 1.0/DOT(ftp->r_i1,ftp->r_i1); |
157 |
> |
ftp->I1 = acos( DOT(ftp->r_i, ftp->r_i1) * sqrt(rdot_r*rdot_r1) ) * |
158 |
|
sqrt( ftp->nf ); |
159 |
< |
ftp->I2 = ( DOT(ftp->e_i, ftp->r_i1)/dot_r1 - dot_er/dot_r + |
159 |
> |
ftp->I2 = ( DOT(ftp->e_i, ftp->r_i1)*rdot_r1 - dot_er*rdot_r + |
160 |
|
dot_e*ftp->I1 )*0.5*ftp->nf; |
161 |
< |
J2 = 0.5/dot_e*( 1.0/dot_r - 1.0/dot_r1 ) - dot_er/dot_e*ftp->I2; |
161 |
> |
J2 = ( 0.5*(rdot_r - rdot_r1) - dot_er*ftp->I2 ) / dot_e; |
162 |
|
for (i = 3; i--; ) |
163 |
|
ftp->rI2_eJ2[i] = ftp->I2*ftp->r_i[i] + J2*ftp->e_i[i]; |
164 |
|
} |
210 |
|
hess[i][j] = m1[i][j] + d1*( I3*m2[i][j] + K3*m3[i][j] + |
211 |
|
2.0*J3*m4[i][j] ); |
212 |
|
hess[i][j] += d2*(i==j); |
213 |
< |
hess[i][j] *= -1.0/PI; |
213 |
> |
hess[i][j] *= 1.0/PI; |
214 |
|
} |
215 |
|
} |
216 |
|
|
254 |
|
f1 = 2.0*DOT(nrm, vcp); |
255 |
|
VCROSS(vcp, nrm, ftp->e_i); |
256 |
|
for (i = 3; i--; ) |
257 |
< |
grad[i] = (0.5/PI)*( ftp->I1*vcp[i] + f1*ftp->rI2_eJ2[i] ); |
257 |
> |
grad[i] = (-0.5/PI)*( ftp->I1*vcp[i] + f1*ftp->rI2_eJ2[i] ); |
258 |
|
} |
259 |
|
|
260 |
|
|
456 |
|
|
457 |
|
if (ra != NULL) /* extract eigenvectors & radii */ |
458 |
|
eigenvectors(uv, ra, hessian); |
459 |
< |
if (pg != NULL) { /* tangential position gradient/PI */ |
460 |
< |
pg[0] = DOT(gradient, uv[0]) / PI; |
461 |
< |
pg[1] = DOT(gradient, uv[1]) / PI; |
459 |
> |
if (pg != NULL) { /* tangential position gradient */ |
460 |
> |
pg[0] = DOT(gradient, uv[0]); |
461 |
> |
pg[1] = DOT(gradient, uv[1]); |
462 |
|
} |
463 |
|
} |
464 |
|
|
535 |
|
free(hp); |
536 |
|
return(-1); /* no radius or gradient calc. */ |
537 |
|
} |
538 |
< |
multcolor(acol, hp->acoef); /* normalize Y values */ |
539 |
< |
if ((d = bright(acol)) > FTINY) |
537 |
< |
d = 1.0/d; |
538 |
> |
if (bright(acol) > FTINY) /* normalize Y values */ |
539 |
> |
d = cnt/bright(acol); |
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 + 0.0314; |
544 |
> |
colval(ap->v,CIEY) = bright(ap->v)*d + 0.01; |
545 |
|
|
546 |
|
if (uv == NULL) /* make sure we have axis pointers */ |
547 |
|
uv = my_uv; |
556 |
|
ra[0] = minarad; |
557 |
|
if (ra[1] < minarad) |
558 |
|
ra[1] = minarad; |
559 |
+ |
/* cap gradient if necessary */ |
560 |
+ |
if (pg != NULL) { |
561 |
+ |
d = pg[0]*pg[0]*ra[0]*ra[0] + |
562 |
+ |
pg[1]*pg[1]*ra[1]*ra[1]; |
563 |
+ |
if (d > 1.0) { |
564 |
+ |
d = 1.0/sqrt(d); |
565 |
+ |
pg[0] *= d; |
566 |
+ |
pg[1] *= d; |
567 |
+ |
} |
568 |
+ |
} |
569 |
|
} |
570 |
|
ra[0] *= d = 1.0/sqrt(sqrt(wt)); |
571 |
|
if ((ra[1] *= d) > 2.0*ra[0]) |