From 96071fd1b1e84e1ebaa72557d3e7265289826d45 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 28 Dec 2006 08:16:36 +0000 Subject: [PATCH] Removed osgViewer::GraphicsWindowProxy as its was causing wrapper compile problems and also no longer has a key role in osgViewer. --- VisualStudio/OpenSceneGraph.dsw | 21 +++++ .../osgViewer/wrapper_osgViewer.dsp | 4 - include/osgViewer/GraphicsWindowProxy | 88 ------------------- src/osgWrappers/osgViewer/GNUmakefile | 1 - .../osgViewer/GraphicsWindowProxy.cpp | 86 ------------------ 5 files changed, 21 insertions(+), 179 deletions(-) delete mode 100644 include/osgViewer/GraphicsWindowProxy delete mode 100644 src/osgWrappers/osgViewer/GraphicsWindowProxy.cpp diff --git a/VisualStudio/OpenSceneGraph.dsw b/VisualStudio/OpenSceneGraph.dsw index 12bd45286..9ef77021f 100644 --- a/VisualStudio/OpenSceneGraph.dsw +++ b/VisualStudio/OpenSceneGraph.dsw @@ -4007,6 +4007,27 @@ Package=<4> ############################################################################### +Project: "osgWrapper osgUtil"=.\osgWrappers\osgUtil\wrapper_osgViewer.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core osg + End Project Dependency + Begin Project Dependency + Project_Dep_Name Core osgViewer + End Project Dependency + Begin Project Dependency + Project_Dep_Name Core osgIntrospection + End Project Dependency +}}} + +############################################################################### + Global: Package=<5> diff --git a/VisualStudio/osgWrappers/osgViewer/wrapper_osgViewer.dsp b/VisualStudio/osgWrappers/osgViewer/wrapper_osgViewer.dsp index fe55b6590..5675857b2 100644 --- a/VisualStudio/osgWrappers/osgViewer/wrapper_osgViewer.dsp +++ b/VisualStudio/osgWrappers/osgViewer/wrapper_osgViewer.dsp @@ -103,10 +103,6 @@ SOURCE=..\..\..\src\osgWrappers\osgViewer\CompositeViewer.cpp SOURCE=..\..\..\src\osgWrappers\osgViewer\GraphicsWindow.cpp # End Source File -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osgViewer\GraphicsWindowProxy.cpp -# End Source File - # Begin Source File SOURCE=..\..\..\src\osgWrappers\osgViewer\Scene.cpp # End Source File diff --git a/include/osgViewer/GraphicsWindowProxy b/include/osgViewer/GraphicsWindowProxy deleted file mode 100644 index b8594be5d..000000000 --- a/include/osgViewer/GraphicsWindowProxy +++ /dev/null @@ -1,88 +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. -*/ - -#ifndef OSGVIEWER_GRAPHICWINDOW -#define OSGVIEWER_GRAPHICWINDOW 1 - -#include -#include - -#include - -#include - -namespace osgViewer { - -/** GraphicsWindowProxy acts as an adpater GraphicsWindow which allows the implementation of the GraphicsWindow to be decoupled */ -class OSGVIEWER_EXPORT GraphicsWindowProxy : public osgViewer::GraphicsWindow -{ - public: - - GraphicsWindowProxy(); - - void setGraphicsWindowImplentation(osgViewer::GraphicsWindow* gw) { _gw = gw; } - - osgViewer::GraphicsWindow* getGraphicsWindowImplentation() { return _gw.get(); } - - const osgViewer::GraphicsWindow* getGraphicsWindowImplentation() const { return _gw.get(); } - - /** Realise the GraphicsContext implementation, - * Pure virtual - must be implemented by concrate implementations of GraphicsContext. */ - virtual bool realizeImplementation() { if (_gw.valid()) return _gw->realizeImplementation(); else osg::notify(osg::NOTICE)<<"GraphicsWindow::realizeImplementation() not implemented."<isRealizedImplementation(); else osg::notify(osg::NOTICE)<<"GraphicsWindow::isRealizedImplementation() not implemented."<closeImplementation(); else osg::notify(osg::NOTICE)<<"GraphicsWindow::closeImplementation() not implemented."<makeCurrentImplementation(); else osg::notify(osg::NOTICE)<<"GraphicsWindow::makeCurrentImplementation() not implemented."<makeContextCurrentImplementation(readContext); else osg::notify(osg::NOTICE)<<"GraphicsWindow::makeContextCurrentImplementation(..) not implemented."<bindPBufferToTextureImplementation(buffer) else osg::notify(osg::NOTICE)<<"GraphicsWindow::void bindPBufferToTextureImplementation(..) not implemented."<swapBuffersImplementation() else osg::notify(osg::NOTICE)<<"GraphicsWindow:: swapBuffersImplementation() not implemented."<requestRedraw(); } - - // Override from GUIActionAdapter - virtual void requestContinuousUpdate(bool needed=true) { if (_gw.valid()) _gw->tequestContinuousUpdate(needed); } - - // Override from GUIActionAdapter - virtual void requestWarpPointer(float x,float y) { if (_gw.valid()) _gw->requestWarpPointer(x,y); } - - - protected: - - osg::ref_ptr _gw; - -}; - - -} - -#endif diff --git a/src/osgWrappers/osgViewer/GNUmakefile b/src/osgWrappers/osgViewer/GNUmakefile index 70c2c4217..185f4963d 100644 --- a/src/osgWrappers/osgViewer/GNUmakefile +++ b/src/osgWrappers/osgViewer/GNUmakefile @@ -4,7 +4,6 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ CompositeViewer.cpp\ GraphicsWindow.cpp\ - GraphicsWindowProxy.cpp\ Scene.cpp\ SimpleViewer.cpp\ View.cpp\ diff --git a/src/osgWrappers/osgViewer/GraphicsWindowProxy.cpp b/src/osgWrappers/osgViewer/GraphicsWindowProxy.cpp deleted file mode 100644 index 4886b3ac5..000000000 --- a/src/osgWrappers/osgViewer/GraphicsWindowProxy.cpp +++ /dev/null @@ -1,86 +0,0 @@ -// *************************************************************************** -// -// Generated automatically by genwrapper. -// Please DO NOT EDIT this file! -// -// *************************************************************************** - -#include -#include -#include -#include - -#include -#include -#include - -// Must undefine IN and OUT macros defined in Windows headers -#ifdef IN -#undef IN -#endif -#ifdef OUT -#undef OUT -#endif - -BEGIN_OBJECT_REFLECTOR(osgViewer::GraphicsWindowProxy) - I_BaseType(osgViewer::GraphicsWindow); - I_Constructor0(____GraphicsWindowProxy, - "", - ""); - I_Method1(void, setGraphicsWindowImplentation, IN, osgViewer::GraphicsWindow *, gw, - __void__setGraphicsWindowImplentation__osgViewer_GraphicsWindow_P1, - "", - ""); - I_Method0(osgViewer::GraphicsWindow *, getGraphicsWindowImplentation, - __osgViewer_GraphicsWindow_P1__getGraphicsWindowImplentation, - "", - ""); - I_Method0(const osgViewer::GraphicsWindow *, getGraphicsWindowImplentation, - __C5_osgViewer_GraphicsWindow_P1__getGraphicsWindowImplentation, - "", - ""); - I_Method0(bool, realizeImplementation, - __bool__realizeImplementation, - "Realise the GraphicsContext implementation, Pure virtual - must be implemented by concrate implementations of GraphicsContext. ", - ""); - I_Method0(bool, isRealizedImplementation, - __bool__isRealizedImplementation, - "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. "); - I_Method0(void, closeImplementation, - __void__closeImplementation, - "Close the graphics context implementation. ", - "Pure virtual - must be implemented by concrate implementations of GraphicsContext. "); - I_Method0(void, makeCurrentImplementation, - __void__makeCurrentImplementation, - "Make this graphics context current implementation. ", - "Pure virtual - must be implemented by concrate implementations of GraphicsContext. "); - I_Method1(void, makeContextCurrentImplementation, IN, osg::GraphicsContext *, readContext, - __void__makeContextCurrentImplementation__GraphicsContext_P1, - "Make this graphics context current with specified read context implementation. ", - "Pure virtual - must be implemented by concrate implementations of GraphicsContext. "); - I_Method1(void, bindPBufferToTextureImplementation, IN, GLenum, buffer, - __void__bindPBufferToTextureImplementation__GLenum, - "Pure virtual, Bind the graphics context to associated texture implementation. ", - "Pure virtual - must be implemented by concrate implementations of GraphicsContext. "); - I_Method0(void, swapBuffersImplementation, - __void__swapBuffersImplementation, - "Swap the front and back buffers implementation. ", - "Pure virtual - must be implemented by Concrate implementations of GraphicsContext. "); - I_Method0(void, requestRedraw, - __void__requestRedraw, - "requestRedraw() requests a single redraw. ", - ""); - I_MethodWithDefaults1(void, requestContinuousUpdate, IN, bool, needed, true, - __void__requestContinuousUpdate__bool, - "requestContinousUpdate(bool) is for en/disabling a throw or idle callback to be requested by a GUIEventHandler (typically a MatrixManipulator, though other GUIEventHandler's may also provide functionality). ", - "GUI toolkits can respond to this immediately by registering an idle/timed callback, or can delay setting the callback and update at their own leisure."); - I_Method2(void, requestWarpPointer, IN, float, x, IN, float, y, - __void__requestWarpPointer__float__float, - "requestWarpPointer(int,int) is requesting a repositioning of the mouse pointer to a specified x,y location on the window. ", - "This is used by some camera manipulators to initialise the mouse pointer when mouse position relative to a controls neutral mouse position is required, i.e when mimicking a aircrafts joystick."); - I_SimpleProperty(osgViewer::GraphicsWindow *, GraphicsWindowImplentation, - __osgViewer_GraphicsWindow_P1__getGraphicsWindowImplentation, - __void__setGraphicsWindowImplentation__osgViewer_GraphicsWindow_P1); -END_REFLECTOR -