ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/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.18 by greg, Sun Sep 26 15:51:15 2010 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"
96 –
97   #include  "ambient.h"
98 –
98   #include  "otypes.h"
100 –
99   #include  "random.h"
102 –
100   #include  "data.h"
104 –
101   #include  "font.h"
102  
103   char    *progname = "unknown_app";      /* caller sets to argv[0] */
# Line 119 | Line 115 | int    samplendx = 0;                  /* index for this sample */
115  
116   void    (*trace)() = NULL;              /* trace call */
117  
118 < extern void     ambnotify();
123 < void    (*addobjnotify[])() = {ambnotify, NULL};
118 > void    (*addobjnotify[8])() = {ambnotify, NULL};
119  
120   int     do_irrad = 0;                   /* compute irradiance? */
121  
122 + int     rand_samp = 0;                  /* pure Monte Carlo sampling? */
123 +
124   double  dstrsrc = 0.0;                  /* square source distribution */
125 < double  shadthresh = .05;               /* shadow threshold */
126 < double  shadcert = .5;                  /* shadow certainty */
125 > double  shadthresh = .03;               /* shadow threshold */
126 > double  shadcert = .75;                 /* shadow certainty */
127   int     directrelay = 2;                /* number of source relays */
128   int     vspretest = 512;                /* virtual source pretest density */
129   int     directvis = 1;                  /* sources visible? */
# Line 142 | Line 139 | double specjitter = 1.;                /* specular sampling jitter *
139  
140   int     backvis = 1;                    /* back face visibility */
141  
142 < int     maxdepth = 6;                   /* maximum recursion depth */
143 < double  minweight = 4e-3;               /* minimum ray weight */
142 > int     maxdepth = 8;                   /* maximum recursion depth */
143 > double  minweight = 2e-3;               /* minimum ray weight */
144  
145   char    *ambfile = NULL;                /* ambient file name */
146   COLOR   ambval = BLKCOLOR;              /* ambient value */
147   int     ambvwt = 0;                     /* initial weight for ambient value */
148 < double  ambacc = 0.2;                   /* ambient accuracy */
149 < int     ambres = 128;                   /* ambient resolution */
150 < int     ambdiv = 512;                   /* ambient divisions */
151 < int     ambssamp = 0;                   /* ambient super-samples */
148 > double  ambacc = 0.1;                   /* ambient accuracy */
149 > int     ambres = 256;                   /* ambient resolution */
150 > int     ambdiv = 1024;                  /* ambient divisions */
151 > int     ambssamp = 512;                 /* ambient super-samples */
152   int     ambounce = 0;                   /* ambient bounces */
153   char    *amblist[AMBLLEN+1];            /* ambient include/exclude list */
154   int     ambincl = -1;                   /* include == 1, exclude == 0 */
155  
156  
157   void
158 < ray_init(otnm)                  /* initialize ray-tracing calculation */
159 < char    *otnm;
158 > ray_init(                       /* initialize ray-tracing calculation */
159 >        char    *otnm
160 > )
161   {
162          if (nobjects > 0)               /* free old scene data */
163                  ray_done(0);
# Line 167 | Line 165 | char   *otnm;
165          if (ofun[OBJ_SPHERE].funp == o_default)
166                  initotypes();
167                                          /* initialize urand */
168 <        if (urperm == NULL)
168 >        if (rand_samp) {
169 >                srandom((long)time(0));
170 >                initurand(0);
171 >        } else {
172 >                srandom(0L);
173                  initurand(2048);
174 +        }
175                                          /* read scene octree */
176          readoct(octname = otnm, ~(IO_FILES|IO_INFO), &thescene, NULL);
177          nsceneobjs = nobjects;
# Line 179 | Line 182 | char   *otnm;
182                                          /* ready to go... */
183   }
184  
182 –
185   void
186 < ray_trace(RAY *r)               /* trace a primary ray */
186 > ray_trace(                      /* trace a primary ray */
187 >        RAY     *r
188 > )
189   {
190 <        rayorigin(r, NULL, PRIMARY, 1.0);
190 >        rayorigin(r, PRIMARY, NULL, NULL);
191          samplendx++;
192          rayvalue(r);            /* assumes origin and direction are set */
193   }
194  
195  
196   void
197 < ray_done(freall)                /* free ray-tracing data */
198 < int     freall;
197 > ray_done(               /* free ray-tracing data */
198 >        int     freall
199 > )
200   {
201          retainfonts = 1;
202          ambdone();
# Line 209 | Line 214 | int    freall;
214                  initurand(0);
215          }
216          if (nobjects > 0) {
217 <                sprintf(errmsg, "%d objects left after call to ray_done()",
218 <                                nobjects);
217 >                sprintf(errmsg, "%ld objects left after call to ray_done()",
218 >                                (long)nobjects);
219                  error(WARNING, errmsg);
220          }
221   }
222  
223  
224   void
225 < ray_save(rp)                    /* save current parameter settings */
226 < RAYPARAMS       *rp;
225 > ray_save(                       /* save current parameter settings */
226 >        RAYPARAMS       *rp
227 > )
228   {
229          int     i, ndx;
230  
# Line 242 | Line 248 | RAYPARAMS      *rp;
248          rp->maxdepth = maxdepth;
249          rp->minweight = minweight;
250          copycolor(rp->ambval, ambval);
251 <        bzero(rp->ambfile, sizeof(rp->ambfile));
251 >        memset(rp->ambfile, '\0', sizeof(rp->ambfile));
252          if (ambfile != NULL)
253                  strncpy(rp->ambfile, ambfile, sizeof(rp->ambfile)-1);
254          rp->ambvwt = ambvwt;
# Line 252 | Line 258 | RAYPARAMS      *rp;
258          rp->ambssamp = ambssamp;
259          rp->ambounce = ambounce;
260          rp->ambincl = ambincl;
261 <        bzero(rp->amblval, sizeof(rp->amblval));
261 >        memset(rp->amblval, '\0', sizeof(rp->amblval));
262          ndx = 0;
263          for (i = 0; i < AMBLLEN && amblist[i] != NULL; i++) {
264                  int     len = strlen(amblist[i]);
# Line 267 | Line 273 | RAYPARAMS      *rp;
273  
274  
275   void
276 < ray_restore(rp)                 /* restore parameter settings */
277 < RAYPARAMS       *rp;
276 > ray_restore(                    /* restore parameter settings */
277 >        RAYPARAMS       *rp
278 > )
279   {
280          register int    i;
281  
# Line 334 | Line 341 | RAYPARAMS      *rp;
341  
342  
343   void
344 < ray_defaults(rp)                /* get default parameter values */
345 < RAYPARAMS       *rp;
344 > ray_defaults(           /* get default parameter values */
345 >        RAYPARAMS       *rp
346 > )
347   {
348          int     i;
349  
# Line 344 | Line 352 | RAYPARAMS      *rp;
352  
353          rp->do_irrad = 0;
354          rp->dstrsrc = 0.0;
355 <        rp->shadthresh = .05;
356 <        rp->shadcert = .5;
355 >        rp->shadthresh = .03;
356 >        rp->shadcert = .75;
357          rp->directrelay = 2;
358          rp->vspretest = 512;
359          rp->directvis = 1;
# Line 357 | Line 365 | RAYPARAMS      *rp;
365          rp->specthresh = .15;
366          rp->specjitter = 1.;
367          rp->backvis = 1;
368 <        rp->maxdepth = 6;
369 <        rp->minweight = 4e-3;
368 >        rp->maxdepth = 8;
369 >        rp->minweight = 2e-3;
370          setcolor(rp->ambval, 0., 0., 0.);
371 <        bzero(rp->ambfile, sizeof(rp->ambfile));
371 >        memset(rp->ambfile, '\0', sizeof(rp->ambfile));
372          rp->ambvwt = 0;
373 <        rp->ambres = 128;
374 <        rp->ambacc = 0.2;
375 <        rp->ambdiv = 512;
376 <        rp->ambssamp = 0;
373 >        rp->ambres = 256;
374 >        rp->ambacc = 0.15;
375 >        rp->ambdiv = 1024;
376 >        rp->ambssamp = 512;
377          rp->ambounce = 0;
378          rp->ambincl = -1;
379 <        bzero(rp->amblval, sizeof(rp->amblval));
379 >        memset(rp->amblval, '\0', sizeof(rp->amblval));
380          for (i = AMBLLEN+1; i--; )
381                  rp->amblndx[i] = -1;
382   }

Diff Legend

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