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

Comparing ray/src/rt/glass.c (file contents):
Revision 2.13 by greg, Wed Mar 12 04:59:05 2003 UTC vs.
Revision 2.15 by schorsch, Tue Mar 30 16:13:01 2004 UTC

# Line 8 | Line 8 | static const char RCSid[] = "$Id$";
8   #include "copyright.h"
9  
10   #include  "ray.h"
11 –
11   #include  "otypes.h"
12 + #include  "rtotypes.h"
13  
14   /*
15   *  This definition of glass provides for a quick calculation
# Line 41 | Line 41 | static const char RCSid[] = "$Id$";
41   #define  RINDEX         1.52            /* refractive index of glass */
42  
43  
44 < m_glass(m, r)           /* color a ray which hit a thin glass surface */
45 < OBJREC  *m;
46 < register RAY  *r;
44 > extern int
45 > m_glass(                /* color a ray which hit a thin glass surface */
46 >        OBJREC  *m,
47 >        register RAY  *r
48 > )
49   {
50          COLOR  mcolor;
51          double  pdot;
# Line 73 | Line 75 | register RAY  *r;
75          mirtest = transtest = 0;
76          mirdist = transdist = r->rot;
77                                                  /* perturb normal */
78 <        if (hastexture = (DOT(r->pert,r->pert) > FTINY*FTINY)) {
78 >        if ( (hastexture = (DOT(r->pert,r->pert) > FTINY*FTINY)) ) {
79                  pdot = raynormal(pnorm, r);
80          } else {
81                  VCOPY(pnorm, r->ron);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines