ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/rt/rtmain.c
(Generate patch)

Comparing ray/src/rt/rtmain.c (file contents):
Revision 2.32 by greg, Mon Apr 6 04:10:44 2020 UTC vs.
Revision 2.35 by greg, Tue Apr 5 03:02:15 2022 UTC

# Line 45 | Line 45 | char  *outvals = "v";                  /* output specification */
45   int  hresolu = 0;                       /* horizontal (scan) size */
46   int  vresolu = 0;                       /* vertical resolution */
47  
48 < int  castonly = 0;                      /* only doing ray-casting? */
48 > extern int  castonly;                   /* only doing ray-casting? */
49  
50   int  imm_irrad = 0;                     /* compute immediate irradiance? */
51   int  lim_dist = 0;                      /* limit distance? */
# Line 251 | Line 251 | main(int  argc, char  *argv[])
251                          goto badopt;
252                  }
253          }
254 <        if (nproc > 1) {
255 <                if (persist)
256 <                        error(USER, "multiprocessing incompatible with persist file");
257 <                if (!vresolu && hresolu > 0 && hresolu < nproc)
258 <                        error(WARNING, "number of cores should not exceed horizontal resolution");
259 <                if (trace != NULL)
260 <                        error(WARNING, "multiprocessing does not work properly with trace mode");
261 <        }
254 >        if (nproc > 1 && persist)
255 >                error(USER, "multiprocessing incompatible with persist file");
256                                          /* initialize object types */
257          initotypes();
258                                          /* initialize urand */
# Line 339 | Line 333 | main(int  argc, char  *argv[])
333                  marksources();          /* find and mark sources */
334  
335                  setambient();           /* initialize ambient calculation */
336 <        }
336 >        } else
337 >                distantsources();       /* else mark only distant sources */
338 >
339 >                fflush(stdout);         /* in case we're duplicating header */
340 >
341   #ifdef  PERSIST
342          if (persist) {
345 –                fflush(stdout);
343                                                  /* reconnect stdout */
344                  dup2(duped1, fileno(stdout));
345                  close(duped1);

Diff Legend

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