Changeset 10341

Timestamp:

06/12/09 12:08:15 (4 years ago)

Author:

robert

Message:

From Mathias Froehlich, "attached is a change to the ProxyNode? that also includes ProxyNode? local
database options like recently added to PagedLOD.

Also there is a change to the traverse method:
The previous ProxyNode? checks the VisitorType? to be a CULL_VISITOR and the
presence of a request handler to submit a database request.
In contrast to that PagedLOD uses the request handler if it is there - even if
the visitor type is not a cull visitor.
The change removes the cull visitor test from the ProxyNode? so that it behaves
like the PagedLOD.
I believe that the presence of a request handler in a visitor might be
sufficient to trigger the requests as this is done in the PagedLOD anyway.

Based on rev 10332."

Location:

OpenSceneGraph/trunk

Files:

• include/osg/ProxyNode (modified) (2 diffs)
• src/osg/ProxyNode.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/include/osg/ProxyNode

@@ -41 +41 @@
         
         virtual bool removeChildren(unsigned int pos,unsigned int numChildrenToRemove);
+
+
+        /** Set the optional database osgDB::Options object to use when loaded children.*/
+        void setDatabaseOptions(osg::Referenced* options) { _databaseOptions = options; }
+
+        /** Get the optional database osgDB::Options object used when loaded children.*/
+        osg::Referenced* getDatabaseOptions() { return _databaseOptions.get(); }
+
+        /** Get the optional database osgDB::Options object used when loaded children.*/
+        const osg::Referenced* getDatabaseOptions() const { return _databaseOptions.get(); }
+
 
         /** Set the database path to prepend to children's filenames.*/
@@ -115 +126 @@
 
         FileNameDatabaseRequestList     _filenameList;
+        ref_ptr<Referenced>             _databaseOptions;
         std::string                     _databasePath;
         

OpenSceneGraph/trunk/src/osg/ProxyNode.cpp

@@ -28 +28 @@
     Group(proxynode,copyop),
     _filenameList(proxynode._filenameList),
+    _databaseOptions(proxynode._databaseOptions),
+    _databasePath(proxynode._databasePath),
     _loadingExtReference(proxynode._loadingExtReference),
     _centerMode(proxynode._centerMode),
@@ -58 +60 @@
 {
     if (nv.getDatabaseRequestHandler() && _filenameList.size()>_children.size() &&
-        nv.getVisitorType()==NodeVisitor::CULL_VISITOR &&
         _loadingExtReference!=NO_AUTOMATIC_LOADING)
     {
         for(unsigned int i=_children.size(); i<_filenameList.size(); ++i)
         {
-            nv.getDatabaseRequestHandler()->requestNodeFile(_databasePath+_filenameList[i].first, this, 1.0f, nv.getFrameStamp(), _filenameList[i].second);
+            nv.getDatabaseRequestHandler()->requestNodeFile(_databasePath+_filenameList[i].first, this, 1.0f, nv.getFrameStamp(), _filenameList[i].second, _databaseOptions.get());
         }
     }