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.17 by greg, Wed Dec 21 09:10:23 1994 UTC vs.
Revision 2.19 by greg, Thu Jan 26 15:34:55 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 396 | Line 396 | register CUBE  *scene;
396                          return(0);
397          }
398          cxset[0] = 0;
399 <        return(raymove(curpos, cxset, sflags, r, scene) == RAYHIT &&
400 <                        r->ro != &Aftplane);
399 >        raymove(curpos, cxset, sflags, r, scene);
400 >        return(r->ro != NULL & r->ro != &Aftplane);
401   }
402  
403  
# Line 452 | Line 452 | register CUBE  *cu;
452                  }
453                  /*NOTREACHED*/
454          }
455 <        if (isfull(cu->cutree) && checkhit(r, cu, cxs))
455 >        if (isfull(cu->cutree)) {
456 >                if (checkhit(r, cu, cxs))
457 >                        return(RAYHIT);
458 >        } else if (r->ro == &Aftplane && incube(cu, r->rop))
459                  return(RAYHIT);
460                                          /* advance to next cube */
461          if (dirf&0x11) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines