fly/flightgear
1
0
Fork 0
Code Activity

Modified Files:

Browse source 
src/Model/panelnode.cxx src/Model/panelnode.hxx: Make it compile
	also with osg HEAD.
This commit is contained in:
frohlich 2007-01-07 19:00:25 +00:00
parent 826866b327
commit 99cb08ef87
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/Model/panelnode.cxx
View file

@ -130,12 +130,14 @@ FGPanelNode::drawImplementation(osg::State& state) const
// coordinates to panel coordinates when the user clicks the
// mouse.
// OSGFIXME: we don't need that when we can really pick
const_cast<osg::Matrix&>(_lastModelview) = state.getModelViewMatrix();
const_cast<osg::Matrix&>(_lastProjection) = state.getProjectionMatrix();
state.getCurrentViewport()->getViewport(const_cast<int&>(_lastViewport[0]),
const_cast<int&>(_lastViewport[1]),
const_cast<int&>(_lastViewport[2]),
const_cast<int&>(_lastViewport[3]));
_lastModelview = state.getModelViewMatrix();
_lastProjection = state.getProjectionMatrix();
const osg::Viewport* vp = state.getCurrentViewport();
_lastViewport[0] = vp->x();
_lastViewport[1] = vp->y();
_lastViewport[2] = vp->width();
_lastViewport[3] = vp->height();
_panel->draw(state);
}

6
src/Model/panelnode.hxx
View file

@ -53,9 +53,9 @@ private:
// The matrix transformation state that was active the last time
// we were rendered. Used by the mouse code to compute
// intersections.
osg::Matrix _lastModelview;
osg::Matrix _lastProjection;
int _lastViewport[4];
mutable osg::Matrix _lastModelview;
mutable osg::Matrix _lastProjection;
mutable double _lastViewport[4];
};