mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-03 23:45:33 +00:00
Code Issues Releases Wiki Activity

fix 5

Browse source
This commit is contained in:
scrawl 2012-03-31 20:05:23 +02:00
parent c9067249dd
commit b018d00fd3
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/openmw/mwrender/occlusionquery.cpp
View file

@ -126,7 +126,7 @@ void OcclusionQuery::notifyRenderSingleObject(Renderable* rend, const Pass* pass
mActiveQuery = mSunVisibleAreaQuery; mActiveQuery = mSunVisibleAreaQuery;
} }
} }
if (mDoQuery2 == true && rend == mBBQuerySingleObject) if (mDoQuery == true && rend == mBBQuerySingleObject)
{ {
mQuerySingleObjectStarted = true; mQuerySingleObjectStarted = true;
mQuerySingleObjectRequested = false; mQuerySingleObjectRequested = false;
@ -155,7 +155,7 @@ void OcclusionQuery::renderQueueEnded(uint8 queueGroupId, const String& invocati
mSunVisibleAreaQuery->beginOcclusionQuery(); mSunVisibleAreaQuery->beginOcclusionQuery();
mSunVisibleAreaQuery->endOcclusionQuery(); mSunVisibleAreaQuery->endOcclusionQuery();
} }
if (mObjectWasVisible == false && mDoQuery2) if (mObjectWasVisible == false && mDoQuery)
{ {
mSingleObjectQuery->beginOcclusionQuery(); mSingleObjectQuery->beginOcclusionQuery();
mSingleObjectQuery->endOcclusionQuery(); mSingleObjectQuery->endOcclusionQuery();
@ -189,7 +189,8 @@ void OcclusionQuery::update(float duration)
mDoQuery2 = false; mDoQuery2 = false;
if (!mSunTotalAreaQuery->isStillOutstanding() if (!mSunTotalAreaQuery->isStillOutstanding()
&& !mSunVisibleAreaQuery->isStillOutstanding()) && !mSunVisibleAreaQuery->isStillOutstanding()
&& !mSingleObjectQuery->isStillOutstanding())
{ {
unsigned int totalPixels; unsigned int totalPixels;
unsigned int visiblePixels; unsigned int visiblePixels;
@ -208,10 +209,6 @@ void OcclusionQuery::update(float duration)
if (mSunVisibility > 1) mSunVisibility = 1; if (mSunVisibility > 1) mSunVisibility = 1;
} }
mDoQuery = true;
}
if (!mSingleObjectQuery->isStillOutstanding())
{
unsigned int result; unsigned int result;
mSingleObjectQuery->pullOcclusionQuery(&result); mSingleObjectQuery->pullOcclusionQuery(&result);
@ -222,7 +219,7 @@ void OcclusionQuery::update(float duration)
mQuerySingleObjectStarted = false; mQuerySingleObjectStarted = false;
mQuerySingleObjectRequested = false; mQuerySingleObjectRequested = false;
mDoQuery2 = true; mDoQuery = true;
} }
} }