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

Fixed build errors in osgViewer

Browse Source
This commit is contained in:
Robert Osfield 2006-11-28 20:35:31 +00:00
parent 4fa214fb40
commit b6e1924192
7 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/osgViewer/CompositeViewer
View File

@ -29,10 +29,12 @@ class OSGVIEWER_EXPORT CompositeViewer : public osg::Referenced
CompositeViewer();
virtual ~CompositeViewer();
void addView(osgViewer* view);
osgViewer* getView(unsigned i) { return _views[i].get(); }
const osgViewer* getView(unsigned i) const { return _views[i].get(); }
void getNumViews() const { return _views.size(); }
void addView(osgViewer::View* view);
osgViewer::View* getView(unsigned i) { return _views[i].get(); }
const osgViewer::View* getView(unsigned i) const { return _views[i].get(); }
unsigned int getNumViews() const { return _views.size(); }
/** Render a complete new frame.
* Calls frameAdvance(), frameEventTraversal(), frameUpateTraversal(), frameCullTraversal() and frameDrawTraversal().
@ -57,7 +59,7 @@ class OSGVIEWER_EXPORT CompositeViewer : public osg::Referenced
protected:
typedef std::vector< osg::ref_ptr<osg:Viewer:View> > Views;
typedef std::vector< osg::ref_ptr<osgViewer::View> > Views;
Views _views;
};

1
include/osgViewer/GraphicsWindow
View File

@ -18,6 +18,7 @@
#include <osg/Notify>
#include <osgGA/EventQueue>
#include <osgGA/GUIActionAdapter>
#include <osgViewer/Export>

8
include/osgViewer/View
View File

@ -18,13 +18,14 @@
#include <osgGA/MatrixManipulator>
#include <osgViewer/Scene>
namespace osgViewer {
/** View holds a single view on a scene, this view may be composed of one or more slave cameras.*/
class OSGVIEWER_EXPORT View : public virtual osg::View, public osgViewer::Scene
class OSGVIEWER_EXPORT View : public virtual osg::View, public virtual osgViewer::Scene
{
public:
View();
virtual ~View();
void setSceneData(osg::Node* node);
osg::Node* getSceneData();
@ -46,6 +47,7 @@ class OSGVIEWER_EXPORT View : public virtual osg::View, public osgViewer::Scene
protected:
virtual ~View();
osg::ref_ptr<osgViewer::Scene> _scene;
@ -55,4 +57,6 @@ class OSGVIEWER_EXPORT View : public virtual osg::View, public osgViewer::Scene
};
}
#endif

2
include/osgViewer/Viewer
View File

@ -17,7 +17,7 @@
#include <osgViewer/GraphicsWindow>
#include <osgViewer/View>
namespace osgViewer{
namespace osgViewer {
// WARNING ** Under development do not use, yet :-)

2
src/osgViewer/CompositeViewer.cpp
View File

@ -15,7 +15,7 @@
using namespace osgViewer;
CompositeViewer::CompositeViewer():
CompositeViewer::CompositeViewer()
{
}

4
src/osgViewer/GNUmakefile
View File

@ -4,8 +4,10 @@ include $(TOPDIR)/Make/makedefs
CXXFILES = \
SimpleViewer.cpp\
Scene.cpp\
View.cpp\
Scene.cpp\
Viewer.cpp\
CompositeViewer.cpp\
Version.cpp\
DEF += -DOSGVIEWER_LIBRARY

2
src/osgViewer/Viewer.cpp
View File

@ -15,7 +15,7 @@
using namespace osgViewer;
Viewer::Viewer():
Viewer::Viewer()
{
}