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.19 by greg, Thu Jan 26 15:34:55 1995 UTC vs.
Revision 2.21 by greg, Thu Nov 2 17:38:02 1995 UTC

# Line 195 | Line 195 | int  mod;
195                          error(USER, errmsg);
196                  }
197                  ******/
198 <                if ((*ofun[m->otype].funp)(m, r))
199 <                        objerror(r->ro, USER, "conflicting materials");
198 >                if ((*ofun[m->otype].funp)(m, r)) {
199 >                        sprintf(errmsg, "conflicting material \"%s\"",
200 >                                        m->oname);
201 >                        objerror(r->ro, USER, errmsg);
202 >                }
203          }
204          depth--;                        /* end here */
205   }
# Line 253 | Line 256 | double  coef;
256          }
257                                          /* return value tells if material */
258          return(foremat);
259 + }
260 +
261 +
262 + double
263 + raydist(r, flags)               /* compute (cumulative) ray distance */
264 + register RAY  *r;
265 + register int  flags;
266 + {
267 +        double  sum = 0.0;
268 +
269 +        while (r != NULL && r->crtype&flags) {
270 +                sum += r->rot;
271 +                r = r->parent;
272 +        }
273 +        return(sum);
274   }
275  
276  

Diff Legend

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