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

more fix for SH-4501: Interesting: Occluded objects do not appear when Occluder object is deleted.

master
Xiaohong Bao 2013-09-20 11:46:51 -06:00
parent ba4f64ed7a
commit 3eb226275b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llvocache.cpp
View File

@ -492,6 +492,7 @@ LLVOCachePartition::LLVOCachePartition(LLViewerRegion* regionp)
mRegionp = regionp;
mPartitionType = LLViewerRegion::PARTITION_VO_CACHE;
mBackSlectionEnabled = -1;
mIdleHash = 0;
for(S32 i = 0; i < LLViewerCamera::NUM_CAMERAS; i++)
{
@ -721,17 +722,15 @@ S32 LLVOCachePartition::cull(LLCamera &camera, bool do_occlusion)
if(!mCullHistory[LLViewerCamera::sCurCameraID] && LLViewerRegion::isViewerCameraStatic())
{
static U32 hash = 0;
U32 seed = llmax(mLODPeriod >> 1, (U32)4);
if(LLViewerCamera::sCurCameraID == LLViewerCamera::CAMERA_WORLD)
{
if(!(LLViewerOctreeEntryData::getCurrentFrame() % seed))
{
hash = (hash + 1) % seed;
mIdleHash = (mIdleHash + 1) % seed;
}
}
if(LLViewerOctreeEntryData::getCurrentFrame() % seed != hash)
if(LLViewerOctreeEntryData::getCurrentFrame() % seed != mIdleHash)
{
selectBackObjects(camera);//process back objects selection
return 0; //nothing changed, reduce frequency of culling

1
indra/newview/llvocache.h
View File

@ -184,6 +184,7 @@ private:
std::set<LLOcclusionCullingGroup*> mOccludedGroups;
S32 mBackSlectionEnabled; //enable to select back objects if > 0.
U32 mIdleHash;
};
//