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.8 by greg, Sat Oct 4 14:39:53 2003 UTC vs.
Revision 2.19 by greg, Fri Feb 18 00:40:25 2011 UTC

# Line 23 | 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
29 < *  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 91 | Line 90 | static const char      RCSid[] = "$Id$";
90   */
91  
92   #include <string.h>
93 + #include <time.h>
94  
95   #include  "ray.h"
96   #include  "source.h"
97 + #include  "bsdf.h"
98   #include  "ambient.h"
99   #include  "otypes.h"
100   #include  "random.h"
# Line 115 | Line 116 | int    samplendx = 0;                  /* index for this sample */
116  
117   void    (*trace)() = NULL;              /* trace call */
118  
118 extern void     ambnotify();
119   void    (*addobjnotify[8])() = {ambnotify, NULL};
120  
121   int     do_irrad = 0;                   /* compute irradiance? */
122  
123 + int     rand_samp = 0;                  /* pure Monte Carlo sampling? */
124 +
125   double  dstrsrc = 0.0;                  /* square source distribution */
126   double  shadthresh = .03;               /* shadow threshold */
127   double  shadcert = .75;                 /* shadow certainty */
# Line 154 | Line 156 | int    ambincl = -1;                   /* include == 1, exclude == 0 */
156  
157  
158   void
159 < ray_init(otnm)                  /* initialize ray-tracing calculation */
160 < char    *otnm;
159 > ray_init(                       /* initialize ray-tracing calculation */
160 >        char    *otnm
161 > )
162   {
163          if (nobjects > 0)               /* free old scene data */
164                  ray_done(0);
# Line 163 | Line 166 | char   *otnm;
166          if (ofun[OBJ_SPHERE].funp == o_default)
167                  initotypes();
168                                          /* initialize urand */
169 <        initurand(2048);
169 >        if (rand_samp) {
170 >                srandom((long)time(0));
171 >                initurand(0);
172 >        } else {
173 >                srandom(0L);
174 >                initurand(2048);
175 >        }
176                                          /* read scene octree */
177          readoct(octname = otnm, ~(IO_FILES|IO_INFO), &thescene, NULL);
178          nsceneobjs = nobjects;
# Line 175 | Line 184 | char   *otnm;
184   }
185  
186   void
187 < ray_trace(r)                    /* trace a primary ray */
188 < RAY     *r;
187 > ray_trace(                      /* trace a primary ray */
188 >        RAY     *r
189 > )
190   {
191 <        rayorigin(r, NULL, PRIMARY, 1.0);
191 >        rayorigin(r, PRIMARY, NULL, NULL);
192          samplendx++;
193          rayvalue(r);            /* assumes origin and direction are set */
194   }
195  
196  
197   void
198 < ray_done(freall)                /* free ray-tracing data */
199 < int     freall;
198 > ray_done(               /* free ray-tracing data */
199 >        int     freall
200 > )
201   {
202          retainfonts = 1;
203          ambdone();
# Line 197 | Line 208 | int    freall;
208          octdone();
209          thescene.cutree = EMPTY;
210          octname = NULL;
211 +        retainfonts = 0;
212          if (freall) {
201                retainfonts = 0;
213                  freefont(NULL);
214                  freedata(NULL);
215 +                SDfreeCache(NULL);
216                  initurand(0);
217          }
218          if (nobjects > 0) {
219 <                sprintf(errmsg, "%d objects left after call to ray_done()",
220 <                                nobjects);
219 >                sprintf(errmsg, "%ld objects left after call to ray_done()",
220 >                                (long)nobjects);
221                  error(WARNING, errmsg);
222          }
223   }
224  
225  
226   void
227 < ray_save(rp)                    /* save current parameter settings */
228 < RAYPARAMS       *rp;
227 > ray_save(                       /* save current parameter settings */
228 >        RAYPARAMS       *rp
229 > )
230   {
231          int     i, ndx;
232  
# Line 262 | Line 275 | RAYPARAMS      *rp;
275  
276  
277   void
278 < ray_restore(rp)                 /* restore parameter settings */
279 < RAYPARAMS       *rp;
278 > ray_restore(                    /* restore parameter settings */
279 >        RAYPARAMS       *rp
280 > )
281   {
282          register int    i;
283  
# Line 329 | Line 343 | RAYPARAMS      *rp;
343  
344  
345   void
346 < ray_defaults(rp)                /* get default parameter values */
347 < RAYPARAMS       *rp;
346 > ray_defaults(           /* get default parameter values */
347 >        RAYPARAMS       *rp
348 > )
349   {
350          int     i;
351  
# Line 358 | Line 373 | RAYPARAMS      *rp;
373          memset(rp->ambfile, '\0', sizeof(rp->ambfile));
374          rp->ambvwt = 0;
375          rp->ambres = 256;
376 <        rp->ambacc = 0.1;
376 >        rp->ambacc = 0.15;
377          rp->ambdiv = 1024;
378          rp->ambssamp = 512;
379          rp->ambounce = 0;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines