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

Attempt at build fixes for IRIX.

Browse Source
This commit is contained in:
Robert Osfield
2005-12-05 10:24:02 +00:00
parent 197b68ecb8
commit e1454d22a7
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/osgdelaunay/osgdelaunay.cpp
View File

@@ -143,7 +143,7 @@ class LinearConstraint: public osgUtil::DelaunayConstraint {
* if 2 roads cross, then the overlap will be replaced by a 'cross road'
* and the roads built up to the cross roads with a texture along its length. */
public:
LinearConstraint() : DelaunayConstraint(), txxrepAlong(10), txyrepAcross(10), width(2) { }
LinearConstraint() : osgUtil::DelaunayConstraint(), txxrepAlong(10), txyrepAcross(10), width(2) { }
/** geometry creation parameters */
/* Width of linear feature (eg road, railway) */

5
examples/osgdepthpartition/DepthPartitionNode.cpp
View File

@@ -1,7 +1,10 @@
#include "DepthPartitionNode.h"
#include <osgUtil/CullVisitor>
using namespace osg;
#define CURRENT_CLASS DepthPartitionNode
CURRENT_CLASS::CURRENT_CLASS()
{
_distAccumulator = new DistanceAccumulator;
@@ -9,7 +12,7 @@ CURRENT_CLASS::CURRENT_CLASS()
}
CURRENT_CLASS::CURRENT_CLASS(const CURRENT_CLASS& dpn, const osg::CopyOp& copyop)
: Group(dpn, copyop),
: osg::Group(dpn, copyop),
_active(dpn._active),
_renderOrder(dpn._renderOrder),
_clearColorBuffer(dpn._clearColorBuffer)

4
src/osgProducer/GraphicsContextImplementation.cpp
View File

@@ -138,7 +138,7 @@ GraphicsContextImplementation::GraphicsContextImplementation(Traits* traits)
}
else
{
getState()->setContextID( GraphicsContext::createNewContextID() );
getState()->setContextID( osg::GraphicsContext::createNewContextID() );
}
// but we share texture objects etc. so we also share the same contextID
@@ -150,7 +150,7 @@ GraphicsContextImplementation::GraphicsContextImplementation(Traits* traits)
// need to do something here....
setState( new osg::State );
getState()->setContextID( GraphicsContext::createNewContextID() );
getState()->setContextID( osg::GraphicsContext::createNewContextID() );
//_rs->realize();
}

3
src/osgSim/OverlayNode.cpp
View File

@@ -20,6 +20,7 @@
#include <osgSim/OverlayNode>
using namespace osgSim;
using namespace osg;
OverlayNode::OverlayNode():
_texEnvMode(GL_DECAL),
@@ -31,7 +32,7 @@ OverlayNode::OverlayNode():
}
OverlayNode::OverlayNode(const OverlayNode& copy, const osg::CopyOp& copyop):
Group(copy,copyop),
osg::Group(copy,copyop),
_overlaySubgraph(copy._overlaySubgraph),
_texEnvMode(copy._texEnvMode),
_textureUnit(copy._textureUnit),