Added support for passing in ArgumentParser in Viewer and CompositeViewer constructor

This commit is contained in:
Robert Osfield
2007-06-06 10:57:02 +00:00
parent 3199d7bc85
commit 6e3c9ad3d3
5 changed files with 87 additions and 31 deletions

View File

@@ -14,6 +14,7 @@
#ifndef OSGVIEWER_CompositeViewer
#define OSGVIEWER_CompositeViewer 1
#include <osg/ArgumentParser>
#include <osgViewer/GraphicsWindow>
#include <osgViewer/View>
@@ -25,6 +26,9 @@ class OSGVIEWER_EXPORT CompositeViewer : public osg::Referenced
public:
CompositeViewer();
CompositeViewer(osg::ArgumentParser& arguments);
virtual ~CompositeViewer();
void addView(osgViewer::View* view);
@@ -160,7 +164,10 @@ class OSGVIEWER_EXPORT CompositeViewer : public osg::Referenced
protected:
void constructorInit();
void init();
void checkWindowStatus();
typedef std::vector< osg::ref_ptr<osgViewer::View> > Views;

View File

@@ -14,9 +14,11 @@
#ifndef OSGVIEWER_Viewer
#define OSGVIEWER_Viewer 1
#include <osg/ArgumentParser>
#include <osgGA/EventVisitor>
#include <osgViewer/GraphicsWindow>
#include <osgViewer/View>
#include <osgGA/EventVisitor>
namespace osgViewer {
@@ -26,6 +28,9 @@ class OSGVIEWER_EXPORT Viewer : public osgViewer::View
public:
Viewer();
Viewer(osg::ArgumentParser& arguments);
virtual ~Viewer();
/** Get whether at least of one of this viewers windows are realized.*/
@@ -175,6 +180,8 @@ class OSGVIEWER_EXPORT Viewer : public osgViewer::View
protected:
void constructorInit();
void checkWindowStatus();
inline void makeCurrent(osg::GraphicsContext* gc)