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

Comparing ray/src/rt/renderopts.c (file contents):
Revision 2.1 by greg, Sat Feb 22 02:07:29 2003 UTC vs.
Revision 2.11 by greg, Tue Jun 14 03:53:58 2005 UTC

# Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7   *  External symbols declared in ray.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"
13 + #include  "paths.h"
14  
15  
16 < int
17 < getrenderopt(ac, av)            /* get next render option */
18 < int  ac;
19 < char  *av[];
16 > extern int
17 > getrenderopt(           /* get next render option */
18 >        int  ac,
19 >        char  *av[]
20 > )
21   {
22   #define  check(ol,al)           if (av[0][ol] || \
23                                  badarg(ac-1,av+1,al)) \
# Line 89 | Line 36 | char  *av[];
36                  return(-1);
37                                          /* check if it's one we know */
38          switch (av[0][1]) {
39 +        case 'u':                               /* uncorrelated sampling */
40 +                bool(2,rand_samp);
41 +                return(0);
42          case 'b':                               /* back face vis. */
43                  if (av[0][2] == 'v') {
44                          bool(3,backvis);
# Line 194 | Line 144 | char  *av[];
144                          }
145                          if (av[0][2] == 'I') {  /* file */
146                                  rval = wordfile(amblp,
147 <                                        getpath(av[1],getlibpath(),R_OK));
147 >                                        getpath(av[1],getrlibpath(),R_OK));
148                                  if (rval < 0) {
149                                          sprintf(errmsg,
150 <                        "cannot open ambient include file \"%s\"", av[0]);
150 >                        "cannot open ambient include file \"%s\"", av[1]);
151                                          error(SYSTEM, errmsg);
152                                  }
153                                  amblp += rval;
154                          } else {
155 <                                *amblp++ = av[1];
155 >                                *amblp++ = savqstr(av[1]);
156                                  *amblp = NULL;
157                          }
158                          return(1);
# Line 215 | Line 165 | char  *av[];
165                          }
166                          if (av[0][2] == 'E') {  /* file */
167                                  rval = wordfile(amblp,
168 <                                        getpath(av[1],getlibpath(),R_OK));
168 >                                        getpath(av[1],getrlibpath(),R_OK));
169                                  if (rval < 0) {
170                                          sprintf(errmsg,
171 <                        "cannot open ambient exclude file \"%s\"", av[0]);
171 >                        "cannot open ambient exclude file \"%s\"", av[1]);
172                                          error(SYSTEM, errmsg);
173                                  }
174                                  amblp += rval;
175                          } else {
176 <                                *amblp++ = av[1];
176 >                                *amblp++ = savqstr(av[1]);
177                                  *amblp = NULL;
178                          }
179                          return(1);
180                  case 'f':                               /* file */
181                          check(3,"s");
182 <                        ambfile= av[1];
182 >                        ambfile = savqstr(av[1]);
183                          return(1);
184                  }
185                  break;
# Line 265 | Line 215 | char  *av[];
215   }
216  
217  
218 < void
219 < print_rdefaults()               /* print default render values to stdout */
218 > extern void
219 > print_rdefaults(void)           /* print default render values to stdout */
220   {
271 –        register char  *cp;
272 –
221          printf(do_irrad ? "-i+\t\t\t\t# irradiance calculation on\n" :
222                          "-i-\t\t\t\t# irradiance calculation off\n");
223 +        printf(rand_samp ? "-u+\t\t\t\t# uncorrelated Monte Carlo sampling\n" :
224 +                        "-u-\t\t\t\t# low-discrepancy sampling\n");
225          printf(backvis ? "-bv+\t\t\t\t# back face visibility on\n" :
226                          "-bv-\t\t\t\t# back face visibility off\n");
227          printf("-dt %f\t\t\t# direct threshold\n", shadthresh);
# Line 300 | Line 250 | print_rdefaults()              /* print default render values to s
250                          colval(salbedo,GRN), colval(salbedo,BLU));
251          printf("-mg %f\t\t\t# mist scattering eccentricity\n", seccg);
252          printf("-ms %f\t\t\t# mist sampling distance\n", ssampdist);
253 <        printf("-lr %-9d\t\t\t# limit reflection\n", maxdepth);
253 >        printf("-lr %-9d\t\t\t# limit reflection%s\n", maxdepth,
254 >                        maxdepth<=0 ? " (Russian roulette)" : "");
255          printf("-lw %f\t\t\t# limit weight\n", minweight);
256   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines