ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/util/rad.c

Comparing ray/src/util/rad.c (file contents):
Revision 2.3 by greg, Thu Mar 11 17:23:33 1993 UTC vs.
Revision 2.22 by greg, Wed Aug 25 13:48:37 1993 UTC

#	Line 94 | Line 94 | int    (*setqopts[3])() = {lowqopts, medqopts, hiqopts};
94
95		#define renderopts      (*setqopts[vscale(QUALITY)])
96
97	+	/* overture calculation file */
98	+	#ifdef NIX
99	+	char    overfile[] = "overture.raw";
100	+	#else
101	+	char    overfile[] = "/dev/null";
102	+	#endif
103	+
104		extern long     fdate(), time();
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 */
112		int     noaction = 0;           /* don't do anything */
113	+	int     sayview = 0;            /* print view out */
114		char    *rvdevice = NULL;       /* rview output device */
115		char    *viewselect = NULL;     /* specific view only */
116
117		int     overture = 0;           /* overture calculation needed */
118
119		char    *progname;              /* global argv[0] */
120	+	char    *rifname;               /* global rad input file name */
121
122		char    radname[MAXPATH];       /* root Radiance file name */
123
#	Line 135 | Line 145 | char   *argv[];
145		case 'o':
146		rvdevice = argv[++i];
147		break;
148	+	case 'V':
149	+	sayview++;
150	+	break;
151		case 'v':
152		viewselect = argv[++i];
153		break;
#	Line 143 | Line 156 | char   *argv[];
156		}
157		if (i >= argc)
158		goto userr;
159	+	rifname = argv[i];
160		/* assign Radiance root file name */
161	<	rootname(radname, argv[i]);
161	>	rootname(radname, rifname);
162		/* load variable values */
163	<	load(argv[i]);
163	>	load(rifname);
164		/* get any additional assignments */
165		for (i++; i < argc; i++)
166		setvariable(argv[i]);
#	Line 159 | Line 173 | char   *argv[];
173		/* print all values if requested */
174		if (explicate)
175		printvals();
176	<	/* run simulation */
176	>	/* build octree */
177		oconv();
178	+	/* check date on ambient file */
179	+	checkambfile();
180	+	/* run simulation */
181		renderopts(ropts);
182		xferopts(ropts);
183		if (rvdevice != NULL)
#	Line 195 | Line 212 | load(rfname)                   /* load Radiance simulation file */
212		char    *rfname;
213		{
214		FILE    *fp;
215	<	char    buf[256];
215	>	char    buf[512];
216		register char   *cp;
217
218		if (rfname == NULL)
#	Line 212 | Line 229 | char   *rfname;
229		case '#':
230		*cp = '\0';
231		break;
232	+	default:
233	+	continue;
234		}
235		break;
236		}
#	Line 260 | Line 279 | register char  *ass;
279		exit(1);
280		}
281		/* assign new value */
282	<	cp = vp->value; i = vp->nass;
283	<	while (i--)
284	<	while (*cp++)
285	<	;
286	<	i = cp - vp->value;
287	<	vp->value = realloc(vp->value, i+n+1);
282	>	if (i = vp->nass) {
283	>	cp = vp->value;
284	>	while (i--)
285	>	while (*cp++)
286	>	;
287	>	i = cp - vp->value;
288	>	vp->value = realloc(vp->value, i+n+1);
289	>	} else
290	>	vp->value = malloc(n+1);
291		if (vp->value == NULL)
292		syserr(progname);
293		strcpy(vp->value+i, ass);
#	Line 294 | Line 316 | register int   n;
316		{
317		register char   *cp;
318
319	<	if (vp == NULL || n < 0 || n >= vp->nass)
319	>	if (vp == NULL | n < 0 | n >= vp->nass)
320		return(NULL);
321		cp = vp->value;
322		while (n--)
#	Line 369 | Line 391 | register char  *fnames;
391		while (*fnames) {
392		while (isspace(*fnames)) fnames++;
393		cp = thisfile;
394	<	while (*fnames && !isspace(*fnames)) *cp++ = *fnames++;
394	>	while (*fnames && !isspace(*fnames))
395	>	*cp++ = *fnames++;
396		*cp = '\0';
397		if ((thisdate = fdate(thisfile)) < 0)
398		syserr(thisfile);
#	Line 407 | Line 430 | checkfiles()                   /* check for existence and modified tim
430		vnam(OCTREE), vnam(SCENE));
431		exit(1);
432		}
433	+	matdate = -1;
434	+	if (vdef(MATERIAL))
435	+	matdate = checklast(vval(MATERIAL));
436		}
437
438
#	Line 488 | Line 514 | printvals()                    /* print variable values */
514		register int    i, j;
515
516		for (i = 0; i < NVARS; i++)
517	<	for (j = 0; j < vv[i].nass; j++)
518	<	printf("%s= %s\n", vv[i].name, nvalue(vv+i, j));
517	>	for (j = 0; j < vdef(i); j++)
518	>	printf("%s= %s\n", vnam(i), nvalue(vv+i, j));
519		fflush(stdout);
520		}
521
#	Line 502 | Line 528 | oconv()                                /* run oconv if necessary */
528		return;
529		/* build command */
530		oconvopts(ocopts);
531	<	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
532	<	vdef(MATERIAL) ? vval(MATERIAL) : "",
533	<	vval(SCENE), vval(OCTREE));
534	<	if (!silent) {                  /* echo it */
535	<	printf("\t%s\n", combuf);
536	<	fflush(stdout);
537	<	}
538	<	if (noaction)
513	<	return;
514	<	if (system(combuf)) {           /* run it */
531	>	if (vdef(MATERIAL))
532	>	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
533	>	vval(MATERIAL), vval(SCENE), vval(OCTREE));
534	>	else
535	>	sprintf(combuf, "oconv%s %s > %s", ocopts,
536	>	vval(SCENE), vval(OCTREE));
537	>
538	>	if (runcom(combuf)) {           /* run it */
539		fprintf(stderr, "%s: error generating octree\n\t%s removed\n",
540		progname, vval(OCTREE));
541		unlink(vval(OCTREE));
#	Line 543 | Line 567 | register char  *oo;
567		}
568
569
570	+	checkambfile()                  /* check date on ambient file */
571	+	{
572	+	long    afdate;
573	+
574	+	if (!vdef(AMBFILE))
575	+	return;
576	+	if ((afdate = fdate(vval(AMBFILE))) < 0)
577	+	return;
578	+	if (octreedate > afdate | matdate > afdate)
579	+	rmfile(vval(AMBFILE));
580	+	}
581	+
582	+
583		double
584		ambval()                                /* compute ambient value */
585		{
586		if (vdef(EXPOSURE)) {
587	+	if (!isflt(vval(EXPOSURE)))
588	+	badvalue(EXPOSURE);
589		if (vval(EXPOSURE)[0] == '+' || vval(EXPOSURE)[0] == '-')
590		return(.5/pow(2.,atof(vval(EXPOSURE))));
591	<	if (isdigit(vval(EXPOSURE)[0]) || vval(EXPOSURE)[0] == '.')
553	<	return(.5/atof(vval(EXPOSURE)));
554	<	badvalue(EXPOSURE);
591	>	return(.5/atof(vval(EXPOSURE)));
592		}
593		if (vlet(ZONE) == 'E')
594		return(10.);
#	Line 575 | Line 612 | register char  *op;
612		d *= 3./(siz[0]+siz[1]+siz[2]);
613		switch (vscale(DETAIL)) {
614		case LOW:
615	<	op = addarg(op, "-ps 16");
579	<	op = addarg(op, "-dp 16");
615	>	op = addarg(op, "-ps 16 -dp 16");
616		sprintf(op, " -ar %d", (int)(4*d));
617		op += strlen(op);
618		break;
619		case MEDIUM:
620	<	op = addarg(op, "-ps 8");
585	<	op = addarg(op, "-dp 32");
620	>	op = addarg(op, "-ps 8 -dp 32");
621		sprintf(op, " -ar %d", (int)(8*d));
622		op += strlen(op);
623		break;
624		case HIGH:
625	<	op = addarg(op, "-ps 4");
591	<	op = addarg(op, "-dp 64");
625	>	op = addarg(op, "-ps 4 -dp 64");
626		sprintf(op, " -ar %d", (int)(16*d));
627		op += strlen(op);
628		break;
#	Line 596 | Line 630 | register char  *op;
630		op = addarg(op, "-pt .16");
631		if (vbool(PENUMBRAS))
632		op = addarg(op, "-ds .4");
633	<	op = addarg(op, "-dt .2");
634	<	op = addarg(op, "-dc .25");
635	<	op = addarg(op, "-dr 0");
602	<	op = addarg(op, "-sj 0");
603	<	op = addarg(op, "-st .7");
604	<	op = addarg(op, "-ab 0");
633	>	else
634	>	op = addarg(op, "-ds 0");
635	>	op = addarg(op, "-dt .2 -dc .25 -dr 0 -sj 0 -st .5");
636		if (vdef(AMBFILE)) {
637		sprintf(op, " -af %s", vval(AMBFILE));
638		op += strlen(op);
#	Line 609 | Line 640 | register char  *op;
640		overture = 0;
641		switch (vscale(VARIABILITY)) {
642		case LOW:
643	<	op = addarg(op, "-aa .4");
613	<	op = addarg(op, "-ad 32");
643	>	op = addarg(op, "-aa .4 -ad 64");
644		break;
645		case MEDIUM:
646	<	op = addarg(op, "-aa .3");
617	<	op = addarg(op, "-ad 64");
646	>	op = addarg(op, "-aa .3 -ad 128");
647		break;
648		case HIGH:
649	<	op = addarg(op, "-aa .25");
621	<	op = addarg(op, "-ad 128");
649	>	op = addarg(op, "-aa .25 -ad 256");
650		break;
651		}
652		op = addarg(op, "-as 0");
653		d = ambval();
654		sprintf(op, " -av %.2g %.2g %.2g", d, d, d);
655		op += strlen(op);
656	<	op = addarg(op, "-lr 3");
629	<	op = addarg(op, "-lw .02");
656	>	op = addarg(op, "-lr 3 -lw .02");
657		if (vdef(RENDER))
658		op = addarg(op, vval(RENDER));
659		}
#	Line 665 | Line 692 | register char  *op;
692		break;
693		}
694		op = addarg(op, "-pt .08");
695	<	if (vbool(PENUMBRAS)) {
696	<	op = addarg(op, "-ds .2");
697	<	op = addarg(op, "-dj .35");
671	<	} else
695	>	if (vbool(PENUMBRAS))
696	>	op = addarg(op, "-ds .2 -dj .35");
697	>	else
698		op = addarg(op, "-ds .3");
699	<	op = addarg(op, "-dt .1");
700	<	op = addarg(op, "-dc .5");
701	<	op = addarg(op, "-dr 1");
702	<	op = addarg(op, "-sj .7");
703	<	op = addarg(op, "-st .15");
678	<	sprintf(op, " -ab %d", overture=vint(INDIRECT));
679	<	op += strlen(op);
699	>	op = addarg(op, "-dt .1 -dc .5 -dr 1 -sj .7 -st .1");
700	>	if (overture = vint(INDIRECT)) {
701	>	sprintf(op, " -ab %d", overture);
702	>	op += strlen(op);
703	>	}
704		if (vdef(AMBFILE)) {
705		sprintf(op, " -af %s", vval(AMBFILE));
706		op += strlen(op);
#	Line 684 | Line 708 | register char  *op;
708		overture = 0;
709		switch (vscale(VARIABILITY)) {
710		case LOW:
711	<	op = addarg(op, "-aa .25");
688	<	op = addarg(op, "-ad 128");
689	<	op = addarg(op, "-as 0");
711	>	op = addarg(op, "-aa .25 -ad 196 -as 0");
712		break;
713		case MEDIUM:
714	<	op = addarg(op, "-aa .2");
693	<	op = addarg(op, "-ad 300");
694	<	op = addarg(op, "-as 64");
714	>	op = addarg(op, "-aa .2 -ad 400 -as 64");
715		break;
716		case HIGH:
717	<	op = addarg(op, "-aa .15");
698	<	op = addarg(op, "-ad 500");
699	<	op = addarg(op, "-as 128");
717	>	op = addarg(op, "-aa .15 -ad 768 -as 196");
718		break;
719		}
720		d = ambval();
721		sprintf(op, " -av %.2g %.2g %.2g", d, d, d);
722		op += strlen(op);
723	<	op = addarg(op, "-lr 6");
706	<	op = addarg(op, "-lw .002");
723	>	op = addarg(op, "-lr 6 -lw .002");
724		if (vdef(RENDER))
725		op = addarg(op, vval(RENDER));
726		}
#	Line 742 | Line 759 | register char  *op;
759		break;
760		}
761		op = addarg(op, "-pt .04");
762	<	if (vbool(PENUMBRAS)) {
763	<	op = addarg(op, "-ds .1");
764	<	op = addarg(op, "-dj .7");
748	<	} else
762	>	if (vbool(PENUMBRAS))
763	>	op = addarg(op, "-ds .1 -dj .7");
764	>	else
765		op = addarg(op, "-ds .2");
766	<	op = addarg(op, "-dt .05");
751	<	op = addarg(op, "-dc .75");
752	<	op = addarg(op, "-dr 3");
753	<	op = addarg(op, "-sj 1");
754	<	op = addarg(op, "-st .03");
766	>	op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .01");
767		sprintf(op, " -ab %d", overture=vint(INDIRECT)+1);
768		op += strlen(op);
769		if (vdef(AMBFILE)) {
#	Line 761 | Line 773 | register char  *op;
773		overture = 0;
774		switch (vscale(VARIABILITY)) {
775		case LOW:
776	<	op = addarg(op, "-aa .15");
765	<	op = addarg(op, "-ad 200");
766	<	op = addarg(op, "-as 0");
776	>	op = addarg(op, "-aa .15 -ad 256 -as 0");
777		break;
778		case MEDIUM:
779	<	op = addarg(op, "-aa .125");
770	<	op = addarg(op, "-ad 512");
771	<	op = addarg(op, "-as 128");
779	>	op = addarg(op, "-aa .125 -ad 512 -as 256");
780		break;
781		case HIGH:
782	<	op = addarg(op, "-aa .08");
775	<	op = addarg(op, "-ad 850");
776	<	op = addarg(op, "-as 256");
782	>	op = addarg(op, "-aa .08 -ad 1024 -as 512");
783		break;
784		}
785		d = ambval();
786		sprintf(op, " -av %.2g %.2g %.2g", d, d, d);
787		op += strlen(op);
788	<	op = addarg(op, "-lr 12");
783	<	op = addarg(op, "-lw .0005");
788	>	op = addarg(op, "-lr 12 -lw .0005");
789		if (vdef(RENDER))
790		op = addarg(op, vval(RENDER));
791		}
#	Line 790 | Line 795 | xferopts(ro)                           /* transfer options if indicated */
795		char    *ro;
796		{
797		int     fd, n;
798	+	register char   *cp;
799
800		n = strlen(ro);
801		if (n < 2)
802		return;
803		if (vdef(OPTFILE)) {
804	<	if ((fd = open(vval(OPTFILE), O_WRONLY|O_CREAT|O_TRUNC, 0666)) == -1)
804	>	for (cp = ro; cp[1]; cp++)
805	>	if (isspace(cp[1]) && cp[2] == '-' && isalpha(cp[3]))
806	>	*cp = '\n';
807	>	else
808	>	*cp = cp[1];
809	>	*cp = '\n';
810	>	fd = open(vval(OPTFILE), O_WRONLY|O_CREAT|O_TRUNC, 0666);
811	>	if (fd < 0 || write(fd, ro, n) != n || close(fd) < 0)
812		syserr(vval(OPTFILE));
813	<	if (write(fd, ro+1, n-1) != n-1)
801	<	syserr(vval(OPTFILE));
802	<	write(fd, "\n", 1);
803	<	close(fd);
804	<	ro[0] = ' ';
805	<	ro[1] = '^';
806	<	strcpy(ro+2, vval(OPTFILE));
813	>	sprintf(ro, " @%s", vval(OPTFILE));
814		}
815		#ifdef MSDOS
816		else if (n > 50) {
817	<	register char   *evp = bmalloc(n+6);
811	<	if (evp == NULL)
812	<	syserr(progname);
813	<	strcpy(evp, "ROPT=");
814	<	strcat(evp, ro);
815	<	if (putenv(evp) != 0) {
816	<	fprintf(stderr, "%s: out of environment space\n",
817	<	progname);
818	<	exit(1);
819	<	}
817	>	setenv("ROPT", ro+1);
818		strcpy(ro, " $ROPT");
819		}
820		#endif
#	Line 831 | Line 829 | register char  *po;
829		po = addarg(po, "-1 -e");
830		po = addarg(po, vval(EXPOSURE));
831		}
832	<	if (vscale(QUALITY) == HIGH)
833	<	po = addarg(po, "-r .65");
832	>	switch (vscale(QUALITY)) {
833	>	case MEDIUM:
834	>	po = addarg(po, "-r 1");
835	>	break;
836	>	case HIGH:
837	>	po = addarg(po, "-m .25");
838	>	break;
839	>	}
840		if (vdef(PFILT))
841		po = addarg(po, vval(PFILT));
842		}
#	Line 948 | Line 952 | register char  *vs;
952		break;
953		}
954		} else {
955	<	while (*vs && !isspace(*vs))    /* else skip id */
956	<	vs++;
955	>	while (!isspace(*vs))           /* else skip id */
956	>	if (!*vs++)
957	>	return(NULL);
958		if (upax) {                     /* specify up vector */
959		strcpy(cp, vup[upax+3]);
960		cp += strlen(cp);
961		}
962		}
963	<	/* append any additional options */
964	<	strcpy(cp, vs);
963	>	strcpy(cp, vs);                 /* append any additional options */
964	>	#ifdef MSDOS
965	>	if (strlen(viewopts) > 40) {
966	>	setenv("VIEW", viewopts);
967	>	return("$VIEW");
968	>	}
969	>	#endif
970		return(viewopts);
971		}
972
#	Line 964 | Line 974 | register char  *vs;
974		char *
975		getview(n, vn)                          /* get view n, or NULL if none */
976		int     n;
977	<	char    *vn;
977	>	char    *vn;            /* returned view name */
978		{
979		register char   *mv;
980
981	<	if (viewselect != NULL) {
981	>	if (viewselect != NULL) {               /* command-line selected */
982		if (n)                          /* only do one */
983		return(NULL);
984		if (viewselect[0] == '-') {     /* already specified */
#	Line 981 | Line 991 | char   *vn;
991		;
992		*vn = '\0';
993		}
994	+	/* view number? */
995	+	if (isint(viewselect))
996	+	return(specview(nvalue(vv+VIEW, atoi(viewselect)-1)));
997		/* check list */
998		while ((mv = nvalue(vv+VIEW, n++)) != NULL)
999		if (matchword(viewselect, mv))
1000		return(specview(mv));
1001		return(specview(viewselect));   /* standard view? */
1002		}
1003	<	if (vn != NULL && (mv = nvalue(vv+VIEW, n)) != NULL) {
1004	<	if (*mv != '-')
1005	<	while (*mv && !isspace(*mv))
1006	<	*vn++ = *mv++;
1003	>	mv = nvalue(vv+VIEW, n);                /* use view n */
1004	>	if (vn != NULL & mv != NULL) {
1005	>	register char   *mv2 = mv;
1006	>	if (*mv2 != '-')
1007	>	while (*mv2 && !isspace(*mv2))
1008	>	*vn++ = *mv2++;
1009		*vn = '\0';
1010		}
1011	<	return(specview(nvalue(vv+VIEW, n)));   /* use view n */
1011	>	return(specview(mv));
1012		}
1013
1014
1015	+	printview(vopts)                        /* print out selected view */
1016	+	register char   *vopts;
1017	+	{
1018	+	extern char     *atos();
1019	+	char    buf[256];
1020	+	FILE    *fp;
1021	+	register char   *cp;
1022	+
1023	+	if (vopts == NULL)
1024	+	return(-1);
1025	+	fputs("VIEW=", stdout);
1026	+	do {
1027	+	if (matchword(vopts, "-vf")) {          /* expand view file */
1028	+	vopts = sskip(vopts);
1029	+	if (!*atos(buf, sizeof(buf), vopts))
1030	+	return(-1);
1031	+	if ((fp = fopen(buf, "r")) == NULL)
1032	+	return(-1);
1033	+	for (buf[sizeof(buf)-2] = '\n';
1034	+	fgets(buf, sizeof(buf), fp) != NULL &&
1035	+	buf[0] != '\n';
1036	+	buf[sizeof(buf)-2] = '\n') {
1037	+	if (buf[sizeof(buf)-2] != '\n') {
1038	+	ungetc(buf[sizeof(buf)-2], fp);
1039	+	buf[sizeof(buf)-2] = '\0';
1040	+	}
1041	+	if (matchword(buf, "VIEW=") ||
1042	+	matchword(buf, "rview")) {
1043	+	for (cp = sskip(buf); *cp && *cp != '\n'; cp++)
1044	+	putchar(*cp);
1045	+	}
1046	+	}
1047	+	fclose(fp);
1048	+	vopts = sskip(vopts);
1049	+	} else {
1050	+	while (isspace(*vopts))
1051	+	vopts++;
1052	+	putchar(' ');
1053	+	while (*vopts && !isspace(*vopts))
1054	+	putchar(*vopts++);
1055	+	}
1056	+	} while (*vopts++);
1057	+	putchar('\n');
1058	+	return(0);
1059	+	}
1060	+
1061	+
1062		rview(opts)                             /* run rview with first view */
1063		char    *opts;
1064		{
1065	+	char    *vw;
1066		char    combuf[512];
1067		/* build command */
1068	<	sprintf(combuf, "rview %s%s ", getview(0, NULL), opts);
1068	>	if ((vw = getview(0, NULL)) == NULL)
1069	>	return;
1070	>	if (sayview)
1071	>	printview(vw);
1072	>	sprintf(combuf, "rview %s%s -R %s ", vw, opts, rifname);
1073		if (rvdevice != NULL)
1074		sprintf(combuf+strlen(combuf), "-o %s ", rvdevice);
1075		strcat(combuf, vval(OCTREE));
1076	<	if (!silent) {                  /* echo it */
1010	<	printf("\t%s\n", combuf);
1011	<	fflush(stdout);
1012	<	}
1013	<	if (noaction)
1014	<	return;
1015	<	if (system(combuf)) {           /* run it */
1076	>	if (runcom(combuf)) {           /* run it */
1077		fprintf(stderr, "%s: error running rview\n", progname);
1078		exit(1);
1079		}
#	Line 1027 | Line 1088 | char   *opts;
1088		char    pfopts[128];
1089		char    vs[32], *vw;
1090		int     vn, mult;
1091	+	long    lastdate;
1092		/* get pfilt options */
1093		pfiltopts(pfopts);
1094		/* get resolution, reporting */
#	Line 1057 | Line 1119 | char   *opts;
1119		else
1120		badvalue(REPORT);
1121		}
1122	<	/* check date on ambient file */
1123	<	if (vdef(AMBFILE)) {
1062	<	long    afdate = fdate(vval(AMBFILE));
1063	<	if (afdate >= 0 & octreedate > afdate) {
1064	<	if (!silent)
1065	<	#ifdef MSDOS
1066	<	printf("\tdel %s\n", vval(AMBFILE));
1067	<	#else
1068	<	printf("\trm %s\n", vval(AMBFILE));
1069	<	#endif
1070	<	if (!noaction)
1071	<	unlink(vval(AMBFILE));
1072	<	}
1073	<	}
1122	>	/* get update time */
1123	>	lastdate = octreedate > matdate ? octreedate : matdate;
1124		/* do each view */
1125		vn = 0;
1126		while ((vw = getview(vn++, vs)) != NULL) {
1127	+	if (sayview)
1128	+	printview(vw);
1129		if (!vs[0])
1130		sprintf(vs, "%d", vn);
1131		sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs);
1132		/* check date on picture */
1133	<	if (fdate(picfile) > octreedate)
1133	>	if (fdate(picfile) >= lastdate)
1134		continue;
1135		/* build rpict command */
1136		sprintf(rawfile, "%s_%s.raw", vval(PICTURE), vs);
1137	<	if (fdate(rawfile) > octreedate)        /* recover */
1137	>	if (fdate(rawfile) >= octreedate)       /* recover */
1138		sprintf(combuf, "rpict%s%s -ro %s %s",
1139		rep, opts, rawfile, vval(OCTREE));
1140		else {
#	Line 1090 | Line 1142 | char   *opts;
1142		sprintf(combuf,
1143		"rpict%s %s%s -x 64 -y 64 -ps 1 %s > %s",
1144		rep, vw, opts,
1145	<	vval(OCTREE), rawfile);
1146	<	if (!silent) {
1095	<	printf("\t%s\n", combuf);
1096	<	fflush(stdout);
1097	<	}
1098	<	if (!noaction && system(combuf)) {
1145	>	vval(OCTREE), overfile);
1146	>	if (runcom(combuf)) {
1147		fprintf(stderr,
1148	<	"%s: error in overture for view %s\n\t%s removed\n",
1149	<	progname, vs, rawfile);
1102	<	unlink(rawfile);
1148	>	"%s: error in overture for view %s\n",
1149	>	progname, vs);
1150		exit(1);
1151		}
1152	+	#ifdef NIX
1153	+	rmfile(overfile);
1154	+	#endif
1155		}
1156		sprintf(combuf, "rpict%s %s %s%s %s > %s",
1157		rep, vw, res, opts,
1158		vval(OCTREE), rawfile);
1159		}
1160	<	if (!silent) {                  /* echo rpict command */
1111	<	printf("\t%s\n", combuf);
1112	<	fflush(stdout);
1113	<	}
1114	<	if (!noaction && system(combuf)) {      /* run rpict */
1160	>	if (runcom(combuf)) {           /* run rpict */
1161		fprintf(stderr, "%s: error rendering view %s\n",
1162		progname, vs);
1163		exit(1);
#	Line 1123 | Line 1169 | char   *opts;
1169		else
1170		sprintf(combuf, "pfilt%s %s > %s", pfopts,
1171		rawfile, picfile);
1172	<	if (!silent) {                  /* echo pfilt command */
1127	<	printf("\t%s\n", combuf);
1128	<	fflush(stdout);
1129	<	}
1130	<	if (!noaction && system(combuf)) {      /* run pfilt */
1172	>	if (runcom(combuf)) {           /* run pfilt */
1173		fprintf(stderr,
1174		"%s: error filtering view %s\n\t%s removed\n",
1175		progname, vs, picfile);
#	Line 1135 | Line 1177 | char   *opts;
1177		exit(1);
1178		}
1179		/* remove raw file */
1180	<	if (!silent)
1180	>	rmfile(rawfile);
1181	>	}
1182	>	}
1183	>
1184	>
1185	>	runcom(cs)                      /* run command */
1186	>	char    *cs;
1187	>	{
1188	>	if (!silent)            /* echo it */
1189	>	printf("\t%s\n", cs);
1190	>	if (noaction)
1191	>	return(0);
1192	>	fflush(stdout);         /* flush output and pass to shell */
1193	>	return(system(cs));
1194	>	}
1195	>
1196	>
1197	>	rmfile(fn)                      /* remove a file */
1198	>	char    *fn;
1199	>	{
1200	>	if (!silent)
1201		#ifdef MSDOS
1202	<	printf("\tdel %s\n", rawfile);
1202	>	printf("\tdel %s\n", fn);
1203		#else
1204	<	printf("\trm %s\n", rawfile);
1204	>	printf("\trm -f %s\n", fn);
1205		#endif
1206	<	if (!noaction)
1207	<	unlink(rawfile);
1206	>	if (noaction)
1207	>	return(0);
1208	>	return(unlink(fn));
1209	>	}
1210	>
1211	>
1212	>	#ifdef MSDOS
1213	>	setenv(vname, value)            /* set an environment variable */
1214	>	char    *vname, *value;
1215	>	{
1216	>	register char   *evp;
1217	>
1218	>	evp = bmalloc(strlen(vname)+strlen(value)+2);
1219	>	if (evp == NULL)
1220	>	syserr(progname);
1221	>	sprintf(evp, "%s=%s", vname, value);
1222	>	if (putenv(evp) != 0) {
1223	>	fprintf(stderr, "%s: out of environment space\n", progname);
1224	>	exit(1);
1225		}
1226	+	if (!silent)
1227	+	printf("set %s\n", evp);
1228		}
1229	+	#endif
1230
1231
1232		badvalue(vc)                    /* report bad variable value and exit */

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)