105 |
|
|
106 |
|
long scenedate; /* date of latest scene or object file */ |
107 |
|
long octreedate; /* date of octree */ |
108 |
+ |
long matdate; /* date of latest material file */ |
109 |
|
|
110 |
|
int explicate = 0; /* explicate variables */ |
111 |
|
int silent = 0; /* do work silently */ |
424 |
|
vnam(OCTREE), vnam(SCENE)); |
425 |
|
exit(1); |
426 |
|
} |
427 |
+ |
matdate = -1; |
428 |
+ |
if (vdef(MATERIAL)) |
429 |
+ |
matdate = checklast(vval(MATERIAL)); |
430 |
|
} |
431 |
|
|
432 |
|
|
565 |
|
{ |
566 |
|
long afdate; |
567 |
|
|
568 |
< |
if (vdef(AMBFILE)) { |
569 |
< |
afdate = fdate(vval(AMBFILE)); |
570 |
< |
if (afdate >= 0 & octreedate > afdate) |
571 |
< |
rmfile(vval(AMBFILE)); |
572 |
< |
} |
568 |
> |
if (!vdef(AMBFILE)) |
569 |
> |
return; |
570 |
> |
if ((afdate = fdate(vval(AMBFILE))) < 0) |
571 |
> |
return; |
572 |
> |
if (octreedate > afdate | matdate > afdate) |
573 |
> |
rmfile(vval(AMBFILE)); |
574 |
|
} |
575 |
|
|
576 |
|
|
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(); |
789 |
|
char *ro; |
790 |
|
{ |
791 |
|
int fd, n; |
792 |
+ |
register char *cp; |
793 |
|
|
794 |
|
n = strlen(ro); |
795 |
|
if (n < 2) |
796 |
|
return; |
797 |
|
if (vdef(OPTFILE)) { |
798 |
< |
if ((fd = open(vval(OPTFILE), O_WRONLY|O_CREAT|O_TRUNC, 0666)) == -1) |
798 |
> |
for (cp = ro; cp[1]; cp++) |
799 |
> |
if (isspace(cp[1]) && cp[2] == '-' && isalpha(cp[3])) |
800 |
> |
*cp = '\n'; |
801 |
> |
else |
802 |
> |
*cp = cp[1]; |
803 |
> |
*cp = '\n'; |
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 |
< |
if (write(fd, ro+1, n-1) != n-1) |
795 |
< |
syserr(vval(OPTFILE)); |
796 |
< |
write(fd, "\n", 1); |
797 |
< |
close(fd); |
798 |
< |
sprintf(ro, " \"^%s\"", vval(OPTFILE)); |
807 |
> |
sprintf(ro, " @%s", vval(OPTFILE)); |
808 |
|
} |
809 |
|
#ifdef MSDOS |
810 |
|
else if (n > 50) { |
811 |
< |
register char *evp = bmalloc(n+6); |
803 |
< |
if (evp == NULL) |
804 |
< |
syserr(progname); |
805 |
< |
strcpy(evp, "ROPT="); |
806 |
< |
strcat(evp, ro); |
807 |
< |
if (putenv(evp) != 0) { |
808 |
< |
fprintf(stderr, "%s: out of environment space\n", |
809 |
< |
progname); |
810 |
< |
exit(1); |
811 |
< |
} |
811 |
> |
setenv("ROPT", ro+1); |
812 |
|
strcpy(ro, " $ROPT"); |
813 |
|
} |
814 |
|
#endif |
823 |
|
po = addarg(po, "-1 -e"); |
824 |
|
po = addarg(po, vval(EXPOSURE)); |
825 |
|
} |
826 |
< |
if (vscale(QUALITY) == HIGH) |
827 |
< |
po = addarg(po, "-r .65"); |
826 |
> |
switch (vscale(QUALITY)) { |
827 |
> |
case MEDIUM: |
828 |
> |
po = addarg(po, "-r 1"); |
829 |
> |
break; |
830 |
> |
case HIGH: |
831 |
> |
po = addarg(po, "-m .25"); |
832 |
> |
break; |
833 |
> |
} |
834 |
|
if (vdef(PFILT)) |
835 |
|
po = addarg(po, vval(PFILT)); |
836 |
|
} |
954 |
|
cp += strlen(cp); |
955 |
|
} |
956 |
|
} |
957 |
< |
/* append any additional options */ |
958 |
< |
strcpy(cp, vs); |
957 |
> |
strcpy(cp, vs); /* append any additional options */ |
958 |
> |
#ifdef MSDOS |
959 |
> |
if (strlen(viewopts) > 40) { |
960 |
> |
setenv("VIEW", viewopts); |
961 |
> |
return("$VIEW"); |
962 |
> |
} |
963 |
> |
#endif |
964 |
|
return(viewopts); |
965 |
|
} |
966 |
|
|
968 |
|
char * |
969 |
|
getview(n, vn) /* get view n, or NULL if none */ |
970 |
|
int n; |
971 |
< |
char *vn; |
971 |
> |
char *vn; /* returned view name */ |
972 |
|
{ |
973 |
< |
register char *mv; |
973 |
> |
register char *mv = NULL; |
974 |
> |
register int i; |
975 |
|
|
976 |
< |
if (viewselect != NULL) { |
976 |
> |
if (viewselect != NULL) { /* command-line selected */ |
977 |
|
if (n) /* only do one */ |
978 |
|
return(NULL); |
979 |
|
if (viewselect[0] == '-') { /* already specified */ |
992 |
|
return(specview(mv)); |
993 |
|
return(specview(viewselect)); /* standard view? */ |
994 |
|
} |
995 |
< |
if (vn != NULL && (mv = nvalue(vv+VIEW, n)) != NULL) { |
996 |
< |
if (*mv != '-') |
997 |
< |
while (*mv && !isspace(*mv)) |
998 |
< |
*vn++ = *mv++; |
995 |
> |
mv = nvalue(vv+VIEW, n); /* use view n */ |
996 |
> |
if (vn != NULL & mv != NULL) { |
997 |
> |
if (mv[i=0] != '-') |
998 |
> |
while (mv[i] && !isspace(mv[i])) |
999 |
> |
*vn++ = mv[i++]; |
1000 |
|
*vn = '\0'; |
1001 |
|
} |
1002 |
< |
return(specview(nvalue(vv+VIEW, n))); /* use view n */ |
1002 |
> |
return(specview(mv)); |
1003 |
|
} |
1004 |
|
|
1005 |
|
|
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); |
1074 |
< |
if (fdate(rawfile) > octreedate) /* recover */ |
1074 |
> |
if (fdate(rawfile) >= octreedate) /* recover */ |
1075 |
|
sprintf(combuf, "rpict%s%s -ro %s %s", |
1076 |
|
rep, opts, rawfile, vval(OCTREE)); |
1077 |
|
else { |
1144 |
|
return(0); |
1145 |
|
return(unlink(fn)); |
1146 |
|
} |
1147 |
+ |
|
1148 |
+ |
|
1149 |
+ |
#ifdef MSDOS |
1150 |
+ |
setenv(vname, value) /* set an environment variable */ |
1151 |
+ |
char *vname, *value; |
1152 |
+ |
{ |
1153 |
+ |
register char *evp; |
1154 |
+ |
|
1155 |
+ |
evp = bmalloc(strlen(vname)+strlen(value)+2); |
1156 |
+ |
if (evp == NULL) |
1157 |
+ |
syserr(progname); |
1158 |
+ |
sprintf(evp, "%s=%s", vname, value); |
1159 |
+ |
if (putenv(evp) != 0) { |
1160 |
+ |
fprintf(stderr, "%s: out of environment space\n", progname); |
1161 |
+ |
exit(1); |
1162 |
+ |
} |
1163 |
+ |
if (!silent) |
1164 |
+ |
printf("set %s\n", evp); |
1165 |
+ |
} |
1166 |
+ |
#endif |
1167 |
|
|
1168 |
|
|
1169 |
|
badvalue(vc) /* report bad variable value and exit */ |