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.66 by greg, Thu Jul 3 15:00:19 2003 UTC vs.
Revision 2.70 by schorsch, Mon Jul 21 22:30:19 2003 UTC

#	Line 8 | Line 8 | static const char      RCSid[] = "$Id$";
8		#include "standard.h"
9
10		#include <ctype.h>
11	+	#include <time.h>
12
13		#include "platform.h"
14		#include "view.h"
15		#include "paths.h"
16		#include "vars.h"
17
18	+	#ifdef _WIN32
19	+	#define DELCMD "del"
20	+	#define RENAMECMD "rename"
21	+	#else
22	+	#define DELCMD "rm -f"
23	+	#define RENAMECMD "mv"
24	+	#endif
25	+
26		/* variables (alphabetical by name) */
27		#define AMBFILE         0               /* ambient file name */
28		#define DETAIL          1               /* level of scene detail */
#	Line 80 | Line 89 | char   overfile[] = NULL_DEVICE;
89		char    overfile[] = "overture.unf";
90		#endif
91
83	–	extern time_t   time();
92
93		time_t  scenedate;              /* date of latest scene or object file */
94		time_t  octreedate;             /* date of octree */
#	Line 110 | Line 118 | char   *rifname;               /* global rad input file name */
118
119		char    radname[PATH_MAX];      /* root Radiance file name */
120
121	+	#define inchild()       (children_running < 0)
122
123	+
124		main(argc, argv)
125		int     argc;
126		char    *argv[];
#	Line 158 | Line 168 | char   *argv[];
168		if (i >= argc)
169		goto userr;
170		rifname = argv[i];
171	+	/* check command-line options */
172	+	if (nprocs > 1 & viewselect != NULL)
173	+	nprocs = 1;
174		/* assign Radiance root file name */
175		rootname(radname, rifname);
176		/* load variable values */
#	Line 305 | Line 318 | double org[3], *sizp;
318		FILE    *fp;
319		register int    i;
320
321	<	if (osiz <= FTINY)
321	>	if (osiz <= FTINY) {
322		if (!nprocs && fdate(oct1name) <
323		(scenedate>illumdate?scenedate:illumdate)) {
324		/* run getbbox */
#	Line 341 | Line 354 | double org[3], *sizp;
354		}
355		pclose(fp);
356		}
357	+	}
358		org[0] = oorg[0]; org[1] = oorg[1]; org[2] = oorg[2]; *sizp = osiz;
359		}
360
#	Line 545 | Line 559 | checkambfile()                 /* check date on ambient file */
559		return;
560		if (!(afdate = fdate(vval(AMBFILE))))
561		return;
562	<	if (oct1date > afdate)
562	>	if (oct1date > afdate) {
563		if (touchonly)
564		touch(vval(AMBFILE));
565		else
566		rmfile(vval(AMBFILE));
567	+	}
568		}
569
570
#	Line 1037 | Line 1052 | char   *vn;            /* returned view name */
1052		}
1053
1054
1055	<	printview(vopts)                        /* print out selected view */
1055	>	int
1056	>	myprintview(vopts, fp)                  /* print out selected view */
1057		register char   *vopts;
1058	+	FILE    *fp;
1059		{
1060		VIEW    vwr;
1061		char    buf[128];
#	Line 1052 | Line 1069 | again:
1069		goto again;
1070		}
1071		#endif
1072	<	copystruct(&vwr, &stdview);
1072	>	vwr = stdview;
1073		sscanview(&vwr, cp=vopts);              /* set initial options */
1074		while ((cp = strstr(cp, "-vf ")) != NULL &&
1075		*atos(buf, sizeof(buf), cp += 4)) {
1076		viewfile(buf, &vwr, NULL);      /* load -vf file */
1077		sscanview(&vwr, cp);            /* reset tail */
1078		}
1079	<	fputs(VIEWSTR, stdout);
1080	<	fprintview(&vwr, stdout);               /* print full spec. */
1081	<	fputc('\n', stdout);
1079	>	fputs(VIEWSTR, fp);
1080	>	fprintview(&vwr, fp);                   /* print full spec. */
1081	>	fputc('\n', fp);
1082		return(0);
1083		}
1084
#	Line 1075 | Line 1092 | char   *opts, *po;
1092		if (touchonly || (vw = getview(0, NULL)) == NULL)
1093		return;
1094		if (sayview)
1095	<	printview(vw);
1095	>	myprintview(vw, stdout);
1096		sprintf(combuf, "rview %s%s%s -R %s ", vw, po, opts, rifname);
1097		if (rvdevice != NULL)
1098		sprintf(combuf+strlen(combuf), "-o %s ", rvdevice);
#	Line 1095 | Line 1112 | char   *opts, *po;
1112		char    combuf[PATH_MAX];
1113		char    rawfile[PATH_MAX], picfile[PATH_MAX];
1114		char    zopt[PATH_MAX+4], rep[PATH_MAX+16], res[32];
1115	+	char    rppopt[128], *pfile = NULL;
1116		char    pfopts[128];
1117		char    vs[32], *vw;
1118		int     vn, mult;
1119	+	FILE    *fp;
1120		time_t  rfdt, pfdt;
1121		/* get pfilt options */
1122		pfiltopts(pfopts);
#	Line 1139 | Line 1158 | char   *opts, *po;
1158		else
1159		badvalue(REPORT);
1160		}
1161	+	/* set up parallel rendering */
1162	+	if (nprocs > 1 & !vdef(ZFILE)) {
1163	+	strcpy(rppopt, "-S 1 -PP pfXXXXXX");
1164	+	pfile = rppopt+9;
1165	+	if (mktemp(pfile) == NULL)
1166	+	pfile = NULL;
1167	+	}
1168		vn = 0;                                 /* do each view */
1169		while ((vw = getview(vn++, vs)) != NULL) {
1170		if (sayview)
1171	<	printview(vw);
1171	>	myprintview(vw, stdout);
1172		if (!vs[0])
1173		sprintf(vs, "%d", vn);
1174		sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs);
#	Line 1166 | Line 1192 | char   *opts, *po;
1192		touch(picfile);
1193		continue;
1194		}
1195	<	if (next_process())             /* parallel running? */
1195	>	if (next_process()) {           /* parallel running? */
1196	>	if (pfile != NULL)
1197	>	sleep(20);
1198		continue;
1199	+	}
1200		/* XXX Remember to call finish_process() */
1201		/* build rpict command */
1202	<	if (rfdt >= oct1date)           /* recover */
1202	>	if (rfdt >= oct1date) {         /* recover */
1203		sprintf(combuf, "rpict%s%s%s%s -ro %s %s",
1204		rep, po, opts, zopt, rawfile, oct1name);
1205	<	else {
1205	>	if (runcom(combuf))     /* run rpict */
1206	>	goto rperror;
1207	>	} else {
1208		if (overture) {         /* run overture calculation */
1209		sprintf(combuf,
1210		"rpict%s %s%s -x 64 -y 64 -ps 1 %s > %s",
#	Line 1190 | Line 1221 | char   *opts, *po;
1221		#endif
1222		}
1223		sprintf(combuf, "rpict%s %s %s%s%s%s %s > %s",
1224	<	rep, vw, res, po, opts, zopt,
1225	<	oct1name, rawfile);
1224	>	rep, vw, res, po, opts,
1225	>	zopt, oct1name, rawfile);
1226	>	if (pfile != NULL && inchild()) {
1227	>	/* rpict persistent mode */
1228	>	if (!silent)
1229	>	printf("\t%s\n", combuf);
1230	>	sprintf(combuf, "rpict%s %s %s%s%s %s > %s",
1231	>	rep, rppopt, res, po, opts,
1232	>	oct1name, rawfile);
1233	>	fflush(stdout);
1234	>	fp = popen(combuf, "w");
1235	>	if (fp == NULL)
1236	>	goto rperror;
1237	>	myprintview(vw, fp);
1238	>	if (pclose(fp))
1239	>	goto rperror;
1240	>	} else {                /* rpict normal mode */
1241	>	if (runcom(combuf))
1242	>	goto rperror;
1243	>	}
1244		}
1196	–	if (runcom(combuf)) {           /* run rpict */
1197	–	fprintf(stderr, "%s: error rendering view %s\n",
1198	–	progname, vs);
1199	–	quit(1);
1200	–	}
1245		if (!vdef(RAWFILE) || strcmp(vval(RAWFILE),vval(PICTURE))) {
1246		/* build pfilt command */
1247		if (mult > 1)
#	Line 1206 | Line 1250 | char   *opts, *po;
1250		else
1251		sprintf(combuf, "pfilt%s %s > %s", pfopts,
1252		rawfile, picfile);
1253	<	if (runcom(combuf)) {           /* run pfilt */
1253	>	if (runcom(combuf)) {   /* run pfilt */
1254		fprintf(stderr,
1255		"%s: error filtering view %s\n\t%s removed\n",
1256		progname, vs, picfile);
#	Line 1223 | Line 1267 | char   *opts, *po;
1267		finish_process();               /* leave if child */
1268		}
1269		wait_process(1);                /* wait for children to finish */
1270	+	if (pfile != NULL) {            /* clean up rpict persistent mode */
1271	+	int     pid;
1272	+	fp = fopen(pfile, "r");
1273	+	if (fp != NULL) {
1274	+	if (fscanf(fp, "%*s %d", &pid) != 1 ||
1275	+	kill(pid, 1) == -1)
1276	+	unlink(pfile);
1277	+	fclose(fp);
1278	+	}
1279	+	}
1280	+	return;
1281	+	rperror:
1282	+	fprintf(stderr, "%s: error rendering view %s\n", progname, vs);
1283	+	quit(1);
1284		}
1285
1286
#	Line 1258 | Line 1316 | rmfile(fn)                     /* remove a file */
1316		char    *fn;
1317		{
1318		if (!silent)
1319	<	#ifdef _WIN32
1262	<	printf("\tdel %s\n", fn);
1263	<	#else
1264	<	printf("\trm -f %s\n", fn);
1265	<	#endif
1319	>	printf("\t%s %s\n", DELCMD, fn);
1320		if (!nprocs)
1321		return(0);
1322		return(unlink(fn));
#	Line 1273 | Line 1327 | mvfile(fold, fnew)             /* move a file */
1327		char    *fold, *fnew;
1328		{
1329		if (!silent)
1330	<	#ifdef _WIN32
1277	<	printf("\trename %s %s\n", fold, fnew);
1278	<	#else
1279	<	printf("\tmv %s %s\n", fold, fnew);
1280	<	#endif
1330	>	printf("\t%s %s %s\n", RENAMECMD, fold, fnew);
1331		if (!nprocs)
1332		return(0);
1333		return(rename(fold, fnew));
#	Line 1292 | Line 1342 | next_process()                 /* fork the next process (max. nprocs
1342
1343		if (nprocs <= 1)
1344		return(0);              /* it's us or no one */
1345	<	if (children_running < 0) {
1345	>	if (inchild()) {
1346		fprintf(stderr, "%s: internal error 1 in spawn_process()\n",
1347		progname);
1348		quit(1);
#	Line 1351 | Line 1401 | int    all;
1401		{
1402		(void)all;                      /* no one to wait for */
1403		}
1404	+	int
1405	+	kill(pid, sig) /* win|unix_process.c should also wait and kill */
1406	+	int pid, sig;
1407	+	{
1408	+	return 0;
1409	+	}
1410		#endif  /* ! RHAS_FORK_EXEC */
1411
1412		finish_process()                        /* exit a child process */
1413		{
1414	<	if (children_running >= 0)
1414	>	if (!inchild())
1415		return;                 /* in parent -- noop */
1416		exit(0);
1417		}

Diff Legend

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