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.9 by greg, Wed Jan 12 16:52:08 1994 UTC vs.
Revision 2.10 by greg, Wed Jan 12 20:42:34 1994 UTC

# Line 188 | Line 188 | int  mod;
188                  }
189                  ******/
190                  if ((*ofun[m->otype].funp)(m, r))
191 <                        objerror(USER, r->ro, "conflicting materials");
191 >                        objerror(r->ro, USER, "conflicting materials");
192          }
193          depth--;                        /* end here */
194   }
# Line 228 | Line 228 | double  coef;
228                  backmat = foremat;
229                                          /* check */
230          if (backmat != foremat)
231 <                objerror(USER, r->ro, "mixing material with non-material");
231 >                objerror(r->ro, USER, "mixing material with non-material");
232                                          /* sum perturbations */
233          for (i = 0; i < 3; i++)
234                  r->pert[i] += coef*fr.pert[i] + (1.0-coef)*br.pert[i];
# Line 243 | Line 243 | double  coef;
243          scalecolor(br.rcol, 1.0-coef);
244          addcolor(r->rcol, fr.rcol);
245          addcolor(r->rcol, br.rcol);
246 +        if (foremat)
247 +                r->rt = bright(fr.rcol) > bright(br.rcol) ? fr.rt : br.rt;
248                                          /* return value tells if material */
249          return(foremat);
250   }

Diff Legend

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