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.18 by greg, Fri Jan 6 14:00:47 1995 UTC vs.
Revision 2.21 by greg, Thu Nov 2 17:38:02 1995 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1994 Regents of the University of California */
1 > /* Copyright (c) 1995 Regents of the University of California */
2  
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ LBL";
# 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 257 | Line 260 | double  coef;
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 +
277 + double
278   raynormal(norm, r)              /* compute perturbed normal for ray */
279   FVECT  norm;
280   register RAY  *r;
# Line 396 | Line 414 | register CUBE  *scene;
414                          return(0);
415          }
416          cxset[0] = 0;
417 <        return(raymove(curpos, cxset, sflags, r, scene) == RAYHIT &&
418 <                        r->ro != &Aftplane);
417 >        raymove(curpos, cxset, sflags, r, scene);
418 >        return(r->ro != NULL & r->ro != &Aftplane);
419   }
420  
421  

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)