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.17 by greg, Wed Dec 21 09:10:23 1994 UTC vs.
Revision 2.20 by greg, Fri Sep 29 10:46:12 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 396 | Line 399 | register CUBE  *scene;
399                          return(0);
400          }
401          cxset[0] = 0;
402 <        return(raymove(curpos, cxset, sflags, r, scene) == RAYHIT &&
403 <                        r->ro != &Aftplane);
402 >        raymove(curpos, cxset, sflags, r, scene);
403 >        return(r->ro != NULL & r->ro != &Aftplane);
404   }
405  
406  
# Line 452 | Line 455 | register CUBE  *cu;
455                  }
456                  /*NOTREACHED*/
457          }
458 <        if (isfull(cu->cutree) && checkhit(r, cu, cxs))
458 >        if (isfull(cu->cutree)) {
459 >                if (checkhit(r, cu, cxs))
460 >                        return(RAYHIT);
461 >        } else if (r->ro == &Aftplane && incube(cu, r->rop))
462                  return(RAYHIT);
463                                          /* advance to next cube */
464          if (dirf&0x11) {

Diff Legend

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