AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-09 12:25:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix MyGUI rendering not taking DataVariance of textures into account

Browse Source
This commit is contained in:
scrawl 2015-05-09 00:13:22 +02:00
parent 52a4456cf7
commit d432a3ed08
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/myguiplatform/myguirendermanager.cpp
View File

@ -401,6 +401,9 @@ void RenderManager::destroyVertexBuffer(MyGUI::IVertexBuffer *buffer)
void RenderManager::begin() void RenderManager::begin()
{ {
mDrawable->clear();
// variance will be recomputed based on textures being rendered in this frame
mDrawable->setDataVariance(osg::Object::STATIC);
} }
void RenderManager::doRender(MyGUI::IVertexBuffer *buffer, MyGUI::ITexture *texture, size_t count) void RenderManager::doRender(MyGUI::IVertexBuffer *buffer, MyGUI::ITexture *texture, size_t count)
@ -410,7 +413,11 @@ void RenderManager::doRender(MyGUI::IVertexBuffer *buffer, MyGUI::ITexture *text
batch.mVertexBuffer = static_cast<OSGVertexBuffer*>(buffer)->getBuffer(); batch.mVertexBuffer = static_cast<OSGVertexBuffer*>(buffer)->getBuffer();
batch.mArray = static_cast<OSGVertexBuffer*>(buffer)->getArray(); batch.mArray = static_cast<OSGVertexBuffer*>(buffer)->getArray();
if (texture) if (texture)
{
batch.mTexture = static_cast<OSGTexture*>(texture)->getTexture(); batch.mTexture = static_cast<OSGTexture*>(texture)->getTexture();
if (batch.mTexture->getDataVariance() == osg::Object::DYNAMIC)
mDrawable->setDataVariance(osg::Object::DYNAMIC); // only for this frame, reset in begin()
}
mDrawable->addBatch(batch); mDrawable->addBatch(batch);
} }
@ -433,8 +440,9 @@ void RenderManager::update()
void RenderManager::collectDrawCalls() void RenderManager::collectDrawCalls()
{ {
mDrawable->clear(); begin();
onRenderToTarget(this, mUpdate); onRenderToTarget(this, mUpdate);
end();
mUpdate = false; mUpdate = false;
} }