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

4
src/osg/AutoTransform.cpp
View File

@@ -118,7 +118,7 @@ void AutoTransform::accept(NodeVisitor& nv)
osg::Vec3 localUp = cs->getUpLocal();
osg::Vec3 position = getPosition();
const osg::Matrix& projection = cs->getProjectionMatrix();
const osg::Matrix& projection = *(cs->getProjectionMatrix());
bool doUpdate = _firstTimeToInitEyePoint;
if (!_firstTimeToInitEyePoint)
@@ -161,7 +161,7 @@ void AutoTransform::accept(NodeVisitor& nv)
if (_autoRotateMode==ROTATE_TO_SCREEN)
{
osg::Quat rotation = cs->getModelViewMatrix().getRotate();
osg::Quat rotation = cs->getModelViewMatrix()->getRotate();
setRotation(rotation.inverse());
}
else if (_autoRotateMode==ROTATE_TO_CAMERA)

2
src/osg/CollectOccludersVisitor.cpp
View File

@@ -87,7 +87,7 @@ void CollectOccludersVisitor::apply(osg::Transform& node)
// push the culling mode.
pushCurrentMask();
ref_ptr<osg::RefMatrix> matrix = createOrReuseMatrix(getModelViewMatrix());
ref_ptr<osg::RefMatrix> matrix = createOrReuseMatrix(*getModelViewMatrix());
node.computeLocalToWorldMatrix(*matrix,this);
pushModelViewMatrix(matrix.get(), node.getReferenceFrame());

2
src/osg/CullStack.cpp
View File

@@ -270,7 +270,7 @@ void CullStack::popModelViewMatrix()
void CullStack::computeFrustumVolume()
{
osg::Matrix invP;
invP.invert(getProjectionMatrix());
invP.invert(*getProjectionMatrix());
osg::Vec3 f1(-1,-1,-1); f1 = f1*invP;
osg::Vec3 f2(-1, 1,-1); f2 = f2*invP;

4
src/osg/ShadowVolumeOccluder.cpp
View File

@@ -182,8 +182,8 @@ bool ShadowVolumeOccluder::computeOccluder(const NodePath& nodePath,const Convex
CullingSet& cullingset = cullStack.getCurrentCullingSet();
const RefMatrix& MV = cullStack.getModelViewMatrix();
const RefMatrix& P = cullStack.getProjectionMatrix();
const RefMatrix& MV = *cullStack.getModelViewMatrix();
const RefMatrix& P = *cullStack.getProjectionMatrix();
// take a reference to the NodePath to this occluder.
_nodePath = nodePath;