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.11 by greg, Tue Apr 19 01:15:06 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   /*
13   *  These routines are designed to aid the programmer who wishes
# Line 78 | Line 23 | static const char      RCSid[] = "$Id$";
23   *  sort of context, so it is impossible to simultaneously run
24   *  this library on multiple scenes or in multiple threads.
25   *  You get one scene and one thread, and if you want more, you
26 < *  will have to go with the process model used by the programs
27 < *  gen/mkillum, hd/rholo, and px/pinterp.  Finally, unrecoverable
28 < *  errors result in a call to the application-defined function
84 < *  quit().  The usual thing to do is to call exit().
26 > *  will have to go with the process model defined in raypcalls.c.
27 > *  Finally, unrecoverable errors result in a call to the application-
28 > *  defined function quit().  The usual thing to do is to call exit().
29   *  You might want to do something else instead, like
30   *  call setjmp()/longjmp() to bring you back to the calling
31   *  function for recovery.  You may also wish to define your own
# Line 133 | Line 77 | static const char      RCSid[] = "$Id$";
77   *  restarted at any point by calling ray_init() on a new
78   *  octree.
79   *
80 < *  The call ray_save(rp) allocates and returns a buffer
80 > *  The call ray_save(rp) fills a parameter structure
81   *  with the current global parameter settings, which may be
82   *  restored at any time with a call to ray_restore(rp).
83   *  This buffer contains no linked information, and thus
# Line 145 | Line 89 | static const char      RCSid[] = "$Id$";
89   *  same as the defaults for rtrace.)
90   */
91  
92 < #include  "ray.h"
92 > #include <string.h>
93  
94 + #include  "ray.h"
95   #include  "source.h"
151
96   #include  "ambient.h"
153
97   #include  "otypes.h"
155
98   #include  "random.h"
157
99   #include  "data.h"
159
100   #include  "font.h"
101  
102   char    *progname = "unknown_app";      /* caller sets to argv[0] */
# Line 174 | Line 114 | int    samplendx = 0;                  /* index for this sample */
114  
115   void    (*trace)() = NULL;              /* trace call */
116  
117 < extern void     ambnotify();
178 < void    (*addobjnotify[])() = {ambnotify, NULL};
117 > void    (*addobjnotify[8])() = {ambnotify, NULL};
118  
119   int     do_irrad = 0;                   /* compute irradiance? */
120  
121   double  dstrsrc = 0.0;                  /* square source distribution */
122 < double  shadthresh = .05;               /* shadow threshold */
123 < double  shadcert = .5;                  /* shadow certainty */
122 > double  shadthresh = .03;               /* shadow threshold */
123 > double  shadcert = .75;                 /* shadow certainty */
124   int     directrelay = 2;                /* number of source relays */
125   int     vspretest = 512;                /* virtual source pretest density */
126   int     directvis = 1;                  /* sources visible? */
# Line 197 | Line 136 | double specjitter = 1.;                /* specular sampling jitter *
136  
137   int     backvis = 1;                    /* back face visibility */
138  
139 < int     maxdepth = 6;                   /* maximum recursion depth */
140 < double  minweight = 4e-3;               /* minimum ray weight */
139 > int     maxdepth = 8;                   /* maximum recursion depth */
140 > double  minweight = 2e-3;               /* minimum ray weight */
141  
142   char    *ambfile = NULL;                /* ambient file name */
143   COLOR   ambval = BLKCOLOR;              /* ambient value */
144   int     ambvwt = 0;                     /* initial weight for ambient value */
145 < double  ambacc = 0.2;                   /* ambient accuracy */
146 < int     ambres = 128;                   /* ambient resolution */
147 < int     ambdiv = 512;                   /* ambient divisions */
148 < int     ambssamp = 0;                   /* ambient super-samples */
145 > double  ambacc = 0.1;                   /* ambient accuracy */
146 > int     ambres = 256;                   /* ambient resolution */
147 > int     ambdiv = 1024;                  /* ambient divisions */
148 > int     ambssamp = 512;                 /* ambient super-samples */
149   int     ambounce = 0;                   /* ambient bounces */
150   char    *amblist[AMBLLEN+1];            /* ambient include/exclude list */
151   int     ambincl = -1;                   /* include == 1, exclude == 0 */
152  
153  
154 < void
155 < ray_init(otnm)                  /* initialize ray-tracing calculation */
156 < char    *otnm;
154 > extern void
155 > ray_init(                       /* initialize ray-tracing calculation */
156 >        char    *otnm
157 > )
158   {
159          if (nobjects > 0)               /* free old scene data */
160                  ray_done(0);
# Line 222 | Line 162 | char   *otnm;
162          if (ofun[OBJ_SPHERE].funp == o_default)
163                  initotypes();
164                                          /* initialize urand */
165 <        if (urperm == NULL)
226 <                initurand(2048);
165 >        initurand(2048);
166                                          /* read scene octree */
167          readoct(octname = otnm, ~(IO_FILES|IO_INFO), &thescene, NULL);
168          nsceneobjs = nobjects;
# Line 234 | Line 173 | char   *otnm;
173                                          /* ready to go... */
174   }
175  
176 <
177 < void
178 < ray_trace(RAY *r)               /* trace a primary ray */
176 > extern void
177 > ray_trace(                      /* trace a primary ray */
178 >        RAY     *r
179 > )
180   {
181 <        rayorigin(r, NULL, PRIMARY, 1.0);
181 >        rayorigin(r, PRIMARY, NULL, NULL);
182          samplendx++;
183          rayvalue(r);            /* assumes origin and direction are set */
184   }
185  
186  
187 < void
188 < ray_done(freall)                /* free ray-tracing data */
189 < int     freall;
187 > extern void
188 > ray_done(               /* free ray-tracing data */
189 >        int     freall
190 > )
191   {
192          retainfonts = 1;
193          ambdone();
# Line 264 | Line 205 | int    freall;
205                  initurand(0);
206          }
207          if (nobjects > 0) {
208 <                sprintf(errmsg, "%d objects left after call to ray_done()",
208 >                sprintf(errmsg, "%ld objects left after call to ray_done()",
209                                  nobjects);
210                  error(WARNING, errmsg);
211          }
212   }
213  
214  
215 < void
216 < ray_save(rp)                    /* save current parameter settings */
217 < RAYPARAMS       *rp;
215 > extern void
216 > ray_save(                       /* save current parameter settings */
217 >        RAYPARAMS       *rp
218 > )
219   {
220          int     i, ndx;
221  
# Line 297 | Line 239 | RAYPARAMS      *rp;
239          rp->maxdepth = maxdepth;
240          rp->minweight = minweight;
241          copycolor(rp->ambval, ambval);
242 <        bzero(rp->ambfile, sizeof(rp->ambfile));
242 >        memset(rp->ambfile, '\0', sizeof(rp->ambfile));
243          if (ambfile != NULL)
244                  strncpy(rp->ambfile, ambfile, sizeof(rp->ambfile)-1);
245          rp->ambvwt = ambvwt;
# Line 307 | Line 249 | RAYPARAMS      *rp;
249          rp->ambssamp = ambssamp;
250          rp->ambounce = ambounce;
251          rp->ambincl = ambincl;
252 <        bzero(rp->amblval, sizeof(rp->amblval));
252 >        memset(rp->amblval, '\0', sizeof(rp->amblval));
253          ndx = 0;
254          for (i = 0; i < AMBLLEN && amblist[i] != NULL; i++) {
255                  int     len = strlen(amblist[i]);
# Line 321 | Line 263 | RAYPARAMS      *rp;
263   }
264  
265  
266 < void
267 < ray_restore(rp)                 /* restore parameter settings */
268 < RAYPARAMS       *rp;
266 > extern void
267 > ray_restore(                    /* restore parameter settings */
268 >        RAYPARAMS       *rp
269 > )
270   {
271          register int    i;
272  
# Line 388 | Line 331 | RAYPARAMS      *rp;
331   }
332  
333  
334 < void
335 < ray_defaults(rp)                /* get default parameter values */
336 < RAYPARAMS       *rp;
334 > extern void
335 > ray_defaults(           /* get default parameter values */
336 >        RAYPARAMS       *rp
337 > )
338   {
339          int     i;
340  
# Line 399 | Line 343 | RAYPARAMS      *rp;
343  
344          rp->do_irrad = 0;
345          rp->dstrsrc = 0.0;
346 <        rp->shadthresh = .05;
347 <        rp->shadcert = .5;
346 >        rp->shadthresh = .03;
347 >        rp->shadcert = .75;
348          rp->directrelay = 2;
349          rp->vspretest = 512;
350          rp->directvis = 1;
# Line 412 | Line 356 | RAYPARAMS      *rp;
356          rp->specthresh = .15;
357          rp->specjitter = 1.;
358          rp->backvis = 1;
359 <        rp->maxdepth = 6;
360 <        rp->minweight = 4e-3;
359 >        rp->maxdepth = 8;
360 >        rp->minweight = 2e-3;
361          setcolor(rp->ambval, 0., 0., 0.);
362 <        bzero(rp->ambfile, sizeof(rp->ambfile));
362 >        memset(rp->ambfile, '\0', sizeof(rp->ambfile));
363          rp->ambvwt = 0;
364 <        rp->ambres = 128;
365 <        rp->ambacc = 0.2;
366 <        rp->ambdiv = 512;
367 <        rp->ambssamp = 0;
364 >        rp->ambres = 256;
365 >        rp->ambacc = 0.15;
366 >        rp->ambdiv = 1024;
367 >        rp->ambssamp = 512;
368          rp->ambounce = 0;
369          rp->ambincl = -1;
370 <        bzero(rp->amblval, sizeof(rp->amblval));
370 >        memset(rp->amblval, '\0', sizeof(rp->amblval));
371          for (i = AMBLLEN+1; i--; )
372                  rp->amblndx[i] = -1;
373   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines