Made the FRAME event handling in the various MatrixManipulators return false
from the handle method to prevent frame events from being eaten.
This commit is contained in:
@@ -65,9 +65,6 @@ bool AnimationPathManipulator::handle(const osgGA::GUIEventAdapter& ea,osgGA::GU
|
||||
{
|
||||
if( !valid() ) return false;
|
||||
|
||||
us = us;
|
||||
|
||||
bool retval = false;
|
||||
switch( ea.getEventType() )
|
||||
{
|
||||
case GUIEventAdapter::FRAME:
|
||||
@@ -79,8 +76,7 @@ bool AnimationPathManipulator::handle(const osgGA::GUIEventAdapter& ea,osgGA::GU
|
||||
{
|
||||
handleFrame( ea.time() );
|
||||
}
|
||||
retval = true;
|
||||
break;
|
||||
return false;
|
||||
case GUIEventAdapter::KEYDOWN:
|
||||
if (ea.getKey()==' ')
|
||||
{
|
||||
@@ -108,12 +104,11 @@ bool AnimationPathManipulator::handle(const osgGA::GUIEventAdapter& ea,osgGA::GU
|
||||
return true;
|
||||
}
|
||||
|
||||
retval = false;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return retval;
|
||||
return false;
|
||||
}
|
||||
|
||||
void AnimationPathManipulator::getUsage(osg::ApplicationUsage& usage) const
|
||||
|
||||
@@ -328,7 +328,7 @@ bool DriveManipulator::handle(const GUIEventAdapter& ea,GUIActionAdapter& us)
|
||||
{
|
||||
addMouseEvent(ea);
|
||||
if (calcMovement()) us.requestRedraw();
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
case(GUIEventAdapter::RESIZE):
|
||||
|
||||
@@ -147,7 +147,7 @@ bool FlightManipulator::handle(const GUIEventAdapter& ea,GUIActionAdapter& us)
|
||||
case(GUIEventAdapter::FRAME):
|
||||
addMouseEvent(ea);
|
||||
if (calcMovement()) us.requestRedraw();
|
||||
return true;
|
||||
return false;
|
||||
|
||||
case(GUIEventAdapter::RESIZE):
|
||||
init(ea,us);
|
||||
|
||||
@@ -152,7 +152,6 @@ bool TrackballManipulator::handle(const GUIEventAdapter& ea,GUIActionAdapter& us
|
||||
if (_thrown)
|
||||
{
|
||||
if (calcMovement()) us.requestRedraw();
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
default:
|
||||
|
||||
Reference in New Issue
Block a user