Fixes for IRIX build

This commit is contained in:
Don BURNS
2002-11-22 05:00:43 +00:00
parent c735c379af
commit 65fec63389
4 changed files with 7 additions and 6 deletions

View File

@@ -68,7 +68,7 @@ class CreateShadowTextureCullCallback : public osg::NodeCallback
{
glPushMatrix();
glLoadMatrixf(_matrix.ptr());
TexGen::apply(state);
osg::TexGen::apply(state);
glPopMatrix();
}

View File

@@ -452,8 +452,9 @@ osg::Group *ac_load_object(FILE *f,const ACObject *parent)
else
if (streq(t, "url"))
{
if (get_tokens(buff, &tokc, tokv) != 2)
printf("expected one arg to url at line %d (got %d)\n", line, tokv);
int ret;
if ((ret = get_tokens(buff, &tokc, tokv)) != 2)
printf("expected one arg to url at line %d (got %d)\n", line, ret);
else
ob.url = STRING(tokv[1]);
}

View File

@@ -13,7 +13,7 @@
using namespace osgSim;
LightPointDrawable::LightPointDrawable():
Drawable(),
osg::Drawable(),
_referenceTime(0.0),
_referenceTimeInterval(0.0),
_sizedLightPointList()
@@ -36,7 +36,7 @@ LightPointDrawable::LightPointDrawable():
}
LightPointDrawable::LightPointDrawable(const LightPointDrawable& lpd,const osg::CopyOp& copyop):
Drawable(lpd,copyop),
osg::Drawable(lpd,copyop),
_referenceTime(lpd._referenceTime),
_referenceTimeInterval(lpd._referenceTimeInterval),
_sizedLightPointList(lpd._sizedLightPointList)

View File

@@ -26,7 +26,7 @@ LightPointNode::LightPointNode()
/** Copy constructor using CopyOp to manage deep vs shallow copy.*/
LightPointNode::LightPointNode(const LightPointNode& lpn,const osg::CopyOp& copyop):
Node(lpn,copyop),
osg::Node(lpn,copyop),
_lightPointList(lpn._lightPointList)
{
}