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

Fixed panning bug, when using RUN_ON_DEMAND, that resulted in the camera being thrown off towards infinity.

Browse Source 
The solution for to refactor the way that events are checked so I add a bool return type to checkEvents() method across osgViewer::GraphcisWindow, osgGA::Devive and osgViewer::Viewer/CompositeViewer classes
This commit is contained in:
Robert Osfield
2013-05-24 09:35:58 +00:00
parent 1cd73f0238
commit fb3178106a
24 changed files with 132 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/osgViewer/GraphicsWindowCarbon.cpp
View File

@@ -844,9 +844,9 @@ bool GraphicsWindowCarbon::handleModifierKeys(EventRef theEvent)
void GraphicsWindowCarbon::checkEvents()
bool GraphicsWindowCarbon::checkEvents()
{
if (!_realized) return;
if (!_realized) return false;
EventRef theEvent;
EventTargetRef theTarget = GetEventDispatcherTarget();
@@ -869,7 +869,7 @@ void GraphicsWindowCarbon::checkEvents()
if ((fwres == inMenuBar) && (mouseButton >= 1)) {
MenuSelect(wheresMyMouse);
HiliteMenu(0);
return;
return !(getEventQueue()->empty());
}
break;
}
@@ -903,6 +903,7 @@ void GraphicsWindowCarbon::checkEvents()
s_quit_requested = false;
}
return !(getEventQueue()->empty());
}