ViewVC Help

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

root/Development/ray/src/rt/rtmain.c

Comparing ray/src/rt/rtmain.c (file contents):
Revision 2.10 by greg, Wed May 25 04:44:26 2005 UTC vs.
Revision 2.19 by greg, Sun Dec 13 19:13:04 2009 UTC

#	Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7
8		#include "copyright.h"
9
10	–	#include  <sys/types.h>
10		#include  <signal.h>
11
12		#include  "platform.h"
#	Line 19 | Line 18 | static const char      RCSid[] = "$Id$";
18		#include  "random.h"
19		#include  "paths.h"
20
21	+	extern char     *progname;              /* global argv[0] */
22	+
23	+	extern char     *shm_boundary;          /* boundary of shared memory */
24	+
25		/* persistent processes define */
26		#ifdef  F_SETLKW
27		#define  PERSIST        1               /* normal persist */
#	Line 26 | Line 29 | static const char      RCSid[] = "$Id$";
29		#define  PCHILD         3               /* child of normal persist */
30		#endif
31
29	–	char  *progname;                        /* argv[0] */
30	–	char  *octname;                         /* octree name */
32		char  *sigerr[NSIG];                    /* signal error messages */
32	–	char  *shm_boundary = NULL;             /* boundary of shared memory */
33		char  *errfile = NULL;                  /* error output file */
34
35	+	int  nproc = 1;                         /* number of processes */
36	+
37		extern char  *formstr();                /* string from format */
38	<	extern int  inform;                     /* input format */
39	<	extern int  outform;                    /* output format */
40	<	extern char  *outvals;                  /* output values */
38	>	int  inform = 'a';                      /* input format */
39	>	int  outform = 'a';                     /* output format */
40	>	char  *outvals = "v";                   /* output specification */
41
42	<	extern int  hresolu;                    /* horizontal resolution */
43	<	extern int  vresolu;                    /* vertical resolution */
42	>	int  hresolu = 0;                       /* horizontal (scan) size */
43	>	int  vresolu = 0;                       /* vertical resolution */
44
45	<	extern int  imm_irrad;                  /* compute immediate irradiance? */
46	<	extern int  lim_dist;                   /* limit distance? */
45	>	int  imm_irrad = 0;                     /* compute immediate irradiance? */
46	>	int  lim_dist = 0;                      /* limit distance? */
47
48	<	extern char  *tralist[];                /* list of modifers to trace (or no) */
49	<	extern int  traincl;                    /* include == 1, exclude == 0 */
48	>	#ifndef MAXMODLIST
49	>	#define MAXMODLIST      1024            /* maximum modifiers we'll track */
50	>	#endif
51
52	+	extern void  (*addobjnotify[])();       /* object notification calls */
53	+	extern void  tranotify(OBJECT obj);
54	+
55	+	char  *tralist[MAXMODLIST];             /* list of modifers to trace (or no) */
56	+	int  traincl = -1;                      /* include == 1, exclude == 0 */
57	+
58		static int  loadflags = ~IO_FILES;      /* what to load from octree */
59
60		static void onsig(int  signo);
#	Line 67 | Line 76 | main(int  argc, char  *argv[])
76		case '-': case '0': var = 0; break; \
77		default: goto badopt; }
78		int  persist = 0;
79	+	char  *octnm = NULL;
80		char  **tralp;
81		int  duped1;
82		int  rval;
83		int  i;
84		/* global program name */
85		progname = argv[0] = fixargv0(argv[0]);
86	+	/* add trace notify function */
87	+	for (i = 0; addobjnotify[i] != NULL; i++)
88	+	;
89	+	addobjnotify[i] = tranotify;
90	+	/* set our defaults */
91	+	maxdepth = -10;
92	+	minweight = 2e-3;
93		/* option city */
94		for (i = 1; i < argc; i++) {
95		/* expand arguments */
#	Line 99 | Line 116 | main(int  argc, char  *argv[])
116		continue;
117		}
118		switch (argv[i][1]) {
119	+	case 'n':                               /* number of cores */
120	+	check(2,"i");
121	+	nproc = atoi(argv[++i]);
122	+	if (nproc <= 0)
123	+	error(USER, "bad number of processes");
124	+	break;
125		case 'x':                               /* x resolution */
126		check(2,"i");
127		hresolu = atoi(argv[++i]);
#	Line 225 | Line 248 | main(int  argc, char  *argv[])
248		goto badopt;
249		}
250		}
251	+	if (nproc > 1) {
252	+	if (persist)
253	+	error(USER, "multiprocessing incompatible with persist file");
254	+	if (hresolu > 0 && hresolu < nproc)
255	+	error(WARNING, "number of cores should not exceed horizontal resolution");
256	+	if (trace != NULL)
257	+	error(WARNING, "multiprocessing does not work properly with trace mode");
258	+	}
259		/* initialize object types */
260		initotypes();
261		/* initialize urand */
262	<	initurand(2048);
262	>	if (rand_samp) {
263	>	srandom((long)time(0));
264	>	initurand(0);
265	>	} else {
266	>	srandom(0L);
267	>	initurand(2048);
268	>	}
269		/* set up signal handling */
270		sigdie(SIGINT, "Interrupt");
271		#ifdef SIGHUP
#	Line 260 | Line 297 | main(int  argc, char  *argv[])
297		#endif
298		/* get octree */
299		if (i == argc)
300	<	octname = NULL;
300	>	octnm = NULL;
301		else if (i == argc-1)
302	<	octname = argv[i];
302	>	octnm = argv[i];
303		else
304		goto badopt;
305	<	if (octname == NULL)
305	>	if (octnm == NULL)
306		error(USER, "missing octree argument");
307		/* set up output */
308		#ifdef  PERSIST
#	Line 274 | Line 311 | main(int  argc, char  *argv[])
311		openheader();
312		}
313		#endif
277	–	#ifdef  _WIN32
314		if (outform != 'a')
315		SET_FILE_BINARY(stdout);
316	<	if (octname == NULL)
281	<	SET_FILE_BINARY(stdin);
282	<	#endif
283	<	readoct(octname, loadflags, &thescene, NULL);
316	>	readoct(octnm, loadflags, &thescene, NULL);
317		nsceneobjs = nobjects;
318
319		if (loadflags & IO_INFO) {      /* print header */
#	Line 308 | Line 341 | main(int  argc, char  *argv[])
341		while ((rval=fork()) == 0) {    /* keep on forkin' */
342		pflock(1);
343		pfhold();
344	+	ambsync();              /* load new values */
345		}
346		if (rval < 0)
347		error(SYSTEM, "cannot fork child for persist function");
348	<	pfdetach();             /* parent exits */
348	>	pfdetach();             /* parent will run then exit */
349		}
350		}
351		runagain:
#	Line 319 | Line 353 | runagain:
353		dupheader();                    /* send header to stdout */
354		#endif
355		/* trace rays */
356	<	rtrace(NULL);
356	>	rtrace(NULL, nproc);
357		/* flush ambient file */
358		ambsync();
359		#ifdef  PERSIST
#	Line 334 | Line 368 | runagain:
368		}
369		}
370		if (persist == PCHILD) {        /* wait for a signal then go again */
337	–	close(duped1);                  /* release output handle */
371		pfhold();
372		raynum = nrays = 0;             /* reinitialize */
373		goto runagain;
#	Line 424 | Line 457 | printdefaults(void)                    /* print default values to stdou
457
458		if (imm_irrad)
459		printf("-I+\t\t\t\t# immediate irradiance on\n");
460	<	printf("-x  %-9d\t\t\t# x resolution (flush interval)\n", hresolu);
461	<	printf("-y  %-9d\t\t\t# y resolution\n", vresolu);
460	>	printf("-n %-2d\t\t\t\t# number of rendering processes\n", nproc);
461	>	printf("-x %-9d\t\t\t# x resolution (flush interval)\n", hresolu);
462	>	printf("-y %-9d\t\t\t# y resolution\n", vresolu);
463		printf(lim_dist ? "-ld+\t\t\t\t# limit distance on\n" :
464		"-ld-\t\t\t\t# limit distance off\n");
465		printf("-h%c\t\t\t\t# %s header\n", loadflags & IO_INFO ? '+' : '-',
#	Line 439 | Line 473 | printdefaults(void)                    /* print default values to stdou
473		case 'o': printf(" origin"); break;
474		case 'd': printf(" direction"); break;
475		case 'v': printf(" value"); break;
476	+	case 'V': printf(" contribution"); break;
477		case 'l': printf(" length"); break;
478		case 'L': printf(" first_length"); break;
479		case 'p': printf(" point"); break;
#	Line 446 | Line 481 | printdefaults(void)                    /* print default values to stdou
481		case 'N': printf(" unperturbed_normal"); break;
482		case 's': printf(" surface"); break;
483		case 'w': printf(" weight"); break;
484	+	case 'W': printf(" coefficient"); break;
485		case 'm': printf(" modifier"); break;
486		case 'M': printf(" material"); break;
451	–	case 'W': printf(" contribution"); break;
487		case '-': printf(" stroke"); break;
488		}
489		putchar('\n');

Diff Legend

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