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

From Nathan Monteleone and Robert Osfield,

Browse Source 
submission email from Nathan: "I discovered a problem with POINT_ROT_EYE billboards in IntersectionVisitor: because we pass in just the model matrix to Billboard::computeBillboardMatrix, the billboard gets the wrong up vector.  It really needs to take the view matrix into account to get the correct up vector.

This version of IntersectionVisitor.cpp is made against today's SVN.  It corrects the problem by computing the billboard matrix using the complete modelview, and then multiplies by the inverse of the view matrix before pushing onto IntersectionVisitor's model stack.  The only code I changed is in apply(Billboard&)."

notes from Robert, refactored the matrix multiplication code and the use of RefMatrix to make Nathan's changes more efficient.
This commit is contained in:
Robert Osfield
2010-09-09 08:47:12 +00:00
parent 6f49d85f88
commit 6f08e25c05
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/osgUtil/IntersectionVisitor.cpp
View File

@@ -250,12 +250,17 @@ void IntersectionVisitor::apply(osg::Billboard& billboard)
for(unsigned int i = 0; i < billboard.getNumDrawables(); i++ )
{
const osg::Vec3& pos = billboard.getPosition(i);
osg::ref_ptr<osg::RefMatrix> billboard_matrix = _modelStack.empty() ?
new osg::RefMatrix :
new osg::RefMatrix(*_modelStack.back());
osg::ref_ptr<osg::RefMatrix> billboard_matrix = new osg::RefMatrix;
if (getViewMatrix())
{
if (getModelMatrix()) billboard_matrix->mult( *getModelMatrix(), *getViewMatrix() );
else billboard_matrix->set( *getViewMatrix() );
}
else if (getModelMatrix()) billboard_matrix->set( *getModelMatrix() );
billboard.computeMatrix(*billboard_matrix,eye_local,pos);
if (getViewMatrix()) billboard_matrix->postMult( osg::Matrix::inverse(*getViewMatrix()) );
pushModelMatrix(billboard_matrix.get());
// now push an new intersector clone transform to the new local coordinates