[ViewVC] Diff of: radiance/ray/src/rt/rcmain.c

Comparing ray/src/rt/rcmain.c (file contents):
Revision 2.1 by greg, Sat Jun 9 07:16:47 2012 UTC vs.
Revision 2.3 by greg, Mon Jun 11 05:07:55 2012 UTC

#	Line 14 \| Line 14 \| static const char RCSid[] = "$Id$";
14		#include "source.h"
15		#include "ambient.h"
16
17	–	char shm_boundary = NULL; / boundary of shared memory */
18	–
17		int gargc; /* global argc */
18		char *gargv; / global argv */
19		char octname; / global octree name */
#	Line 56 \| Line 54 \| *printdefaults(void) / print default values to stdou**
54		{
55		char *cp;
56
57	+	printf("-c %-5d\t\t\t# accumulated rays per record\n", accumulate);
58	+	printf("-V%c\t\t\t\t# output %s\n", contrib ? '+' : '-',
59	+	contrib ? "contributions" : "coefficients");
60		if (imm_irrad)
61		printf("-I+\t\t\t\t# immediate irradiance on\n");
62		printf("-n %-2d\t\t\t\t# number of rendering processes\n", nproc);
#	Line 227 \| Line 228 \| *main(int argc, char argv[])**
228		yres = atoi(argv[++i]);
229		break;
230		case 'w': /* warnings */
231	<	rval = erract[WARNING].pf != NULL;
231	>	rval = (erract[WARNING].pf != NULL);
232		bool(2,rval);
233		if (rval) erract[WARNING].pf = wputs;
234		else erract[WARNING].pf = NULL;
#	Line 339 \| Line 340 \| *main(int argc, char argv[])**
340
341		setambient(); /* initialize ambient calculation */
342
343	<	if (nproc > 1) {
343	<	preload_objs(); /* preload auxiliary data */
344	<	/* set shared memory boundary */
345	<	shm_boundary = strcpy((char *)malloc(16), "SHM_BOUNDARY");
346	<	}
347	<	rcontrib(); /* trace ray contributions */
343	>	rcontrib(); /* trace ray contributions (loop) */
344
345		ambsync(); /* flush ambient file */
346

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