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

Comparing ray/src/rt/rcmain.c (file contents):
Revision 2.6 by greg, Fri Jun 22 21:58:45 2012 UTC vs.
Revision 2.11 by greg, Sun Aug 11 13:48:48 2013 UTC

# Line 8 | Line 8 | static const char      RCSid[] = "$Id$";
8   #include "copyright.h"
9  
10   #include <signal.h>
11 + #include <time.h>
12   #include "rcontrib.h"
13   #include "random.h"
14   #include "source.h"
# Line 45 | Line 46 | int            nmods = 0;              /* number of modifiers */
46  
47   void    (*addobjnotify[8])() = {ambnotify, NULL};
48  
49 < char    RCCONTEXT[] = "RCONTRIB";       /* our special evaluation context */
49 > char    RCCONTEXT[] = "RC";             /* our special evaluation context */
50  
51  
52   static void
53   printdefaults(void)                     /* print default values to stdout */
54   {
54 –        char  *cp;
55 –
55          printf("-c %-5d\t\t\t# accumulated rays per record\n", accumulate);
56          printf("-V%c\t\t\t\t# output %s\n", contrib ? '+' : '-',
57                          contrib ? "contributions" : "coefficients");
# Line 169 | Line 168 | main(int argc, char *argv[])
168                                  case 'n': case 'N': case 'f': case 'F': \
169                                  case '-': case '0': var = 0; break; \
170                                  default: goto badopt; }
172 –        int     nprocs = 1;
171          char    *curout = NULL;
172          char    *binval = NULL;
173          int     bincnt = 0;
# Line 291 | Line 289 | main(int argc, char *argv[])
289                          goto badopt;
290                  }
291          }
292 +        if (nmods <= 0)
293 +                error(USER, "missing required modifier argument");
294                                          /* override some option settings */
295          override_options();
296                                          /* initialize object types */

Diff Legend

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