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

Comparing ray/src/rt/rcmain.c (file contents):
Revision 2.1 by greg, Sat Jun 9 07:16:47 2012 UTC vs.
Revision 2.4 by greg, Fri Jun 15 00:57:40 2012 UTC

# Line 14 | Line 14 | static const char      RCSid[] = "$Id$";
14   #include "source.h"
15   #include "ambient.h"
16  
17 – char    *shm_boundary = NULL;           /* boundary of shared memory */
18 –
17   int     gargc;                          /* global argc */
18   char    **gargv;                        /* global argv */
19   char    *octname;                       /* global octree name */
# Line 46 | Line 44 | int    lim_dist = 0;                   /* limit distance? */
44   const char      *modname[MAXMODLIST];   /* ordered modifier name list */
45   int             nmods = 0;              /* number of modifiers */
46  
47 + void    (*addobjnotify[8])() = {ambnotify, NULL};
48 +
49   char    RCCONTEXT[] = "RCONTRIB";       /* our special evaluation context */
50  
51 – void    (*addobjnotify[8])() = {ambnotify, tranotify, NULL};
51  
53 –
52   static void
53   printdefaults(void)                     /* print default values to stdout */
54   {
55          char  *cp;
56  
57 +        printf("-c %-5d\t\t\t# accumulated rays per record\n", accumulate);
58 +        printf("-V%c\t\t\t\t# output %s\n", contrib ? '+' : '-',
59 +                        contrib ? "contributions" : "coefficients");
60          if (imm_irrad)
61                  printf("-I+\t\t\t\t# immediate irradiance on\n");
62          printf("-n %-2d\t\t\t\t# number of rendering processes\n", nproc);
# Line 227 | Line 228 | main(int argc, char *argv[])
228                          yres = atoi(argv[++i]);
229                          break;
230                  case 'w':                       /* warnings */
231 <                        rval = erract[WARNING].pf != NULL;
231 >                        rval = (erract[WARNING].pf != NULL);
232                          bool(2,rval);
233                          if (rval) erract[WARNING].pf = wputs;
234                          else erract[WARNING].pf = NULL;
# Line 339 | Line 340 | main(int argc, char *argv[])
340  
341          setambient();                   /* initialize ambient calculation */
342  
343 <        if (nproc > 1) {
343 <                preload_objs();         /* preload auxiliary data */
344 <                                        /* set shared memory boundary */
345 <                shm_boundary = strcpy((char *)malloc(16), "SHM_BOUNDARY");
346 <        }
347 <        rcontrib();                     /* trace ray contributions */
343 >        rcontrib();                     /* trace ray contributions (loop) */
344  
345          ambsync();                      /* flush ambient file */
346  

Diff Legend

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