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

4
examples/osgcallback/osgcallback.cpp
View File

@@ -39,10 +39,10 @@ class CullCallback : public osg::NodeCallback
class DrawableDrawCallback : public osg::Drawable::DrawCallback
{
virtual void drawImplementation(osg::State& state,const osg::Drawable* drawable) const
virtual void drawImplementation(osg::RenderInfo& renderInfo,const osg::Drawable* drawable) const
{
std::cout<<"draw call back - pre drawImplementation"<<drawable<<std::endl;
drawable->drawImplementation(state);
drawable->drawImplementation(renderInfo);
std::cout<<"draw call back - post drawImplementation"<<drawable<<std::endl;
}
};

6
examples/osgcegui/osgcegui.cpp
View File

@@ -41,7 +41,7 @@ public:
void loadFont(const std::string& font);
void loadLayout(const std::string& layout);
void drawImplementation(osg::State& state) const;
void drawImplementation(osg::RenderInfo& renderInfo) const;
protected:
@@ -185,8 +185,10 @@ void CEGUIDrawable::loadLayout(const std::string& layout)
}
void CEGUIDrawable::drawImplementation(osg::State& state) const
void CEGUIDrawable::drawImplementation(osg::RenderInfo& renderInfo) const
{
osg::State& state = renderInfo.getState();
if (state.getContextID()!=_activeContextID) return;
glPushAttrib(GL_ALL_ATTRIB_BITS);

5
examples/osgspacewarp/osgspacewarp.cpp
View File

@@ -25,8 +25,9 @@ struct DrawCallback : public osg::Drawable::DrawCallback
DrawCallback():
_firstTime(true) {}
virtual void drawImplementation(osg::State& state,const osg::Drawable* drawable) const
virtual void drawImplementation(osg::RenderInfo& renderInfo,const osg::Drawable* drawable) const
{
osg::State& state = *renderInfo.getState();
if (!_firstTime)
{
@@ -50,7 +51,7 @@ struct DrawCallback : public osg::Drawable::DrawCallback
_firstTime = false;
drawable->drawImplementation(state);
drawable->drawImplementation(renderInfo);
}
mutable bool _firstTime;

2
examples/osgteapot/osgteapot.cpp
View File

@@ -215,7 +215,7 @@ class Teapot : public osg::Drawable
// the draw immediate mode method is where the OSG wraps up the drawing of
// of OpenGL primitives.
virtual void drawImplementation(osg::State&) const
virtual void drawImplementation(osg::RenderInfo&) const
{
// teapot(..) doens't use vertex arrays at all so we don't need to toggle their state
// if we did we'd need to something like following call