FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug related to osgUtil::Optimizer::FlatternStaticTransform::Visitor's

Browse Source 
apply(Billboard& ) method which was apply the accumulated transform to
the billbaord geometry when it should have been applying the matrix without
the transform component.
This commit is contained in:
Robert Osfield 2001-11-10 13:36:05 +00:00
parent 7290f793f1
commit d4926589dc
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/osgUtil/Optimizer.cpp
View File

@ -306,9 +306,13 @@ void Optimizer::FlattenStaticTransformsVisitor::apply(osg::Billboard& billboard)
if (!_matrixStack.empty())
{
osg::Matrix& matrix = _matrixStack.back();
TransformFunctor tf(matrix);
osg::Matrix matrix_no_trans = matrix;
matrix_no_trans.setTrans(0.0f,0.0f,0.0f);
TransformFunctor tf(matrix_no_trans);
osg::Vec3 axis = osg::Matrix::transform3x3(tf._im,billboard.getAxis());
axis.normalize();
billboard.setAxis(axis);
for(int i=0;i<billboard.getNumDrawables();++i)
@ -316,6 +320,8 @@ void Optimizer::FlattenStaticTransformsVisitor::apply(osg::Billboard& billboard)
billboard.setPos(i,billboard.getPos(i)*matrix);
billboard.getDrawable(i)->applyAttributeOperation(tf);
}
billboard.dirtyBound();
}
}
@ -324,6 +330,7 @@ void Optimizer::FlattenStaticTransformsVisitor::apply(osg::LOD& lod)
if (!_matrixStack.empty())
{
lod.setCenter(lod.getCenter()*_matrixStack.back());
lod.dirtyBound();
}
traverse(lod);
}
@ -345,6 +352,8 @@ void Optimizer::FlattenStaticTransformsVisitor::apply(osg::Transform& transform)
// reset the matrix to identity.
transform.getMatrix().makeIdent();
transform.dirtyBound();
_matrixStack.pop_back();
}