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

Comparing ray/src/gen/mkillum3.c (file contents):
Revision 1.2 by greg, Thu Jul 25 10:59:09 1991 UTC vs.
Revision 1.5 by greg, Fri Aug 23 12:30:35 1991 UTC

# Line 96 | Line 96 | FVECT  u, v, w;
96          FILE  *dfp;
97          int  i;
98  
99        average(il, da, n*m);
99          if (il->flags & IL_COLDST) {
100                  printf("\n%s %s %s%s", VOIDID, ofun[PAT_CDATA].funame,
101                                  il->matname, DSTSUF);
# Line 135 | Line 134 | int  n, m;
134          FILE  *dfp;
135          int  i;
136  
138        average(il, da, n*m);
137          if (il->flags & IL_COLDST) {
138                  printf("\n%s %s %s%s", VOIDID, ofun[PAT_CDATA].funame,
139                                  il->matname, DSTSUF);
# Line 169 | Line 167 | OBJREC  *ob;
167   {
168          double  cout[3];
169  
170 <        printf("\n%s%s %s %s", il->matname, DSTSUF,
171 <                        ofun[il->flags&IL_LIGHT?MAT_LIGHT:MAT_ILLUM].funame,
170 >        if (il->sampdens <= 0)
171 >                printf("\n%s ", VOIDID);
172 >        else
173 >                printf("\n%s%s ", il->matname, DSTSUF);
174 >        printf("%s %s", ofun[il->flags&IL_LIGHT?MAT_LIGHT:MAT_ILLUM].funame,
175                          il->matname);
176          if (il->flags & IL_LIGHT || !strcmp(il->altmat,VOIDID))
177                  printf("\n0");
# Line 183 | Line 184 | OBJREC  *ob;
184          } else {
185                  cout[0] = cout[1] = cout[2] = brt(il->col);
186          }
187 <        if (il->flags & IL_LIGHT)
187 <                printf("\n3 %f %f %f\n", cout[0], cout[1], cout[2]);
188 <        else
189 <                printf("\n4 %f %f %f 0\n", cout[0], cout[1], cout[2]);
187 >        printf("\n0\n3 %f %f %f\n", cout[0], cout[1], cout[2]);
188  
189          printobj(il->matname, ob);
190   }
# Line 208 | Line 206 | int  n;
206          }
207          for (i = 0; i < 3; i++)
208                  il->col[i] /= (double)n*il->nsamps;
209 +
210 +        return(brt(il->col) >= il->minbrt);
211   }
212  
213  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines