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

Comparing ray/src/rt/o_cone.c (file contents):
Revision 1.2 by greg, Wed Apr 19 22:24:25 1989 UTC vs.
Revision 2.3 by greg, Tue Feb 25 02:47:22 2003 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_cone.c - routine to determine ray intersection with cones.
9 – *
10 – *     2/13/86
6   */
7  
8 + #include "copyright.h"
9 +
10   #include  "ray.h"
11  
12   #include  "otypes.h"
# Line 86 | Line 83 | register RAY  *r;
83                          r->rop[i] = r->rorg[i] + r->rdir[i]*r->rot;
84                  VCOPY(r->ron, co->ad);
85                  r->rod = -rdx[2];
86 <                r->rofs = 1.0; setident4(r->rofx);
90 <                r->robs = 1.0; setident4(r->robx);
86 >                r->rox = NULL;
87                  return(1);                              /* good */
88          }
89                                          /* roots for cone, cup, cyl., tube */
# Line 131 | Line 127 | register RAY  *r;
127                                  r->ron[i] = (co->al*r->ron[i] - c*co->ad[i])
128                                                  /co->sl;
129                  r->rod = -DOT(r->rdir, r->ron);
130 <                r->rofs = 1.0; setident4(r->rofx);
135 <                r->robs = 1.0; setident4(r->robx);
130 >                r->rox = NULL;
131                  return(1);                      /* good */
132          }
133          return(0);

Diff Legend

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