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

Compile fixes for IRIX, submitted by Randall Hopper.

Browse Source
This commit is contained in:
Robert Osfield
2002-04-15 21:48:43 +00:00
parent 5a0f8118b7
commit 9fd7c528f4
13 changed files with 22 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/osg/ImpostorSprite
View File

@@ -103,7 +103,7 @@ class SG_EXPORT ImpostorSprite : public Drawable
/** calculate the pixel error value for passing in the ModelViewProjectionWindow transform,
* which transform local coords into screen space.*/
const float ImpostorSprite::calcPixelError(const Matrix& MVPW) const;
const float calcPixelError(const Matrix& MVPW) const;
void setTexture(Texture* tex,int s,int t);

17
include/osgUtil/CullVisitor
View File

@@ -308,9 +308,7 @@ class OSGUTIL_EXPORT CullVisitor : public osg::NodeVisitor
}
else
{
// default construction to identity.
static osg::Matrix identity;
return identity;
return _identity;
}
}
@@ -322,9 +320,7 @@ class OSGUTIL_EXPORT CullVisitor : public osg::NodeVisitor
}
else
{
// default construction to identity.
static osg::Matrix identity;
return identity;
return _identity;
}
}
@@ -337,9 +333,7 @@ class OSGUTIL_EXPORT CullVisitor : public osg::NodeVisitor
}
else
{
// default construction to identity.
static osg::Matrix identity;
return identity;
return _identity;
}
}
@@ -355,9 +349,7 @@ class OSGUTIL_EXPORT CullVisitor : public osg::NodeVisitor
}
else
{
// default construction to identity.
static osg::Matrix identity;
return identity;
return _identity;
}
}
@@ -389,6 +381,7 @@ class OSGUTIL_EXPORT CullVisitor : public osg::NodeVisitor
unsigned int _bbCornerNear;
unsigned int _bbCornerFar;
osg::Matrix _identity;
osg::ref_ptr<RenderGraph> _rootRenderGraph;
RenderGraph* _currentRenderGraph;