| 22 |
|
|
| 23 |
|
#define AVGREFL 0.5 /* assumed average reflectance */ |
| 24 |
|
|
| 25 |
< |
#define MAXAC 64 /* maximum number of args */ |
| 25 |
> |
#define MAXAC 512 /* maximum number of args */ |
| 26 |
|
|
| 27 |
|
#ifndef MINTHRESH |
| 28 |
|
#define MINTHRESH 5.0 /* source threshold w.r.t. mean */ |
| 320 |
|
continue; /* too dim */ |
| 321 |
|
ssph_direc(v, alt, azi); /* else add it in */ |
| 322 |
|
VSUM(ls->direc, ls->direc, v, d); |
| 323 |
< |
ls->omega++; |
| 323 |
> |
ls->omega += 1.; |
| 324 |
|
addcolor(ls->val, ssamp[alt][azi].val); |
| 325 |
+ |
/* remove from list */ |
| 326 |
|
setcolor(ssamp[alt][azi].val, 0., 0., 0.); |
| 327 |
+ |
ssamp[alt][azi].nsamp = 0; |
| 328 |
|
} |
| 329 |
|
d = 1./ls->omega; /* avg. brightness */ |
| 330 |
|
scalecolor(ls->val, d); |
| 614 |
|
} |
| 615 |
|
|
| 616 |
|
|
| 617 |
< |
dobj_xform(nam, add, ac, av) /* set/add transform for nam */ |
| 617 |
> |
dobj_xform(nam, rel, ac, av) /* set/add transform for nam */ |
| 618 |
|
char *nam; |
| 619 |
< |
int add, ac; |
| 619 |
> |
int rel, ac; |
| 620 |
|
char **av; |
| 621 |
|
{ |
| 622 |
|
register DOBJECT *op; |
| 623 |
+ |
FVECT cent; |
| 624 |
+ |
double rad; |
| 625 |
+ |
char scoord[16]; |
| 626 |
+ |
int i; |
| 627 |
|
|
| 628 |
|
if ((op = getdobj(nam)) == NULL) { |
| 629 |
|
error(COMMAND, "no object"); |
| 630 |
|
return(0); |
| 631 |
|
} |
| 632 |
< |
if (add) add = op->xfac; |
| 633 |
< |
if (ac + add > MAXAC) { |
| 632 |
> |
if (rel) |
| 633 |
> |
rel = op->xfac + 8; |
| 634 |
> |
if (ac + rel > MAXAC) { |
| 635 |
|
error(COMMAND, "too many transform arguments"); |
| 636 |
|
return(0); |
| 637 |
|
} |
| 638 |
< |
savedxf(curobj = op); |
| 639 |
< |
if (!add) |
| 638 |
> |
savedxf(curobj = op); /* remember current transform */ |
| 639 |
> |
if (rel && ac == 4 && !strcmp(av[0], "-t")) |
| 640 |
> |
rel = -1; /* don't move for translate */ |
| 641 |
> |
else { |
| 642 |
> |
getdcent(cent, op); /* don't move if near orig. */ |
| 643 |
> |
rad = getdrad(op); |
| 644 |
> |
if (DOT(cent,cent) < rad*rad) |
| 645 |
> |
rel = -1; |
| 646 |
> |
} |
| 647 |
> |
if (!rel) { /* remove old transform */ |
| 648 |
|
while (op->xfac) |
| 649 |
|
freestr(op->xfav[--op->xfac]); |
| 650 |
+ |
} else if (rel > 0) { /* relative move */ |
| 651 |
+ |
op->xfav[op->xfac++] = savestr("-t"); |
| 652 |
+ |
for (i = 0; i < 3; i++) { |
| 653 |
+ |
sprintf(scoord, "%.4e", -cent[i]); |
| 654 |
+ |
op->xfav[op->xfac++] = savestr(scoord); |
| 655 |
+ |
} |
| 656 |
+ |
} |
| 657 |
|
while (ac--) |
| 658 |
|
op->xfav[op->xfac++] = savestr(*av++); |
| 659 |
+ |
if (rel > 0) { /* move back */ |
| 660 |
+ |
op->xfav[op->xfac++] = savestr("-t"); |
| 661 |
+ |
for (i = 0; i < 3; i++) { |
| 662 |
+ |
sprintf(scoord, "%.4e", cent[i]); |
| 663 |
+ |
op->xfav[op->xfac++] = savestr(scoord); |
| 664 |
+ |
} |
| 665 |
+ |
} |
| 666 |
|
op->xfav[op->xfac] = NULL; |
| 667 |
|
if (fullxf(&op->xfb, op->xfac, op->xfav) != op->xfac) { |
| 668 |
|
error(COMMAND, "bad transform arguments"); |
| 699 |
|
return(0); |
| 700 |
|
} |
| 701 |
|
getdcent(ocent, op); |
| 702 |
< |
fprintf(fp, "%s: %s, center [%f %f %f], radius %f", op->name, |
| 702 |
> |
fprintf(fp, "%s: %s, center [%g %g %g], radius %g", op->name, |
| 703 |
|
op->drawcode==DO_HIDE ? "hidden" : |
| 704 |
|
op->drawcode==DO_LIGHT && op->ol!=NULL ? "lighted" : |
| 705 |
|
"shown", |
