[ViewVC] Diff of: radiance/ray/src/util/rad.c

Comparing ray/src/util/rad.c (file contents):
Revision 2.69 by schorsch, Mon Jul 14 20:02:30 2003 UTC vs.
Revision 2.76 by schorsch, Fri Mar 26 21:36:19 2004 UTC

#	Line 11 \| Line 11 \| static const char RCSid[] = "$Id$";
11		#include <time.h>
12
13		#include "platform.h"
14	+	#include "rtprocess.h"
15		#include "view.h"
16		#include "paths.h"
17		#include "vars.h"
#	Line 21 \| Line 22 \| static const char RCSid[] = "$Id$";
22		#else
23		#define DELCMD "rm -f"
24		#define RENAMECMD "mv"
25	+	#include <sys/types.h>
26	+	#include <sys/wait.h>
27		#endif
28
29		/* variables (alphabetical by name) */
#	Line 106 \| Line 109 \| *int silent = 0; / do work silently /*
109		int touchonly = 0; /* touch files only */
110		int nprocs = 1; /* maximum executing processes */
111		int sayview = 0; /* print view out */
112	<	char rvdevice = NULL; / rview output device */
112	>	char rvdevice = NULL; / rvu output device */
113		char viewselect = NULL; / specific view only */
114
115		int overture = 0; /* overture calculation needed */
#	Line 120 \| Line 123 \| *char radname[PATH_MAX]; / root Radiance file name /*
123
124		#define inchild() (children_running < 0)
125
126	+	static void rootname(char rn, char fn);
127	+	static time_t checklast(char *fnames);
128	+	static char * newfname(char *orig, int pred);
129	+	static void checkfiles(void);
130	+	static void getoctcube(double org[3], double *sizp);
131	+	static void setdefaults(void);
132	+	static void oconv(void);
133	+	static char * addarg(char op, char arg);
134	+	static void oconvopts(char *oo);
135	+	static void mkillumopts(char *mo);
136	+	static void checkambfile(void);
137	+	static double ambval(void);
138	+	static void renderopts(char op, char po);
139	+	static void lowqopts(char op, char po);
140	+	static void medqopts(char op, char po);
141	+	static void hiqopts(char op, char po);
142	+	static void xferopts(char *ro);
143	+	static void pfiltopts(char *po);
144	+	static int matchword(char s1, char s2);
145	+	static char * specview(char *vs);
146	+	static char * getview(int n, char *vn);
147	+	static int myprintview(char vopts, FILE fp);
148	+	static void rvu(char opts, char po);
149	+	static void rpict(char opts, char po);
150	+	static int touch(char *fn);
151	+	static int runcom(char *cs);
152	+	static int rmfile(char *fn);
153	+	static int mvfile(char fold, char fnew);
154	+	static int next_process(void);
155	+	static void wait_process(int all);
156	+	static void finish_process(void);
157	+	static void badvalue(int vc);
158	+	static void syserr(char *s);
159
160	<	main(argc, argv)
161	<	int argc;
162	<	char *argv[];
160	>
161	>	int
162	>	main(
163	>	int argc,
164	>	char *argv[]
165	>	)
166		{
167		char ropts[512];
168		char popts[64];
#	Line 169 \| Line 208 \| *char argv[];**
208		goto userr;
209		rifname = argv[i];
210		/* check command-line options */
211	<	if (nprocs > 1 & viewselect != NULL)
211	>	if ((nprocs > 1) & (viewselect != NULL))
212		nprocs = 1;
213		/* assign Radiance root file name */
214		rootname(radname, rifname);
#	Line 199 \| Line 238 \| *char argv[];**
238		renderopts(ropts, popts);
239		xferopts(ropts);
240		if (rvdevice != NULL)
241	<	rview(ropts, popts);
241	>	rvu(ropts, popts);
242		else
243		rpict(ropts, popts);
244		quit(0);
#	Line 208 \| Line 247 \| userr:
247		"Usage: %s [-w][-s][-n\|-N npr][-t][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n",
248		progname);
249		quit(1);
250	+	return 1; /* pro forma return */
251		}
252
253
254	<	rootname(rn, fn) /* remove tail from end of fn */
255	<	register char rn, fn;
254	>	static void
255	>	rootname( /* remove tail from end of fn */
256	>	register char *rn,
257	>	register char *fn
258	>	)
259		{
260		char tp, dp;
261
262	<	for (tp = NULL, dp = rn; rn = fn++; rn++)
262	>	for (tp = NULL, dp = rn; (rn = fn++); rn++)
263		if (ISDIRSEP(*rn))
264		dp = rn;
265		else if (*rn == '.')
#	Line 226 \| Line 269 \| *register char rn, fn;*
269		}
270
271
272	<	time_t
273	<	checklast(fnames) /* check files and find most recent */
274	<	register char *fnames;
272	>	static time_t
273	>	checklast( /* check files and find most recent */
274	>	register char *fnames
275	>	)
276		{
277		char thisfile[PATH_MAX];
278		time_t thisdate, lastdate = 0;
#	Line 248 \| Line 292 \| *register char fnames;**
292		}
293
294
295	<	char *
296	<	newfname(orig, pred) /* create modified file name */
297	<	char *orig;
298	<	int pred;
295	>	static char *
296	>	newfname( /* create modified file name */
297	>	char *orig,
298	>	int pred
299	>	)
300		{
301		register char *cp;
302		register int n;
#	Line 273 \| Line 318 \| int pred;
318		}
319
320
321	<	checkfiles() /* check for existence and modified times */
321	>	static void
322	>	checkfiles(void) /* check for existence and modified times */
323		{
324		time_t objdate;
325
#	Line 308 \| Line 354 \| *checkfiles() / check for existence and modified tim**
354		}
355
356
357	<	getoctcube(org, sizp) /* get octree bounding cube */
358	<	double org[3], *sizp;
357	>	static void
358	>	getoctcube( /* get octree bounding cube */
359	>	double org[3],
360	>	double *sizp
361	>	)
362		{
314	–	extern FILE *popen();
363		static double oorg[3], osiz = 0.;
364		double min[3], max[3];
365		char buf[1024];
366		FILE *fp;
367		register int i;
368
369	<	if (osiz <= FTINY)
369	>	if (osiz <= FTINY) {
370		if (!nprocs && fdate(oct1name) <
371		(scenedate>illumdate?scenedate:illumdate)) {
372		/* run getbbox */
#	Line 354 \| Line 402 \| *double org[3], sizp;**
402		}
403		pclose(fp);
404		}
405	+	}
406		org[0] = oorg[0]; org[1] = oorg[1]; org[2] = oorg[2]; *sizp = osiz;
407		}
408
409
410	<	setdefaults() /* set default values for unassigned var's */
410	>	static void
411	>	setdefaults(void) /* set default values for unassigned var's */
412		{
413		double org[3], lim[3], size;
414		char buf[128];
#	Line 415 \| Line 465 \| *setdefaults() / set default values for unassigned v**
465		}
466
467
468	<	oconv() /* run oconv and mkillum if necessary */
468	>	static void
469	>	oconv(void) /* run oconv and mkillum if necessary */
470		{
471		static char illumtmp[] = "ilXXXXXX";
472		char combuf[PATH_MAX], ocopts[64], mkopts[64];
#	Line 447 \| Line 498 \| *oconv() / run oconv and mkillum if necessary /*
498		}
499		if (oct1name == vval(OCTREE)) /* no mkillum? */
500		oct1date = octreedate > matdate ? octreedate : matdate;
501	<	if (oct1date >= octreedate & oct1date >= matdate
502	<	& oct1date >= illumdate) /* all done */
501	>	if ((oct1date >= octreedate) & (oct1date >= matdate)
502	>	& (oct1date >= illumdate)) /* all done */
503		return;
504		/* make octree0 */
505	<	if (oct0date < scenedate \| oct0date < illumdate) {
505	>	if ((oct0date < scenedate) \| (oct0date < illumdate)) {
506		if (touchonly && oct0date)
507		touch(oct0name);
508		else { /* build command */
#	Line 517 \| Line 568 \| *oconv() / run oconv and mkillum if necessary /*
568		}
569
570
571	<	char *
572	<	addarg(op, arg) /* add argument and advance pointer */
573	<	register char op, arg;
571	>	static char *
572	>	addarg( /* add argument and advance pointer */
573	>	register char *op,
574	>	register char *arg
575	>	)
576		{
577		*op = ' ';
578	<	while (++op = arg++)
578	>	while ( (++op = arg++) )
579		;
580		return(op);
581		}
582
583
584	<	oconvopts(oo) /* get oconv options */
585	<	register char *oo;
584	>	static void
585	>	oconvopts( /* get oconv options */
586	>	register char *oo
587	>	)
588		{
589		/* BEWARE: This may be called via setdefaults(), so no assumptions */
590
#	Line 539 \| Line 594 \| *register char oo;**
594		}
595
596
597	<	mkillumopts(mo) /* get mkillum options */
598	<	register char *mo;
597	>	static void
598	>	mkillumopts( /* get mkillum options */
599	>	register char *mo
600	>	)
601		{
602		/* BEWARE: This may be called via setdefaults(), so no assumptions */
603
#	Line 550 \| Line 607 \| *register char mo;**
607		}
608
609
610	<	checkambfile() /* check date on ambient file */
610	>	static void
611	>	checkambfile(void) /* check date on ambient file */
612		{
613		time_t afdate;
614
#	Line 558 \| Line 616 \| *checkambfile() / check date on ambient file /*
616		return;
617		if (!(afdate = fdate(vval(AMBFILE))))
618		return;
619	<	if (oct1date > afdate)
619	>	if (oct1date > afdate) {
620		if (touchonly)
621		touch(vval(AMBFILE));
622		else
623		rmfile(vval(AMBFILE));
624	+	}
625		}
626
627
628	<	double
629	<	ambval() /* compute ambient value */
628	>	static double
629	>	ambval(void) /* compute ambient value */
630		{
631		if (vdef(EXPOSURE)) {
632		if (vval(EXPOSURE)[0] == '+' \|\| vval(EXPOSURE)[0] == '-')
#	Line 579 \| Line 638 \| *ambval() / compute ambient value /*
638		if (vlet(ZONE) == 'I')
639		return(.01);
640		badvalue(ZONE);
641	+	return 0; /* pro forma return */
642		}
643
644
645	<	renderopts(op, po) /* set rendering options */
646	<	char op, po;
645	>	static void
646	>	renderopts( /* set rendering options */
647	>	char *op,
648	>	char *po
649	>	)
650		{
651		switch(vscale(QUALITY)) {
652		case LOW:
#	Line 599 \| Line 662 \| *char op, po;*
662		}
663
664
665	<	lowqopts(op, po) /* low quality rendering options */
666	<	register char *op;
667	<	char *po;
665	>	static void
666	>	lowqopts( /* low quality rendering options */
667	>	register char *op,
668	>	char *po
669	>	)
670		{
671		double d, org[3], siz[3];
672
#	Line 611 \| Line 676 \| *char po;**
676		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
677		badvalue(ZONE);
678		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
679	<	if (siz[0] <= FTINY \| siz[1] <= FTINY \| siz[2] <= FTINY)
679	>	if ((siz[0] <= FTINY) \| (siz[1] <= FTINY) \| (siz[2] <= FTINY))
680		badvalue(ZONE);
681		getoctcube(org, &d);
682		d *= 3./(siz[0]+siz[1]+siz[2]);
#	Line 619 \| Line 684 \| *char po;**
684		case LOW:
685		po = addarg(po, "-ps 16");
686		op = addarg(op, "-dp 64");
687	<	sprintf(op, " -ar %d", (int)(4*d));
687	>	sprintf(op, " -ar %d", (int)(8*d));
688		op += strlen(op);
689		break;
690		case MEDIUM:
691		po = addarg(po, "-ps 8");
692		op = addarg(op, "-dp 128");
693	<	sprintf(op, " -ar %d", (int)(8*d));
693	>	sprintf(op, " -ar %d", (int)(16*d));
694		op += strlen(op);
695		break;
696		case HIGH:
697		po = addarg(po, "-ps 4");
698		op = addarg(op, "-dp 256");
699	<	sprintf(op, " -ar %d", (int)(16*d));
699	>	sprintf(op, " -ar %d", (int)(32*d));
700		op += strlen(op);
701		break;
702		}
#	Line 648 \| Line 713 \| *char po;**
713		overture = 0;
714		switch (vscale(VARIABILITY)) {
715		case LOW:
716	<	op = addarg(op, "-aa .4 -ad 64");
716	>	op = addarg(op, "-aa .3 -ad 256");
717		break;
718		case MEDIUM:
719	<	op = addarg(op, "-aa .3 -ad 128");
719	>	op = addarg(op, "-aa .25 -ad 512");
720		break;
721		case HIGH:
722	<	op = addarg(op, "-aa .25 -ad 256");
722	>	op = addarg(op, "-aa .2 -ad 1024");
723		break;
724		}
725		op = addarg(op, "-as 0");
726		d = ambval();
727		sprintf(op, " -av %.2g %.2g %.2g", d, d, d);
728		op += strlen(op);
729	<	op = addarg(op, "-lr 3 -lw .02");
729	>	op = addarg(op, "-lr 6 -lw .01");
730		if (vdef(RENDER))
731		op = addarg(op, vval(RENDER));
732		}
733
734
735	<	medqopts(op, po) /* medium quality rendering options */
736	<	register char *op;
737	<	char *po;
735	>	static void
736	>	medqopts( /* medium quality rendering options */
737	>	register char *op,
738	>	char *po
739	>	)
740		{
741		double d, org[3], siz[3], asz;
742
#	Line 679 \| Line 746 \| *char po;**
746		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
747		badvalue(ZONE);
748		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
749	<	if (siz[0] <= FTINY \| siz[1] <= FTINY \| siz[2] <= FTINY)
749	>	if ((siz[0] <= FTINY) \| (siz[1] <= FTINY) \| (siz[2] <= FTINY))
750		badvalue(ZONE);
751		getoctcube(org, &d);
752		asz = (siz[0]+siz[1]+siz[2])/3.;
#	Line 688 \| Line 755 \| *char po;**
755		case LOW:
756		po = addarg(po, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8");
757		op = addarg(op, "-dp 256");
758	<	sprintf(op, " -ar %d", (int)(8*d));
758	>	sprintf(op, " -ar %d", (int)(16*d));
759		op += strlen(op);
760		sprintf(op, " -ms %.2g", asz/20.);
761		op += strlen(op);
#	Line 696 \| Line 763 \| *char po;**
763		case MEDIUM:
764		po = addarg(po, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6");
765		op = addarg(op, "-dp 512");
766	<	sprintf(op, " -ar %d", (int)(16*d));
766	>	sprintf(op, " -ar %d", (int)(32*d));
767		op += strlen(op);
768		sprintf(op, " -ms %.2g", asz/40.);
769		op += strlen(op);
#	Line 704 \| Line 771 \| *char po;**
771		case HIGH:
772		po = addarg(po, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4");
773		op = addarg(op, "-dp 1024");
774	<	sprintf(op, " -ar %d", (int)(32*d));
774	>	sprintf(op, " -ar %d", (int)(64*d));
775		op += strlen(op);
776		sprintf(op, " -ms %.2g", asz/80.);
777		op += strlen(op);
#	Line 716 \| Line 783 \| *char po;**
783		else
784		op = addarg(op, "-ds .3");
785		op = addarg(op, "-dt .1 -dc .5 -dr 1 -sj .7 -st .1");
786	<	if (overture = vint(INDIRECT)) {
786	>	if ( (overture = vint(INDIRECT)) ) {
787		sprintf(op, " -ab %d", overture);
788		op += strlen(op);
789		}
#	Line 727 \| Line 794 \| *char po;**
794		overture = 0;
795		switch (vscale(VARIABILITY)) {
796		case LOW:
797	<	op = addarg(op, "-aa .25 -ad 196 -as 0");
797	>	op = addarg(op, "-aa .2 -ad 329 -as 42");
798		break;
799		case MEDIUM:
800	<	op = addarg(op, "-aa .2 -ad 400 -as 64");
800	>	op = addarg(op, "-aa .15 -ad 800 -as 128");
801		break;
802		case HIGH:
803	<	op = addarg(op, "-aa .15 -ad 768 -as 196");
803	>	op = addarg(op, "-aa .1 -ad 1536 -as 392");
804		break;
805		}
806		d = ambval();
807		sprintf(op, " -av %.2g %.2g %.2g", d, d, d);
808		op += strlen(op);
809	<	op = addarg(op, "-lr 6 -lw .002");
809	>	op = addarg(op, "-lr 8 -lw .002");
810		if (vdef(RENDER))
811		op = addarg(op, vval(RENDER));
812		}
813
814
815	<	hiqopts(op, po) /* high quality rendering options */
816	<	register char *op;
817	<	char *po;
815	>	static void
816	>	hiqopts( /* high quality rendering options */
817	>	register char *op,
818	>	char *po
819	>	)
820		{
821		double d, org[3], siz[3], asz;
822
#	Line 757 \| Line 826 \| *char po;**
826		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
827		badvalue(ZONE);
828		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
829	<	if (siz[0] <= FTINY \| siz[1] <= FTINY \| siz[2] <= FTINY)
829	>	if ((siz[0] <= FTINY) \| (siz[1] <= FTINY) \| (siz[2] <= FTINY))
830		badvalue(ZONE);
831		getoctcube(org, &d);
832		asz = (siz[0]+siz[1]+siz[2])/3.;
#	Line 766 \| Line 835 \| *char po;**
835		case LOW:
836		po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8");
837		op = addarg(op, "-dp 1024");
838	<	sprintf(op, " -ar %d", (int)(16*d));
838	>	sprintf(op, " -ar %d", (int)(32*d));
839		op += strlen(op);
840		sprintf(op, " -ms %.2g", asz/40.);
841		op += strlen(op);
#	Line 774 \| Line 843 \| *char po;**
843		case MEDIUM:
844		po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5");
845		op = addarg(op, "-dp 2048");
846	<	sprintf(op, " -ar %d", (int)(32*d));
846	>	sprintf(op, " -ar %d", (int)(64*d));
847		op += strlen(op);
848		sprintf(op, " -ms %.2g", asz/80.);
849		op += strlen(op);
#	Line 782 \| Line 851 \| *char po;**
851		case HIGH:
852		po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3");
853		op = addarg(op, "-dp 4096");
854	<	sprintf(op, " -ar %d", (int)(64*d));
854	>	sprintf(op, " -ar %d", (int)(128*d));
855		op += strlen(op);
856		sprintf(op, " -ms %.2g", asz/160.);
857		op += strlen(op);
#	Line 803 \| Line 872 \| *char po;**
872		overture = 0;
873		switch (vscale(VARIABILITY)) {
874		case LOW:
875	<	op = addarg(op, "-aa .15 -ad 256 -as 0");
875	>	op = addarg(op, "-aa .125 -ad 512 -as 64");
876		break;
877		case MEDIUM:
878	<	op = addarg(op, "-aa .125 -ad 512 -as 256");
878	>	op = addarg(op, "-aa .1 -ad 1536 -as 768");
879		break;
880		case HIGH:
881	<	op = addarg(op, "-aa .08 -ad 1024 -as 512");
881	>	op = addarg(op, "-aa .075 -ad 4096 -as 2048");
882		break;
883		}
884		d = ambval();
#	Line 821 \| Line 890 \| *char po;**
890		}
891
892
893	<	xferopts(ro) /* transfer options if indicated */
894	<	char *ro;
893	>	static void
894	>	xferopts( /* transfer options if indicated */
895	>	char *ro
896	>	)
897		{
898		int fd, n;
899		register char *cp;
#	Line 852 \| Line 923 \| *char ro;**
923		}
924
925
926	<	pfiltopts(po) /* get pfilt options */
927	<	register char *po;
926	>	static void
927	>	pfiltopts( /* get pfilt options */
928	>	register char *po
929	>	)
930		{
931		*po = '\0';
932		if (vdef(EXPOSURE)) {
#	Line 873 \| Line 946 \| *register char po;**
946		}
947
948
949	<	matchword(s1, s2) /* match white-delimited words */
950	<	register char s1, s2;
949	>	static int
950	>	matchword( /* match white-delimited words */
951	>	register char *s1,
952	>	register char *s2
953	>	)
954		{
955		while (isspace(*s1)) s1++;
956		while (isspace(*s2)) s2++;
#	Line 885 \| Line 961 \| *register char s1, s2;*
961		}
962
963
964	<	char *
965	<	specview(vs) /* get proper view spec from vs */
966	<	register char *vs;
964	>	static char *
965	>	specview( /* get proper view spec from vs */
966	>	register char *vs
967	>	)
968		{
969		static char vup[7][12] = {"-vu 0 0 -1","-vu 0 -1 0","-vu -1 0 0",
970		"-vu 0 0 1", "-vu 1 0 0","-vu 0 1 0","-vu 0 0 1"};
#	Line 905 \| Line 982 \| *register char vs;**
982		upax = 1-'X'+UPPER(vval(UP)[1]);
983		else
984		upax = 1-'X'+vlet(UP);
985	<	if (upax < 1 \| upax > 3)
985	>	if ((upax < 1) \| (upax > 3))
986		badvalue(UP);
987		if (vval(UP)[0] == '-')
988		upax = -upax;
#	Line 928 \| Line 1005 \| *register char vs;**
1005		zpos = -1; vs++;
1006		}
1007		viewtype = 'v';
1008	<	if (vs == 'v' \| vs == 'l' \| vs == 'a' \| vs == 'h' \| *vs == 'c')
1008	>	if((vs == 'v') \| (vs == 'l') \| (vs == 'a') \| (vs == 'h') \| (*vs == 'c'))
1009		viewtype = *vs++;
1010		cp = viewopts;
1011		if ((!vs \|\| isspace(vs)) && (xpos\|ypos\|zpos)) { /* got one! */
#	Line 1009 \| Line 1086 \| *register char vs;**
1086		}
1087
1088
1089	<	char *
1090	<	getview(n, vn) /* get view n, or NULL if none */
1091	<	int n;
1092	<	char vn; / returned view name */
1089	>	static char *
1090	>	getview( /* get view n, or NULL if none */
1091	>	int n,
1092	>	char vn / returned view name */
1093	>	)
1094		{
1095		register char *mv;
1096
#	Line 1039 \| Line 1117 \| *char vn; /* returned view name /*
1117		return(specview(viewselect)); /* standard view? */
1118		}
1119		mv = nvalue(VIEWS, n); /* use view n */
1120	<	if (vn != NULL & mv != NULL) {
1120	>	if ((vn != NULL) & (mv != NULL)) {
1121		register char *mv2 = mv;
1122		if (*mv2 != '-')
1123		while (mv2 && !isspace(mv2))
#	Line 1050 \| Line 1128 \| *char vn; /* returned view name /*
1128		}
1129
1130
1131	<	int
1132	<	myprintview(vopts, fp) /* print out selected view */
1133	<	register char *vopts;
1134	<	FILE *fp;
1131	>	static int
1132	>	myprintview( /* print out selected view */
1133	>	register char *vopts,
1134	>	FILE *fp
1135	>	)
1136		{
1137		VIEW vwr;
1138		char buf[128];
1139		register char *cp;
1061	–	again:
1140		if (vopts == NULL)
1141		return(-1);
1142		#ifdef _WIN32
#	Line 1067 \| Line 1145 \| again:
1145		goto again;
1146		}
1147		#endif
1148	<	copystruct(&vwr, &stdview);
1148	>	vwr = stdview;
1149		sscanview(&vwr, cp=vopts); /* set initial options */
1150		while ((cp = strstr(cp, "-vf ")) != NULL &&
1151		*atos(buf, sizeof(buf), cp += 4)) {
#	Line 1081 \| Line 1159 \| again:
1159		}
1160
1161
1162	<	rview(opts, po) /* run rview with first view */
1163	<	char opts, po;
1162	>	static void
1163	>	rvu( /* run rvu with first view */
1164	>	char *opts,
1165	>	char *po
1166	>	)
1167		{
1168		char *vw;
1169		char combuf[PATH_MAX];
#	Line 1091 \| Line 1172 \| *char opts, po;*
1172		return;
1173		if (sayview)
1174		myprintview(vw, stdout);
1175	<	sprintf(combuf, "rview %s%s%s -R %s ", vw, po, opts, rifname);
1175	>	sprintf(combuf, "rvu %s%s%s -R %s ", vw, po, opts, rifname);
1176		if (rvdevice != NULL)
1177		sprintf(combuf+strlen(combuf), "-o %s ", rvdevice);
1178		if (vdef(EXPOSURE))
1179		sprintf(combuf+strlen(combuf), "-pe %s ", vval(EXPOSURE));
1180		strcat(combuf, oct1name);
1181		if (runcom(combuf)) { /* run it */
1182	<	fprintf(stderr, "%s: error running rview\n", progname);
1182	>	fprintf(stderr, "%s: error running rvu\n", progname);
1183		quit(1);
1184		}
1185		}
1186
1187
1188	<	rpict(opts, po) /* run rpict and pfilt for each view */
1189	<	char opts, po;
1188	>	static void
1189	>	rpict( /* run rpict and pfilt for each view */
1190	>	char *opts,
1191	>	char *po
1192	>	)
1193		{
1194		char combuf[PATH_MAX];
1195		char rawfile[PATH_MAX], picfile[PATH_MAX];
#	Line 1157 \| Line 1241 \| *char opts, po;*
1241		badvalue(REPORT);
1242		}
1243		/* set up parallel rendering */
1244	<	if (nprocs > 1 & !vdef(ZFILE)) {
1244	>	if ((nprocs > 1) & (!vdef(ZFILE))) {
1245		strcpy(rppopt, "-S 1 -PP pfXXXXXX");
1246		pfile = rppopt+9;
1247		if (mktemp(pfile) == NULL)
#	Line 1262 \| Line 1346 \| *char opts, po;*
1346		mvfile(rawfile, combuf);
1347		} else
1348		rmfile(rawfile);
1349	<	finish_process(); /* leave if child */
1349	>	finish_process(); /* exit if child */
1350		}
1351		wait_process(1); /* wait for children to finish */
1352		if (pfile != NULL) { /* clean up rpict persistent mode */
#	Line 1270 \| Line 1354 \| *char opts, po;*
1354		fp = fopen(pfile, "r");
1355		if (fp != NULL) {
1356		if (fscanf(fp, "%*s %d", &pid) != 1 \|\|
1357	<	kill(pid, 1) == -1)
1357	>	kill(pid, 1) < 0)
1358		unlink(pfile);
1359		fclose(fp);
1360		}
#	Line 1282 \| Line 1366 \| rperror:
1366		}
1367
1368
1369	<	touch(fn) /* update a file */
1370	<	char *fn;
1369	>	static int
1370	>	touch( /* update a file */
1371	>	char *fn
1372	>	)
1373		{
1374		if (!silent)
1375		printf("\ttouch %s\n", fn);
#	Line 1298 \| Line 1384 \| *char fn;**
1384		}
1385
1386
1387	<	runcom(cs) /* run command */
1388	<	char *cs;
1387	>	static int
1388	>	runcom( /* run command */
1389	>	char *cs
1390	>	)
1391		{
1392		if (!silent) /* echo it */
1393		printf("\t%s\n", cs);
#	Line 1310 \| Line 1398 \| *char cs;**
1398		}
1399
1400
1401	<	rmfile(fn) /* remove a file */
1402	<	char *fn;
1401	>	static int
1402	>	rmfile( /* remove a file */
1403	>	char *fn
1404	>	)
1405		{
1406		if (!silent)
1407		printf("\t%s %s\n", DELCMD, fn);
#	Line 1321 \| Line 1411 \| *char fn;**
1411		}
1412
1413
1414	<	mvfile(fold, fnew) /* move a file */
1415	<	char fold, fnew;
1414	>	static int
1415	>	mvfile( /* move a file */
1416	>	char *fold,
1417	>	char *fnew
1418	>	)
1419		{
1420		if (!silent)
1421		printf("\t%s %s %s\n", RENAMECMD, fold, fnew);
#	Line 1333 \| Line 1426 \| *char fold, fnew;*
1426
1427
1428		#ifdef RHAS_FORK_EXEC
1429	<	int
1430	<	next_process() /* fork the next process (max. nprocs) */
1429	>	static int
1430	>	next_process(void) /* fork the next process (max. nprocs) */
1431		{
1432		int child_pid;
1433
1434		if (nprocs <= 1)
1435		return(0); /* it's us or no one */
1436		if (inchild()) {
1437	<	fprintf(stderr, "%s: internal error 1 in spawn_process()\n",
1437	>	fprintf(stderr, "%s: internal error 1 in next_process()\n",
1438		progname);
1439		quit(1);
1440		}
#	Line 1361 \| Line 1454 \| *next_process() / fork the next process (max. nprocs**
1454		return(0);
1455		}
1456
1457	<	wait_process(all) /* wait for process(es) to finish */
1458	<	int all;
1457	>	static void
1458	>	wait_process( /* wait for process(es) to finish */
1459	>	int all
1460	>	)
1461		{
1462		int ourstatus = 0;
1463		int pid, status;
#	Line 1378 \| Line 1473 \| int all;
1473		status = status>>8 & 0xff;
1474		--children_running;
1475		if (status != 0) { /* child's problem is our problem */
1476	<	if (ourstatus == 0 & children_running > 0)
1476	>	if ((ourstatus == 0) & (children_running > 0))
1477		fprintf(stderr, "%s: waiting for remaining processes\n",
1478		progname);
1479		ourstatus = status;
#	Line 1389 \| Line 1484 \| int all;
1484		quit(ourstatus); /* bad status from child */
1485		}
1486		#else /* ! RHAS_FORK_EXEC */
1487	<	int
1488	<	next_process()
1487	>	static int
1488	>	next_process(void)
1489		{
1490		return(0); /* cannot start new process */
1491		}
1492	+	static void
1493		wait_process(all)
1494		int all;
1495		{
#	Line 1407 \| Line 1503 \| int pid, sig;
1503		}
1504		#endif /* ! RHAS_FORK_EXEC */
1505
1506	<	finish_process() /* exit a child process */
1506	>	static void
1507	>	finish_process(void) /* exit a child process */
1508		{
1509		if (!inchild())
1510		return; /* in parent -- noop */
#	Line 1434 \| Line 1531 \| *char vname, value;*
1531		#endif
1532
1533
1534	<	badvalue(vc) /* report bad variable value and exit */
1535	<	int vc;
1534	>	static void
1535	>	badvalue( /* report bad variable value and exit */
1536	>	int vc
1537	>	)
1538		{
1539		fprintf(stderr, "%s: bad value for variable '%s'\n",
1540		progname, vnam(vc));
#	Line 1443 \| Line 1542 \| int vc;
1542		}
1543
1544
1545	<	syserr(s) /* report a system error and exit */
1546	<	char *s;
1545	>	static void
1546	>	syserr( /* report a system error and exit */
1547	>	char *s
1548	>	)
1549		{
1550		perror(s);
1551		quit(1);

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing ray/src/util/rad.c (file contents): Revision 2.69 by schorsch, Mon Jul 14 20:02:30 2003 UTC vs. Revision 2.76 by schorsch, Fri Mar 26 21:36:19 2004 UTC

Diff Legend

Comparing ray/src/util/rad.c (file contents):
Revision 2.69 by schorsch, Mon Jul 14 20:02:30 2003 UTC vs.
Revision 2.76 by schorsch, Fri Mar 26 21:36:19 2004 UTC