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.6 by greg, Tue Aug 26 04:24:26 2003 UTC vs.
Revision 2.21 by greg, Tue Feb 24 19:39:27 2015 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"
101   #include  "data.h"
102   #include  "font.h"
103 + #include  "pmapray.h"
104  
105   char    *progname = "unknown_app";      /* caller sets to argv[0] */
106  
# Line 115 | Line 117 | int    samplendx = 0;                  /* index for this sample */
117  
118   void    (*trace)() = NULL;              /* trace call */
119  
118 – extern void     ambnotify();
120   void    (*addobjnotify[8])() = {ambnotify, NULL};
121  
122   int     do_irrad = 0;                   /* compute irradiance? */
123  
124 + int     rand_samp = 0;                  /* pure Monte Carlo sampling? */
125 +
126   double  dstrsrc = 0.0;                  /* square source distribution */
127 < double  shadthresh = .05;               /* shadow threshold */
128 < double  shadcert = .5;                  /* shadow certainty */
127 > double  shadthresh = .03;               /* shadow threshold */
128 > double  shadcert = .75;                 /* shadow certainty */
129   int     directrelay = 2;                /* number of source relays */
130   int     vspretest = 512;                /* virtual source pretest density */
131   int     directvis = 1;                  /* sources visible? */
# Line 138 | Line 141 | double specjitter = 1.;                /* specular sampling jitter *
141  
142   int     backvis = 1;                    /* back face visibility */
143  
144 < int     maxdepth = 6;                   /* maximum recursion depth */
145 < double  minweight = 4e-3;               /* minimum ray weight */
144 > int     maxdepth = 8;                   /* maximum recursion depth */
145 > double  minweight = 5e-4;               /* minimum ray weight */
146  
147   char    *ambfile = NULL;                /* ambient file name */
148   COLOR   ambval = BLKCOLOR;              /* ambient value */
149   int     ambvwt = 0;                     /* initial weight for ambient value */
150 < double  ambacc = 0.2;                   /* ambient accuracy */
151 < int     ambres = 128;                   /* ambient resolution */
152 < int     ambdiv = 512;                   /* ambient divisions */
153 < int     ambssamp = 0;                   /* ambient super-samples */
150 > double  ambacc = 0.1;                   /* ambient accuracy */
151 > int     ambres = 256;                   /* ambient resolution */
152 > int     ambdiv = 1024;                  /* ambient divisions */
153 > int     ambssamp = 512;                 /* ambient super-samples */
154   int     ambounce = 0;                   /* ambient bounces */
155   char    *amblist[AMBLLEN+1];            /* ambient include/exclude list */
156   int     ambincl = -1;                   /* include == 1, exclude == 0 */
157  
158  
159   void
160 < ray_init(otnm)                  /* initialize ray-tracing calculation */
161 < char    *otnm;
160 > ray_init(                       /* initialize ray-tracing calculation */
161 >        char    *otnm
162 > )
163   {
164          if (nobjects > 0)               /* free old scene data */
165                  ray_done(0);
# Line 163 | Line 167 | char   *otnm;
167          if (ofun[OBJ_SPHERE].funp == o_default)
168                  initotypes();
169                                          /* initialize urand */
170 <        initurand(2048);
170 >        if (rand_samp) {
171 >                srandom((long)time(0));
172 >                initurand(0);
173 >        } else {
174 >                srandom(0L);
175 >                initurand(2048);
176 >        }
177                                          /* read scene octree */
178          readoct(octname = otnm, ~(IO_FILES|IO_INFO), &thescene, NULL);
179          nsceneobjs = nobjects;
180 +                                        /* PMAP: Init & load photon maps */
181 +        ray_init_pmap();
182                                          /* find and mark sources */
183          marksources();
184                                          /* initialize ambient calculation */
185          setambient();
186 <                                        /* ready to go... */
186 >                                        /* ready to go... (almost) */
187   }
188  
189   void
190 < ray_trace(r)                    /* trace a primary ray */
191 < RAY     *r;
190 > ray_trace(                      /* trace a primary ray */
191 >        RAY     *r
192 > )
193   {
194 <        rayorigin(r, NULL, PRIMARY, 1.0);
194 >        rayorigin(r, PRIMARY, NULL, NULL);
195          samplendx++;
196          rayvalue(r);            /* assumes origin and direction are set */
197   }
198  
199  
200   void
201 < ray_done(freall)                /* free ray-tracing data */
202 < int     freall;
201 > ray_done(               /* free ray-tracing data */
202 >        int     freall
203 > )
204   {
205          retainfonts = 1;
206          ambdone();
# Line 197 | Line 211 | int    freall;
211          octdone();
212          thescene.cutree = EMPTY;
213          octname = NULL;
214 +        retainfonts = 0;
215          if (freall) {
201 –                retainfonts = 0;
216                  freefont(NULL);
217                  freedata(NULL);
218 +                SDfreeCache(NULL);
219                  initurand(0);
220          }
221          if (nobjects > 0) {
222 <                sprintf(errmsg, "%d objects left after call to ray_done()",
223 <                                nobjects);
222 >                sprintf(errmsg, "%ld objects left after call to ray_done()",
223 >                                (long)nobjects);
224                  error(WARNING, errmsg);
225          }
226 +        
227 +        ray_done_pmap();
228   }
229  
230  
231   void
232 < ray_save(rp)                    /* save current parameter settings */
233 < RAYPARAMS       *rp;
232 > ray_save(                       /* save current parameter settings */
233 >        RAYPARAMS       *rp
234 > )
235   {
236          int     i, ndx;
237  
# Line 258 | Line 276 | RAYPARAMS      *rp;
276          }
277          while (i <= AMBLLEN)
278                  rp->amblndx[i++] = -1;
279 +                
280 +        /* PMAP: save photon mapping params */
281 +        ray_save_pmap(rp);
282   }
283  
284  
285   void
286 < ray_restore(rp)                 /* restore parameter settings */
287 < RAYPARAMS       *rp;
286 > ray_restore(                    /* restore parameter settings */
287 >        RAYPARAMS       *rp
288 > )
289   {
290          register int    i;
291  
# Line 325 | Line 347 | RAYPARAMS      *rp;
347                  ambres = rp->ambres;
348                  ambacc = rp->ambacc;
349          }
350 +        
351 +        /* PMAP: restore photon mapping params */
352 +        ray_restore_pmap(rp);
353   }
354  
355  
356   void
357 < ray_defaults(rp)                /* get default parameter values */
358 < RAYPARAMS       *rp;
357 > ray_defaults(           /* get default parameter values */
358 >        RAYPARAMS       *rp
359 > )
360   {
361          int     i;
362  
# Line 339 | Line 365 | RAYPARAMS      *rp;
365  
366          rp->do_irrad = 0;
367          rp->dstrsrc = 0.0;
368 <        rp->shadthresh = .05;
369 <        rp->shadcert = .5;
368 >        rp->shadthresh = .03;
369 >        rp->shadcert = .75;
370          rp->directrelay = 2;
371          rp->vspretest = 512;
372          rp->directvis = 1;
# Line 352 | Line 378 | RAYPARAMS      *rp;
378          rp->specthresh = .15;
379          rp->specjitter = 1.;
380          rp->backvis = 1;
381 <        rp->maxdepth = 6;
382 <        rp->minweight = 4e-3;
381 >        rp->maxdepth = 8;
382 >        rp->minweight = 2e-3;
383          setcolor(rp->ambval, 0., 0., 0.);
384          memset(rp->ambfile, '\0', sizeof(rp->ambfile));
385          rp->ambvwt = 0;
386 <        rp->ambres = 128;
387 <        rp->ambacc = 0.2;
388 <        rp->ambdiv = 512;
389 <        rp->ambssamp = 0;
386 >        rp->ambres = 256;
387 >        rp->ambacc = 0.15;
388 >        rp->ambdiv = 1024;
389 >        rp->ambssamp = 512;
390          rp->ambounce = 0;
391          rp->ambincl = -1;
392          memset(rp->amblval, '\0', sizeof(rp->amblval));

Diff Legend

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