diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llmath/llcamera.cpp | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/linden/indra/llmath/llcamera.cpp b/linden/indra/llmath/llcamera.cpp index 9c37fcf..e6b6797 100644 --- a/linden/indra/llmath/llcamera.cpp +++ b/linden/indra/llmath/llcamera.cpp | |||
@@ -246,10 +246,6 @@ S32 LLCamera::AABBInFrustum(const LLVector3 ¢er, const LLVector3& radius) | |||
246 | for (U32 i = 0; i < mPlaneCount; i++) | 246 | for (U32 i = 0; i < mPlaneCount; i++) |
247 | { | 247 | { |
248 | mask = mAgentPlanes[i].mask; | 248 | mask = mAgentPlanes[i].mask; |
249 | if (mask == 0xff) | ||
250 | { | ||
251 | continue; | ||
252 | } | ||
253 | LLPlane p = mAgentPlanes[i].p; | 249 | LLPlane p = mAgentPlanes[i].p; |
254 | LLVector3 n = LLVector3(p); | 250 | LLVector3 n = LLVector3(p); |
255 | float d = p.mV[3]; | 251 | float d = p.mV[3]; |
@@ -298,10 +294,6 @@ S32 LLCamera::AABBInFrustumNoFarClip(const LLVector3 ¢er, const LLVector3& r | |||
298 | } | 294 | } |
299 | 295 | ||
300 | mask = mAgentPlanes[i].mask; | 296 | mask = mAgentPlanes[i].mask; |
301 | if (mask == 0xff) | ||
302 | { | ||
303 | continue; | ||
304 | } | ||
305 | LLPlane p = mAgentPlanes[i].p; | 297 | LLPlane p = mAgentPlanes[i].p; |
306 | LLVector3 n = LLVector3(p); | 298 | LLVector3 n = LLVector3(p); |
307 | float d = p.mV[3]; | 299 | float d = p.mV[3]; |
@@ -445,11 +437,6 @@ int LLCamera::sphereInFrustum(const LLVector3 &sphere_center, const F32 radius) | |||
445 | int res = 2; | 437 | int res = 2; |
446 | for (int i = 0; i < 6; i++) | 438 | for (int i = 0; i < 6; i++) |
447 | { | 439 | { |
448 | if (mAgentPlanes[i].mask == 0xff) | ||
449 | { | ||
450 | continue; | ||
451 | } | ||
452 | |||
453 | float d = mAgentPlanes[i].p.dist(sphere_center); | 440 | float d = mAgentPlanes[i].p.dist(sphere_center); |
454 | 441 | ||
455 | if (d > radius) | 442 | if (d > radius) |
@@ -635,17 +622,6 @@ U8 LLCamera::calcPlaneMask(const LLPlane& plane) | |||
635 | return mask; | 622 | return mask; |
636 | } | 623 | } |
637 | 624 | ||
638 | void LLCamera::ignoreAgentFrustumPlane(S32 idx) | ||
639 | { | ||
640 | if (idx < 0 || idx > (S32) mPlaneCount) | ||
641 | { | ||
642 | return; | ||
643 | } | ||
644 | |||
645 | mAgentPlanes[idx].mask = 0xff; | ||
646 | mAgentPlanes[idx].p.clearVec(); | ||
647 | } | ||
648 | |||
649 | void LLCamera::calcAgentFrustumPlanes(LLVector3* frust) | 625 | void LLCamera::calcAgentFrustumPlanes(LLVector3* frust) |
650 | { | 626 | { |
651 | 627 | ||