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

Comparing ray/src/common/fvect.c (file contents):
Revision 2.10 by greg, Tue Jun 24 02:16:14 2008 UTC vs.
Revision 2.12 by greg, Sun Sep 26 15:42:48 2010 UTC

# Line 13 | Line 13 | static const char      RCSid[] = "$Id$";
13  
14   double
15   fdot(                           /* return the dot product of two vectors */
16 < register FVECT v1,
17 < register FVECT v2
16 > FVECT v1,
17 > FVECT v2
18   )
19   {
20          return(DOT(v1,v2));
# Line 23 | Line 23 | register FVECT v2
23  
24   double
25   dist2(                          /* return square of distance between points */
26 < register FVECT p1,
27 < register FVECT p2
26 > FVECT p1,
27 > FVECT p2
28   )
29   {
30          FVECT  delta;
# Line 44 | Line 44 | FVECT ep1,
44   FVECT ep2               /* points on the line */
45   )
46   {
47 <        register double  d, d1, d2;
47 >        double  d, d1, d2;
48  
49          d = dist2(ep1, ep2);
50          d1 = dist2(ep1, p);
# Line 61 | Line 61 | FVECT ep1,
61   FVECT ep2               /* the end points */
62   )
63   {
64 <        register double  d, d1, d2;
64 >        double  d, d1, d2;
65  
66          d = dist2(ep1, ep2);
67          d1 = dist2(ep1, p);
# Line 82 | Line 82 | FVECT ep2              /* the end points */
82  
83   void
84   fcross(                         /* vres = v1 X v2 */
85 < register FVECT vres,
86 < register FVECT v1,
87 < register FVECT v2
85 > FVECT vres,
86 > FVECT v1,
87 > FVECT v2
88   )
89   {
90          vres[0] = v1[1]*v2[2] - v1[2]*v2[1];
# Line 95 | Line 95 | register FVECT v2
95  
96   void
97   fvsum(                          /* vres = v0 + f*v1 */
98 < register FVECT vres,
99 < register FVECT v0,
100 < register FVECT v1,
101 < register double f
98 > FVECT vres,
99 > FVECT v0,
100 > FVECT v1,
101 > double f
102   )
103   {
104          vres[0] = v0[0] + f*v1[0];
# Line 109 | Line 109 | register double f
109  
110   double
111   normalize(                      /* normalize a vector, return old magnitude */
112 < register FVECT  v
112 > FVECT  v
113   )
114   {
115 <        register double  len, d;
115 >        double  len, d;
116          
117          d = DOT(v, v);
118          
119          if (d == 0.0)
120                  return(0.0);
121          
122 <        if (d <= 1.0+FTINY && d >= 1.0-FTINY)
122 >        if (d <= 1.0+FTINY && d >= 1.0-FTINY) {
123                  len = 0.5 + 0.5*d;      /* first order approximation */
124 <        else
124 >                d = 2.0 - len;
125 >        } else {
126                  len = sqrt(d);
127 <
128 <        v[0] *= d = 1.0/len;
127 >                d = 1.0/len;
128 >        }
129 >        v[0] *= d;
130          v[1] *= d;
131          v[2] *= d;
132  
# Line 158 | Line 160 | FVECT rdir1            /* second direction (normalized) */
160   }
161  
162  
161 – #if 0
162 – int
163 – closestapproach(                        /* closest approach of two rays */
164 – RREAL t[2],             /* returned distances along each ray */
165 – FVECT rorg0,            /* first origin */
166 – FVECT rdir0,            /* first direction (unnormalized) */
167 – FVECT rorg1,            /* second origin */
168 – FVECT rdir1             /* second direction (unnormalized) */
169 – )
170 – {
171 –        double  dotprod = DOT(rdir0, rdir1);
172 –        double  d0n2 = DOT(rdir0, rdir0);
173 –        double  d1n2 = DOT(rdir1, rdir1);
174 –        double  denom = d0n2*d1n2 - dotprod*dotprod;
175 –        double  o1o2_d1;
176 –        FVECT   o0o1;
177 –
178 –        if (denom <= FTINY) {           /* check if lines are parallel */
179 –                t[0] = t[1] = 0.0;
180 –                return(0);
181 –        }
182 –        VSUB(o0o1, rorg0, rorg1);
183 –        o1o2_d1 = DOT(o0o1, rdir1);
184 –        t[0] = (o1o2_d1*dotprod - DOT(o0o1,rdir0)*d1n2) / denom;
185 –        t[1] = (o1o2_d1 + t[0]*dotprod) / d1n2;
186 –        return(1);
187 – }
188 – #endif
189 –
190 –
163   void
164   spinvector(                             /* rotate vector around normal */
165   FVECT vres,             /* returned vector */
# Line 198 | Line 170 | double theta           /* left-hand radians */
170   {
171          double  sint, cost, normprod;
172          FVECT  vperp;
173 <        register int  i;
173 >        int  i;
174          
175          if (theta == 0.0) {
176                  if (vres != vorig)

Diff Legend

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