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.26 by greg, Tue Jan 24 21:54:49 2023 UTC vs.
Revision 2.33 by greg, Tue Jun 3 21:31:51 2025 UTC

# Line 36 | Line 36 | static const char      RCSid[] = "$Id$";
36   *  as simple as we can.  Global variables and their defaults
37   *  are defined below, and including "ray.h" declares these
38   *  along with all the routines you are likely to need.  First,
39 < *  assign the global variable progname to your argv[0], then
40 < *  change the rendering parameters as you like.  If you have a set
41 < *  of option arguments you are working from, the getrenderopt(ac,av)
39 > *  assign the global variable progname by calling fixargv0(argv[0]),
40 > *  then change the rendering parameters as you like.  If you have a
41 > *  set of option arguments you are working from, the getrenderopt()
42   *  call should be very useful.  Before tracing any rays, you
43   *  must read in the octree with a call to ray_init(oct).
44   *  Passing NULL for the file name causes ray_init() to read
# Line 98 | Line 98 | static const char      RCSid[] = "$Id$";
98   #include  "ambient.h"
99   #include  "otypes.h"
100   #include  "random.h"
101 + #include  "func.h"
102   #include  "data.h"
103   #include  "font.h"
104   #include  "pmapray.h"
105  
105 char    *progname = "unknown_app";      /* caller sets to argv[0] */
106
106   char    *octname;                       /* octree name we are given */
107  
109 char    *shm_boundary = NULL;           /* boundary of shared memory */
110
108   CUBE    thescene;                       /* our scene */
109   OBJECT  nsceneobjs;                     /* number of objects in our scene */
110  
# Line 119 | Line 116 | void   (*trace)() = NULL;              /* trace call */
116  
117   void    (*addobjnotify[8])() = {ambnotify, NULL};
118  
119 + int     castonly = 0;                   /* only doing ray-casting? */
120 +
121   int     do_irrad = 0;                   /* compute irradiance? */
122  
123   int     rand_samp = 1;                  /* pure Monte Carlo sampling? */
# Line 179 | Line 178 | ray_init(                      /* initialize ray-tracing calculation */
178                                          /* initialize object types */
179          if (ofun[OBJ_SPHERE].funp == o_default)
180                  initotypes();
181 +                                        /* initialize calcomp routines */
182 +        initfunc();
183                                          /* initialize urand */
184          reset_random();
185 <                                        /* read scene octree */
186 <        readoct(octname = otnm, ~(IO_FILES|IO_INFO), &thescene, NULL);
185 >                                        /* initialize spectral sampling */
186 >        if (setspectrsamp(CNDX, WLPART) < 0)
187 >                error(USER, "unsupported spectral sampling");
188 >
189 >        octname = savqstr(otnm);        /* read scene octree */
190 >        readoct(octname, ~(IO_FILES|IO_INFO), &thescene, NULL);
191          nsceneobjs = nobjects;
192 <                                        /* PMAP: Init & load photon maps */
193 <        ray_init_pmap();
194 <                                        /* find and mark sources */
195 <        marksources();
196 <                                        /* initialize ambient calculation */
197 <        setambient();
198 <                                        /* ready to go... (almost) */
192 >
193 >        if (!castonly) {                /* any actual ray traversal to do? */
194 >
195 >                ray_init_pmap();        /* PMAP: set up & load photon maps */
196 >
197 >                marksources();          /* find and mark sources */
198 >
199 >                setambient();           /* initialize ambient calculation */
200 >        } else
201 >                distantsources();       /* else mark only distant sources */
202   }
203  
204  
# Line 218 | Line 226 | ray_done(              /* free ray-tracing data */
226          donesets();
227          octdone();
228          thescene.cutree = EMPTY;
229 <        octname = NULL;
229 >        freeqstr(octname); octname = NULL;
230          retainfonts = 0;
231          if (freall) {
232                  freefont(NULL);
# Line 341 | Line 349 | ray_restore(                   /* restore parameter settings */
349          ambincl = rp->ambincl;
350                                          /* update ambient calculation */
351          ambnotify(OVOID);
352 <        if (thescene.cutree != EMPTY) {
352 >        if ((thescene.cutree != EMPTY) & !castonly) {
353                  int     newamb = (ambfile == NULL) ?  rp->ambfile[0] :
354                                          strcmp(ambfile, rp->ambfile) ;
355  
# Line 382 | Line 390 | ray_defaults(          /* get default parameter values */
390          rp->do_irrad = 0;
391          rp->rand_samp = 1;
392          rp->dstrsrc = 0.0;
393 <        rp->shadthresh = .03;
394 <        rp->shadcert = .75;
393 >        rp->shadthresh = 0.03;
394 >        rp->shadcert = 0.75;
395          rp->directrelay = 2;
396          rp->vspretest = 512;
397          rp->directvis = 1;
# Line 392 | Line 400 | ray_defaults(          /* get default parameter values */
400          setcolor(rp->salbedo, 0., 0., 0.);
401          rp->seccg = 0.;
402          rp->ssampdist = 0.;
403 <        rp->specthresh = .15;
403 >        rp->specthresh = 0.15;
404          rp->specjitter = 1.;
405          rp->backvis = 1;
406          rp->maxdepth = -10;
407 <        rp->minweight = 2e-3;
407 >        rp->minweight = 1e-4;
408          memset(rp->ambfile, '\0', sizeof(rp->ambfile));
409          setcolor(rp->ambval, 0., 0., 0.);
410          rp->ambvwt = 0;
411          rp->ambres = 256;
412 <        rp->ambacc = 0.15;
412 >        rp->ambacc = 0.1;
413          rp->ambdiv = 1024;
414          rp->ambssamp = 512;
415          rp->ambounce = 0;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines