diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llmath/v3math.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/linden/indra/llmath/v3math.h b/linden/indra/llmath/v3math.h index 4935443..7f96800 100644 --- a/linden/indra/llmath/v3math.h +++ b/linden/indra/llmath/v3math.h | |||
@@ -17,7 +17,8 @@ | |||
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception | 20 | * online at |
21 | * http://secondlifegrid.net/programs/open_source/licensing/flossexception | ||
21 | * | 22 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 23 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 24 | * that you have read and understood your obligations described above, |
@@ -160,8 +161,8 @@ typedef LLVector3 LLSimLocalVec; | |||
160 | F32 angle_between(const LLVector3 &a, const LLVector3 &b); // Returns angle (radians) between a and b | 161 | F32 angle_between(const LLVector3 &a, const LLVector3 &b); // Returns angle (radians) between a and b |
161 | BOOL are_parallel(const LLVector3 &a, const LLVector3 &b, F32 epsilon=F_APPROXIMATELY_ZERO); // Returns TRUE if a and b are very close to parallel | 162 | BOOL are_parallel(const LLVector3 &a, const LLVector3 &b, F32 epsilon=F_APPROXIMATELY_ZERO); // Returns TRUE if a and b are very close to parallel |
162 | F32 dist_vec(const LLVector3 &a, const LLVector3 &b); // Returns distance between a and b | 163 | F32 dist_vec(const LLVector3 &a, const LLVector3 &b); // Returns distance between a and b |
163 | F32 dist_vec_squared(const LLVector3 &a, const LLVector3 &b);// Returns distance sqaured between a and b | 164 | F32 dist_vec_squared(const LLVector3 &a, const LLVector3 &b);// Returns distance squared between a and b |
164 | F32 dist_vec_squared2D(const LLVector3 &a, const LLVector3 &b);// Returns distance sqaured between a and b ignoring Z component | 165 | F32 dist_vec_squared2D(const LLVector3 &a, const LLVector3 &b);// Returns distance squared between a and b ignoring Z component |
165 | LLVector3 projected_vec(const LLVector3 &a, const LLVector3 &b); // Returns vector a projected on vector b | 166 | LLVector3 projected_vec(const LLVector3 &a, const LLVector3 &b); // Returns vector a projected on vector b |
166 | LLVector3 lerp(const LLVector3 &a, const LLVector3 &b, F32 u); // Returns a vector that is a linear interpolation between a and b | 167 | LLVector3 lerp(const LLVector3 &a, const LLVector3 &b, F32 u); // Returns a vector that is a linear interpolation between a and b |
167 | 168 | ||