From f690bfd11371eadf3e1b8b8f8a3e224fc114ee55 Mon Sep 17 00:00:00 2001 From: frohlich Date: Sat, 7 Apr 2007 09:54:18 +0000 Subject: [PATCH] Modified Files: src/Main/renderer.cxx src/Model/panelnode.hxx: Make it compile with current osg svn. --- src/Main/renderer.cxx | 8 ++++++-- src/Model/panelnode.hxx | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/Main/renderer.cxx b/src/Main/renderer.cxx index 237435c97..f3dd310c5 100644 --- a/src/Main/renderer.cxx +++ b/src/Main/renderer.cxx @@ -121,7 +121,9 @@ public: stateSet->setMode(GL_FOG, osg::StateAttribute::OFF); stateSet->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF); } - virtual void drawImplementation(osg::State& state) const + virtual void drawImplementation(osg::RenderInfo& renderInfo) const + { drawImplementation(*renderInfo.getState()); } + void drawImplementation(osg::State& state) const { state.pushStateSet(getStateSet()); state.apply(); @@ -184,7 +186,9 @@ public: stateSet->setTextureAttribute(0, new osg::TexEnv(osg::TexEnv::MODULATE)); } - virtual void drawImplementation(osg::State& state) const + virtual void drawImplementation(osg::RenderInfo& renderInfo) const + { drawImplementation(*renderInfo.getState()); } + void drawImplementation(osg::State& state) const { state.pushStateSet(getStateSet()); state.apply(); diff --git a/src/Model/panelnode.hxx b/src/Model/panelnode.hxx index 0745e5d24..9a5bf938a 100644 --- a/src/Model/panelnode.hxx +++ b/src/Model/panelnode.hxx @@ -33,7 +33,9 @@ public: FGPanel* getPanel() { return _panel; } - virtual void drawImplementation(osg::State& state) const; + virtual void drawImplementation(osg::RenderInfo& renderInfo) const + { drawImplementation(*renderInfo.getState()); } + void drawImplementation(osg::State& state) const; virtual osg::BoundingBox computeBound() const; private: