| 206 |
|
b = 1.0/ndivs; |
| 207 |
|
scalecolor(acol, b); |
| 208 |
|
if (arad <= FTINY) |
| 209 |
< |
arad = FHUGE; |
| 209 |
> |
arad = maxarad; |
| 210 |
|
else |
| 211 |
|
arad = (ndivs+ns)/arad; |
| 212 |
|
if (pg != NULL) { /* reduce radius if gradient large */ |
| 214 |
|
if (d*arad*arad > 1.0) |
| 215 |
|
arad = 1.0/sqrt(d); |
| 216 |
|
} |
| 217 |
< |
if (arad > maxarad) |
| 218 |
< |
arad = maxarad; |
| 219 |
< |
else if (arad < minarad) |
| 217 |
> |
if (arad < minarad) { |
| 218 |
|
arad = minarad; |
| 219 |
< |
return(arad/sqrt(wt)); |
| 219 |
> |
if (pg != NULL && d*arad*arad > 1.0) { /* cap gradient */ |
| 220 |
> |
d = 1.0/arad/sqrt(d); |
| 221 |
> |
for (i = 0; i < 3; i++) |
| 222 |
> |
pg[i] *= d; |
| 223 |
> |
} |
| 224 |
> |
} |
| 225 |
> |
if ((arad /= sqrt(wt)) > maxarad) |
| 226 |
> |
arad = maxarad; |
| 227 |
> |
return(arad); |
| 228 |
|
oopsy: |
| 229 |
|
if (div != NULL) |
| 230 |
|
free((char *)div); |
| 313 |
|
posgradient(gv, da, hp) /* compute position gradient */ |
| 314 |
|
FVECT gv; |
| 315 |
|
AMBSAMP *da; /* assumes standard ordering */ |
| 316 |
< |
AMBHEMI *hp; |
| 316 |
> |
register AMBHEMI *hp; |
| 317 |
|
{ |
| 318 |
|
register int i, j; |
| 319 |
< |
double b, d; |
| 319 |
> |
double nextsine, lastsine, b, d; |
| 320 |
|
double mag0, mag1; |
| 321 |
|
double phi, cosp, sinp, xd, yd; |
| 322 |
|
register AMBSAMP *dp; |
| 325 |
|
for (j = 0; j < hp->np; j++) { |
| 326 |
|
dp = da + j; |
| 327 |
|
mag0 = mag1 = 0.0; |
| 328 |
+ |
lastsine = 0.0; |
| 329 |
|
for (i = 0; i < hp->nt; i++) { |
| 330 |
|
#ifdef DEBUG |
| 331 |
|
if (dp->t != i || dp->p != j) |
| 336 |
|
if (i > 0) { |
| 337 |
|
d = dp[-hp->np].r; |
| 338 |
|
if (dp[0].r > d) d = dp[0].r; |
| 339 |
< |
d *= 1.0 - (double)i/hp->nt; /* cos(t)^2 */ |
| 339 |
> |
/* sin(t)*cos(t)^2 */ |
| 340 |
> |
d *= lastsine * (1.0 - (double)i/hp->nt); |
| 341 |
|
mag0 += d*(b - bright(dp[-hp->np].v)); |
| 342 |
|
} |
| 343 |
+ |
nextsine = sqrt((double)(i+1)/hp->nt); |
| 344 |
|
if (j > 0) { |
| 345 |
|
d = dp[-1].r; |
| 346 |
|
if (dp[0].r > d) d = dp[0].r; |
| 347 |
< |
mag1 += d*(b - bright(dp[-1].v)); |
| 347 |
> |
mag1 += d * (nextsine - lastsine) * |
| 348 |
> |
(b - bright(dp[-1].v)); |
| 349 |
|
} else { |
| 350 |
|
d = dp[hp->np-1].r; |
| 351 |
|
if (dp[0].r > d) d = dp[0].r; |
| 352 |
< |
mag1 += d*(b - bright(dp[hp->np-1].v)); |
| 352 |
> |
mag1 += d * (nextsine - lastsine) * |
| 353 |
> |
(b - bright(dp[hp->np-1].v)); |
| 354 |
|
} |
| 355 |
|
dp += hp->np; |
| 356 |
+ |
lastsine = nextsine; |
| 357 |
|
} |
| 358 |
< |
if (hp->nt > 1) { |
| 347 |
< |
mag0 /= (double)hp->np; |
| 348 |
< |
mag1 /= (double)hp->nt; |
| 349 |
< |
} |
| 358 |
> |
mag0 *= 2.0*PI / hp->np; |
| 359 |
|
phi = 2.0*PI * (double)j/hp->np; |
| 360 |
|
cosp = cos(phi); sinp = sin(phi); |
| 361 |
|
xd += mag0*cosp - mag1*sinp; |
| 369 |
|
dirgradient(gv, da, hp) /* compute direction gradient */ |
| 370 |
|
FVECT gv; |
| 371 |
|
AMBSAMP *da; /* assumes standard ordering */ |
| 372 |
< |
AMBHEMI *hp; |
| 372 |
> |
register AMBHEMI *hp; |
| 373 |
|
{ |
| 374 |
|
register int i, j; |
| 375 |
|
double mag; |
| 386 |
|
error(CONSISTENCY, |
| 387 |
|
"division order in dirgradient"); |
| 388 |
|
#endif |
| 389 |
< |
mag += sqrt((i+.5)/hp->nt)*bright(dp->v); /* sin(t) */ |
| 389 |
> |
/* tan(t) */ |
| 390 |
> |
mag += bright(dp->v)/sqrt(hp->nt/(i+.5) - 1.0); |
| 391 |
|
dp += hp->np; |
| 392 |
|
} |
| 393 |
|
phi = 2.0*PI * (j+.5)/hp->np + PI/2.0; |
| 395 |
|
yd += mag * sin(phi); |
| 396 |
|
} |
| 397 |
|
for (i = 0; i < 3; i++) |
| 398 |
< |
gv[i] = (xd*hp->ux[i] + yd*hp->uy[i])*PI/(hp->nt*hp->np); |
| 398 |
> |
gv[i] = (xd*hp->ux[i] + yd*hp->uy[i])/(hp->nt*hp->np); |
| 399 |
|
} |
