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 1.3 by greg, Sat Dec 15 15:03:28 1990 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1986 Regents of the University of California */
1 > /* Copyright (c) 1990 Regents of the University of California */
2  
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ LBL";
# Line 86 | Line 86 | register RAY  *r;
86                          r->rop[i] = r->rorg[i] + r->rdir[i]*r->rot;
87                  VCOPY(r->ron, co->ad);
88                  r->rod = -rdx[2];
89 <                r->rofs = 1.0; setident4(r->rofx);
90 <                r->robs = 1.0; setident4(r->robx);
89 >                r->rox = NULL;
90                  return(1);                              /* good */
91          }
92                                          /* roots for cone, cup, cyl., tube */
# Line 131 | Line 130 | register RAY  *r;
130                                  r->ron[i] = (co->al*r->ron[i] - c*co->ad[i])
131                                                  /co->sl;
132                  r->rod = -DOT(r->rdir, r->ron);
133 <                r->rofs = 1.0; setident4(r->rofx);
135 <                r->robs = 1.0; setident4(r->robx);
133 >                r->rox = NULL;
134                  return(1);                      /* good */
135          }
136          return(0);

Diff Legend

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