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

Comparing ray/src/rt/raycalls.c (file contents):
Revision 2.1 by greg, Sat Feb 22 02:07:29 2003 UTC vs.
Revision 2.8 by greg, Sat Oct 4 14:39:53 2003 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   /*
13   *  These routines are designed to aid the programmer who wishes
# Line 133 | Line 78 | static const char      RCSid[] = "$Id$";
78   *  restarted at any point by calling ray_init() on a new
79   *  octree.
80   *
81 < *  The call ray_save(rp) allocates and returns a buffer
81 > *  The call ray_save(rp) fills a parameter structure
82   *  with the current global parameter settings, which may be
83   *  restored at any time with a call to ray_restore(rp).
84   *  This buffer contains no linked information, and thus
# Line 145 | Line 90 | static const char      RCSid[] = "$Id$";
90   *  same as the defaults for rtrace.)
91   */
92  
93 < #include  "ray.h"
93 > #include <string.h>
94  
95 + #include  "ray.h"
96   #include  "source.h"
151 –
97   #include  "ambient.h"
153 –
98   #include  "otypes.h"
155 –
99   #include  "random.h"
157 –
100   #include  "data.h"
159 –
101   #include  "font.h"
102  
103   char    *progname = "unknown_app";      /* caller sets to argv[0] */
# Line 175 | Line 116 | int    samplendx = 0;                  /* index for this sample */
116   void    (*trace)() = NULL;              /* trace call */
117  
118   extern void     ambnotify();
119 < void    (*addobjnotify[])() = {ambnotify, NULL};
119 > void    (*addobjnotify[8])() = {ambnotify, NULL};
120  
121   int     do_irrad = 0;                   /* compute irradiance? */
122  
123   double  dstrsrc = 0.0;                  /* square source distribution */
124 < double  shadthresh = .05;               /* shadow threshold */
125 < double  shadcert = .5;                  /* shadow certainty */
124 > double  shadthresh = .03;               /* shadow threshold */
125 > double  shadcert = .75;                 /* shadow certainty */
126   int     directrelay = 2;                /* number of source relays */
127   int     vspretest = 512;                /* virtual source pretest density */
128   int     directvis = 1;                  /* sources visible? */
# Line 197 | Line 138 | double specjitter = 1.;                /* specular sampling jitter *
138  
139   int     backvis = 1;                    /* back face visibility */
140  
141 < int     maxdepth = 6;                   /* maximum recursion depth */
142 < double  minweight = 4e-3;               /* minimum ray weight */
141 > int     maxdepth = 8;                   /* maximum recursion depth */
142 > double  minweight = 2e-3;               /* minimum ray weight */
143  
144   char    *ambfile = NULL;                /* ambient file name */
145   COLOR   ambval = BLKCOLOR;              /* ambient value */
146   int     ambvwt = 0;                     /* initial weight for ambient value */
147 < double  ambacc = 0.2;                   /* ambient accuracy */
148 < int     ambres = 128;                   /* ambient resolution */
149 < int     ambdiv = 512;                   /* ambient divisions */
150 < int     ambssamp = 0;                   /* ambient super-samples */
147 > double  ambacc = 0.1;                   /* ambient accuracy */
148 > int     ambres = 256;                   /* ambient resolution */
149 > int     ambdiv = 1024;                  /* ambient divisions */
150 > int     ambssamp = 512;                 /* ambient super-samples */
151   int     ambounce = 0;                   /* ambient bounces */
152   char    *amblist[AMBLLEN+1];            /* ambient include/exclude list */
153   int     ambincl = -1;                   /* include == 1, exclude == 0 */
# Line 222 | Line 163 | char   *otnm;
163          if (ofun[OBJ_SPHERE].funp == o_default)
164                  initotypes();
165                                          /* initialize urand */
166 <        if (urperm == NULL)
226 <                initurand(2048);
166 >        initurand(2048);
167                                          /* read scene octree */
168          readoct(octname = otnm, ~(IO_FILES|IO_INFO), &thescene, NULL);
169          nsceneobjs = nobjects;
# Line 234 | Line 174 | char   *otnm;
174                                          /* ready to go... */
175   }
176  
237 –
177   void
178 < ray_trace(RAY *r)               /* trace a primary ray */
178 > ray_trace(r)                    /* trace a primary ray */
179 > RAY     *r;
180   {
181          rayorigin(r, NULL, PRIMARY, 1.0);
182          samplendx++;
# Line 297 | Line 237 | RAYPARAMS      *rp;
237          rp->maxdepth = maxdepth;
238          rp->minweight = minweight;
239          copycolor(rp->ambval, ambval);
240 <        bzero(rp->ambfile, sizeof(rp->ambfile));
240 >        memset(rp->ambfile, '\0', sizeof(rp->ambfile));
241          if (ambfile != NULL)
242                  strncpy(rp->ambfile, ambfile, sizeof(rp->ambfile)-1);
243          rp->ambvwt = ambvwt;
# Line 307 | Line 247 | RAYPARAMS      *rp;
247          rp->ambssamp = ambssamp;
248          rp->ambounce = ambounce;
249          rp->ambincl = ambincl;
250 <        bzero(rp->amblval, sizeof(rp->amblval));
250 >        memset(rp->amblval, '\0', sizeof(rp->amblval));
251          ndx = 0;
252          for (i = 0; i < AMBLLEN && amblist[i] != NULL; i++) {
253                  int     len = strlen(amblist[i]);
# Line 399 | Line 339 | RAYPARAMS      *rp;
339  
340          rp->do_irrad = 0;
341          rp->dstrsrc = 0.0;
342 <        rp->shadthresh = .05;
343 <        rp->shadcert = .5;
342 >        rp->shadthresh = .03;
343 >        rp->shadcert = .75;
344          rp->directrelay = 2;
345          rp->vspretest = 512;
346          rp->directvis = 1;
# Line 412 | Line 352 | RAYPARAMS      *rp;
352          rp->specthresh = .15;
353          rp->specjitter = 1.;
354          rp->backvis = 1;
355 <        rp->maxdepth = 6;
356 <        rp->minweight = 4e-3;
355 >        rp->maxdepth = 8;
356 >        rp->minweight = 2e-3;
357          setcolor(rp->ambval, 0., 0., 0.);
358 <        bzero(rp->ambfile, sizeof(rp->ambfile));
358 >        memset(rp->ambfile, '\0', sizeof(rp->ambfile));
359          rp->ambvwt = 0;
360 <        rp->ambres = 128;
361 <        rp->ambacc = 0.2;
362 <        rp->ambdiv = 512;
363 <        rp->ambssamp = 0;
360 >        rp->ambres = 256;
361 >        rp->ambacc = 0.1;
362 >        rp->ambdiv = 1024;
363 >        rp->ambssamp = 512;
364          rp->ambounce = 0;
365          rp->ambincl = -1;
366 <        bzero(rp->amblval, sizeof(rp->amblval));
366 >        memset(rp->amblval, '\0', sizeof(rp->amblval));
367          for (i = AMBLLEN+1; i--; )
368                  rp->amblndx[i] = -1;
369   }

Diff Legend

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