diff options
Diffstat (limited to 'src')
3 files changed, 15 insertions, 1 deletions
diff --git a/src/uscxml/concurrency/tinythread.h b/src/uscxml/concurrency/tinythread.h index 18823c3..537cc04 100644 --- a/src/uscxml/concurrency/tinythread.h +++ b/src/uscxml/concurrency/tinythread.h @@ -82,6 +82,7 @@ freely, subject to the following restrictions: #include <sched.h> #include <unistd.h> #include <sys/time.h> +#include <inttypes.h> #endif // Generic includes diff --git a/src/uscxml/plugins/invoker/graphics/openscenegraph/CompositeDisplay.cpp b/src/uscxml/plugins/invoker/graphics/openscenegraph/CompositeDisplay.cpp index c9b00b6..d7e247b 100644 --- a/src/uscxml/plugins/invoker/graphics/openscenegraph/CompositeDisplay.cpp +++ b/src/uscxml/plugins/invoker/graphics/openscenegraph/CompositeDisplay.cpp @@ -1,4 +1,11 @@ #include "CompositeDisplay.h" +#if 0 +#ifdef MACOSX +USE_GRAPICSWINDOW_IMPLEMENTATION(Cocoa) +#else +USE_GRAPHICSWINDOW() +#endif +#endif CompositeDisplay::CompositeDisplay(unsigned int x, unsigned int y, @@ -113,5 +120,10 @@ osg::GraphicsContext::WindowingSystemInterface* CompositeDisplay::wsi = NULL; void CompositeDisplay::getResolution(unsigned int& width, unsigned int& height, int screenId) { if (!wsi) wsi = osg::GraphicsContext::getWindowingSystemInterface(); - wsi->getScreenResolution(osg::GraphicsContext::ScreenIdentifier(screenId), width, height); + if (wsi) { + wsi->getScreenResolution(osg::GraphicsContext::ScreenIdentifier(screenId), width, height); + } else { + width = 800; + height = 600; + } } diff --git a/src/uscxml/plugins/invoker/graphics/openscenegraph/CompositeDisplay.h b/src/uscxml/plugins/invoker/graphics/openscenegraph/CompositeDisplay.h index 51e17c1..0d08c7f 100644 --- a/src/uscxml/plugins/invoker/graphics/openscenegraph/CompositeDisplay.h +++ b/src/uscxml/plugins/invoker/graphics/openscenegraph/CompositeDisplay.h @@ -3,6 +3,7 @@ #include "uscxml/concurrency/tinythread.h" #include <osgGA/TrackballManipulator> +#include <osgViewer/Viewer> #include <osgViewer/CompositeViewer> #include <osgViewer/ViewerEventHandlers> #include <osgGA/StateSetManipulator> |