diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-22 20:51:58 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-22 20:51:58 +0300 |
commit | 6cc7dd09d5e69cf57e6de7fb568a0ad2693f9c9a (patch) | |
tree | fab23811a5cedc1ebf01479c852ee92ff62b636c /indra/llmath/llbboxlocal.cpp | |
parent | ef8f4819822288e044ea719feb6af7a1f4df4c4e (diff) | |
parent | 7bb5afc11ee5a6af78302a8d76a9a619e2baaab2 (diff) |
Merge pull request #1545 from Ansariel/DRTVWR-600-maint-A
Merge main into DRTVWR-600-maint-a
Diffstat (limited to 'indra/llmath/llbboxlocal.cpp')
-rw-r--r-- | indra/llmath/llbboxlocal.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/indra/llmath/llbboxlocal.cpp b/indra/llmath/llbboxlocal.cpp index bf0c1a7b93..cbb7a1b481 100644 --- a/indra/llmath/llbboxlocal.cpp +++ b/indra/llmath/llbboxlocal.cpp @@ -1,25 +1,25 @@ -/** +/** * @file llbboxlocal.cpp * @brief General purpose bounding box class (Not axis aligned). * * $LicenseInfo:firstyear=2001&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$ */ @@ -31,25 +31,25 @@ void LLBBoxLocal::addPoint(const LLVector3& p) { - mMin.mV[VX] = llmin( p.mV[VX], mMin.mV[VX] ); - mMin.mV[VY] = llmin( p.mV[VY], mMin.mV[VY] ); - mMin.mV[VZ] = llmin( p.mV[VZ], mMin.mV[VZ] ); - mMax.mV[VX] = llmax( p.mV[VX], mMax.mV[VX] ); - mMax.mV[VY] = llmax( p.mV[VY], mMax.mV[VY] ); - mMax.mV[VZ] = llmax( p.mV[VZ], mMax.mV[VZ] ); + mMin.mV[VX] = llmin( p.mV[VX], mMin.mV[VX] ); + mMin.mV[VY] = llmin( p.mV[VY], mMin.mV[VY] ); + mMin.mV[VZ] = llmin( p.mV[VZ], mMin.mV[VZ] ); + mMax.mV[VX] = llmax( p.mV[VX], mMax.mV[VX] ); + mMax.mV[VY] = llmax( p.mV[VY], mMax.mV[VY] ); + mMax.mV[VZ] = llmax( p.mV[VZ], mMax.mV[VZ] ); } void LLBBoxLocal::expand( F32 delta ) { - mMin.mV[VX] -= delta; - mMin.mV[VY] -= delta; - mMin.mV[VZ] -= delta; - mMax.mV[VX] += delta; - mMax.mV[VY] += delta; - mMax.mV[VZ] += delta; + mMin.mV[VX] -= delta; + mMin.mV[VY] -= delta; + mMin.mV[VZ] -= delta; + mMax.mV[VX] += delta; + mMax.mV[VY] += delta; + mMax.mV[VZ] += delta; } LLBBoxLocal operator*(const LLBBoxLocal &a, const LLMatrix4 &b) { - return LLBBoxLocal( a.mMin * b, a.mMax * b ); + return LLBBoxLocal( a.mMin * b, a.mMax * b ); } |