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

Comparing ray/src/gen/mkillum.c (file contents):
Revision 1.14 by greg, Fri Nov 8 13:17:44 1991 UTC vs.
Revision 2.5 by greg, Thu Nov 19 20:27:48 1992 UTC

# Line 26 | Line 26 | static char SCCSid[] = "$SunId$ LBL";
26   #define  S_ALL          3               /* select all */
27  
28                                  /* rtrace command and defaults */
29 < char  *rtargv[64] = { "rtrace", "-dj", ".25", "-dr", "3", "-di+",
29 > char  *rtargv[64] = { "rtrace", "-dj", ".25", "-dr", "3", "-dv-",
30                  "-ab", "2", "-ad", "256", "-as", "128", "-aa", ".15", };
31   int  rtargc = 14;
32                                  /* overriding rtrace options */
33 < char  *myrtopts[] = { "-I-", "-i-", "-ov", "-h-", "-fff", NULL };
33 > char  *myrtopts[] = { "-I-", "-i-", "-ov", "-h-", "-fff", "-y", "0", NULL };
34  
35   struct rtproc   rt;             /* our rtrace process */
36  
# Line 82 | Line 82 | char   *argv[];
82                  if (argv[i][0] == '-' && argv[i][1] == 'w')
83                          warnings = !warnings;
84          }
85 <        if ((gargc = i) < 2)
86 <                error(USER, "too few arguments");
85 >        gargc = i;
86          rtargc--;
87          for (i = 0; myrtopts[i] != NULL; i++)
88                  rtargv[rtargc++] = myrtopts[i];
# Line 102 | Line 101 | char   *argv[];
101                  perror(rtpath);
102                  exit(1);
103          }
104 +        if (gargc < 2 || argv[gargc-1][0] == '-')
105 +                error(USER, "missing octree argument");
106                                  /* else initialize and run our calculation */
107          init();
108          if (gargc+1 < argc)
# Line 385 | Line 386 | printopts()                    /* print out option default values */
386   {
387          printf("m=%-15s\t\t# material name\n", thisillum.matname);
388          printf("f=%-15s\t\t# data file name\n", thisillum.datafile);
389 <        printf("c=n\t\t\t\t# color none\n");
389 >        if (thisillum.flags & IL_COLAVG)
390 >                if (thisillum.flags & IL_COLDST)
391 >                        printf("c=d\t\t\t\t# color distribution\n");
392 >                else
393 >                        printf("c=a\t\t\t\t# color average\n");
394 >        else
395 >                printf("c=n\t\t\t\t# color none\n");
396 >        if (thisillum.flags & IL_LIGHT)
397 >                printf("l+\t\t\t\t# light type on\n");
398 >        else
399 >                printf("l-\t\t\t\t# light type off\n");
400          printf("d=%d\t\t\t\t# density of points\n", thisillum.sampdens);
401          printf("s=%d\t\t\t\t# samples per point\n", thisillum.nsamps);
402          printf("b=%f\t\t\t# minimum average brightness\n", thisillum.minbrt);

Diff Legend

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