Changed the DatabasePager so that it bypasses the Registry::readNode() method and calls
readNodeImplementation() directly to avoid calling the KdTreeBuilder. Updated wrappers.
This commit is contained in:
@@ -227,6 +227,10 @@ class OSG_EXPORT KdTreeBuilder : public osg::NodeVisitor
|
||||
|
||||
KdTreeBuilder();
|
||||
|
||||
KdTreeBuilder(const KdTreeBuilder& rhs);
|
||||
|
||||
virtual KdTreeBuilder* clone() { return new KdTreeBuilder(*this); }
|
||||
|
||||
void apply(osg::Geode& geode);
|
||||
|
||||
KdTree::BuildOptions _buildOptions;
|
||||
|
||||
@@ -104,6 +104,8 @@ class OSGDB_EXPORT DatabasePager : public osg::NodeVisitor::DatabaseRequestHandl
|
||||
|
||||
virtual void run();
|
||||
|
||||
osg::ref_ptr<osg::Node> dpReadRefNodeFile(const std::string& fileName,const ReaderWriter::Options* options);
|
||||
|
||||
protected:
|
||||
|
||||
virtual ~DatabaseThread();
|
||||
|
||||
@@ -320,7 +320,8 @@ class OSGDB_EXPORT Registry : public osg::Referenced
|
||||
|
||||
if (doKdTreeBuilder && _kdTreeBuilder.valid() && result.validNode())
|
||||
{
|
||||
result.getNode()->accept(*_kdTreeBuilder);
|
||||
osg::ref_ptr<osg::KdTreeBuilder> builder = _kdTreeBuilder->clone();
|
||||
result.getNode()->accept(*builder);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user