This commit is contained in:
scrawl 2012-03-31 19:16:14 +02:00
parent c08a2b2942
commit c9067249dd

View file

@ -126,7 +126,7 @@ void OcclusionQuery::notifyRenderSingleObject(Renderable* rend, const Pass* pass
mActiveQuery = mSunVisibleAreaQuery; mActiveQuery = mSunVisibleAreaQuery;
} }
} }
if (mDoQuery2 == true && rend == mBBQuerySingleObject && mQuerySingleObjectRequested) if (mDoQuery2 == 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 && mQuerySingleObjectRequested) if (mObjectWasVisible == false && mDoQuery2)
{ {
mSingleObjectQuery->beginOcclusionQuery(); mSingleObjectQuery->beginOcclusionQuery();
mSingleObjectQuery->endOcclusionQuery(); mSingleObjectQuery->endOcclusionQuery();
@ -210,13 +210,13 @@ void OcclusionQuery::update(float duration)
mDoQuery = true; mDoQuery = true;
} }
if (mQuerySingleObjectStarted && !mSingleObjectQuery->isStillOutstanding()) if (!mSingleObjectQuery->isStillOutstanding())
{ {
unsigned int result; unsigned int result;
mSingleObjectQuery->pullOcclusionQuery(&result); mSingleObjectQuery->pullOcclusionQuery(&result);
//std::cout << "Single object query result: " << result << " pixels " << std::endl; std::cout << "Single object query result: " << result << " pixels " << std::endl;
mTestResult = (result != 0); mTestResult = (result != 0);
mQuerySingleObjectStarted = false; mQuerySingleObjectStarted = false;