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.1 by greg, Thu Feb 2 10:41:31 1989 UTC vs.
Revision 2.4 by greg, Tue Mar 11 17:08:55 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->rox = NULL;
87                  return(1);                              /* good */
88          }
89                                          /* roots for cone, cup, cyl., tube */
# Line 129 | 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->pert[0] = r->pert[1] = r->pert[2] = 0.0;
131 +                r->uv[0] = r->uv[1] = 0.0;
132 +                r->rox = NULL;
133                  return(1);                      /* good */
134          }
135          return(0);

Diff Legend

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