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.2 by greg, Tue Feb 25 02:47:23 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 78 | 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 90 | 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 > #include <time.h>
94  
95 + #include  "ray.h"
96   #include  "source.h"
97 <
97 > #include  "bsdf.h"
98   #include  "ambient.h"
98 –
99   #include  "otypes.h"
100 –
100   #include  "random.h"
102 –
101   #include  "data.h"
104 –
102   #include  "font.h"
103  
104   char    *progname = "unknown_app";      /* caller sets to argv[0] */
# Line 119 | Line 116 | int    samplendx = 0;                  /* index for this sample */
116  
117   void    (*trace)() = NULL;              /* trace call */
118  
119 < extern void     ambnotify();
123 < void    (*addobjnotify[])() = {ambnotify, NULL};
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 = .05;               /* shadow threshold */
127 < double  shadcert = .5;                  /* shadow certainty */
126 > double  shadthresh = .03;               /* shadow threshold */
127 > double  shadcert = .75;                 /* shadow certainty */
128   int     directrelay = 2;                /* number of source relays */
129   int     vspretest = 512;                /* virtual source pretest density */
130   int     directvis = 1;                  /* sources visible? */
# Line 142 | Line 140 | double specjitter = 1.;                /* specular sampling jitter *
140  
141   int     backvis = 1;                    /* back face visibility */
142  
143 < int     maxdepth = 6;                   /* maximum recursion depth */
144 < double  minweight = 4e-3;               /* minimum ray weight */
143 > int     maxdepth = 8;                   /* maximum recursion depth */
144 > double  minweight = 2e-3;               /* minimum ray weight */
145  
146   char    *ambfile = NULL;                /* ambient file name */
147   COLOR   ambval = BLKCOLOR;              /* ambient value */
148   int     ambvwt = 0;                     /* initial weight for ambient value */
149 < double  ambacc = 0.2;                   /* ambient accuracy */
150 < int     ambres = 128;                   /* ambient resolution */
151 < int     ambdiv = 512;                   /* ambient divisions */
152 < int     ambssamp = 0;                   /* ambient super-samples */
149 > double  ambacc = 0.1;                   /* ambient accuracy */
150 > int     ambres = 256;                   /* ambient resolution */
151 > int     ambdiv = 1024;                  /* ambient divisions */
152 > int     ambssamp = 512;                 /* ambient super-samples */
153   int     ambounce = 0;                   /* ambient bounces */
154   char    *amblist[AMBLLEN+1];            /* ambient include/exclude list */
155   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 167 | Line 166 | char   *otnm;
166          if (ofun[OBJ_SPHERE].funp == o_default)
167                  initotypes();
168                                          /* initialize urand */
169 <        if (urperm == NULL)
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 179 | Line 183 | char   *otnm;
183                                          /* ready to go... */
184   }
185  
182 –
186   void
187 < ray_trace(RAY *r)               /* trace a primary ray */
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 202 | Line 208 | int    freall;
208          octdone();
209          thescene.cutree = EMPTY;
210          octname = NULL;
211 +        retainfonts = 0;
212          if (freall) {
206 –                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 242 | Line 250 | RAYPARAMS      *rp;
250          rp->maxdepth = maxdepth;
251          rp->minweight = minweight;
252          copycolor(rp->ambval, ambval);
253 <        bzero(rp->ambfile, sizeof(rp->ambfile));
253 >        memset(rp->ambfile, '\0', sizeof(rp->ambfile));
254          if (ambfile != NULL)
255                  strncpy(rp->ambfile, ambfile, sizeof(rp->ambfile)-1);
256          rp->ambvwt = ambvwt;
# Line 252 | Line 260 | RAYPARAMS      *rp;
260          rp->ambssamp = ambssamp;
261          rp->ambounce = ambounce;
262          rp->ambincl = ambincl;
263 <        bzero(rp->amblval, sizeof(rp->amblval));
263 >        memset(rp->amblval, '\0', sizeof(rp->amblval));
264          ndx = 0;
265          for (i = 0; i < AMBLLEN && amblist[i] != NULL; i++) {
266                  int     len = strlen(amblist[i]);
# Line 267 | 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 334 | 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 344 | Line 354 | RAYPARAMS      *rp;
354  
355          rp->do_irrad = 0;
356          rp->dstrsrc = 0.0;
357 <        rp->shadthresh = .05;
358 <        rp->shadcert = .5;
357 >        rp->shadthresh = .03;
358 >        rp->shadcert = .75;
359          rp->directrelay = 2;
360          rp->vspretest = 512;
361          rp->directvis = 1;
# Line 357 | Line 367 | RAYPARAMS      *rp;
367          rp->specthresh = .15;
368          rp->specjitter = 1.;
369          rp->backvis = 1;
370 <        rp->maxdepth = 6;
371 <        rp->minweight = 4e-3;
370 >        rp->maxdepth = 8;
371 >        rp->minweight = 2e-3;
372          setcolor(rp->ambval, 0., 0., 0.);
373 <        bzero(rp->ambfile, sizeof(rp->ambfile));
373 >        memset(rp->ambfile, '\0', sizeof(rp->ambfile));
374          rp->ambvwt = 0;
375 <        rp->ambres = 128;
376 <        rp->ambacc = 0.2;
377 <        rp->ambdiv = 512;
378 <        rp->ambssamp = 0;
375 >        rp->ambres = 256;
376 >        rp->ambacc = 0.15;
377 >        rp->ambdiv = 1024;
378 >        rp->ambssamp = 512;
379          rp->ambounce = 0;
380          rp->ambincl = -1;
381 <        bzero(rp->amblval, sizeof(rp->amblval));
381 >        memset(rp->amblval, '\0', sizeof(rp->amblval));
382          for (i = AMBLLEN+1; i--; )
383                  rp->amblndx[i] = -1;
384   }

Diff Legend

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