ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/rt/rvmain.c
(Generate patch)

Comparing ray/src/rt/rvmain.c (file contents):
Revision 2.1 by greg, Sat Feb 22 02:07:29 2003 UTC vs.
Revision 2.8 by greg, Tue Mar 11 02:21:47 2008 UTC

# Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
5   *  rvmain.c - main for rview interactive viewer
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  <signal.h>
11 > #include  <time.h>
12  
13 + #include  "platform.h"
14 + #include  "ray.h"
15   #include  "source.h"
68
16   #include  "ambient.h"
17 <
17 > #include  "rpaint.h"
18   #include  "random.h"
72
19   #include  "paths.h"
74
75 #include  <signal.h>
76
20   #include  "view.h"
21  
22   char  *progname;                        /* argv[0] */
# Line 100 | Line 43 | extern int  vresolu;                   /* vertical resolution */
43   extern int  psample;                    /* pixel sample size */
44   extern double  maxdiff;                 /* max. sample difference */
45  
46 < void    onsig();
47 < void    sigdie();
48 < void    printdefaults();
46 > static void onsig(int  signo);
47 > static void sigdie(int  signo, char  *msg);
48 > static void printdefaults(void);
49  
50  
51   int
52 < main(argc, argv)
110 < int  argc;
111 < char  *argv[];
52 > main(int  argc, char  *argv[])
53   {
54   #define  check(ol,al)           if (argv[i][ol] || \
55                                  badarg(argc-i-1,argv+i+1,al)) \
# Line 228 | Line 169 | char  *argv[];
169                                          /* initialize object types */
170          initotypes();
171                                          /* initialize urand */
172 <        initurand(2048);
172 >        if (rand_samp) {
173 >                srandom((long)time(0));
174 >                initurand(0);
175 >        } else {
176 >                srandom(0L);
177 >                initurand(2048);
178 >        }
179                                          /* set up signal handling */
180          sigdie(SIGINT, "Interrupt");
181          sigdie(SIGHUP, "Hangup");
# Line 262 | Line 209 | char  *argv[];
209          if (octname == NULL)
210                  error(USER, "missing octree argument");
211                                          /* set up output */
212 < #ifdef  MSDOS
266 <        setmode(fileno(stdout), O_BINARY);
267 < #endif
212 >        SET_FILE_BINARY(stdout);
213          readoct(octname, ~(IO_FILES|IO_INFO), &thescene, NULL);
214          nsceneobjs = nobjects;
215  
# Line 281 | Line 226 | char  *argv[];
226   badopt:
227          sprintf(errmsg, "command line error at '%s'", argv[i]);
228          error(USER, errmsg);
229 +        return 1; /* pro forma return */
230  
231   #undef  check
232   #undef  bool
# Line 288 | Line 234 | badopt:
234  
235  
236   void
237 < wputs(s)                                /* warning output function */
238 < char    *s;
237 > wputs(                          /* warning output function */
238 >        char    *s
239 > )
240   {
241          int  lasterrno = errno;
242          eputs(s);
# Line 298 | Line 245 | char   *s;
245  
246  
247   void
248 < eputs(s)                                /* put string to stderr */
249 < register char  *s;
248 > eputs(                          /* put string to stderr */
249 >        register char  *s
250 > )
251   {
252          static int  midline = 0;
253  
# Line 317 | Line 265 | register char  *s;
265   }
266  
267  
268 < void
269 < onsig(signo)                            /* fatal signal */
270 < int  signo;
268 > static void
269 > onsig(                          /* fatal signal */
270 >        int  signo
271 > )
272   {
273          static int  gotsig = 0;
274  
# Line 335 | Line 284 | int  signo;
284   }
285  
286  
287 < void
288 < sigdie(signo, msg)                      /* set fatal signal */
289 < int  signo;
290 < char  *msg;
287 > static void
288 > sigdie(                 /* set fatal signal */
289 >        int  signo,
290 >        char  *msg
291 > )
292   {
293          if (signal(signo, onsig) == SIG_IGN)
294                  signal(signo, SIG_IGN);
# Line 346 | Line 296 | char  *msg;
296   }
297  
298  
299 < void
300 < printdefaults()                 /* print default values to stdout */
299 > static void
300 > printdefaults(void)                     /* print default values to stdout */
301   {
352        register char  *cp;
353
302          printf(greyscale ? "-b+\t\t\t\t# greyscale on\n" :
303                          "-b-\t\t\t\t# greyscale off\n");
304          printf("-vt%c\t\t\t\t# view type %s\n", ourview.type,
# Line 359 | Line 307 | printdefaults()                        /* print default values to stdout */
307                          ourview.type==VT_HEM ? "hemispherical" :
308                          ourview.type==VT_ANG ? "angular" :
309                          ourview.type==VT_CYL ? "cylindrical" :
310 +                        ourview.type==VT_PLS ? "planisphere" :
311                          "unknown");
312          printf("-vp %f %f %f\t# view point\n",
313                          ourview.vp[0], ourview.vp[1], ourview.vp[2]);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines