Added GraphicsWindowWin32 and GraphicsWindowCocoa classes, curently not implmented,

but added as a placeholder for members of the community to step forward and implement.

include/osgViewer/GraphicsWindowCocoa

@@ -0,0 +1,89 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
+ *
+ * This library is open source and may be redistributed and/or modified under  
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * OpenSceneGraph Public License for more details.
+*/
+
+/* Note, elements of GraphicsWindowX11 have used Prodcer/RenderSurface_X11.cpp as both
+ * a guide to use of X11/GLX and copiying directly in the case of setBorder().
+ * These elements are license under OSGPL as above, with Copyright (C) 2001-2004  Don Burns.
+ */
+
+#ifndef OSGVIEWER_GRAPHICSWINDOWCOCOA
+#define OSGVIEWER_GRAPHICSWINDOWCOCOA 1
+
+#include <osgViewer/GraphicsWindow>
+
+namespace osgViewer
+{
+
+class GraphicsWindowCocoa : public osgViewer::GraphicsWindow
+{
+    public:
+
+        GraphicsWindowCocoa(osg::GraphicsContext::Traits* traits):
+            _valid(false),
+            _initialized(false),
+            _realized(false)
+        {
+            _traits = traits;
+
+            init();
+            
+            if (valid())
+            {
+                setState( new osg::State );
+                getState()->setContextID( osg::GraphicsContext::createNewContextID() );
+            }
+        }
+    
+        virtual bool valid() const { return _valid; }
+
+        /** Realise the GraphicsContext.*/
+        virtual bool realizeImplementation();
+
+        /** Return true if the graphics context has been realised and is ready to use.*/
+        virtual bool isRealizedImplementation() const { return _realized; }
+
+        /** Close the graphics context.*/
+        virtual void closeImplementation();
+
+        /** Make this graphics context current.*/
+        virtual void makeCurrentImplementation();
+
+        /** Swap the front and back buffers.*/
+        virtual void swapBuffersImplementation();
+        
+        /** Check to see if any events have been generated.*/
+        virtual void checkEvents();
+
+        /** Set Window decoration.*/
+        virtual void setWindowDecoration(bool flag);
+
+        /** Get focus.*/
+        virtual void grabFocus();
+        
+        /** Get focus on if the pointer is in this window.*/
+        virtual void grabFocusIfPointerInWindow();
+
+    protected:
+    
+        void init();
+        
+        void transformMouseXY(float& x, float& y);
+
+        bool            _valid;
+        bool            _initialized;
+        bool            _realized;
+};
+
+}
+
+#endif

include/osgViewer/GraphicsWindowWin32

@@ -0,0 +1,89 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
+ *
+ * This library is open source and may be redistributed and/or modified under  
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * OpenSceneGraph Public License for more details.
+*/
+
+/* Note, elements of GraphicsWindowX11 have used Prodcer/RenderSurface_X11.cpp as both
+ * a guide to use of X11/GLX and copiying directly in the case of setBorder().
+ * These elements are license under OSGPL as above, with Copyright (C) 2001-2004  Don Burns.
+ */
+
+#ifndef OSGVIEWER_GRAPHICSWINDOWWIN32
+#define OSGVIEWER_GRAPHICSWINDOWIN32 1
+
+#include <osgViewer/GraphicsWindow>
+
+namespace osgViewer
+{
+
+class GraphicsWindowWin32 : public osgViewer::GraphicsWindow
+{
+    public:
+
+        GraphicsWindowWin32(osg::GraphicsContext::Traits* traits):
+            _valid(false),
+            _initialized(false),
+            _realized(false)
+        {
+            _traits = traits;
+
+            init();
+            
+            if (valid())
+            {
+                setState( new osg::State );
+                getState()->setContextID( osg::GraphicsContext::createNewContextID() );
+            }
+        }
+    
+        virtual bool valid() const { return _valid; }
+
+        /** Realise the GraphicsContext.*/
+        virtual bool realizeImplementation();
+
+        /** Return true if the graphics context has been realised and is ready to use.*/
+        virtual bool isRealizedImplementation() const { return _realized; }
+
+        /** Close the graphics context.*/
+        virtual void closeImplementation();
+
+        /** Make this graphics context current.*/
+        virtual void makeCurrentImplementation();
+
+        /** Swap the front and back buffers.*/
+        virtual void swapBuffersImplementation();
+        
+        /** Check to see if any events have been generated.*/
+        virtual void checkEvents();
+
+        /** Set Window decoration.*/
+        virtual void setWindowDecoration(bool flag);
+
+        /** Get focus.*/
+        virtual void grabFocus();
+        
+        /** Get focus on if the pointer is in this window.*/
+        virtual void grabFocusIfPointerInWindow();
+
+    protected:
+    
+        void init();
+        
+        void transformMouseXY(float& x, float& y);
+
+        bool            _valid;
+        bool            _initialized;
+        bool            _realized;
+};
+
+}
+
+#endif

src/osgViewer/GNUmakefile

@@ -13,6 +13,10 @@ CXXFILES = \
 
 CXXFILES += GraphicsWindowX11.cpp\
 
+# CXXFILES += GraphicsWindowWin32.cpp\
+
+# CXXFILES += GraphicsWindowCocoa.cpp\
+
 
 DEF     += -DOSGVIEWER_LIBRARY
 

src/osgViewer/GraphicsWindowCocoa.cpp

@@ -0,0 +1,178 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
+ *
+ * This library is open source and may be redistributed and/or modified under  
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * OpenSceneGraph Public License for more details.
+*/
+
+#include <osgViewer/GraphicsWindowCocoa>
+
+
+using namespace osgViewer;
+
+namespace osgViewer
+{
+
+/** This is the class we need to create for pbuffers, note its not a GraphicsWindow as it won't need any of the event handling and window mapping facilities.*/
+class GraphicsContextCocoa : public osg::GraphicsContext
+{
+    public:
+
+        GraphicsContextCocoa(osg::GraphicsContext::Traits* traits):
+            _valid(false)
+        {
+            _traits = traits;
+        }
+    
+        virtual bool valid() const { return _valid; }
+
+        /** Realise the GraphicsContext implementation, 
+          * Pure virtual - must be implemented by concrate implementations of GraphicsContext. */
+        virtual bool realizeImplementation() { osg::notify(osg::NOTICE)<<"GraphicsWindow::realizeImplementation() not implemented."<<std::endl; return false; }
+
+        /** Return true if the graphics context has been realised, and is ready to use, implementation.
+          * Pure virtual - must be implemented by concrate implementations of GraphicsContext. */
+        virtual bool isRealizedImplementation() const  { osg::notify(osg::NOTICE)<<"GraphicsWindow::isRealizedImplementation() not implemented."<<std::endl; return false; }
+
+        /** Close the graphics context implementation.
+          * Pure virtual - must be implemented by concrate implementations of GraphicsContext. */
+        virtual void closeImplementation()  { osg::notify(osg::NOTICE)<<"GraphicsWindow::closeImplementation() not implemented."<<std::endl; }
+
+        /** Make this graphics context current implementation.
+          * Pure virtual - must be implemented by concrate implementations of GraphicsContext. */
+        virtual void makeCurrentImplementation()  { osg::notify(osg::NOTICE)<<"GraphicsWindow::makeCurrentImplementation() not implemented."<<std::endl; }
+        
+        /** Make this graphics context current with specified read context implementation.
+          * Pure virtual - must be implemented by concrate implementations of GraphicsContext. */
+        virtual void makeContextCurrentImplementation(GraphicsContext* /*readContext*/)  { osg::notify(osg::NOTICE)<<"GraphicsWindow::makeContextCurrentImplementation(..) not implemented."<<std::endl; }
+
+        /** Pure virtual, Bind the graphics context to associated texture implementation.
+          * Pure virtual - must be implemented by concrate implementations of GraphicsContext. */
+        virtual void bindPBufferToTextureImplementation(GLenum /*buffer*/)  { osg::notify(osg::NOTICE)<<"GraphicsWindow::void bindPBufferToTextureImplementation(..) not implemented."<<std::endl; }
+
+        /** Swap the front and back buffers implementation.
+          * Pure virtual - must be implemented by Concrate implementations of GraphicsContext. */
+        virtual void swapBuffersImplementation()  { osg::notify(osg::NOTICE)<<"GraphicsWindow:: swapBuffersImplementation() not implemented."<<std::endl; }
+        
+    protected:
+        
+        bool        _valid;
+
+};
+
+}
+
+void GraphicsWindowCocoa::setWindowDecoration(bool flag)
+{
+    osg::notify(osg::NOTICE)<<"GraphicWindowCocoa::setWindowDecoration() Please implement me!"<<std::endl;
+}
+
+void GraphicsWindowCocoa::init()
+{
+    osg::notify(osg::NOTICE)<<"GraphicWindowCocoa::init() Please implement me!"<<std::endl;
+}
+
+bool GraphicsWindowCocoa::realizeImplementation()
+{
+    osg::notify(osg::NOTICE)<<"GraphicWindowCocoa::realizeImplementation() Please implement me!"<<std::endl;
+    return false;
+}
+
+void GraphicsWindowCocoa::makeCurrentImplementation()
+{
+    osg::notify(osg::NOTICE)<<"GraphicWindowCocoa::makeCurrentImplementation() Please implement me!"<<std::endl;
+}
+
+void GraphicsWindowCocoa::closeImplementation()
+{
+    osg::notify(osg::NOTICE)<<"GraphicWindowCocoa::closeImplementation() Please implement me!"<<std::endl;
+}
+
+void GraphicsWindowCocoa::swapBuffersImplementation()
+{
+    osg::notify(osg::NOTICE)<<"GraphicWindowCocoa::swapBuffersImplementation() Please implement me!"<<std::endl;
+}
+
+void GraphicsWindowCocoa::checkEvents()
+{
+    osg::notify(osg::NOTICE)<<"GraphicWindowCocoa::checkEvents() Please implement me!"<<std::endl;
+}
+
+void GraphicsWindowCocoa::grabFocus()
+{
+    osg::notify(osg::NOTICE)<<"GraphicWindowCocoa::grabFocus() Please implement me!"<<std::endl;
+}
+
+void GraphicsWindowCocoa::grabFocusIfPointerInWindow()
+{
+    osg::notify(osg::NOTICE)<<"GraphicWindowCocoa::grabFocusIfPointerInWindow() Please implement me!"<<std::endl;
+}
+
+
+void GraphicsWindowCocoa::transformMouseXY(float& x, float& y)
+{
+    if (getEventQueue()->getUseFixedMouseInputRange())
+    {
+        osgGA::GUIEventAdapter* eventState = getEventQueue()->getCurrentEventState();
+        x = eventState->getXmin() + (eventState->getXmax()-eventState->getXmin())*x/float(_traits->width);
+        y = eventState->getYmin() + (eventState->getYmax()-eventState->getYmin())*y/float(_traits->height);
+    }
+}
+
+struct CocoaWindowingSystemInterface : public osg::GraphicsContext::WindowingSystemInterface
+{
+
+    CocoaWindowingSystemInterface()
+    {
+        
+    }
+
+    virtual unsigned int getNumScreens(const osg::GraphicsContext::ScreenIdentifier& si) 
+    {
+        osg::notify(osg::NOTICE)<<"CocoaWindowingSystemInterface::getNumScreens() Please implement me!"<<std::endl;
+        return 1;
+    }
+
+    virtual void getScreenResolution(const osg::GraphicsContext::ScreenIdentifier& si, unsigned int& width, unsigned int& height)
+    {
+        osg::notify(osg::NOTICE)<<"CocoaWindowingSystemInterface::getScreenResolution() Please implement me!"<<std::endl;
+    }
+
+    virtual osg::GraphicsContext* createGraphicsContext(osg::GraphicsContext::Traits* traits)
+    {
+        if (traits->pbuffer)
+        {
+            osg::ref_ptr<osgViewer::GraphicsContextCocoa> pbuffer = new GraphicsContextCocoa(traits);
+            if (pbuffer->valid()) return pbuffer.release();
+            else return 0;
+        }
+        else
+        {
+            osg::ref_ptr<osgViewer::GraphicsWindowCocoa> window = new GraphicsWindowCocoa(traits);
+            if (window->valid()) return window.release();
+            else return 0;
+        }
+    }
+
+};
+
+struct RegisterWindowingSystemInterfaceProxy
+{
+    RegisterWindowingSystemInterfaceProxy()
+    {
+        osg::GraphicsContext::setWindowingSystemInterface(new CocoaWindowingSystemInterface);
+    }
+
+    ~RegisterWindowingSystemInterfaceProxy()
+    {
+        osg::GraphicsContext::setWindowingSystemInterface(0);
+    }
+};
+
+RegisterWindowingSystemInterfaceProxy createWindowingSystemInterfaceProxy;

src/osgViewer/GraphicsWindowWin32.cpp

@@ -0,0 +1,178 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
+ *
+ * This library is open source and may be redistributed and/or modified under  
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * OpenSceneGraph Public License for more details.
+*/
+
+#include <osgViewer/GraphicsWindowWin32>
+
+
+using namespace osgViewer;
+
+namespace osgViewer
+{
+
+/** This is the class we need to create for pbuffers, note its not a GraphicsWindow as it won't need any of the event handling and window mapping facilities.*/
+class GraphicsContextWin32 : public osg::GraphicsContext
+{
+    public:
+
+        GraphicsContextWin32(osg::GraphicsContext::Traits* traits):
+            _valid(false)
+        {
+            _traits = traits;
+        }
+    
+        virtual bool valid() const { return _valid; }
+
+        /** Realise the GraphicsContext implementation, 
+          * Pure virtual - must be implemented by concrate implementations of GraphicsContext. */
+        virtual bool realizeImplementation() { osg::notify(osg::NOTICE)<<"GraphicsWindow::realizeImplementation() not implemented."<<std::endl; return false; }
+
+        /** Return true if the graphics context has been realised, and is ready to use, implementation.
+          * Pure virtual - must be implemented by concrate implementations of GraphicsContext. */
+        virtual bool isRealizedImplementation() const  { osg::notify(osg::NOTICE)<<"GraphicsWindow::isRealizedImplementation() not implemented."<<std::endl; return false; }
+
+        /** Close the graphics context implementation.
+          * Pure virtual - must be implemented by concrate implementations of GraphicsContext. */
+        virtual void closeImplementation()  { osg::notify(osg::NOTICE)<<"GraphicsWindow::closeImplementation() not implemented."<<std::endl; }
+
+        /** Make this graphics context current implementation.
+          * Pure virtual - must be implemented by concrate implementations of GraphicsContext. */
+        virtual void makeCurrentImplementation()  { osg::notify(osg::NOTICE)<<"GraphicsWindow::makeCurrentImplementation() not implemented."<<std::endl; }
+        
+        /** Make this graphics context current with specified read context implementation.
+          * Pure virtual - must be implemented by concrate implementations of GraphicsContext. */
+        virtual void makeContextCurrentImplementation(GraphicsContext* /*readContext*/)  { osg::notify(osg::NOTICE)<<"GraphicsWindow::makeContextCurrentImplementation(..) not implemented."<<std::endl; }
+
+        /** Pure virtual, Bind the graphics context to associated texture implementation.
+          * Pure virtual - must be implemented by concrate implementations of GraphicsContext. */
+        virtual void bindPBufferToTextureImplementation(GLenum /*buffer*/)  { osg::notify(osg::NOTICE)<<"GraphicsWindow::void bindPBufferToTextureImplementation(..) not implemented."<<std::endl; }
+
+        /** Swap the front and back buffers implementation.
+          * Pure virtual - must be implemented by Concrate implementations of GraphicsContext. */
+        virtual void swapBuffersImplementation()  { osg::notify(osg::NOTICE)<<"GraphicsWindow:: swapBuffersImplementation() not implemented."<<std::endl; }
+        
+    protected:
+        
+        bool        _valid;
+
+};
+
+}
+
+void GraphicsWindowWin32::setWindowDecoration(bool flag)
+{
+    osg::notify(osg::NOTICE)<<"GraphicWindowWin32::setWindowDecoration() Please implement me!"<<std::endl;
+}
+
+void GraphicsWindowWin32::init()
+{
+    osg::notify(osg::NOTICE)<<"GraphicWindowWin32::init() Please implement me!"<<std::endl;
+}
+
+bool GraphicsWindowWin32::realizeImplementation()
+{
+    osg::notify(osg::NOTICE)<<"GraphicWindowWin32::realizeImplementation() Please implement me!"<<std::endl;
+    return false;
+}
+
+void GraphicsWindowWin32::makeCurrentImplementation()
+{
+    osg::notify(osg::NOTICE)<<"GraphicWindowWin32::makeCurrentImplementation() Please implement me!"<<std::endl;
+}
+
+void GraphicsWindowWin32::closeImplementation()
+{
+    osg::notify(osg::NOTICE)<<"GraphicWindowWin32::closeImplementation() Please implement me!"<<std::endl;
+}
+
+void GraphicsWindowWin32::swapBuffersImplementation()
+{
+    osg::notify(osg::NOTICE)<<"GraphicWindowWin32::swapBuffersImplementation() Please implement me!"<<std::endl;
+}
+
+void GraphicsWindowWin32::checkEvents()
+{
+    osg::notify(osg::NOTICE)<<"GraphicWindowWin32::checkEvents() Please implement me!"<<std::endl;
+}
+
+void GraphicsWindowWin32::grabFocus()
+{
+    osg::notify(osg::NOTICE)<<"GraphicWindowWin32::grabFocus() Please implement me!"<<std::endl;
+}
+
+void GraphicsWindowWin32::grabFocusIfPointerInWindow()
+{
+    osg::notify(osg::NOTICE)<<"GraphicWindowWin32::grabFocusIfPointerInWindow() Please implement me!"<<std::endl;
+}
+
+
+void GraphicsWindowWin32::transformMouseXY(float& x, float& y)
+{
+    if (getEventQueue()->getUseFixedMouseInputRange())
+    {
+        osgGA::GUIEventAdapter* eventState = getEventQueue()->getCurrentEventState();
+        x = eventState->getXmin() + (eventState->getXmax()-eventState->getXmin())*x/float(_traits->width);
+        y = eventState->getYmin() + (eventState->getYmax()-eventState->getYmin())*y/float(_traits->height);
+    }
+}
+
+struct Win32WindowingSystemInterface : public osg::GraphicsContext::WindowingSystemInterface
+{
+
+    Win32WindowingSystemInterface()
+    {
+        
+    }
+
+    virtual unsigned int getNumScreens(const osg::GraphicsContext::ScreenIdentifier& si) 
+    {
+        osg::notify(osg::NOTICE)<<"Win32WindowingSystemInterface::getNumScreens() Please implement me!"<<std::endl;
+        return 1;
+    }
+
+    virtual void getScreenResolution(const osg::GraphicsContext::ScreenIdentifier& si, unsigned int& width, unsigned int& height)
+    {
+        osg::notify(osg::NOTICE)<<"Win32WindowingSystemInterface::getScreenResolution() Please implement me!"<<std::endl;
+    }
+
+    virtual osg::GraphicsContext* createGraphicsContext(osg::GraphicsContext::Traits* traits)
+    {
+        if (traits->pbuffer)
+        {
+            osg::ref_ptr<osgViewer::GraphicsContextWin32> pbuffer = new GraphicsContextWin32(traits);
+            if (pbuffer->valid()) return pbuffer.release();
+            else return 0;
+        }
+        else
+        {
+            osg::ref_ptr<osgViewer::GraphicsWindowWin32> window = new GraphicsWindowWin32(traits);
+            if (window->valid()) return window.release();
+            else return 0;
+        }
+    }
+
+};
+
+struct RegisterWindowingSystemInterfaceProxy
+{
+    RegisterWindowingSystemInterfaceProxy()
+    {
+        osg::GraphicsContext::setWindowingSystemInterface(new Win32WindowingSystemInterface);
+    }
+
+    ~RegisterWindowingSystemInterfaceProxy()
+    {
+        osg::GraphicsContext::setWindowingSystemInterface(0);
+    }
+};
+
+RegisterWindowingSystemInterfaceProxy createWindowingSystemInterfaceProxy;

src/osgViewer/Viewer.cpp

@@ -246,6 +246,8 @@ void Viewer::frame()
 {
     if (_done) return;
 
+    // osg::notify(osg::NOTICE)<<std::endl<<"Viewer::frame()"<<std::endl<<std::endl;
+
     if (_firstFrame)
     {
         init();