diff options
Diffstat (limited to 'linden/indra/llmath/v2math.h')
-rw-r--r-- | linden/indra/llmath/v2math.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/linden/indra/llmath/v2math.h b/linden/indra/llmath/v2math.h index 6016c04..9fef885 100644 --- a/linden/indra/llmath/v2math.h +++ b/linden/indra/llmath/v2math.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, |
@@ -115,8 +116,8 @@ class LLVector2 | |||
115 | F32 angle_between(const LLVector2 &a, const LLVector2 &b); // Returns angle (radians) between a and b | 116 | F32 angle_between(const LLVector2 &a, const LLVector2 &b); // Returns angle (radians) between a and b |
116 | BOOL are_parallel(const LLVector2 &a, const LLVector2 &b, F32 epsilon=F_APPROXIMATELY_ZERO); // Returns TRUE if a and b are very close to parallel | 117 | BOOL are_parallel(const LLVector2 &a, const LLVector2 &b, F32 epsilon=F_APPROXIMATELY_ZERO); // Returns TRUE if a and b are very close to parallel |
117 | F32 dist_vec(const LLVector2 &a, const LLVector2 &b); // Returns distance between a and b | 118 | F32 dist_vec(const LLVector2 &a, const LLVector2 &b); // Returns distance between a and b |
118 | F32 dist_vec_squared(const LLVector2 &a, const LLVector2 &b);// Returns distance sqaured between a and b | 119 | F32 dist_vec_squared(const LLVector2 &a, const LLVector2 &b);// Returns distance squared between a and b |
119 | F32 dist_vec_squared2D(const LLVector2 &a, const LLVector2 &b);// Returns distance sqaured between a and b ignoring Z component | 120 | F32 dist_vec_squared2D(const LLVector2 &a, const LLVector2 &b);// Returns distance squared between a and b ignoring Z component |
120 | LLVector2 lerp(const LLVector2 &a, const LLVector2 &b, F32 u); // Returns a vector that is a linear interpolation between a and b | 121 | LLVector2 lerp(const LLVector2 &a, const LLVector2 &b, F32 u); // Returns a vector that is a linear interpolation between a and b |
121 | 122 | ||
122 | // Constructors | 123 | // Constructors |