FGFS-4.1/OpenSceneGraph
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added osgGA::GraphicsWindow base class that derives from osg::GraphicsContext but

Browse Source 
adds default overrides its pure virtue methods, and an EventQueue.
This commit is contained in:
Robert Osfield
2006-10-05 10:06:19 +00:00
parent 281865d7fc
commit 632df7f3ff
3 changed files with 94 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/osgGA/SimpleViewer
View File

@@ -14,9 +14,9 @@
#ifndef OSGGA_SimpleViewer
#define OSGGA_SimpleViewer 1
#include <osgGA/EventQueue>
#include <osgGA/EventVisitor>
#include <osgGA/MatrixManipulator>
#include <osgGA/GraphicsWindow>
#include <osgDB/DatabasePager>
@@ -25,7 +25,7 @@
namespace osgGA{
/** SimpleViewer provide a simple interface for setting up rendering of an scene graph, using a single camera view within a single window.*/
class OSGGA_EXPORT SimpleViewer : public osgGA::GUIActionAdapter, public osg::Referenced
class OSGGA_EXPORT SimpleViewer : public virtual osgGA::GraphicsWindow
{
public:
@@ -50,9 +50,6 @@ class OSGGA_EXPORT SimpleViewer : public osgGA::GUIActionAdapter, public osg::Re
EventHandlers& getEventHandlers() { return _eventHandlers; }
const EventHandlers& getEventHandlers() const { return _eventHandlers; }
EventQueue* getEventQueue() { return _eventQueue.get(); }
const EventQueue* getEventQueue() const { return _eventQueue.get(); }
void setDatabasePager(osgDB::DatabasePager* dp);
osgDB::DatabasePager* getDatabasePager() { return _databasePager.get(); }
const osgDB::DatabasePager* getDatabasePager() const { return _databasePager.get(); }
@@ -77,15 +74,6 @@ class OSGGA_EXPORT SimpleViewer : public osgGA::GUIActionAdapter, public osg::Re
public:
// Override from GUIActionAdapter
virtual void requestRedraw() {}
// Override from GUIActionAdapter
virtual void requestContinuousUpdate(bool /*needed*/=true) {}
// Override from GUIActionAdapter
virtual void requestWarpPointer(float /*x*/,float /*y*/) {}
osgUtil::SceneView* getSceneView() { return _sceneView.get(); }
const osgUtil::SceneView* getSceneView() const { return _sceneView.get(); }
@@ -100,8 +88,6 @@ class OSGGA_EXPORT SimpleViewer : public osgGA::GUIActionAdapter, public osg::Re
osg::ref_ptr<osgUtil::SceneView> _sceneView;
osg::ref_ptr<osgGA::EventQueue> _eventQueue;
osg::ref_ptr<osgGA::MatrixManipulator> _cameraManipulator;
EventHandlers _eventHandlers;