Create new incliude/osgViewer/api directory to hold platform specific classes such as GraphicsWindow implementations.
Moved GraphicsWindowWin32,X11 and Carbon into their api/Win32, api/X11 and api/Carbon directories.
This commit is contained in:
Robert Osfield
parent
a78e8d2b6b
commit
cc1ab2c711
@ -1,92 +0,0 @@
|
||||
/* -*-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 bool makeCurrentImplementation();
|
||||
|
||||
/** Release the graphics context.*/
|
||||
virtual bool releaseContextImplementation();
|
||||
|
||||
/** 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
|
||||
@ -22,10 +22,9 @@ SET(LIB_PUBLIC_HEADERS
|
||||
)
|
||||
|
||||
SET(LIB_PRIVATE_HEADERS
|
||||
${HEADER_PATH}/GraphicsWindowCarbon
|
||||
${HEADER_PATH}/GraphicsWindowCocoa
|
||||
${HEADER_PATH}/GraphicsWindowWin32
|
||||
${HEADER_PATH}/GraphicsWindowX11
|
||||
${HEADER_PATH}/api/Carbon/GraphicsWindowCarbon
|
||||
${HEADER_PATH}/api/Win32/GraphicsWindowWin32
|
||||
${HEADER_PATH}/api/X11/GraphicsWindowX11
|
||||
)
|
||||
|
||||
SET(LIB_COMMON_FILES
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
#ifdef __APPLE__
|
||||
#include <osg/observer_ptr>
|
||||
#include <osgViewer/GraphicsWindowCarbon>
|
||||
#include <osgViewer/api/Carbon/GraphicsWindowCarbon>
|
||||
#include <Carbon/Carbon.h>
|
||||
#include <OpenGL/OpenGL.h>
|
||||
using namespace osgViewer;
|
||||
|
||||
@ -1,188 +0,0 @@
|
||||
/* -*-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 bool makeCurrentImplementation() { osg::notify(osg::NOTICE)<<"GraphicsWindow::makeCurrentImplementation() not implemented."<<std::endl; return false;}
|
||||
|
||||
/** Make this graphics context current with specified read context implementation.
|
||||
* Pure virtual - must be implemented by concrate implementations of GraphicsContext. */
|
||||
virtual bool makeContextCurrentImplementation(GraphicsContext* /*readContext*/) { osg::notify(osg::NOTICE)<<"GraphicsWindow::makeContextCurrentImplementation(..) not implemented."<<std::endl; return false; }
|
||||
|
||||
/** Release the graphics context.*/
|
||||
virtual bool releaseContextImplementation() { osg::notify(osg::NOTICE)<<"GraphicsWindow::releaseContextImplementation(..) not implemented."<<std::endl; return false; }
|
||||
|
||||
/** 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;
|
||||
}
|
||||
|
||||
bool GraphicsWindowCocoa::makeCurrentImplementation()
|
||||
{
|
||||
osg::notify(osg::NOTICE)<<"GraphicWindowCocoa::makeCurrentImplementation() Please implement me!"<<std::endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
bool GraphicsWindowCocoa::releaseContextImplementation()
|
||||
{
|
||||
osg::notify(osg::NOTICE)<<"GraphicWindowCocoa::releaseContextImplementation() Please implement me!"<<std::endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
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;
|
||||
@ -16,7 +16,7 @@
|
||||
* These elements are licensed under OSGPL as above, with Copyright (C) 2001-2004 Don Burns.
|
||||
*/
|
||||
|
||||
#include <osgViewer/GraphicsWindowWin32>
|
||||
#include <osgViewer/api/Win32/GraphicsWindowWin32>
|
||||
#include <vector>
|
||||
#include <map>
|
||||
#include <sstream>
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
* These elements are license under OSGPL as above, with Copyright (C) 2001-2004 Don Burns.
|
||||
*/
|
||||
|
||||
#include <osgViewer/GraphicsWindowX11>
|
||||
#include <osgViewer/api/X11/GraphicsWindowX11>
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xutil.h>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user