ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/ot/o_face.c
(Generate patch)

Comparing ray/src/ot/o_face.c (file contents):
Revision 1.3 by greg, Sat Oct 14 11:19:32 1989 UTC vs.
Revision 2.5 by schorsch, Tue Mar 30 16:13:00 2004 UTC

# Line 1 | Line 1
1 /* Copyright (c) 1986 Regents of the University of California */
2
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6
4   /*
5   *  o_face.c - routines for creating octrees for polygonal faces.
6   *
# Line 40 | Line 37 | static char SCCSid[] = "$SunId$ LBL";
37   *      5) If test 4 fails, we have no intersection.
38   */
39  
40 <
41 < o_face(o, cu)                   /* determine if face intersects cube */
42 < OBJREC  *o;
43 < CUBE  *cu;
40 > int
41 > o_face(         /* determine if face intersects cube */
42 >        OBJREC  *o,
43 >        CUBE  *cu
44 > )
45   {
46          FVECT  cumin, cumax;
47          FVECT  v1, v2;
# Line 57 | Line 55 | CUBE  *cu;
55                  return(O_MISS);
56                                          /* compute cube boundaries */
57          for (j = 0; j < 3; j++)
58 <                cumax[j] = (cumin[j] = cu->cuorg[j]) + cu->cusize;
58 >                cumax[j] = (cumin[j] = cu->cuorg[j]-FTINY)
59 >                                + cu->cusize + 2.0*FTINY;
60  
61          vloc = ABOVE | BELOW;           /* check vertices */
62          for (i = 0; i < f->nv; i++)
63 <                if (j = plocate(VERTEX(f,i), cumin, cumax))
63 >                if ( (j = plocate(VERTEX(f,i), cumin, cumax)) )
64                          vloc &= j;
65                  else
66                          return(O_HIT);  /* vertex inside */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines