fly/flightgear
1
0
Fork 0
Code Activity

Modified Files:

Browse source 
src/Main/renderer.cxx src/Model/panelnode.hxx: Make it compile with
	current osg svn.
This commit is contained in:
frohlich 2007-04-07 09:54:18 +00:00
parent df4f1aa248
commit f690bfd113
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Main/renderer.cxx
View file

@ -121,7 +121,9 @@ public:
stateSet->setMode(GL_FOG, osg::StateAttribute::OFF); stateSet->setMode(GL_FOG, osg::StateAttribute::OFF);
stateSet->setMode(GL_DEPTH_TEST, 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.pushStateSet(getStateSet());
state.apply(); state.apply();
@ -184,7 +186,9 @@ public:
stateSet->setTextureAttribute(0, new osg::TexEnv(osg::TexEnv::MODULATE)); 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.pushStateSet(getStateSet());
state.apply(); state.apply();

4
src/Model/panelnode.hxx
View file

@ -33,7 +33,9 @@ public:
FGPanel* getPanel() { return _panel; } 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; virtual osg::BoundingBox computeBound() const;
private: private: