--- ray/src/gen/mkillum3.c 1991/08/26 10:16:59 1.6 +++ ray/src/gen/mkillum3.c 1992/03/11 12:25:49 2.2 @@ -10,7 +10,7 @@ static char SCCSid[] = "$SunId$ LBL"; #include "mkillum.h" -#define brt(col) (.295*(col)[0] + .635*(col)[1] + .070*(col)[2]) +#define brt(col) (.263*(col)[0]+.655*(col)[1]+.082*(col)[2]) char DATORD[] = "RGB"; /* data ordering */ char DATSUF[] = ".dat"; /* data file suffix */ @@ -24,6 +24,8 @@ register OBJREC *obj; { register int i; + if (!strcmp(mod, VOIDID)) /* don't print void objects */ + return; printf("\n%s %s %s", mod, ofun[obj->otype].funame, obj->oname); printf("\n%d", obj->oargs.nsargs); for (i = 0; i < obj->oargs.nsargs; i++) @@ -112,7 +114,7 @@ FVECT u, v, w; } else { printf("\n%s %s %s%s", VOIDID, ofun[PAT_BDATA].funame, il->matname, DSTSUF); - printf("\n5 noop"); + printf("\n5 noneg"); dfp = dfopen(il, 0); fprintf(dfp, "2\n%f %f %d\n%f %f %d\n", 1.-.5/n, .5/n, n, 0., 2.*PI, m+1); @@ -153,7 +155,7 @@ int n, m; } else { printf("\n%s %s %s%s", VOIDID, ofun[PAT_BDATA].funame, il->matname, DSTSUF); - printf("\n5 noop"); + printf("\n5 noneg"); dfp = dfopen(il, 0); fprintf(dfp, "2\n%f %f %d\n%f %f %d\n", 1.-1./n, -1.+1./n, n, 0., 2.*PI, m+1);