626 |
|
op = addarg(op, "-ds .4"); |
627 |
|
else |
628 |
|
op = addarg(op, "-ds 0"); |
629 |
< |
op = addarg(op, "-dt .2 -dc .25 -dr 0 -sj 0 -st .7"); |
629 |
> |
op = addarg(op, "-dt .2 -dc .25 -dr 0 -sj 0 -st .5"); |
630 |
|
if (vdef(AMBFILE)) { |
631 |
|
sprintf(op, " -af %s", vval(AMBFILE)); |
632 |
|
op += strlen(op); |
634 |
|
overture = 0; |
635 |
|
switch (vscale(VARIABILITY)) { |
636 |
|
case LOW: |
637 |
< |
op = addarg(op, "-aa .4 -ad 32"); |
637 |
> |
op = addarg(op, "-aa .4 -ad 64"); |
638 |
|
break; |
639 |
|
case MEDIUM: |
640 |
< |
op = addarg(op, "-aa .3 -ad 64"); |
640 |
> |
op = addarg(op, "-aa .3 -ad 128"); |
641 |
|
break; |
642 |
|
case HIGH: |
643 |
< |
op = addarg(op, "-aa .25 -ad 128"); |
643 |
> |
op = addarg(op, "-aa .25 -ad 256"); |
644 |
|
break; |
645 |
|
} |
646 |
|
op = addarg(op, "-as 0"); |
690 |
|
op = addarg(op, "-ds .2 -dj .35"); |
691 |
|
else |
692 |
|
op = addarg(op, "-ds .3"); |
693 |
< |
op = addarg(op, "-dt .1 -dc .5 -dr 1 -sj .7 -st .15"); |
693 |
> |
op = addarg(op, "-dt .1 -dc .5 -dr 1 -sj .7 -st .1"); |
694 |
|
if (overture = vint(INDIRECT)) { |
695 |
|
sprintf(op, " -ab %d", overture); |
696 |
|
op += strlen(op); |
702 |
|
overture = 0; |
703 |
|
switch (vscale(VARIABILITY)) { |
704 |
|
case LOW: |
705 |
< |
op = addarg(op, "-aa .25 -ad 128 -as 0"); |
705 |
> |
op = addarg(op, "-aa .25 -ad 196 -as 0"); |
706 |
|
break; |
707 |
|
case MEDIUM: |
708 |
< |
op = addarg(op, "-aa .2 -ad 300 -as 64"); |
708 |
> |
op = addarg(op, "-aa .2 -ad 400 -as 64"); |
709 |
|
break; |
710 |
|
case HIGH: |
711 |
< |
op = addarg(op, "-aa .15 -ad 500 -as 128"); |
711 |
> |
op = addarg(op, "-aa .15 -ad 768 -as 196"); |
712 |
|
break; |
713 |
|
} |
714 |
|
d = ambval(); |
757 |
|
op = addarg(op, "-ds .1 -dj .7"); |
758 |
|
else |
759 |
|
op = addarg(op, "-ds .2"); |
760 |
< |
op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .03"); |
760 |
> |
op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .01"); |
761 |
|
sprintf(op, " -ab %d", overture=vint(INDIRECT)+1); |
762 |
|
op += strlen(op); |
763 |
|
if (vdef(AMBFILE)) { |
767 |
|
overture = 0; |
768 |
|
switch (vscale(VARIABILITY)) { |
769 |
|
case LOW: |
770 |
< |
op = addarg(op, "-aa .15 -ad 200 -as 0"); |
770 |
> |
op = addarg(op, "-aa .15 -ad 256 -as 0"); |
771 |
|
break; |
772 |
|
case MEDIUM: |
773 |
< |
op = addarg(op, "-aa .125 -ad 512 -as 128"); |
773 |
> |
op = addarg(op, "-aa .125 -ad 512 -as 256"); |
774 |
|
break; |
775 |
|
case HIGH: |
776 |
< |
op = addarg(op, "-aa .08 -ad 850 -as 256"); |
776 |
> |
op = addarg(op, "-aa .08 -ad 1024 -as 512"); |
777 |
|
break; |
778 |
|
} |
779 |
|
d = ambval(); |
804 |
|
fd = open(vval(OPTFILE), O_WRONLY|O_CREAT|O_TRUNC, 0666); |
805 |
|
if (fd < 0 || write(fd, ro, n) != n || close(fd) < 0) |
806 |
|
syserr(vval(OPTFILE)); |
807 |
< |
sprintf(ro, " \"^%s\"", vval(OPTFILE)); |
807 |
> |
sprintf(ro, " @%s", vval(OPTFILE)); |
808 |
|
} |
809 |
|
#ifdef MSDOS |
810 |
|
else if (n > 50) { |
828 |
|
po = addarg(po, "-r 1"); |
829 |
|
break; |
830 |
|
case HIGH: |
831 |
< |
po = addarg(po, "-m .15"); |
831 |
> |
po = addarg(po, "-m .25"); |
832 |
|
break; |
833 |
|
} |
834 |
|
if (vdef(PFILT)) |
971 |
|
char *vn; /* returned view name */ |
972 |
|
{ |
973 |
|
register char *mv = NULL; |
974 |
+ |
register int i; |
975 |
|
|
976 |
|
if (viewselect != NULL) { /* command-line selected */ |
977 |
|
if (n) /* only do one */ |
994 |
|
} |
995 |
|
mv = nvalue(vv+VIEW, n); /* use view n */ |
996 |
|
if (vn != NULL & mv != NULL) { |
997 |
< |
if (*mv != '-') |
998 |
< |
while (*mv && !isspace(*mv)) |
999 |
< |
*vn++ = *mv++; |
997 |
> |
if (mv[i=0] != '-') |
998 |
> |
while (mv[i] && !isspace(mv[i])) |
999 |
> |
*vn++ = mv[i++]; |
1000 |
|
*vn = '\0'; |
1001 |
|
} |
1002 |
|
return(specview(mv)); |
1027 |
|
char pfopts[128]; |
1028 |
|
char vs[32], *vw; |
1029 |
|
int vn, mult; |
1030 |
+ |
long lastdate; |
1031 |
|
/* get pfilt options */ |
1032 |
|
pfiltopts(pfopts); |
1033 |
|
/* get resolution, reporting */ |
1058 |
|
else |
1059 |
|
badvalue(REPORT); |
1060 |
|
} |
1061 |
+ |
/* get update time */ |
1062 |
+ |
lastdate = octreedate > matdate ? octreedate : matdate; |
1063 |
|
/* do each view */ |
1064 |
|
vn = 0; |
1065 |
|
while ((vw = getview(vn++, vs)) != NULL) { |
1067 |
|
sprintf(vs, "%d", vn); |
1068 |
|
sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs); |
1069 |
|
/* check date on picture */ |
1070 |
< |
if (fdate(picfile) >= octreedate) |
1070 |
> |
if (fdate(picfile) >= lastdate) |
1071 |
|
continue; |
1072 |
|
/* build rpict command */ |
1073 |
|
sprintf(rawfile, "%s_%s.raw", vval(PICTURE), vs); |