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.11 by greg, Thu Jun 2 04:47:27 2005 UTC vs.
Revision 2.17 by greg, Mon Jun 22 20:52:56 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 228 | Line 227 | main(int  argc, char  *argv[])
227		/* initialize object types */
228		initotypes();
229		/* initialize urand */
230	<	initurand(2048);
230	>	if (rand_samp) {
231	>	srandom((long)time(0));
232	>	initurand(0);
233	>	} else {
234	>	srandom(0L);
235	>	initurand(2048);
236	>	}
237		/* set up signal handling */
238		sigdie(SIGINT, "Interrupt");
239		#ifdef SIGHUP
#	Line 304 | Line 309 | main(int  argc, char  *argv[])
309		while ((rval=fork()) == 0) {    /* keep on forkin' */
310		pflock(1);
311		pfhold();
312	+	ambsync();              /* load new values */
313		}
314		if (rval < 0)
315		error(SYSTEM, "cannot fork child for persist function");
316	<	pfdetach();             /* parent exits */
316	>	pfdetach();             /* parent will run then exit */
317		}
318		}
319		runagain:
#	Line 330 | Line 336 | runagain:
336		}
337		}
338		if (persist == PCHILD) {        /* wait for a signal then go again */
333	–	close(duped1);                  /* release output handle */
339		pfhold();
340		raynum = nrays = 0;             /* reinitialize */
341		goto runagain;
#	Line 420 | Line 425 | printdefaults(void)                    /* print default values to stdou
425
426		if (imm_irrad)
427		printf("-I+\t\t\t\t# immediate irradiance on\n");
428	<	printf("-x  %-9d\t\t\t# x resolution (flush interval)\n", hresolu);
429	<	printf("-y  %-9d\t\t\t# y resolution\n", vresolu);
428	>	printf("-x %-9d\t\t\t# x resolution (flush interval)\n", hresolu);
429	>	printf("-y %-9d\t\t\t# y resolution\n", vresolu);
430		printf(lim_dist ? "-ld+\t\t\t\t# limit distance on\n" :
431		"-ld-\t\t\t\t# limit distance off\n");
432		printf("-h%c\t\t\t\t# %s header\n", loadflags & IO_INFO ? '+' : '-',
#	Line 435 | Line 440 | printdefaults(void)                    /* print default values to stdou
440		case 'o': printf(" origin"); break;
441		case 'd': printf(" direction"); break;
442		case 'v': printf(" value"); break;
443	+	case 'V': printf(" contribution"); break;
444		case 'l': printf(" length"); break;
445		case 'L': printf(" first_length"); break;
446		case 'p': printf(" point"); break;
#	Line 442 | Line 448 | printdefaults(void)                    /* print default values to stdou
448		case 'N': printf(" unperturbed_normal"); break;
449		case 's': printf(" surface"); break;
450		case 'w': printf(" weight"); break;
451	+	case 'W': printf(" coefficient"); break;
452		case 'm': printf(" modifier"); break;
453		case 'M': printf(" material"); break;
447	–	case 'W': printf(" contribution"); break;
454		case '-': printf(" stroke"); break;
455		}
456		putchar('\n');

Diff Legend

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