--- ray/src/rt/rvmain.c 2003/02/22 02:07:29 2.1
+++ ray/src/rt/rvmain.c 2008/03/11 02:21:47 2.8
@@ -1,79 +1,22 @@
#ifndef lint
-static const char RCSid[] = "$Id: rvmain.c,v 2.1 2003/02/22 02:07:29 greg Exp $";
+static const char RCSid[] = "$Id: rvmain.c,v 2.8 2008/03/11 02:21:47 greg Exp $";
#endif
/*
* rvmain.c - main for rview interactive viewer
*/
-/* ====================================================================
- * 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 "rpaint.h"
#include "random.h"
-
#include "paths.h"
-
-#include
-
#include "view.h"
char *progname; /* argv[0] */
@@ -100,15 +43,13 @@ extern int vresolu; /* vertical resolution */
extern int psample; /* pixel sample size */
extern double maxdiff; /* max. sample difference */
-void onsig();
-void sigdie();
-void printdefaults();
+static void onsig(int signo);
+static void sigdie(int signo, char *msg);
+static void printdefaults(void);
int
-main(argc, argv)
-int argc;
-char *argv[];
+main(int argc, char *argv[])
{
#define check(ol,al) if (argv[i][ol] || \
badarg(argc-i-1,argv+i+1,al)) \
@@ -228,7 +169,13 @@ char *argv[];
/* initialize object types */
initotypes();
/* initialize urand */
- initurand(2048);
+ if (rand_samp) {
+ srandom((long)time(0));
+ initurand(0);
+ } else {
+ srandom(0L);
+ initurand(2048);
+ }
/* set up signal handling */
sigdie(SIGINT, "Interrupt");
sigdie(SIGHUP, "Hangup");
@@ -262,9 +209,7 @@ char *argv[];
if (octname == NULL)
error(USER, "missing octree argument");
/* set up output */
-#ifdef MSDOS
- setmode(fileno(stdout), O_BINARY);
-#endif
+ SET_FILE_BINARY(stdout);
readoct(octname, ~(IO_FILES|IO_INFO), &thescene, NULL);
nsceneobjs = nobjects;
@@ -281,6 +226,7 @@ char *argv[];
badopt:
sprintf(errmsg, "command line error at '%s'", argv[i]);
error(USER, errmsg);
+ return 1; /* pro forma return */
#undef check
#undef bool
@@ -288,8 +234,9 @@ badopt:
void
-wputs(s) /* warning output function */
-char *s;
+wputs( /* warning output function */
+ char *s
+)
{
int lasterrno = errno;
eputs(s);
@@ -298,8 +245,9 @@ char *s;
void
-eputs(s) /* put string to stderr */
-register char *s;
+eputs( /* put string to stderr */
+ register char *s
+)
{
static int midline = 0;
@@ -317,9 +265,10 @@ register char *s;
}
-void
-onsig(signo) /* fatal signal */
-int signo;
+static void
+onsig( /* fatal signal */
+ int signo
+)
{
static int gotsig = 0;
@@ -335,10 +284,11 @@ int signo;
}
-void
-sigdie(signo, msg) /* set fatal signal */
-int signo;
-char *msg;
+static void
+sigdie( /* set fatal signal */
+ int signo,
+ char *msg
+)
{
if (signal(signo, onsig) == SIG_IGN)
signal(signo, SIG_IGN);
@@ -346,11 +296,9 @@ char *msg;
}
-void
-printdefaults() /* print default values to stdout */
+static void
+printdefaults(void) /* print default values to stdout */
{
- register char *cp;
-
printf(greyscale ? "-b+\t\t\t\t# greyscale on\n" :
"-b-\t\t\t\t# greyscale off\n");
printf("-vt%c\t\t\t\t# view type %s\n", ourview.type,
@@ -359,6 +307,7 @@ printdefaults() /* print default values to stdout */
ourview.type==VT_HEM ? "hemispherical" :
ourview.type==VT_ANG ? "angular" :
ourview.type==VT_CYL ? "cylindrical" :
+ ourview.type==VT_PLS ? "planisphere" :
"unknown");
printf("-vp %f %f %f\t# view point\n",
ourview.vp[0], ourview.vp[1], ourview.vp[2]);