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

Changed the osg::Billboard comution so that it get passed in the current

Browse Source 
modelview matrix rathan than an identity matrix, this matrix is then modified
locally.

Changed the osg::Matrix set methods so they are inline.

Added a few useful comments to MemoryManager.cpp to help people understand
the assert's better.
This commit is contained in:
Robert Osfield
2002-04-17 09:48:19 +00:00
parent b76888ffb9
commit e17261c45f
7 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/osgUtil/CullVisitor.cpp
View File

@@ -452,8 +452,7 @@ void CullVisitor::apply(Billboard& node)
if (node_state) pushStateSet(node_state);
const Vec3& eye_local = getEyeLocal();
const Vec3& up_local = getUpLocal();
Matrix* matrix = getCurrentMatrix();
const Matrix& modelview = getModelViewMatrix();
for(int i=0;i<node.getNumDrawables();++i)
{
@@ -465,13 +464,10 @@ void CullVisitor::apply(Billboard& node)
updateCalculatedNearFar(pos);
Matrix* billboard_matrix = createOrReuseMatrix();
node.getMatrix(*billboard_matrix,eye_local,up_local,pos);
Matrix* billboard_matrix = createOrReuseMatrix(modelview);
node.getMatrix(*billboard_matrix,eye_local,pos);
if (matrix)
{
billboard_matrix->postMult(*matrix);
}
StateSet* stateset = drawable->getStateSet();
@@ -480,14 +476,7 @@ void CullVisitor::apply(Billboard& node)
{
Vec3 center;
if (matrix)
{
center = pos*(*matrix);
}
else
{
center = pos;
}
center = pos*modelview;
float depth;
switch(_tsm)
@@ -576,8 +565,7 @@ void CullVisitor::apply(Transform& node)
StateSet* node_state = node.getStateSet();
if (node_state) pushStateSet(node_state);
ref_ptr<osg::Matrix> matrix = createOrReuseMatrix();
*matrix = *getCurrentMatrix();
ref_ptr<osg::Matrix> matrix = createOrReuseMatrix(getModelViewMatrix());
node.getLocalToWorldMatrix(*matrix,this);
pushModelViewMatrix(matrix.get());
@@ -608,8 +596,7 @@ void CullVisitor::apply(Projection& node)
StateSet* node_state = node.getStateSet();
if (node_state) pushStateSet(node_state);
ref_ptr<osg::Matrix> matrix = createOrReuseMatrix();
*matrix = node.getMatrix();
ref_ptr<osg::Matrix> matrix = createOrReuseMatrix(node.getMatrix());
pushProjectionMatrix(matrix.get());
handle_cull_callbacks_and_traverse(node);