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

Comparing ray/src/rt/raytrace.c (file contents):
Revision 2.66 by greg, Tue Feb 24 19:39:27 2015 UTC vs.
Revision 2.67 by greg, Thu May 21 15:28:24 2015 UTC

# Line 107 | Line 107 | rayorigin(             /* start new ray from old one */
107                  return(-1);
108          if (r->crtype & SHADOW)                 /* shadow commitment */
109                  return(0);
110 +                                                /* ambient in photon map? */
111 +        if (r->crtype & AMBIENT && photonMapping)
112 +                return(-1);
113          if (maxdepth <= 0 && rc != NULL) {      /* Russian roulette */
114                  if (minweight <= 0.0)
115                          error(USER, "zero ray weight in Russian roulette");
# Line 182 | Line 185 | raytrans(                      /* transmit ray as is */
185   {
186          RAY  tr;
187  
188 <        if (rayorigin(&tr, TRANS, r, NULL) == 0) {
189 <                VCOPY(tr.rdir, r->rdir);
190 <                rayvalue(&tr);
191 <                copycolor(r->rcol, tr.rcol);
192 <                r->rt = r->rot + tr.rt;
190 <        }
188 >        rayorigin(&tr, TRANS, r, NULL);         /* always continue */
189 >        VCOPY(tr.rdir, r->rdir);
190 >        rayvalue(&tr);
191 >        copycolor(r->rcol, tr.rcol);
192 >        r->rt = r->rot + tr.rt;
193   }
194  
195  

Diff Legend

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