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

Removed deprecated drawImplementation(State&) method from Drawable and Drawable::DrawCallback

Browse Source
This commit is contained in:
Robert Osfield
2007-03-28 11:30:38 +00:00
parent 7fb38ff42f
commit 7fc714ada1
31 changed files with 83 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/osgSim/ImpostorSprite.cpp
View File

@@ -79,7 +79,7 @@ float ImpostorSprite::calcPixelError(const osg::Matrix& MVPW) const
return sqrtf(max_error_sqrd);
}
void ImpostorSprite::drawImplementation(osg::State&) const
void ImpostorSprite::drawImplementation(osg::RenderInfo&) const
{
// when the tex env is set to REPLACE, and the
// texture is set up correctly the color has no effect.

3
src/osgSim/LightPointDrawable.cpp
View File

@@ -82,8 +82,9 @@ void LightPointDrawable::reset()
}
void LightPointDrawable::drawImplementation(osg::State& state) const
void LightPointDrawable::drawImplementation(osg::RenderInfo& renderInfo) const
{
osg::State& state = *renderInfo.getState();
state.applyMode(GL_POINT_SMOOTH,true);
state.applyMode(GL_BLEND,true);

2
src/osgSim/LightPointDrawable.h
View File

@@ -80,7 +80,7 @@ class OSGSIM_EXPORT LightPointDrawable : public osg::Drawable
}
/** draw LightPoints. */
virtual void drawImplementation(osg::State& state) const;
virtual void drawImplementation(osg::RenderInfo& renderInfo) const;
void setSimulationTime(double time)

5
src/osgSim/LightPointSpriteDrawable.cpp
View File

@@ -28,12 +28,13 @@ LightPointSpriteDrawable::LightPointSpriteDrawable(const LightPointSpriteDrawabl
{
}
void LightPointSpriteDrawable::drawImplementation(osg::State& state) const
void LightPointSpriteDrawable::drawImplementation(osg::RenderInfo& renderInfo) const
{
osg::State& state = *renderInfo.getState();
if (!state.getModeValidity(GL_POINT_SPRITE_ARB))
{
LightPointDrawable::drawImplementation(state);
LightPointDrawable::drawImplementation(renderInfo);
return;
}

2
src/osgSim/LightPointSpriteDrawable.h
View File

@@ -39,7 +39,7 @@ class OSGSIM_EXPORT LightPointSpriteDrawable : public osgSim::LightPointDrawable
/** draw LightPoints. */
virtual void drawImplementation(osg::State& state) const;
virtual void drawImplementation(osg::RenderInfo& renderInfo) const;
protected:

24
src/osgSim/SphereSegment.cpp
View File

@@ -53,7 +53,7 @@ public:
META_Object(osgSim,Surface)
void drawImplementation(osg::State& state) const;
void drawImplementation(osg::RenderInfo& renderInfo) const;
virtual osg::BoundingBox computeBound() const;
@@ -64,9 +64,9 @@ private:
SphereSegment* _ss;
};
void SphereSegment::Surface::drawImplementation(osg::State& state) const
void SphereSegment::Surface::drawImplementation(osg::RenderInfo& renderInfo) const
{
_ss->Surface_drawImplementation(state);
_ss->Surface_drawImplementation(*renderInfo.getState());
}
osg:: BoundingBox SphereSegment::Surface::computeBound() const
@@ -101,7 +101,7 @@ public:
META_Object(osgSim,EdgeLine)
void drawImplementation(osg::State& state) const;
void drawImplementation(osg::RenderInfo& renderInfo) const;
protected:
@@ -121,9 +121,9 @@ private:
SphereSegment* _ss;
};
void SphereSegment::EdgeLine::drawImplementation(osg::State& state) const
void SphereSegment::EdgeLine::drawImplementation(osg::RenderInfo& renderInfo) const
{
_ss->EdgeLine_drawImplementation(state);
_ss->EdgeLine_drawImplementation(*renderInfo.getState());
}
osg::BoundingBox SphereSegment::EdgeLine::computeBound() const
@@ -159,7 +159,7 @@ public:
META_Object(osgSim,Side)
void drawImplementation(osg::State& state) const;
void drawImplementation(osg::RenderInfo& renderInfo) const;
protected:
@@ -172,9 +172,9 @@ private:
};
void SphereSegment::Side::drawImplementation(osg::State& state) const
void SphereSegment::Side::drawImplementation(osg::RenderInfo& renderInfo) const
{
_ss->Side_drawImplementation(state, _planeOrientation, _BoundaryAngle);
_ss->Side_drawImplementation(*renderInfo.getState(), _planeOrientation, _BoundaryAngle);
}
osg::BoundingBox SphereSegment::Side::computeBound() const
@@ -210,7 +210,7 @@ public:
META_Object(osgSim,Spoke)
void drawImplementation(osg::State& state) const;
void drawImplementation(osg::RenderInfo& renderInfo) const;
protected:
@@ -229,9 +229,9 @@ private:
SphereSegment::BoundaryAngle _azAngle, _elevAngle;
};
void SphereSegment::Spoke::drawImplementation(osg::State& state) const
void SphereSegment::Spoke::drawImplementation(osg::RenderInfo& renderInfo) const
{
_ss->Spoke_drawImplementation(state, _azAngle, _elevAngle);
_ss->Spoke_drawImplementation(*renderInfo.getState(), _azAngle, _elevAngle);
}
osg::BoundingBox SphereSegment::Spoke::computeBound() const