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

Merge branch 'master' of https://github.com/fredowski/OpenSceneGraph into fredowski-master

Browse Source
This commit is contained in:
Robert Osfield
2016-11-15 11:13:37 +00:00
parent 137b596943 e506bb3075
commit 5aa897b5fd
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/osgGA/StandardManipulator.cpp
View File

@@ -438,11 +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::RIGHT_MOUSE_BUTTON &&
ModKeyMask & GUIEventAdapter::MODKEY_CTRL ) ||
buttonMask == (GUIEventAdapter::LEFT_MOUSE_BUTTON | GUIEventAdapter::RIGHT_MOUSE_BUTTON) )
{
return performMovementMiddleMouseButton( eventTimeDelta, dx, dy );