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

Comparing ray/src/rt/o_face.c (file contents):
Revision 2.4 by greg, Tue Mar 11 17:08:55 2003 UTC vs.
Revision 2.8 by greg, Sun Jan 31 18:08:04 2021 UTC

# Line 8 | Line 8 | static const char RCSid[] = "$Id$";
8   #include "copyright.h"
9  
10   #include  "ray.h"
11
11   #include  "face.h"
12 + #include  "rtotypes.h"
13  
14  
15 < o_face(o, r)            /* compute intersection with polygonal face */
16 < OBJREC  *o;
17 < register RAY  *r;
15 > int
16 > o_face(         /* compute intersection with polygonal face */
17 >        OBJREC  *o,
18 >        RAY  *r
19 > )
20   {
21          double  rdot;           /* direction . normal */
22          double  t;              /* distance to intersection */
23          FVECT  pisect;          /* intersection point */
24 <        register FACE  *f;      /* face record */
23 <        register int  i;
24 >        FACE  *f;       /* face record */
25  
26          f = getface(o);
27                  
28          /*
29           *  First, we find the distance to the plane containing the
30 <         *  face.  If this distance is less than zero or greater
31 <         *  than a previous intersection, we return.  Otherwise,
30 >         *  face.  If the plane is parallel to our ray, or the
31 >         *  previous hit was better, we return.  Otherwise,
32           *  we determine whether in fact the ray intersects the
33           *  face.  The ray intersects the face if the
34           *  point of intersection with the plane of the face
# Line 35 | Line 36 | register RAY  *r;
36           */
37                                                  /* compute dist. to plane */
38          rdot = -DOT(r->rdir, f->norm);
39 <        if (rdot <= FTINY && rdot >= -FTINY)    /* ray parallels plane */
40 <                t = FHUGE;
41 <        else
42 <                t = (DOT(r->rorg, f->norm) - f->offset) / rdot;
39 >        if ((rdot <= FTINY) & (rdot >= -FTINY)) /* ray parallels plane */
40 >                return(0);
41 >
42 >        t = (DOT(r->rorg, f->norm) - f->offset) / rdot;
43          
44 <        if (t <= FTINY || t >= r->rot)          /* not good enough */
44 >        if (rayreject(o, r, t))                 /* previous hit is better? */
45                  return(0);
46                                                  /* compute intersection */
47 <        for (i = 0; i < 3; i++)
47 <                pisect[i] = r->rorg[i] + r->rdir[i]*t;
47 >        VSUM(pisect, r->rorg, r->rdir, t);
48  
49          if (!inface(pisect, f))                 /* ray intersects face? */
50                  return(0);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines