diff options
Diffstat (limited to 'indra/llmath/v2math.cpp')
| -rw-r--r-- | indra/llmath/v2math.cpp | 100 |
1 files changed, 50 insertions, 50 deletions
diff --git a/indra/llmath/v2math.cpp b/indra/llmath/v2math.cpp index 22b37628d8..4649e13376 100644 --- a/indra/llmath/v2math.cpp +++ b/indra/llmath/v2math.cpp @@ -1,25 +1,25 @@ -/** +/** * @file v2math.cpp * @brief LLVector2 class implementation. * * $LicenseInfo:firstyear=2000&license=viewerlgpl$ * Second Life Viewer Source Code * Copyright (C) 2010, Linden Research, Inc. - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; * version 2.1 of the License only. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * + * * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ @@ -45,82 +45,82 @@ LLVector2 LLVector2::zero(0,0); // Returns true if data changed bool LLVector2::abs() { - bool ret{ false }; + bool ret{ false }; + + if (mV[0] < 0.f) { mV[0] = -mV[0]; ret = true; } + if (mV[1] < 0.f) { mV[1] = -mV[1]; ret = true; } - if (mV[0] < 0.f) { mV[0] = -mV[0]; ret = true; } - if (mV[1] < 0.f) { mV[1] = -mV[1]; ret = true; } - - return ret; + return ret; } F32 angle_between(const LLVector2& a, const LLVector2& b) { - LLVector2 an = a; - LLVector2 bn = b; - an.normVec(); - bn.normVec(); - F32 cosine = an * bn; - F32 angle = (cosine >= 1.0f) ? 0.0f : - (cosine <= -1.0f) ? F_PI : - acos(cosine); - return angle; + LLVector2 an = a; + LLVector2 bn = b; + an.normVec(); + bn.normVec(); + F32 cosine = an * bn; + F32 angle = (cosine >= 1.0f) ? 0.0f : + (cosine <= -1.0f) ? F_PI : + acos(cosine); + return angle; } bool are_parallel(const LLVector2 &a, const LLVector2 &b, float epsilon) { - LLVector2 an = a; - LLVector2 bn = b; - an.normVec(); - bn.normVec(); - F32 dot = an * bn; - if ( (1.0f - fabs(dot)) < epsilon) - { - return true; - } - return false; + LLVector2 an = a; + LLVector2 bn = b; + an.normVec(); + bn.normVec(); + F32 dot = an * bn; + if ( (1.0f - fabs(dot)) < epsilon) + { + return true; + } + return false; } -F32 dist_vec(const LLVector2 &a, const LLVector2 &b) +F32 dist_vec(const LLVector2 &a, const LLVector2 &b) { - F32 x = a.mV[0] - b.mV[0]; - F32 y = a.mV[1] - b.mV[1]; - return (F32) sqrt( x*x + y*y ); + F32 x = a.mV[0] - b.mV[0]; + F32 y = a.mV[1] - b.mV[1]; + return (F32) sqrt( x*x + y*y ); } -F32 dist_vec_squared(const LLVector2 &a, const LLVector2 &b) +F32 dist_vec_squared(const LLVector2 &a, const LLVector2 &b) { - F32 x = a.mV[0] - b.mV[0]; - F32 y = a.mV[1] - b.mV[1]; - return x*x + y*y; + F32 x = a.mV[0] - b.mV[0]; + F32 y = a.mV[1] - b.mV[1]; + return x*x + y*y; } -F32 dist_vec_squared2D(const LLVector2 &a, const LLVector2 &b) +F32 dist_vec_squared2D(const LLVector2 &a, const LLVector2 &b) { - F32 x = a.mV[0] - b.mV[0]; - F32 y = a.mV[1] - b.mV[1]; - return x*x + y*y; + F32 x = a.mV[0] - b.mV[0]; + F32 y = a.mV[1] - b.mV[1]; + return x*x + y*y; } LLVector2 lerp(const LLVector2 &a, const LLVector2 &b, F32 u) { - return LLVector2( - a.mV[VX] + (b.mV[VX] - a.mV[VX]) * u, - a.mV[VY] + (b.mV[VY] - a.mV[VY]) * u ); + return LLVector2( + a.mV[VX] + (b.mV[VX] - a.mV[VX]) * u, + a.mV[VY] + (b.mV[VY] - a.mV[VY]) * u ); } LLSD LLVector2::getValue() const { - LLSD ret; - ret[0] = mV[0]; - ret[1] = mV[1]; - return ret; + LLSD ret; + ret[0] = mV[0]; + ret[1] = mV[1]; + return ret; } void LLVector2::setValue(const LLSD& sd) { - mV[0] = (F32) sd[0].asReal(); - mV[1] = (F32) sd[1].asReal(); + mV[0] = (F32) sd[0].asReal(); + mV[1] = (F32) sd[1].asReal(); } |