--- ray/src/rt/rtmain.c 2003/02/22 02:07:29 2.1
+++ ray/src/rt/rtmain.c 2003/06/05 19:29:34 2.4
@@ -1,80 +1,22 @@
#ifndef lint
-static const char RCSid[] = "$Id: rtmain.c,v 2.1 2003/02/22 02:07:29 greg Exp $";
+static const char RCSid[] = "$Id: rtmain.c,v 2.4 2003/06/05 19:29:34 schorsch Exp $";
#endif
/*
* rtmain.c - main for rtrace per-ray calculation program
*/
-/* ====================================================================
- * The Radiance Software License, Version 1.0
- *
- * Copyright (c) 1990 - 2002 The Regents of the University of California,
- * through Lawrence Berkeley National Laboratory. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes Radiance software
- * (http://radsite.lbl.gov/)
- * developed by the Lawrence Berkeley National Laboratory
- * (http://www.lbl.gov/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
- * and "The Regents of the University of California" must
- * not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact radiance@radsite.lbl.gov.
- *
- * 5. Products derived from this software may not be called "Radiance",
- * nor may "Radiance" appear in their name, without prior written
- * permission of Lawrence Berkeley National Laboratory.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of Lawrence Berkeley National Laboratory. For more
- * information on Lawrence Berkeley National Laboratory, please see
- * .
- */
+#include "copyright.h"
-#include "ray.h"
+#include
+#include
+#include "platform.h"
+#include "ray.h"
#include "source.h"
-
#include "ambient.h"
-
#include "random.h"
-
#include "paths.h"
-#include
-
-#include
/* persistent processes define */
#ifdef F_SETLKW
#define PERSIST 1 /* normal persist */
@@ -231,7 +173,7 @@ char *argv[];
}
if (argv[i][2] == 'I') { /* file */
rval = wordfile(tralp,
- getpath(argv[++i],getlibpath(),R_OK));
+ getpath(argv[++i],getrlibpath(),R_OK));
if (rval < 0) {
sprintf(errmsg,
"cannot open trace include file \"%s\"",
@@ -253,7 +195,7 @@ char *argv[];
}
if (argv[i][2] == 'E') { /* file */
rval = wordfile(tralp,
- getpath(argv[++i],getlibpath(),R_OK));
+ getpath(argv[++i],getrlibpath(),R_OK));
if (rval < 0) {
sprintf(errmsg,
"cannot open trace exclude file \"%s\"",
@@ -329,11 +271,11 @@ char *argv[];
openheader();
}
#endif
-#ifdef MSDOS
+#ifdef _WIN32
if (outform != 'a')
- setmode(fileno(stdout), O_BINARY);
+ SET_FILE_BINARY(stdout);
if (octname == NULL)
- setmode(fileno(stdin), O_BINARY);
+ SET_FILE_BINARY(stdin);
#endif
readoct(octname, loadflags, &thescene, NULL);
nsceneobjs = nobjects;