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.4 by schorsch, Mon Jun 30 14:59:12 2003 UTC vs.
Revision 2.13 by greg, Tue Jun 14 02:46:30 2005 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 115 | Line 114 | int    samplendx = 0;                  /* index for this sample */
114  
115   void    (*trace)() = NULL;              /* trace call */
116  
117 < extern void     ambnotify();
119 < void    (*addobjnotify[])() = {ambnotify, NULL};
117 > void    (*addobjnotify[8])() = {ambnotify, NULL};
118  
119   int     do_irrad = 0;                   /* compute irradiance? */
120  
121 + int     rand_samp = 0;                  /* pure Monte Carlo sampling? */
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 138 | 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 */
154  
155  
156 < void
157 < ray_init(otnm)                  /* initialize ray-tracing calculation */
158 < char    *otnm;
156 > extern void
157 > ray_init(                       /* initialize ray-tracing calculation */
158 >        char    *otnm
159 > )
160   {
161          if (nobjects > 0)               /* free old scene data */
162                  ray_done(0);
# Line 163 | Line 164 | char   *otnm;
164          if (ofun[OBJ_SPHERE].funp == o_default)
165                  initotypes();
166                                          /* initialize urand */
167 <        if (urperm == NULL)
167 <                initurand(2048);
167 >        initurand(2048);
168                                          /* read scene octree */
169          readoct(octname = otnm, ~(IO_FILES|IO_INFO), &thescene, NULL);
170          nsceneobjs = nobjects;
# Line 175 | Line 175 | char   *otnm;
175                                          /* ready to go... */
176   }
177  
178 < void
179 < ray_trace(r)                    /* trace a primary ray */
180 < RAY     *r;
178 > extern void
179 > ray_trace(                      /* trace a primary ray */
180 >        RAY     *r
181 > )
182   {
183 <        rayorigin(r, NULL, PRIMARY, 1.0);
184 <        samplendx++;
183 >        rayorigin(r, PRIMARY, NULL, NULL);
184 >        samplendx = rand_samp ? random() : samplendx+1;
185          rayvalue(r);            /* assumes origin and direction are set */
186   }
187  
188  
189 < void
190 < ray_done(freall)                /* free ray-tracing data */
191 < int     freall;
189 > extern void
190 > ray_done(               /* free ray-tracing data */
191 >        int     freall
192 > )
193   {
194          retainfonts = 1;
195          ambdone();
# Line 205 | Line 207 | int    freall;
207                  initurand(0);
208          }
209          if (nobjects > 0) {
210 <                sprintf(errmsg, "%d objects left after call to ray_done()",
210 >                sprintf(errmsg, "%ld objects left after call to ray_done()",
211                                  nobjects);
212                  error(WARNING, errmsg);
213          }
214   }
215  
216  
217 < void
218 < ray_save(rp)                    /* save current parameter settings */
219 < RAYPARAMS       *rp;
217 > extern void
218 > ray_save(                       /* save current parameter settings */
219 >        RAYPARAMS       *rp
220 > )
221   {
222          int     i, ndx;
223  
# Line 262 | Line 265 | RAYPARAMS      *rp;
265   }
266  
267  
268 < void
269 < ray_restore(rp)                 /* restore parameter settings */
270 < RAYPARAMS       *rp;
268 > extern void
269 > ray_restore(                    /* restore parameter settings */
270 >        RAYPARAMS       *rp
271 > )
272   {
273          register int    i;
274  
# Line 329 | Line 333 | RAYPARAMS      *rp;
333   }
334  
335  
336 < void
337 < ray_defaults(rp)                /* get default parameter values */
338 < RAYPARAMS       *rp;
336 > extern void
337 > ray_defaults(           /* get default parameter values */
338 >        RAYPARAMS       *rp
339 > )
340   {
341          int     i;
342  
# Line 340 | Line 345 | RAYPARAMS      *rp;
345  
346          rp->do_irrad = 0;
347          rp->dstrsrc = 0.0;
348 <        rp->shadthresh = .05;
349 <        rp->shadcert = .5;
348 >        rp->shadthresh = .03;
349 >        rp->shadcert = .75;
350          rp->directrelay = 2;
351          rp->vspretest = 512;
352          rp->directvis = 1;
# Line 353 | Line 358 | RAYPARAMS      *rp;
358          rp->specthresh = .15;
359          rp->specjitter = 1.;
360          rp->backvis = 1;
361 <        rp->maxdepth = 6;
362 <        rp->minweight = 4e-3;
361 >        rp->maxdepth = 8;
362 >        rp->minweight = 2e-3;
363          setcolor(rp->ambval, 0., 0., 0.);
364          memset(rp->ambfile, '\0', sizeof(rp->ambfile));
365          rp->ambvwt = 0;
366 <        rp->ambres = 128;
367 <        rp->ambacc = 0.2;
368 <        rp->ambdiv = 512;
369 <        rp->ambssamp = 0;
366 >        rp->ambres = 256;
367 >        rp->ambacc = 0.15;
368 >        rp->ambdiv = 1024;
369 >        rp->ambssamp = 512;
370          rp->ambounce = 0;
371          rp->ambincl = -1;
372          memset(rp->amblval, '\0', sizeof(rp->amblval));

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines