fly/flightgear
1
0
Fork 0
Code Activity

Handle warped pointer in embedded GLUT osgViewer

Browse source 
Signal the FGManipulator that a warp has occured so that it can drain its
event queue, but otherwise no warp handling is done in GLUT specific code.
This commit is contained in:
timoore 2007-12-12 08:24:27 +00:00
parent 50ba7b93b8
commit 1ec9d615ff
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Main/fg_os.cxx
View file

@ -22,13 +22,6 @@
#include "renderer.hxx"
#include "fg_props.hxx"
// We need to flush all pending mouse move events past a mouse warp to avoid
// a race condition ending in warping twice and having huge increments for the
// second warp.
// I am not aware of such a flush function in glut. So we emulate that by
// ignoring mouse move events between a warp mouse and the next frame.
static bool mouseWarped = false;
//
// Native glut callbacks.
// These translate the glut event model into osgGA events
@ -85,7 +78,7 @@ static void callKeyHandler(int k, int mods, int x, int y)
static void GLUTmotion (int x, int y)
{
if (mouseWarped || !gw.valid())
if (!gw.valid())
return;
gw->getEventQueue()->mouseMotion(x, y);
}
@ -143,7 +136,6 @@ static void GLUTdraw()
viewer->frame();
glutSwapBuffers();
glutPostRedisplay();
mouseWarped = false;
}
static void GLUTreshape(int w, int h)
@ -199,7 +191,7 @@ void fgSetMouseCursor(int cursor)
void fgWarpMouse(int x, int y)
{
mouseWarped = true;
globals->get_renderer()->getManipulator()->setMouseWarped();
glutWarpPointer(x, y);
}