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

Added provisional block in computePositions()

Browse Source
This commit is contained in:
Robert Osfield 2008-08-26 09:39:45 +00:00
parent 11bd5f39d4
commit 86d2eb1e4a
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/osgText/TextBase.cpp
View File

@ -204,6 +204,7 @@ void TextBase::setAutoRotateToScreen(bool autoRotateToScreen)
if (_autoRotateToScreen==autoRotateToScreen) return; if (_autoRotateToScreen==autoRotateToScreen) return;
_autoRotateToScreen = autoRotateToScreen; _autoRotateToScreen = autoRotateToScreen;
computePositions();
} }
@ -235,14 +236,20 @@ osg::BoundingBox TextBase::computeBound() const
if (_autoTransformCache[i]._traversalNumber<0 && (_characterSizeMode!=OBJECT_COORDS || _autoRotateToScreen)) if (_autoTransformCache[i]._traversalNumber<0 && (_characterSizeMode!=OBJECT_COORDS || _autoRotateToScreen))
{ {
// _autoTransformCache is not valid so don't take it into accoumt when compute bounding volume. // _autoTransformCache is not valid so don't take it into accoumt when compute bounding volume.
#if 0
// so fallback to estimating the bounding box size by assuming a scale of 1
// but might cause problems due to small feature culling...
osg::Matrix matrix;
matrix.makeTranslate(_position);
bbox.expandBy(osg::Vec3(_textBB.xMin(),_textBB.yMin(),_textBB.zMin())*matrix);
bbox.expandBy(osg::Vec3(_textBB.xMax(),_textBB.yMax(),_textBB.zMax())*matrix);
#endif
} }
else else
{ {
osg::Matrix& matrix = _autoTransformCache[i]._matrix; osg::Matrix& matrix = _autoTransformCache[i]._matrix;
bbox.expandBy(osg::Vec3(_textBB.xMin(),_textBB.yMin(),_textBB.zMin())*matrix); bbox.expandBy(osg::Vec3(_textBB.xMin(),_textBB.yMin(),_textBB.zMin())*matrix);
// bbox.expandBy(osg::Vec3(_textBB.xMax(),_textBB.yMin(),_textBB.zMin())*matrix);
bbox.expandBy(osg::Vec3(_textBB.xMax(),_textBB.yMax(),_textBB.zMax())*matrix); bbox.expandBy(osg::Vec3(_textBB.xMax(),_textBB.yMax(),_textBB.zMax())*matrix);
// bbox.expandBy(osg::Vec3(_textBB.xMin(),_textBB.yMax(),_textBB.zMin())*matrix);
} }
} }
} }