FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fredowski-master'

Browse Source
This commit is contained in:
Robert Osfield 2016-11-15 11:16:53 +00:00
commit 4ecf541cb6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgGA/StandardManipulator.cpp
View File

@ -438,12 +438,14 @@ bool StandardManipulator::performMovement()
// call appropriate methods
unsigned int buttonMask = _ga_t1->getButtonMask();
unsigned int modKeyMask = _ga_t1->getModKeyMask();
if( buttonMask == GUIEventAdapter::LEFT_MOUSE_BUTTON )
{
return performMovementLeftMouseButton( eventTimeDelta, dx, dy );
}
else if( buttonMask == GUIEventAdapter::MIDDLE_MOUSE_BUTTON ||
buttonMask == (GUIEventAdapter::LEFT_MOUSE_BUTTON | GUIEventAdapter::RIGHT_MOUSE_BUTTON) )
else if( ( buttonMask == GUIEventAdapter::MIDDLE_MOUSE_BUTTON ) ||
( buttonMask == GUIEventAdapter::RIGHT_MOUSE_BUTTON && modKeyMask & GUIEventAdapter::MODKEY_CTRL ) ||
( buttonMask == (GUIEventAdapter::LEFT_MOUSE_BUTTON | GUIEventAdapter::RIGHT_MOUSE_BUTTON) ) )
{
return performMovementMiddleMouseButton( eventTimeDelta, dx, dy );
}