diff --git a/src/osgWrappers/osg/KdTree.cpp b/src/osgWrappers/osg/KdTree.cpp index 79b916d4a..7408cf3c7 100644 --- a/src/osgWrappers/osg/KdTree.cpp +++ b/src/osgWrappers/osg/KdTree.cpp @@ -196,9 +196,9 @@ BEGIN_VALUE_REFLECTOR(osg::KdTree::KdLeaf) ____KdLeaf__value_type__value_type, "", ""); + I_PublicMemberProperty(osg::BoundingBox, bb); I_PublicMemberProperty(osg::KdTree::value_type, first); I_PublicMemberProperty(osg::KdTree::value_type, second); - I_PublicMemberProperty(osg::BoundingBox, bb); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::KdTree::KdNode) @@ -210,9 +210,9 @@ BEGIN_VALUE_REFLECTOR(osg::KdTree::KdNode) ____KdNode__value_type__value_type, "", ""); + I_PublicMemberProperty(osg::BoundingBox, bb); I_PublicMemberProperty(osg::KdTree::value_type, first); I_PublicMemberProperty(osg::KdTree::value_type, second); - I_PublicMemberProperty(osg::BoundingBox, bb); END_REFLECTOR TYPE_NAME_ALIAS(std::vector< unsigned int >, osg::KdTree::LineSegmentIntersection::IndexList) diff --git a/src/osgWrappers/osgUtil/IntersectionVisitor.cpp b/src/osgWrappers/osgUtil/IntersectionVisitor.cpp index f16c6f5e3..75daa90f7 100644 --- a/src/osgWrappers/osgUtil/IntersectionVisitor.cpp +++ b/src/osgWrappers/osgUtil/IntersectionVisitor.cpp @@ -59,6 +59,26 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::IntersectionVisitor) __C5_Intersector_P1__getIntersector, "Get the const intersector that will be used to intersect with the scene, and to store any hits that occur. ", ""); + I_Method1(void, setUseKdTreeWhenAvailable, IN, bool, useKdTrees, + Properties::NON_VIRTUAL, + __void__setUseKdTreeWhenAvailable__bool, + "Set whether the intersectors should use KdTrees when they are found on the scene graph. ", + ""); + I_Method0(bool, getUseKdTreeWhenAvailable, + Properties::NON_VIRTUAL, + __bool__getUseKdTreeWhenAvailable, + "Set whether the intersectors should use KdTrees. ", + ""); + I_Method1(void, setDoDummyTraversal, IN, bool, dummy, + Properties::NON_VIRTUAL, + __void__setDoDummyTraversal__bool, + "", + ""); + I_Method0(bool, getDoDummyTraversal, + Properties::NON_VIRTUAL, + __bool__getDoDummyTraversal, + "", + ""); I_Method1(void, setReadCallback, IN, osgUtil::IntersectionVisitor::ReadCallback *, rc, Properties::NON_VIRTUAL, __void__setReadCallback__ReadCallback_P1, @@ -234,6 +254,9 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::IntersectionVisitor) __void__pop_clone, "", ""); + I_SimpleProperty(bool, DoDummyTraversal, + __bool__getDoDummyTraversal, + __void__setDoDummyTraversal__bool); I_SimpleProperty(osgUtil::Intersector *, Intersector, __Intersector_P1__getIntersector, __void__setIntersector__Intersector_P1); @@ -246,6 +269,9 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::IntersectionVisitor) I_SimpleProperty(osgUtil::IntersectionVisitor::ReadCallback *, ReadCallback, __ReadCallback_P1__getReadCallback, __void__setReadCallback__ReadCallback_P1); + I_SimpleProperty(bool, UseKdTreeWhenAvailable, + __bool__getUseKdTreeWhenAvailable, + __void__setUseKdTreeWhenAvailable__bool); I_SimpleProperty(osg::RefMatrix *, ViewMatrix, __osg_RefMatrix_P1__getViewMatrix, 0);