--- ray/src/gen/mkillum.c 1991/11/12 17:05:04 2.1 +++ ray/src/gen/mkillum.c 1993/09/21 17:09:59 2.6 @@ -26,11 +26,11 @@ static char SCCSid[] = "$SunId$ LBL"; #define S_ALL 3 /* select all */ /* rtrace command and defaults */ -char *rtargv[64] = { "rtrace", "-dj", ".25", "-dr", "3", "-di+", +char *rtargv[64] = { "rtrace", "-dj", ".25", "-dr", "3", "-dv-", "-ab", "2", "-ad", "256", "-as", "128", "-aa", ".15", }; int rtargc = 14; /* overriding rtrace options */ -char *myrtopts[] = { "-I-", "-i-", "-ov", "-h-", "-fff", NULL }; +char *myrtopts[] = { "-I-", "-i-", "-ov", "-h-", "-fff", "-y", "0", NULL }; struct rtproc rt; /* our rtrace process */ @@ -76,14 +76,29 @@ char *argv[]; gargv = argv; /* set up rtrace command */ for (i = 1; i < argc; i++) { - if (argv[i][0] == '<' && !argv[i][1]) + if (argv[i][0] == '<' && argv[i][1] == '\0') break; rtargv[rtargc++] = argv[i]; if (argv[i][0] == '-' && argv[i][1] == 'w') - warnings = !warnings; + switch (argv[i][2]) { + case '\0': + warnings = !warnings; + break; + case '+': + case 'T': case 't': + case 'Y': case 'y': + case '1': + warnings = 1; + break; + case '-': + case 'F': case 'f': + case 'N': case 'n': + case '0': + warnings = 0; + break; + } } - if ((gargc = i) < 2) - error(USER, "too few arguments"); + gargc = i; rtargc--; for (i = 0; myrtopts[i] != NULL; i++) rtargv[rtargc++] = myrtopts[i]; @@ -102,6 +117,8 @@ char *argv[]; perror(rtpath); exit(1); } + if (gargc < 2 || argv[gargc-1][0] == '-') + error(USER, "missing octree argument"); /* else initialize and run our calculation */ init(); if (gargc+1 < argc) @@ -385,7 +402,17 @@ printopts() /* print out option default values */ { printf("m=%-15s\t\t# material name\n", thisillum.matname); printf("f=%-15s\t\t# data file name\n", thisillum.datafile); - printf("c=n\t\t\t\t# color none\n"); + if (thisillum.flags & IL_COLAVG) + if (thisillum.flags & IL_COLDST) + printf("c=d\t\t\t\t# color distribution\n"); + else + printf("c=a\t\t\t\t# color average\n"); + else + printf("c=n\t\t\t\t# color none\n"); + if (thisillum.flags & IL_LIGHT) + printf("l+\t\t\t\t# light type on\n"); + else + printf("l-\t\t\t\t# light type off\n"); printf("d=%d\t\t\t\t# density of points\n", thisillum.sampdens); printf("s=%d\t\t\t\t# samples per point\n", thisillum.nsamps); printf("b=%f\t\t\t# minimum average brightness\n", thisillum.minbrt);