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.16 by greg, Thu Nov 8 00:31:17 2012 UTC vs.
Revision 2.18 by greg, Wed Apr 3 00:22:12 2013 UTC

# Line 29 | Line 29 | const FVECT p2
29   {
30          FVECT  delta;
31  
32 <        delta[0] = p2[0] - p1[0];
33 <        delta[1] = p2[1] - p1[1];
34 <        delta[2] = p2[2] - p1[2];
32 >        VSUB(delta, p2, p1);
33  
34          return(DOT(delta, delta));
35   }
# Line 87 | Line 85 | const FVECT v1,
85   const FVECT v2
86   )
87   {
88 <        vres[0] = v1[1]*v2[2] - v1[2]*v2[1];
91 <        vres[1] = v1[2]*v2[0] - v1[0]*v2[2];
92 <        vres[2] = v1[0]*v2[1] - v1[1]*v2[0];
88 >        VCROSS(vres, v1, v2);
89   }
90  
91  
# Line 101 | Line 97 | const FVECT v1,
97   double f
98   )
99   {
100 <        vres[0] = v0[0] + f*v1[0];
105 <        vres[1] = v0[1] + f*v1[1];
106 <        vres[2] = v0[2] + f*v1[2];
100 >        VSUM(vres, v0, v1, f);
101   }
102  
103  
# Line 180 | Line 174 | double theta           /* right-hand radians */
174          cost = cos(theta);
175          sint = sin(theta);
176          normprod = DOT(vorig, vnorm)*(1.-cost);
177 <        fcross(vperp, vnorm, vorig);
177 >        VCROSS(vperp, vnorm, vorig);
178          for (i = 0; i < 3; i++)
179                  vres[i] = vorig[i]*cost + vnorm[i]*normprod + vperp[i]*sint;
180   }
# Line 195 | Line 189 | int meas               /* distance measure (radians, absolute, rela
189   )
190   {
191          FVECT   normtarg;
192 <        double  volen, dotprod, sint, cost;
192 >        double  volen, dotprod, sintr, cost;
193          int     i;
194  
195          VCOPY(normtarg, vtarg);         /* in case vtarg==vres */
# Line 222 | Line 216 | int meas               /* distance measure (radians, absolute, rela
216          else if (meas == GEOD_REL)
217                  t *= acos(dotprod);
218          cost = cos(t);
219 <        sint = sin(t);
219 >        sintr = sin(t) / sqrt(1. - dotprod*dotprod);
220          for (i = 0; i < 3; i++)
221                  vres[i] = volen*( cost*vres[i] +
222 <                                  sint*(normtarg[i] - dotprod*vres[i]) );
222 >                                  sintr*(normtarg[i] - dotprod*vres[i]) );
223  
224          return(volen);                  /* return vector length */
225   }

Diff Legend

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