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

From Robert Osfield and Carlo Camporesi, took submission from Carlo for adding LoadingExternalReferenceMode to ProxyNode and extended it

Browse Source 
to include a wider range of options, also completed implementation
This commit is contained in:
Robert Osfield
2008-02-25 15:07:35 +00:00
parent 49641debcb
commit 75b9a9c809
3 changed files with 62 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osg/ProxyNode.cpp
View File

@@ -18,6 +18,7 @@
using namespace osg;
ProxyNode::ProxyNode() :
_loadingExtReference(LOAD_IMMEDIATELY),
_centerMode(USER_DEFINED_CENTER),
_radius(-1)
{
@@ -26,6 +27,7 @@ ProxyNode::ProxyNode() :
ProxyNode::ProxyNode(const ProxyNode& proxynode,const CopyOp& copyop):
Group(proxynode,copyop),
_filenameList(proxynode._filenameList),
_loadingExtReference(proxynode._loadingExtReference),
_centerMode(proxynode._centerMode),
_userDefinedCenter(proxynode._userDefinedCenter),
_radius(proxynode._radius)
@@ -54,7 +56,9 @@ void ProxyNode::setDatabasePath(const std::string& path)
void ProxyNode::traverse(NodeVisitor& nv)
{
if (nv.getDatabaseRequestHandler() && _filenameList.size()>_children.size() && nv.getVisitorType()==NodeVisitor::CULL_VISITOR)
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)
{