diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-06-12 12:25:30 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-06-12 12:25:30 -0700 |
| commit | 3eb460f772e8a1cf45d53ed1d06206bfd74a780a (patch) | |
| tree | dde6f157bcdde6ce5b4010f49e962d404451d1da | |
| parent | 88553c9eb1aee59d092cbd73c64da82497fd095f (diff) | |
Remove NaN guards from vopartgroup and volume code
| -rwxr-xr-x | indra/newview/llvopartgroup.cpp | 9 | ||||
| -rwxr-xr-x | indra/newview/llvovolume.cpp | 4 |
2 files changed, 0 insertions, 13 deletions
diff --git a/indra/newview/llvopartgroup.cpp b/indra/newview/llvopartgroup.cpp index b25213d85f..43a5ddba42 100755 --- a/indra/newview/llvopartgroup.cpp +++ b/indra/newview/llvopartgroup.cpp @@ -411,21 +411,15 @@ void LLVOPartGroup::getGeometry(S32 idx, LLVector4a right; right.setCross3(at, up); - // guard against NaNs in normalize below - llassert(right.dot3(right).getF32() > F_APPROXIMATELY_ZERO); right.normalize3fast(); up.setCross3(right, at); - // guard against NaNs in normalize below - llassert(up.dot3(up).getF32() > F_APPROXIMATELY_ZERO); up.normalize3fast(); if (part.mFlags & LLPartData::LL_PART_FOLLOW_VELOCITY_MASK) { LLVector4a normvel; normvel.load3(part.mVelocity.mV); - // guard against NaNs in normalize below - llassert(normvel.dot3(normvel).getF32() > F_APPROXIMATELY_ZERO); normvel.normalize3fast(); LLVector2 up_fracs; up_fracs.mV[0] = normvel.dot3(right).getF32(); @@ -450,9 +444,6 @@ void LLVOPartGroup::getGeometry(S32 idx, up = new_up; right = t; - // guard against NaNs in normalize below - llassert(up.dot3(up).getF32() > F_APPROXIMATELY_ZERO); - llassert(right.dot3(right).getF32() > F_APPROXIMATELY_ZERO); up.normalize3fast(); right.normalize3fast(); } diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 8962d7cadf..e74d2d4b98 100755 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -3751,8 +3751,6 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector4a& start, const LLVector4a& { *normal = n; } - // guard against NaNs in normalize below - llassert(normal->dot3(*normal).getF32() > F_APPROXIMATELY_ZERO); (*normal).normalize3fast(); } @@ -3775,8 +3773,6 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector4a& start, const LLVector4a& { *tangent = tn; } - // guard against NaNs in normalize below - llassert(tangent->dot3(*tangent).getF32() > F_APPROXIMATELY_ZERO); (*tangent).normalize3fast(); } |