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.9 by schorsch, Tue Mar 30 16:13:01 2004 UTC vs.
Revision 2.10 by greg, Wed May 25 04:44:26 2005 UTC

# Line 46 | Line 46 | extern int  lim_dist;                  /* limit distance? */
46   extern char  *tralist[];                /* list of modifers to trace (or no) */
47   extern int  traincl;                    /* include == 1, exclude == 0 */
48  
49 + static int  loadflags = ~IO_FILES;      /* what to load from octree */
50 +
51   static void onsig(int  signo);
52   static void sigdie(int  signo, char  *msg);
53   static void printdefaults(void);
# Line 64 | Line 66 | main(int  argc, char  *argv[])
66                                  case 'n': case 'N': case 'f': case 'F': \
67                                  case '-': case '0': var = 0; break; \
68                                  default: goto badopt; }
67 –        int  loadflags = ~IO_FILES;
69          int  persist = 0;
70          char  **tralp;
71          int  duped1;
# Line 423 | Line 424 | printdefaults(void)                    /* print default values to stdou
424  
425          if (imm_irrad)
426                  printf("-I+\t\t\t\t# immediate irradiance on\n");
427 <        printf("-x  %-9d\t\t\t# x resolution\n", hresolu);
427 >        printf("-x  %-9d\t\t\t# x resolution (flush interval)\n", hresolu);
428          printf("-y  %-9d\t\t\t# y resolution\n", vresolu);
429          printf(lim_dist ? "-ld+\t\t\t\t# limit distance on\n" :
430                          "-ld-\t\t\t\t# limit distance off\n");
431 +        printf("-h%c\t\t\t\t# %s header\n", loadflags & IO_INFO ? '+' : '-',
432 +                        loadflags & IO_INFO ? "output" : "no");
433          printf("-f%c%c\t\t\t\t# format input/output = %s/%s\n",
434                          inform, outform, formstr(inform), formstr(outform));
435 <        printf("-o%s\t\t\t\t# output", outvals);
435 >        printf("-o%-9s\t\t\t# output", outvals);
436          for (cp = outvals; *cp; cp++)
437                  switch (*cp) {
438 <                case 't': printf(" trace"); break;
438 >                case 't': case 'T': printf(" trace"); break;
439                  case 'o': printf(" origin"); break;
440                  case 'd': printf(" direction"); break;
441                  case 'v': printf(" value"); break;
# Line 444 | Line 447 | printdefaults(void)                    /* print default values to stdou
447                  case 's': printf(" surface"); break;
448                  case 'w': printf(" weight"); break;
449                  case 'm': printf(" modifier"); break;
450 +                case 'M': printf(" material"); break;
451 +                case 'W': printf(" contribution"); break;
452 +                case '-': printf(" stroke"); break;
453                  }
454          putchar('\n');
455          printf(erract[WARNING].pf != NULL ?

Diff Legend

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