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

Made the more of the OSG's referenced object desctructors protected to ensure

Browse Source 
that they arn't created on the stack inappropriately.

Split the implemention of Matrix up so that it is a simple no referenced counted
class and can be safefly created on the stack.  To support referenced counting a
seperate subclass now exists, this is RefMatrix which inherits from both Matrix and
Object.
This commit is contained in:
Robert Osfield
2003-01-10 09:25:42 +00:00
parent f948a3de7c
commit f36bc69c58
53 changed files with 446 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
include/osg/CullStack
View File

@@ -51,10 +51,10 @@ class SG_EXPORT CullStack
void pushViewport(osg::Viewport* viewport);
void popViewport();
void pushProjectionMatrix(osg::Matrix* matrix);
void pushProjectionMatrix(osg::RefMatrix* matrix);
void popProjectionMatrix();
void pushModelViewMatrix(osg::Matrix* matrix);
void pushModelViewMatrix(osg::RefMatrix* matrix);
void popModelViewMatrix();
inline float getFrustumVolume() { if (_frustumVolume<0.0f) computeFrustumVolume(); return _frustumVolume; }
@@ -138,10 +138,10 @@ class SG_EXPORT CullStack
inline osg::Viewport* getViewport();
inline osg::Matrix& getModelViewMatrix();
inline osg::Matrix& getProjectionMatrix();
inline osg::RefMatrix& getModelViewMatrix();
inline osg::RefMatrix& getProjectionMatrix();
inline osg::Matrix getWindowMatrix();
inline const osg::Matrix& getMVPW();
inline const osg::RefMatrix& getMVPW();
inline const osg::Vec3& getEyeLocal() const { return _eyePointStack.back(); }
@@ -169,7 +169,7 @@ class SG_EXPORT CullStack
// base set of shadow volume occluder to use in culling.
ShadowVolumeOccluderList _occluderList;
typedef fast_back_stack< ref_ptr<Matrix> > MatrixStack;
typedef fast_back_stack< ref_ptr<RefMatrix> > MatrixStack;
MatrixStack _projectionStack;
@@ -192,13 +192,13 @@ class SG_EXPORT CullStack
unsigned int _bbCornerNear;
unsigned int _bbCornerFar;
osg::Matrix _identity;
ref_ptr<osg::RefMatrix> _identity;
typedef std::vector< osg::ref_ptr<osg::Matrix> > MatrixList;
typedef std::vector< osg::ref_ptr<osg::RefMatrix> > MatrixList;
MatrixList _reuseMatrixList;
unsigned int _currentReuseMatrixIndex;
inline osg::Matrix* createOrReuseMatrix(const osg::Matrix& value);
inline osg::RefMatrix* createOrReuseMatrix(const osg::Matrix& value);
};
@@ -215,7 +215,7 @@ inline osg::Viewport* CullStack::getViewport()
}
}
inline osg::Matrix& CullStack::getModelViewMatrix()
inline osg::RefMatrix& CullStack::getModelViewMatrix()
{
if (!_modelviewStack.empty())
{
@@ -223,11 +223,11 @@ inline osg::Matrix& CullStack::getModelViewMatrix()
}
else
{
return _identity;
return *_identity;
}
}
inline osg::Matrix& CullStack::getProjectionMatrix()
inline osg::RefMatrix& CullStack::getProjectionMatrix()
{
if (!_projectionStack.empty())
{
@@ -235,7 +235,7 @@ inline osg::Matrix& CullStack::getProjectionMatrix()
}
else
{
return _identity;
return *_identity;
}
}
@@ -248,11 +248,11 @@ inline osg::Matrix CullStack::getWindowMatrix()
}
else
{
return _identity;
return *_identity;
}
}
inline const osg::Matrix& CullStack::getMVPW()
inline const osg::RefMatrix& CullStack::getMVPW()
{
if (!_MVPW_Stack.empty())
{
@@ -266,11 +266,11 @@ inline const osg::Matrix& CullStack::getMVPW()
}
else
{
return _identity;
return *_identity;
}
}
inline Matrix* CullStack::createOrReuseMatrix(const osg::Matrix& value)
inline RefMatrix* CullStack::createOrReuseMatrix(const osg::Matrix& value)
{
// skip of any already reused matrix.
while (_currentReuseMatrixIndex<_reuseMatrixList.size() &&
@@ -284,13 +284,13 @@ inline Matrix* CullStack::createOrReuseMatrix(const osg::Matrix& value)
// there return it to be reused.
if (_currentReuseMatrixIndex<_reuseMatrixList.size())
{
Matrix* matrix = _reuseMatrixList[_currentReuseMatrixIndex++].get();
RefMatrix* matrix = _reuseMatrixList[_currentReuseMatrixIndex++].get();
matrix->set(value);
return matrix;
}
// otherwise need to create new matrix.
osg::Matrix* matrix = new Matrix(value);
osg::RefMatrix* matrix = new RefMatrix(value);
_reuseMatrixList.push_back(matrix);
++_currentReuseMatrixIndex;
return matrix;