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.1 by greg, Sat Feb 22 02:07:29 2003 UTC vs.
Revision 2.6 by schorsch, Mon Jun 30 14:59:12 2003 UTC

#	Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
5		*  rtmain.c - main for rtrace per-ray calculation program
6		*/
7
8	<	/* ====================================================================
9	<	* The Radiance Software License, Version 1.0
10	<	*
11	<	* Copyright (c) 1990 - 2002 The Regents of the University of California,
12	<	* through Lawrence Berkeley National Laboratory.   All rights reserved.
13	<	*
14	<	* Redistribution and use in source and binary forms, with or without
15	<	* modification, are permitted provided that the following conditions
16	<	* are met:
17	<	*
18	<	* 1. Redistributions of source code must retain the above copyright
19	<	*         notice, this list of conditions and the following disclaimer.
20	<	*
21	<	* 2. Redistributions in binary form must reproduce the above copyright
22	<	*       notice, this list of conditions and the following disclaimer in
23	<	*       the documentation and/or other materials provided with the
24	<	*       distribution.
25	<	*
26	<	* 3. The end-user documentation included with the redistribution,
27	<	*           if any, must include the following acknowledgment:
28	<	*             "This product includes Radiance software
29	<	*                 (http://radsite.lbl.gov/)
30	<	*                 developed by the Lawrence Berkeley National Laboratory
31	<	*               (http://www.lbl.gov/)."
32	<	*       Alternately, this acknowledgment may appear in the software itself,
33	<	*       if and wherever such third-party acknowledgments normally appear.
34	<	*
35	<	* 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
36	<	*       and "The Regents of the University of California" must
37	<	*       not be used to endorse or promote products derived from this
38	<	*       software without prior written permission. For written
39	<	*       permission, please contact [email protected].
40	<	*
41	<	* 5. Products derived from this software may not be called "Radiance",
42	<	*       nor may "Radiance" appear in their name, without prior written
43	<	*       permission of Lawrence Berkeley National Laboratory.
44	<	*
45	<	* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
46	<	* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
47	<	* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
48	<	* DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
49	<	* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
50	<	* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
51	<	* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
52	<	* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
53	<	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
54	<	* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
55	<	* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
56	<	* SUCH DAMAGE.
57	<	* ====================================================================
58	<	*
59	<	* This software consists of voluntary contributions made by many
60	<	* individuals on behalf of Lawrence Berkeley National Laboratory.   For more
61	<	* information on Lawrence Berkeley National Laboratory, please see
62	<	* <http://www.lbl.gov/>.
63	<	*/
8	>	#include "copyright.h"
9
10	<	#include  "ray.h"
10	>	#include  <sys/types.h>
11	>	#include  <signal.h>
12	>	#ifdef _WIN32
13	>	#include <process.h> /* getpid() */
14	>	#endif
15
16	+	#include  "platform.h"
17	+	#include  "ray.h"
18		#include  "source.h"
68	–
19		#include  "ambient.h"
70	–
20		#include  "random.h"
72	–
21		#include  "paths.h"
22
75	–	#include  <sys/types.h>
76	–
77	–	#include  <signal.h>
23		/* persistent processes define */
24		#ifdef  F_SETLKW
25		#define  PERSIST        1               /* normal persist */
#	Line 231 | Line 176 | char  *argv[];
176		}
177		if (argv[i][2] == 'I') {        /* file */
178		rval = wordfile(tralp,
179	<	getpath(argv[++i],getlibpath(),R_OK));
179	>	getpath(argv[++i],getrlibpath(),R_OK));
180		if (rval < 0) {
181		sprintf(errmsg,
182		"cannot open trace include file \"%s\"",
#	Line 253 | Line 198 | char  *argv[];
198		}
199		if (argv[i][2] == 'E') {        /* file */
200		rval = wordfile(tralp,
201	<	getpath(argv[++i],getlibpath(),R_OK));
201	>	getpath(argv[++i],getrlibpath(),R_OK));
202		if (rval < 0) {
203		sprintf(errmsg,
204		"cannot open trace exclude file \"%s\"",
#	Line 292 | Line 237 | char  *argv[];
237		initurand(2048);
238		/* set up signal handling */
239		sigdie(SIGINT, "Interrupt");
240	+	#ifdef SIGHUP
241		sigdie(SIGHUP, "Hangup");
242	+	#endif
243		sigdie(SIGTERM, "Terminate");
244	+	#ifdef SIGPIPE
245		sigdie(SIGPIPE, "Broken pipe");
246	+	#endif
247	+	#ifdef SIGALRM
248		sigdie(SIGALRM, "Alarm clock");
249	+	#endif
250		#ifdef  SIGXCPU
251		sigdie(SIGXCPU, "CPU limit exceeded");
252		sigdie(SIGXFSZ, "File size exceeded");
#	Line 329 | Line 280 | char  *argv[];
280		openheader();
281		}
282		#endif
283	<	#ifdef  MSDOS
283	>	#ifdef  _WIN32
284		if (outform != 'a')
285	<	setmode(fileno(stdout), O_BINARY);
285	>	SET_FILE_BINARY(stdout);
286		if (octname == NULL)
287	<	setmode(fileno(stdin), O_BINARY);
287	>	SET_FILE_BINARY(stdin);
288		#endif
289		readoct(octname, loadflags, &thescene, NULL);
290		nsceneobjs = nobjects;
#	Line 445 | Line 396 | int  signo;
396		if (gotsig++)                   /* two signals and we're gone! */
397		_exit(signo);
398
399	+	#ifdef SIGALRM
400		alarm(15);                      /* allow 15 seconds to clean up */
401		signal(SIGALRM, SIG_DFL);       /* make certain we do die */
402	+	#endif
403		eputs("signal - ");
404		eputs(sigerr[signo]);
405		eputs("\n");

Diff Legend

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