Fixes for IRIX build
This commit is contained in:
@@ -68,7 +68,7 @@ class CreateShadowTextureCullCallback : public osg::NodeCallback
|
||||
{
|
||||
glPushMatrix();
|
||||
glLoadMatrixf(_matrix.ptr());
|
||||
TexGen::apply(state);
|
||||
osg::TexGen::apply(state);
|
||||
glPopMatrix();
|
||||
}
|
||||
|
||||
|
||||
@@ -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]);
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user