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

Removed the exclusion of CullSettings from the genwrapper.conf, and then changed the CullStack RefMatrix& methods to RefMatrix*

Browse Source 
as the RefMatrix& versions caused the wrappers to fail.
This commit is contained in:
Robert Osfield
2007-02-21 13:48:01 +00:00
parent 664522fb02
commit 228fd04a19
22 changed files with 337 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
include/osg/CullStack
View File

@@ -131,10 +131,10 @@ class OSG_EXPORT CullStack : public osg::CullSettings
inline const CullingSet& getCurrentCullingSet() const { return *_back_modelviewCullingStack; }
inline osg::Viewport* getViewport();
inline osg::RefMatrix& getModelViewMatrix();
inline osg::RefMatrix& getProjectionMatrix();
inline osg::RefMatrix* getModelViewMatrix();
inline osg::RefMatrix* getProjectionMatrix();
inline osg::Matrix getWindowMatrix();
inline const osg::RefMatrix& getMVPW();
inline const osg::RefMatrix* getMVPW();
inline const osg::Vec3& getReferenceViewPoint() const { return _referenceViewPoints.back(); }
inline void pushReferenceViewPoint(const osg::Vec3& viewPoint) { _referenceViewPoints.push_back(viewPoint); }
@@ -217,27 +217,27 @@ inline osg::Viewport* CullStack::getViewport()
}
}
inline osg::RefMatrix& CullStack::getModelViewMatrix()
inline osg::RefMatrix* CullStack::getModelViewMatrix()
{
if (!_modelviewStack.empty())
{
return *_modelviewStack.back();
return _modelviewStack.back().get();
}
else
{
return *_identity;
return _identity.get();
}
}
inline osg::RefMatrix& CullStack::getProjectionMatrix()
inline osg::RefMatrix* CullStack::getProjectionMatrix()
{
if (!_projectionStack.empty())
{
return *_projectionStack.back();
return _projectionStack.back().get();
}
else
{
return *_identity;
return _identity.get();
}
}
@@ -254,21 +254,21 @@ inline osg::Matrix CullStack::getWindowMatrix()
}
}
inline const osg::RefMatrix& CullStack::getMVPW()
inline const osg::RefMatrix* CullStack::getMVPW()
{
if (!_MVPW_Stack.empty())
{
if (!_MVPW_Stack.back())
{
_MVPW_Stack.back() = createOrReuseMatrix(getModelViewMatrix());
(*_MVPW_Stack.back()) *= getProjectionMatrix();
_MVPW_Stack.back() = createOrReuseMatrix(*getModelViewMatrix());
(*_MVPW_Stack.back()) *= *(getProjectionMatrix());
(*_MVPW_Stack.back()) *= getWindowMatrix();
}
return *_MVPW_Stack.back();
return _MVPW_Stack.back().get();
}
else
{
return *_identity;
return _identity.get();
}
}