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

10
src/osgSim/Impostor.cpp
View File

@@ -142,7 +142,7 @@ void Impostor::traverse(osg::NodeVisitor& nv)
// within the impostor distance threshold therefore attempt
// to use impostor instead.
RefMatrix& matrix = cv->getModelViewMatrix();
RefMatrix& matrix = *cv->getModelViewMatrix();
// search for the best fit ImpostorSprite;
ImpostorSprite* impostorSprite = findBestImpostorSprite(contextID,eyeLocal);
@@ -150,7 +150,7 @@ void Impostor::traverse(osg::NodeVisitor& nv)
if (impostorSprite)
{
// impostor found, now check to see if it is good enough to use
float error = impostorSprite->calcPixelError(cv->getMVPW());
float error = impostorSprite->calcPixelError(*(cv->getMVPW()));
if (error>cv->getImpostorPixelErrorThreshold())
{
@@ -220,7 +220,7 @@ ImpostorSprite* Impostor::createImpostorSprite(osgUtil::CullVisitor* cv)
// projection matrix...
bool isPerspectiveProjection = true;
const Matrix& matrix = cv->getModelViewMatrix();
const Matrix& matrix = *(cv->getModelViewMatrix());
const BoundingSphere& bs = getBound();
osg::Vec3 eye_local = cv->getEyeLocal();
@@ -264,7 +264,7 @@ ImpostorSprite* Impostor::createImpostorSprite(osgUtil::CullVisitor* cv)
// convert the corners of the sprite (in world coords) into their
// equivilant window coordinates by using the camera's project method.
const osg::Matrix& MVPW = cv->getMVPW();
const osg::Matrix& MVPW = *(cv->getMVPW());
Vec3 c00_win = c00 * MVPW;
Vec3 c11_win = c11 * MVPW;
@@ -448,7 +448,7 @@ ImpostorSprite* Impostor::createImpostorSprite(osgUtil::CullVisitor* cv)
osg::Matrix::translate(-eye_local)*
osg::Matrix::rotate(rotate_from,rotate_to)*
osg::Matrix::translate(eye_local)*
cv->getModelViewMatrix();
*cv->getModelViewMatrix();
camera->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
camera->setViewMatrix(rotate_matrix);

4
src/osgSim/LightPointNode.cpp
View File

@@ -155,8 +155,8 @@ void LightPointNode::traverse(osg::NodeVisitor& nv)
if (cv /*&& !cv->isCulled(_bbox)*/)
{
osg::Matrix matrix = cv->getModelViewMatrix();
osg::RefMatrix& projection = cv->getProjectionMatrix();
osg::Matrix matrix = *(cv->getModelViewMatrix());
osg::RefMatrix& projection = *(cv->getProjectionMatrix());
osgUtil::StateGraph* rg = cv->getCurrentStateGraph();
if (rg->leaves_empty())

2
src/osgSim/OverlayNode.cpp
View File

@@ -257,7 +257,7 @@ void OverlayNode::traverse(osg::NodeVisitor& nv)
_texgenNode->accept(*cv);
const osg::Matrix modelView = (cv->getModelViewMatrix());
const osg::Matrix modelView = *(cv->getModelViewMatrix());
osg::Polytope viewTextureFrustum;
viewTextureFrustum.setAndTransformProvidingInverse(_textureFrustum, osg::Matrix::inverse(modelView));