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

Comparing ray/src/gen/mkillum3.c (file contents):
Revision 1.6 by greg, Mon Aug 26 10:16:59 1991 UTC vs.
Revision 2.3 by greg, Thu Mar 12 11:44:01 1992 UTC

# Line 10 | Line 10 | static char SCCSid[] = "$SunId$ LBL";
10  
11   #include  "mkillum.h"
12  
13 < #define  brt(col)       (.295*(col)[0] + .635*(col)[1] + .070*(col)[2])
13 > #define  brt(col)       (.263*(col)[0]+.655*(col)[1]+.082*(col)[2])
14  
15   char    DATORD[] = "RGB";               /* data ordering */
16   char    DATSUF[] = ".dat";              /* data file suffix */
# Line 24 | Line 24 | register OBJREC  *obj;
24   {
25          register int  i;
26  
27 +        if (issurface(obj->otype) && !strcmp(mod, VOIDID))
28 +                return;         /* don't print void surfaces */
29          printf("\n%s %s %s", mod, ofun[obj->otype].funame, obj->oname);
30          printf("\n%d", obj->oargs.nsargs);
31          for (i = 0; i < obj->oargs.nsargs; i++)
# Line 112 | Line 114 | FVECT  u, v, w;
114          } else {
115                  printf("\n%s %s %s%s", VOIDID, ofun[PAT_BDATA].funame,
116                                  il->matname, DSTSUF);
117 <                printf("\n5 noop");
117 >                printf("\n5 noneg");
118                  dfp = dfopen(il, 0);
119                  fprintf(dfp, "2\n%f %f %d\n%f %f %d\n", 1.-.5/n, .5/n, n,
120                                  0., 2.*PI, m+1);
# Line 153 | Line 155 | int  n, m;
155          } else {
156                  printf("\n%s %s %s%s", VOIDID, ofun[PAT_BDATA].funame,
157                                  il->matname, DSTSUF);
158 <                printf("\n5 noop");
158 >                printf("\n5 noneg");
159                  dfp = dfopen(il, 0);
160                  fprintf(dfp, "2\n%f %f %d\n%f %f %d\n", 1.-1./n, -1.+1./n, n,
161                                  0., 2.*PI, m+1);

Diff Legend

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