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.54 by greg, Fri Jul 8 05:52:29 2005 UTC vs.
Revision 2.58 by schorsch, Wed Jun 7 17:52:04 2006 UTC

# Line 23 | Line 23 | unsigned long  nrays = 0;              /* number of calls to local
23   static RREAL  Lambfa[5] = {PI, PI, PI, 0.0, 0.0};
24   OBJREC  Lamb = {
25          OVOID, MAT_PLASTIC, "Lambertian",
26 <        {0, 5, NULL, Lambfa}, NULL,
26 >        {NULL, Lambfa, 0, 5}, NULL
27   };                                      /* a Lambertian surface */
28  
29   OBJREC  Aftplane;                       /* aft clipping plane object */
# Line 93 | Line 93 | rayorigin(             /* start new ray from old one */
93                                  colval(ro->cext,RED) : colval(ro->cext,GRN);
94                  if (colval(ro->cext,BLU) < re) re = colval(ro->cext,BLU);
95                  re *= ro->rot;
96 <                if (re > 0.1)
97 <                        if (re > 92.)
96 >                if (re > 0.1) {
97 >                        if (re > 92.) {
98                                  r->rweight = 0.0;
99 <                        else
99 >                        } else {
100                                  r->rweight *= exp(-re);
101 +                        }
102 +                }
103          }
104          rayclear(r);
105          if (r->rweight <= 0.0)                  /* check for expiration */
# Line 111 | Line 113 | rayorigin(             /* start new ray from old one */
113                          return(-1);             /* upper reflection limit */
114                  if (r->rweight >= minweight)
115                          return(0);
116 <                if (frandom() < r->rweight/minweight)
116 >                if (frandom() > r->rweight/minweight)
117                          return(-1);
118                  rw = minweight/r->rweight;      /* promote survivor */
119                  scalecolor(r->rcoef, rw);
120                  r->rweight = minweight;
121                  return(0);
122          }
123 <        return(r->rlvl <= maxdepth && r->rweight >= minweight ? 0 : -1);
123 >        return(r->rlvl <= abs(maxdepth) && r->rweight >= minweight ? 0 : -1);
124   }
125  
126  

Diff Legend

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