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

Converted osgUtil::GUIEventAdapter::MouseButtonMask from LEFT_BUTTON etc to

Browse Source 
LEFT_MOUSE_BUTTON etc, to prevent classes with #define of LEFT_BUTTON.. when
including certain MS Windows headers. Arhsh Snarfff..
This commit is contained in:
Robert Osfield
2002-01-19 22:11:05 +00:00
parent 974b099135
commit cf66502fe5
8 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/osgUtil/TrackballManipulator.cpp
View File

@@ -202,7 +202,7 @@ bool TrackballManipulator::calcMovement()
float focalLength = (_camera->getCenterPoint()-_camera->getEyePoint()).length();
unsigned int buttonMask = _ga_t1->getButtonMask();
if (buttonMask==GUIEventAdapter::LEFT_BUTTON)
if (buttonMask==GUIEventAdapter::LEFT_MOUSE_BUTTON)
{
// rotate camera.
@@ -241,8 +241,8 @@ bool TrackballManipulator::calcMovement()
return true;
}
else if (buttonMask==GUIEventAdapter::MIDDLE_BUTTON ||
buttonMask==(GUIEventAdapter::LEFT_BUTTON|GUIEventAdapter::RIGHT_BUTTON))
else if (buttonMask==GUIEventAdapter::MIDDLE_MOUSE_BUTTON ||
buttonMask==(GUIEventAdapter::LEFT_MOUSE_BUTTON|GUIEventAdapter::RIGHT_MOUSE_BUTTON))
{
// pan model.
@@ -262,7 +262,7 @@ bool TrackballManipulator::calcMovement()
return true;
}
else if (buttonMask==GUIEventAdapter::RIGHT_BUTTON)
else if (buttonMask==GUIEventAdapter::RIGHT_MOUSE_BUTTON)
{
// zoom model.