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

Comparing ray/src/rt/raytrace.c (file contents):
Revision 2.58 by schorsch, Wed Jun 7 17:52:04 2006 UTC vs.
Revision 2.60 by greg, Sat Dec 12 00:03:42 2009 UTC

# Line 17 | Line 17 | static const char RCSid[] = "$Id$";
17  
18   #define  MAXCSET        ((MAXSET+1)*2-1)        /* maximum check set size */
19  
20 < unsigned long  raynum = 0;              /* next unique ray number */
21 < unsigned long  nrays = 0;               /* number of calls to localhit */
20 > RNUMBER  raynum = 0;            /* next unique ray number */
21 > RNUMBER  nrays = 0;             /* number of calls to localhit */
22  
23   static RREAL  Lambfa[5] = {PI, PI, PI, 0.0, 0.0};
24   OBJREC  Lamb = {
# Line 304 | Line 304 | raymixture(            /* mix modifiers */
304                                          /* foreground */
305          fr = *r;
306          if (coef > FTINY) {
307 +                fr.rweight *= coef;
308                  scalecolor(fr.rcoef, coef);
309                  foremat = rayshade(&fr, fore);
310          }
311                                          /* background */
312          br = *r;
313          if (coef < 1.0-FTINY) {
314 +                br.rweight *= 1.0-coef;
315                  scalecolor(br.rcoef, 1.0-coef);
316                  backmat = rayshade(&br, back);
317          }

Diff Legend

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