ViewVC Help

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

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

Comparing ray/src/rt/rvmain.c (file contents):
Revision 2.11 by greg, Wed Oct 5 17:20:55 2011 UTC vs.
Revision 2.19 by greg, Mon Feb 6 22:40:21 2023 UTC

#	Line 18 | Line 18 | static const char      RCSid[] = "$Id$";
18		#include  "random.h"
19		#include  "paths.h"
20		#include  "view.h"
21	+	#include  "pmapray.h"
22
23		extern char  *progname;                 /* global argv[0] */
24
#	Line 54 | Line 55 | static void onsig(int  signo);
55		static void sigdie(int  signo, char  *msg);
56		static void printdefaults(void);
57
57	–
58		int
59		main(int argc, char *argv[])
60		{
61		#define  check(ol,al)           if (argv[i][ol] || \
62		badarg(argc-i-1,argv+i+1,al)) \
63		goto badopt
64	<	#define  bool(olen,var)         switch (argv[i][olen]) { \
64	>	#define  check_bool(olen,var)           switch (argv[i][olen]) { \
65		case '\0': var = !var; break; \
66		case 'y': case 'Y': case 't': case 'T': \
67		case '+': case '1': var = 1; break; \
#	Line 83 | Line 83 | main(int argc, char *argv[])
83		specthresh = .3;
84		specjitter = 1.;
85		maxdepth = 6;
86	<	minweight = 1e-2;
86	>	minweight = 1e-3;
87		ambacc = 0.3;
88		ambres = 32;
89		ambdiv = 256;
#	Line 147 | Line 147 | main(int argc, char *argv[])
147		}
148		break;
149		case 'b':                               /* grayscale */
150	<	bool(2,greyscale);
150	>	check_bool(2,greyscale);
151		break;
152		case 'p':                               /* pixel */
153		switch (argv[i][2]) {
#	Line 171 | Line 171 | main(int argc, char *argv[])
171		break;
172		case 'w':                               /* warnings */
173		rval = erract[WARNING].pf != NULL;
174	<	bool(2,rval);
174	>	check_bool(2,rval);
175		if (rval) erract[WARNING].pf = wputs;
176		else erract[WARNING].pf = NULL;
177		break;
#	Line 197 | Line 197 | main(int argc, char *argv[])
197		/* set up signal handling */
198		sigdie(SIGINT, "Interrupt");
199		sigdie(SIGTERM, "Terminate");
200	<	#ifndef _WIN32
200	>	#if !defined(_WIN32) && !defined(_WIN64)
201		sigdie(SIGHUP, "Hangup");
202		sigdie(SIGPIPE, "Broken pipe");
203		sigdie(SIGALRM, "Alarm clock");
#	Line 227 | Line 227 | main(int argc, char *argv[])
227		/* set up output & start process(es) */
228		SET_FILE_BINARY(stdout);
229
230	<	ray_init(octnm);
231	<
230	>	ray_init(octnm);                /* also calls ray_init_pmap() */
231	>
232	>	/* temporary shortcut, until winrview is refactored into a "device" */
233	>	#ifndef WIN_RVIEW
234		rview();                        /* run interactive viewer */
235
236	+
237		devclose();                     /* close output device */
238	+	#endif
239
240	+	/* PMAP: free photon maps */
241	+	ray_done_pmap();
242	+
243	+	#ifdef WIN_RVIEW
244	+	return 1;
245	+	#endif
246		quit(0);
247
248		badopt:
#	Line 241 | Line 251 | badopt:
251		return 1; /* pro forma return */
252
253		#undef  check
254	<	#undef  bool
254	>	#undef  check_bool
255		}
256
257
258		void
259		wputs(                          /* warning output function */
260	<	char    *s
260	>	const char      *s
261		)
262		{
263		int  lasterrno = errno;
#	Line 258 | Line 268 | wputs(                         /* warning output function */
268
269		void
270		eputs(                          /* put string to stderr */
271	<	char  *s
271	>	const char  *s
272		)
273		{
274		static int  midline = 0;
#	Line 287 | Line 297 | onsig(                         /* fatal signal */
297		if (gotsig++)                   /* two signals and we're gone! */
298		_exit(signo);
299
300	<	#ifndef _WIN32
300	>	#if !defined(_WIN32) && !defined(_WIN64)
301		alarm(15);                      /* allow 15 seconds to clean up */
302		signal(SIGALRM, SIG_DFL);       /* make certain we do die */
303		#endif

Diff Legend

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