livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for SH-4244: interesting: objects on adjacent region are not visible.

meow-7.2.2
Xiaohong Bao 2013-06-12 11:30:43 -06:00
parent 427490edb5
commit db2abd49c3
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llmath/llcamera.cpp
View File

@ -620,7 +620,7 @@ void LLCamera::calcRegionFrustumPlanes(const LLVector3& shift)
if (mPlaneMask[i] != 0xff)
{
n.setVec(mAgentPlanes[i][0], mAgentPlanes[i][1], mAgentPlanes[i][2]);
d = mAgentPlanes[i][3] - n * shift;
d = mAgentPlanes[i][3] + n * shift;
mRegionPlanes[i].setVec(n, d);
}
}

12
indra/newview/llvocache.cpp
View File

@ -417,9 +417,11 @@ public:
virtual S32 frustumCheck(const LLviewerOctreeGroup* group)
{
#if 1
S32 res = AABBInRegionFrustumGroupBounds(group);
//S32 res = AABBInRegionFrustumNoFarClipGroupBounds(group);
#else
S32 res = AABBInRegionFrustumNoFarClipGroupBounds(group);
#endif
if (res != 0)
{
res = llmin(res, AABBRegionSphereIntersectGroupExtents(group, mLocalShift));
@ -429,9 +431,11 @@ public:
virtual S32 frustumCheckObjects(const LLviewerOctreeGroup* group)
{
#if 1
S32 res = AABBInRegionFrustumObjectBounds(group);
//S32 res = AABBInRegionFrustumNoFarClipObjectBounds(group);
#else
S32 res = AABBInRegionFrustumNoFarClipObjectBounds(group);
#endif
if (res != 0)
{
res = llmin(res, AABBRegionSphereIntersectObjectExtents(group, mLocalShift));