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

Comparing ray/src/rt/rview.c (file contents):
Revision 2.18 by greg, Sat Feb 22 02:07:29 2003 UTC vs.
Revision 2.28 by greg, Mon Jun 13 20:07:56 2005 UTC

# Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7   *  External symbols declared in rpaint.h
8   */
9  
10 < /* ====================================================================
11 < * The Radiance Software License, Version 1.0
12 < *
13 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
14 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
15 < *
16 < * Redistribution and use in source and binary forms, with or without
17 < * modification, are permitted provided that the following conditions
18 < * are met:
19 < *
20 < * 1. Redistributions of source code must retain the above copyright
21 < *         notice, this list of conditions and the following disclaimer.
22 < *
23 < * 2. Redistributions in binary form must reproduce the above copyright
24 < *       notice, this list of conditions and the following disclaimer in
25 < *       the documentation and/or other materials provided with the
26 < *       distribution.
27 < *
28 < * 3. The end-user documentation included with the redistribution,
29 < *           if any, must include the following acknowledgment:
30 < *             "This product includes Radiance software
31 < *                 (http://radsite.lbl.gov/)
32 < *                 developed by the Lawrence Berkeley National Laboratory
33 < *               (http://www.lbl.gov/)."
34 < *       Alternately, this acknowledgment may appear in the software itself,
35 < *       if and wherever such third-party acknowledgments normally appear.
36 < *
37 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
38 < *       and "The Regents of the University of California" must
39 < *       not be used to endorse or promote products derived from this
40 < *       software without prior written permission. For written
41 < *       permission, please contact [email protected].
42 < *
43 < * 5. Products derived from this software may not be called "Radiance",
44 < *       nor may "Radiance" appear in their name, without prior written
45 < *       permission of Lawrence Berkeley National Laboratory.
46 < *
47 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
48 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
49 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
50 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
51 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
52 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
53 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
54 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
55 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
56 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
57 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
58 < * SUCH DAMAGE.
59 < * ====================================================================
60 < *
61 < * This software consists of voluntary contributions made by many
62 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
63 < * information on Lawrence Berkeley National Laboratory, please see
64 < * <http://www.lbl.gov/>.
65 < */
10 > #include "copyright.h"
11  
12 < #include  "ray.h"
12 > #include  <signal.h>
13 > #include  <ctype.h>
14  
15 + #include  "ray.h"
16   #include  "rpaint.h"
17  
71 #include  <signal.h>
18  
73 #include  <ctype.h>
74
19   CUBE  thescene;                         /* our scene */
20   OBJECT  nsceneobjs;                     /* number of objects in our scene */
21  
# Line 89 | Line 33 | void  (*trace)() = NULL;               /* trace call */
33  
34   int  do_irrad = 0;                      /* compute irradiance? */
35  
36 + int  rand_samp = 0;                     /* pure Monte Carlo sampling? */
37 +
38   int  psample = 8;                       /* pixel sample size */
39   double  maxdiff = .15;                  /* max. sample difference */
40  
# Line 112 | Line 58 | double specjitter = 1.;                /* specular sampling jitter *
58  
59   int  backvis = 1;                       /* back face visibility */
60  
61 < int  maxdepth = 4;                      /* maximum recursion depth */
61 > int  maxdepth = 6;                      /* maximum recursion depth */
62   double  minweight = 1e-2;               /* minimum ray weight */
63  
64   char  *ambfile = NULL;                  /* ambient file name */
65   COLOR  ambval = BLKCOLOR;               /* ambient value */
66   int  ambvwt = 0;                        /* initial weight for ambient value */
67 < double  ambacc = 0.2;                   /* ambient accuracy */
68 < int  ambres = 8;                        /* ambient resolution */
69 < int  ambdiv = 32;                       /* ambient divisions */
70 < int  ambssamp = 0;                      /* ambient super-samples */
67 > double  ambacc = 0.3;                   /* ambient accuracy */
68 > int  ambres = 32;                       /* ambient resolution */
69 > int  ambdiv = 256;                      /* ambient divisions */
70 > int  ambssamp = 64;                     /* ambient super-samples */
71   int  ambounce = 0;                      /* ambient bounces */
72 < char  *amblist[128];                    /* ambient include/exclude list */
72 > char  *amblist[AMBLLEN];                /* ambient include/exclude list */
73   int  ambincl = -1;                      /* include == 1, exclude == 0 */
74  
75   int  greyscale = 0;                     /* map colors to brightness? */
# Line 170 | Line 116 | char  *dname;
116          id = octname!=NULL ? octname : progname;
117                                                  /* check device table */
118          for (i = 0; devtable[i].name; i++)
119 <                if (!strcmp(dname, devtable[i].name))
119 >                if (!strcmp(dname, devtable[i].name)) {
120                          if ((dev = (*devtable[i].init)(dname, id)) == NULL) {
121                                  sprintf(errmsg, "cannot initialize %s", dname);
122                                  error(USER, errmsg);
123                          } else
124                                  return;
125 < #ifndef NIX                                                
125 >                }
126                                                  /* not there, try exec */
127          if ((dev = comm_init(dname, id)) == NULL) {
128                  sprintf(errmsg, "cannot start device \"%s\"", dname);
129                  error(USER, errmsg);
130          }
185 #endif
131   }
132  
133  
# Line 272 | Line 217 | again:
217          else *++args = '\0';
218          
219          switch (inpbuf[0]) {
220 <        case 'f':                               /* new frame (or free mem.) */
220 >        case 'f':                               /* new frame (|focus|free) */
221                  if (badcom("frame")) {
222 <                        if (badcom("free"))
223 <                                goto commerr;
224 <                        free_objmem();
222 >                        if (badcom("focus")) {
223 >                                if (badcom("free"))
224 >                                        goto commerr;
225 >                                free_objmem();
226 >                                break;
227 >                        }
228 >                        getfocus(args);
229                          break;
230                  }
231                  getframe(args);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines