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.27 by greg, Thu Feb 2 18:45:23 2023 UTC vs.
Revision 2.31 by greg, Wed Aug 21 20:42:20 2024 UTC

# Line 106 | Line 106 | char   *progname = "unknown_app";      /* caller sets to argv
106  
107   char    *octname;                       /* octree name we are given */
108  
109 – char    *shm_boundary = NULL;           /* boundary of shared memory */
110 –
109   CUBE    thescene;                       /* our scene */
110   OBJECT  nsceneobjs;                     /* number of objects in our scene */
111  
# Line 183 | Line 181 | ray_init(                      /* initialize ray-tracing calculation */
181                  initotypes();
182                                          /* initialize urand */
183          reset_random();
184 +                                        /* initialize spectral sampling */
185 +        if (setspectrsamp(CNDX, WLPART) < 0)
186 +                error(USER, "unsupported spectral sampling");
187  
188          octname = savqstr(otnm);        /* read scene octree */
189          readoct(octname, ~(IO_FILES|IO_INFO), &thescene, NULL);
# Line 224 | Line 225 | ray_done(              /* free ray-tracing data */
225          donesets();
226          octdone();
227          thescene.cutree = EMPTY;
228 <        octname = NULL;
228 >        freeqstr(octname); octname = NULL;
229          retainfonts = 0;
230          if (freall) {
231                  freefont(NULL);
# Line 347 | Line 348 | ray_restore(                   /* restore parameter settings */
348          ambincl = rp->ambincl;
349                                          /* update ambient calculation */
350          ambnotify(OVOID);
351 <        if (thescene.cutree != EMPTY) {
351 >        if ((thescene.cutree != EMPTY) & !castonly) {
352                  int     newamb = (ambfile == NULL) ?  rp->ambfile[0] :
353                                          strcmp(ambfile, rp->ambfile) ;
354  

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)