1
0
Fork 0

Modified Files:

fg_os_osgviewer.cxx: Enable mouse cursor change code on
	sufficiently recent osg versions.
This commit is contained in:
frohlich 2007-06-08 07:14:56 +00:00
parent 94bb4ac29b
commit 01f9b2d7b2

View file

@ -8,6 +8,7 @@
#include <osg/Group> #include <osg/Group>
#include <osg/Matrixd> #include <osg/Matrixd>
#include <osg/Viewport> #include <osg/Viewport>
#include <osg/Version>
#include <osgViewer/StatsHandler> #include <osgViewer/StatsHandler>
#include <osgViewer/Viewer> #include <osgViewer/Viewer>
#include <osgGA/MatrixManipulator> #include <osgGA/MatrixManipulator>
@ -18,6 +19,13 @@
#include "globals.hxx" #include "globals.hxx"
#include "renderer.hxx" #include "renderer.hxx"
#if ((1 == OSG_VERSION_MAJOR) && (9 == OSG_VERSION_MINOR) && \
(8 <= OSG_VERSION_PATCH)) || \
((1 == OSG_VERSION_MAJOR) && (9 < OSG_VERSION_MINOR)) || \
(1 < OSG_VERSION_MAJOR)
#define OSG_HAS_MOUSE_CURSOR_PATCH
#endif
// fg_os implementation using OpenSceneGraph's osgViewer::Viewer class // fg_os implementation using OpenSceneGraph's osgViewer::Viewer class
// to create the graphics window and run the event/update/render loop. // to create the graphics window and run the event/update/render loop.
// //
@ -245,7 +253,6 @@ void fgOSFullScreen()
{ {
} }
// #define OSG_HAS_MOUSE_CURSOR_PATCH
#ifdef OSG_HAS_MOUSE_CURSOR_PATCH #ifdef OSG_HAS_MOUSE_CURSOR_PATCH
static void setMouseCursor(osg::Camera* camera, int cursor) static void setMouseCursor(osg::Camera* camera, int cursor)
{ {