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

Refactored the way that the DatabasePager passes the Terrain decorator node onto the TerrainTile.

Browse Source 
The DatabasePager now passes the Terrain pointer into the ReaderWriter's via osgDB::Options object,
rather than pushing a NodePath containing the Terrain onto NodeVisitor.  This
change means that the DatabasePager nolonger needs to observer the whole NodePath and
will be lighter and quicker for it.

The change also means that ReadFileCallback can now run custom NodeVisitor's on the scene graph without
having to worry about TerrainTile's constructing scene graphs prior to the Terrain being assigned.

Also changed is the NodeVisitor::DatabaseRequestHandler which now requires a NodePath to the node that you wish
to add to rather than just the pointer to the node you wish to add to.  This is more robust when handling scenes
with multiple parental paths, whereas previously errors could have occurred due to the default of picking the first
available parental path.  This change means that subclasses of DatabasePager will need to be updated to use this new
function entry point.
This commit is contained in:
Robert Osfield
2011-01-12 19:29:24 +00:00
parent 762f8d5360
commit f61a6aa4e7
15 changed files with 119 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/osgDB/DatabasePager
View File

@@ -70,7 +70,7 @@ class OSGDB_EXPORT DatabasePager : public osg::NodeVisitor::DatabaseRequestHandl
/** Add a request to load a node file to end the the database request list.*/
virtual void requestNodeFile(const std::string& fileName,osg::Group* group,
virtual void requestNodeFile(const std::string& fileName, osg::NodePath& nodePath,
float priority, const osg::FrameStamp* framestamp,
osg::ref_ptr<osg::Referenced>& databaseRequest,
const osg::Referenced* options);
@@ -316,9 +316,12 @@ class OSGDB_EXPORT DatabasePager : public osg::NodeVisitor::DatabaseRequestHandl
double _timestampLastRequest;
float _priorityLastRequest;
unsigned int _numOfRequests;
osg::ObserverNodePath _observerNodePath;
osg::ref_ptr<osg::Node> _loadedModel;
osg::ref_ptr<Options> _loadOptions;
osg::observer_ptr<osg::Node> _terrain;
osg::observer_ptr<osg::Group> _group;
osg::ref_ptr<osg::Node> _loadedModel;
osg::ref_ptr<Options> _loadOptions;
osg::observer_ptr<osgUtil::IncrementalCompileOperation::CompileSet> _compileSet;

1
include/osgDB/InputStream
View File

@@ -25,6 +25,7 @@
#include <osg/PrimitiveSet>
#include <osgDB/ReaderWriter>
#include <osgDB/StreamOperator>
#include <osgDB/Options>
#include <iostream>
#include <sstream>

11
include/osgDB/Options
View File

@@ -15,6 +15,7 @@
#define OSGDB_OPTIONS 1
#include <osgDB/Callbacks>
#include <osg/ObserverNodePath>
#include <deque>
#include <list>
@@ -227,7 +228,6 @@ class OSGDB_EXPORT Options : public osg::Object
/** Get the callback to use inform the DatabasePager whether a file is located on local or remote file system.*/
FileLocationCallback* getFileLocationCallback() const { return _fileLocationCallback.get(); }
/** Set the FileCache that is used to manage local storage of files downloaded from the internet.*/
void setFileCache(FileCache* fileCache) { _fileCache = fileCache; }
@@ -235,6 +235,13 @@ class OSGDB_EXPORT Options : public osg::Object
FileCache* getFileCache() const { return _fileCache.get(); }
/** Set the terrain observer_ptr, use to decorate any osgTerrain subgraphs.*/
void setTerrain(osg::observer_ptr<osg::Node>& terrain) { _terrain = terrain; }
/** Get the terrain observer_ptr, use to decorate any osgTerrain subgraphs.*/
const osg::observer_ptr<osg::Node>& getTerrain() const { return _terrain; }
protected:
virtual ~Options() {}
@@ -257,6 +264,8 @@ class OSGDB_EXPORT Options : public osg::Object
osg::ref_ptr<FileLocationCallback> _fileLocationCallback;
osg::ref_ptr<FileCache> _fileCache;
osg::observer_ptr<osg::Node> _terrain;
};
}