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

Added return value to addViewport.

Browse Source
This commit is contained in:
Robert Osfield
2002-07-27 10:09:39 +00:00
parent 83a276a16a
commit 73b007fccb
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/osgGLUT/Viewer
View File

@@ -40,15 +40,15 @@ class OSGGLUT_EXPORT Viewer : public Window, public osgGA::GUIActionAdapter
* only available for backwards compatibility.*/
virtual void init(osg::Node* rootnode);
virtual void addViewport(osgUtil::SceneView* sv,
virtual unsigned int addViewport(osgUtil::SceneView* sv,
float x = 0.0, float y = 0.0,
float width = 1.0, float height = 1.0);
virtual void addViewport(osg::Node*,
virtual unsigned int addViewport(osg::Node*,
float x = 0.0, float y = 0.0,
float width = 1.0, float height = 1.0);
const int getNumViewports() const { return _viewportList.size(); }
const unsigned int getNumViewports() const { return _viewportList.size(); }
osgUtil::SceneView* getViewportSceneView(unsigned int pos)
{ return _viewportList[pos].sceneView.get(); }

12
src/osgGLUT/Viewer.cpp
View File

@@ -667,7 +667,7 @@ void Viewer::display()
// draw traverasal.
times[2].timeDraw=0.0f;
for(int i = 0; i < getNumViewports(); i++ )
for(unsigned int i = 0; i < getNumViewports(); i++ )
{
// application traverasal.
times[2].timeApp+=app(i);
@@ -1388,7 +1388,7 @@ bool Viewer::run()
}
void Viewer::addViewport(osgUtil::SceneView* sv,
unsigned int Viewer::addViewport(osgUtil::SceneView* sv,
float x, float y, float width, float height)
{
ViewportDef def;
@@ -1397,21 +1397,25 @@ void Viewer::addViewport(osgUtil::SceneView* sv,
def.viewport[1] = y;
def.viewport[2] = width;
def.viewport[3] = height;
unsigned int pos = _viewportList.size();
_viewportList.push_back(def);
return pos;
}
/**
* Adds a default SceneView referring to the passed scene graph root.
*/
void Viewer::addViewport(osg::Node* rootnode,
unsigned int Viewer::addViewport(osg::Node* rootnode,
float x, float y, float width, float height)
{
osgUtil::SceneView *sceneView = osgNew osgUtil::SceneView(_displaySettings.get());
sceneView->setDefaults();
sceneView->setSceneData(rootnode);
addViewport( sceneView, x, y, width, height );
return addViewport( sceneView, x, y, width, height );
}
void Viewer::init(osg::Node* rootnode)