mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-03 16:49:54 +00:00
Code Issues Releases Wiki Activity

optimizer: fix FlattenStaticTransformsVisitor not respecting the is permissible callback

Browse source
This commit is contained in:
scrawl 2017-03-04 21:24:11 +01:00
parent 5866f0f80b
commit 4051018862
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
components/sceneutil/optimizer.cpp
View file

@ -281,11 +281,11 @@ class CollectLowestTransformsVisitor : public BaseOptimizerVisitor
ObjectStruct():_canBeApplied(true),_moreThanOneMatrixRequired(false) {} ObjectStruct():_canBeApplied(true),_moreThanOneMatrixRequired(false) {}
void add(osg::Transform* transform) void add(osg::Transform* transform, bool canOptimize)
{ {
if (transform) if (transform)
{ {
if (transform->getDataVariance()!=osg::Transform::STATIC) _moreThanOneMatrixRequired=true; if (!canOptimize) _moreThanOneMatrixRequired=true;
else if (transform->getReferenceFrame()!=osg::Transform::RELATIVE_RF) _moreThanOneMatrixRequired=true; else if (transform->getReferenceFrame()!=osg::Transform::RELATIVE_RF) _moreThanOneMatrixRequired=true;
else else
{ {
@ -322,7 +322,7 @@ class CollectLowestTransformsVisitor : public BaseOptimizerVisitor
itr!=_currentObjectList.end(); itr!=_currentObjectList.end();
++itr) ++itr)
{ {
_objectMap[*itr].add(transform); _objectMap[*itr].add(transform, transform && isOperationPermissibleForObject(transform));
} }
} }