diff --git a/examples/osgkdtree/CMakeLists.txt b/examples/osgkdtree/CMakeLists.txt index 00f88e1cd..ff0b86fe6 100644 --- a/examples/osgkdtree/CMakeLists.txt +++ b/examples/osgkdtree/CMakeLists.txt @@ -1,4 +1,13 @@ -SET(TARGET_SRC osgkdtree.cpp ) +SET(TARGET_SRC + fixeddivision.cpp + osgkdtree.cpp +) + +SET(TARGET_H + fixeddivision.h +) + + SET(TARGET_ADDED_LIBRARIES osgSim ) #### end var setup ### diff --git a/examples/osgkdtree/fixeddivision.cpp b/examples/osgkdtree/fixeddivision.cpp new file mode 100644 index 000000000..5ecf81cf6 --- /dev/null +++ b/examples/osgkdtree/fixeddivision.cpp @@ -0,0 +1,491 @@ +/* OpenSceneGraph example, osgintersection. +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +*/ + + +#include "fixeddivision.h" + +namespace fixeddivision +{ + +struct TriangleIndicesCollector +{ + TriangleIndicesCollector(): + _indices(0) + { + } + + inline void operator () (unsigned int v1, unsigned int v2, unsigned int v3) + { + _indices->push_back(v1); + _indices->push_back(v2); + _indices->push_back(v3); + } + + Indices* _indices; + +}; + +KDTree* KDTreeBuilder::createKDTree(osg::Geometry* geometry) +{ +#ifdef VERBOSE_OUTPUT + osg::notify(osg::NOTICE)<<"osg::KDTreeBuilder::createKDTree()"<(geometry->getVertexArray()); + if (!vertices) return 0; + + if (vertices->size() <= _targetNumVerticesPerLeaf) return 0; + + osg::ref_ptr kdTree = new KDTree; + kdTree->_geometry = geometry; + kdTree->_bb = kdTree->_geometry->getBound(); + kdTree->_vertices = vertices; + + unsigned int estimatedSize = (unsigned int)(2.0*float(vertices->size())/float(_targetNumVerticesPerLeaf)); + +#ifdef VERBOSE_OUTPUT + osg::notify(osg::NOTICE)<<"kdTree->_kdNodes.reserve()="<_kdNodes.reserve(estimatedSize); + kdTree->_kdLeaves.reserve(estimatedSize); + + computeDivisions(*kdTree); + + + _numVerticesProcessed += vertices->size(); + + if (_processTriangles) + { + + osg::TriangleIndexFunctor collectTriangleIndices; + collectTriangleIndices._indices = &(kdTree->_vertexIndices); + geometry->accept(collectTriangleIndices); + + KDPrimitiveLeaf* primitiveLeaf = createKDPrimitiveLeaf(); + primitiveLeaf->_indices.insert(primitiveLeaf->_indices.end(), + kdTree->_vertexIndices.begin(), + kdTree->_vertexIndices.end()); + + // osg::notify(osg::NOTICE)<<"kdTree->_vertexIndices.size()="<_vertexIndices.size()<addPrimitiveLeaf(primitiveLeaf); + + osg::BoundingBox bb = kdTree->_bb; + int nodeNum = divideTriangles(*kdTree, bb, leafNum, 0); + + std::cout<<"_vertexIndices.size() = "<_vertexIndices.size()<_kdNodes.size()="<_kdNodes.size()<_kdLeaves.size()="<_kdLeaves.size()<_kdNodes.size()="<_kdNodes.size()<<" estimated size = "<_kdLeaves.size()="<_kdLeaves.size()<<" estimated size = "<=dimensions[1]) + { + if (dimensions[0]>=dimensions[2]) axis = 0; + else axis = 2; + } + else if (dimensions[1]>=dimensions[2]) axis = 1; + else axis = 2; + + kdTree._axisStack.push_back(axis); + dimensions[axis] /= 2.0f; + +#ifdef VERBOSE_OUTPUT + osg::notify(osg::NOTICE)<<" "<_indices.size()<=_targetNumIndicesPerLeaf) return nodeIndex; + +#ifdef VERBOSE_OUTPUT + osg::notify(osg::NOTICE)<<" divide leaf"<_indices; + +#ifdef VERBOSE_OUTPUT + osg::notify(osg::NOTICE)<<" divide leaf->_indices.size()="<_indices.size()< leftLeaf = createKDPrimitiveLeaf(); + osg::ref_ptr rightLeaf = createKDPrimitiveLeaf(); + + for(int i = 0; i0) + { + leftLeaf->_indices.push_back(i1); leftLeaf->_indices.push_back(i2); + leftLeaf->_indices.push_back(i3); + } + + if (numRight>0) + { + rightLeaf->_indices.push_back(i1); + rightLeaf->_indices.push_back(i2); + rightLeaf->_indices.push_back(i3); + } +#if 0 + if (numRight>0 && numLeft>0) + { + std::cout<<"In both"<_indices.empty()) + { +#ifdef VERBOSE_OUTPUT + osg::notify(osg::NOTICE)<<"LeftLeaf empty"<_indices.empty()) + { +#ifdef VERBOSE_OUTPUT + osg::notify(osg::NOTICE)<<"RightLeaf empty"<_vertexIndices.size()="<_vertexIndices.size()<mid) { --right; } + + if (left + +#include +#include +#include +#include +#include +#include +#include +#include + + +#include +#include +#include + +#include +#include +#include + +#include + + +namespace fixeddivision +{ + +typedef int value_type; +typedef std::vector< value_type > Indices; + +// #define VERBOSE_OUTPUT + +typedef std::pair< value_type, value_type> KDNode; +typedef std::pair< value_type, value_type> KDLeaf; + +struct Triangle +{ + Triangle(unsigned int p1, unsigned int p2, unsigned int p3): + _p1(p1), _p2(p2), _p3(p3) {} + + bool operator < (const Triangle& rhs) const + { + if (_p1rhs._p1) return false; + if (_p2rhs._p2) return false; + return _p3 AxisStack; + typedef std::vector< KDNode > KDNodeList; + + typedef std::vector< KDLeaf > KDLeafList; + + /// note, leafNum is negative to distinguish from nodeNum + int addLeaf(const KDLeaf& leaf) { int num = _kdLeaves.size(); _kdLeaves.push_back(leaf); return -(num+1); } + + int replaceLeaf(int leafNum, const KDLeaf& leaf) + { + int num = -leafNum-1; + + if (num>_kdLeaves.size()-1) + { + osg::notify(osg::NOTICE)<<"Warning: replaceChild("<=0) + { + KDNode& node = tree._kdNodes[nodeIndex]; + if (node.first) traverse(tree,node.first,level+1); + else output(level+1)<<"empty left child()"<asGeometry(); + if (geom) + { + geom->setShape(createKDTree(geom)); + } + } + } + + KDTree* createKDTree(osg::Geometry* geometry); + + void computeDivisions(KDTree& kdTree); + + int divideTriangles(KDTree& kdTree, osg::BoundingBox& bb, int nodeIndex, unsigned int level); + int dividePoints(KDTree& kdTree, osg::BoundingBox& bb, int nodeIndex, unsigned int level); + + unsigned int _maxNumLevels; + unsigned int _targetNumVerticesPerLeaf; + unsigned int _targetNumIndicesPerLeaf; + + unsigned int _numVerticesProcessed; + bool _processTriangles; + + inline void disposeKDPrimitiveLeaf(KDPrimitiveLeaf* leaf) + { + leaf->_indices.clear(); + _leafRecycleList.push_back(leaf); + } + + inline KDPrimitiveLeaf* createKDPrimitiveLeaf() + { + if (_leafRecycleList.empty()) return new KDPrimitiveLeaf; + osg::ref_ptr leaf = _leafRecycleList.back(); + _leafRecycleList.pop_back(); + return leaf.release(); + } + + typedef std::list< osg::ref_ptr > LeafRecyleList; + LeafRecyleList _leafRecycleList; + +}; + + +} diff --git a/examples/osgkdtree/osgkdtree.cpp b/examples/osgkdtree/osgkdtree.cpp index aa45d3e08..e3b1fc979 100644 --- a/examples/osgkdtree/osgkdtree.cpp +++ b/examples/osgkdtree/osgkdtree.cpp @@ -37,796 +37,23 @@ #include #include -#include +#include "fixeddivision.h" -namespace osg -{ - -typedef int value_type; -typedef std::vector< value_type > Indices; - -// #define VERBOSE_OUTPUT - -typedef std::pair< value_type, value_type> KDNode; -typedef std::pair< value_type, value_type> KDLeaf; - -struct Triangle -{ - Triangle(unsigned int p1, unsigned int p2, unsigned int p3): - _p1(p1), _p2(p2), _p3(p3) {} - - bool operator < (const Triangle& rhs) const - { - if (_p1rhs._p1) return false; - if (_p2rhs._p2) return false; - return _p3 AxisStack; - typedef std::vector< KDNode > KDNodeList; - - typedef std::vector< KDLeaf > KDLeafList; - - /// note, leafNum is negative to distinguish from nodeNum - int addLeaf(const KDLeaf& leaf) { int num = _kdLeaves.size(); _kdLeaves.push_back(leaf); return -(num+1); } - - int replaceLeaf(int leafNum, const KDLeaf& leaf) - { - int num = -leafNum-1; - - if (num>_kdLeaves.size()-1) - { - osg::notify(osg::NOTICE)<<"Warning: replaceChild("<=0) - { - KDNode& node = tree._kdNodes[nodeIndex]; - if (node.first) traverse(tree,node.first,level+1); - else output(level+1)<<"empty left child()"<asGeometry(); - if (geom) - { - geom->setShape(createKDTree(geom)); - } - } - } - - KDTree* createKDTree(osg::Geometry* geometry); - - void computeDivisions(KDTree& kdTree); - - int divideTriangles(KDTree& kdTree, osg::BoundingBox& bb, int nodeIndex, unsigned int level); - int dividePoints(KDTree& kdTree, osg::BoundingBox& bb, int nodeIndex, unsigned int level); - - unsigned int _maxNumLevels; - unsigned int _targetNumVerticesPerLeaf; - unsigned int _targetNumIndicesPerLeaf; - - unsigned int _numVerticesProcessed; - bool _processTriangles; - - inline void disposeKDPrimitiveLeaf(KDPrimitiveLeaf* leaf) - { - leaf->_indices.clear(); - _leafRecycleList.push_back(leaf); - } - - inline KDPrimitiveLeaf* createKDPrimitiveLeaf() - { - if (_leafRecycleList.empty()) return new KDPrimitiveLeaf; - osg::ref_ptr leaf = _leafRecycleList.back(); - _leafRecycleList.pop_back(); - return leaf.release(); - } - - typedef std::list< osg::ref_ptr > LeafRecyleList; - LeafRecyleList _leafRecycleList; - -}; - -struct TriangleIndicesCollector -{ - TriangleIndicesCollector(): - _indices(0) - { - } - - inline void operator () (unsigned int v1, unsigned int v2, unsigned int v3) - { - _indices->push_back(v1); - _indices->push_back(v2); - _indices->push_back(v3); - } - - Indices* _indices; - -}; - -KDTree* KDTreeBuilder::createKDTree(osg::Geometry* geometry) -{ -#ifdef VERBOSE_OUTPUT - osg::notify(osg::NOTICE)<<"osg::KDTreeBuilder::createKDTree()"<(geometry->getVertexArray()); - if (!vertices) return 0; - - if (vertices->size() <= _targetNumVerticesPerLeaf) return 0; - - osg::ref_ptr kdTree = new KDTree; - kdTree->_geometry = geometry; - kdTree->_bb = kdTree->_geometry->getBound(); - kdTree->_vertices = vertices; - - unsigned int estimatedSize = (unsigned int)(2.0*float(vertices->size())/float(_targetNumVerticesPerLeaf)); - -#ifdef VERBOSE_OUTPUT - osg::notify(osg::NOTICE)<<"kdTree->_kdNodes.reserve()="<_kdNodes.reserve(estimatedSize); - kdTree->_kdLeaves.reserve(estimatedSize); - - computeDivisions(*kdTree); - - - _numVerticesProcessed += vertices->size(); - - if (_processTriangles) - { - - osg::TriangleIndexFunctor collectTriangleIndices; - collectTriangleIndices._indices = &(kdTree->_vertexIndices); - geometry->accept(collectTriangleIndices); - - KDPrimitiveLeaf* primitiveLeaf = createKDPrimitiveLeaf(); - primitiveLeaf->_indices.insert(primitiveLeaf->_indices.end(), - kdTree->_vertexIndices.begin(), - kdTree->_vertexIndices.end()); - - // osg::notify(osg::NOTICE)<<"kdTree->_vertexIndices.size()="<_vertexIndices.size()<addPrimitiveLeaf(primitiveLeaf); - - osg::BoundingBox bb = kdTree->_bb; - int nodeNum = divideTriangles(*kdTree, bb, leafNum, 0); - - std::cout<<"_vertexIndices.size() = "<_vertexIndices.size()<_kdNodes.size()="<_kdNodes.size()<_kdLeaves.size()="<_kdLeaves.size()<_kdNodes.size()="<_kdNodes.size()<<" estimated size = "<_kdLeaves.size()="<_kdLeaves.size()<<" estimated size = "<=dimensions[1]) - { - if (dimensions[0]>=dimensions[2]) axis = 0; - else axis = 2; - } - else if (dimensions[1]>=dimensions[2]) axis = 1; - else axis = 2; - - kdTree._axisStack.push_back(axis); - dimensions[axis] /= 2.0f; - -#ifdef VERBOSE_OUTPUT - osg::notify(osg::NOTICE)<<" "<_indices.size()<=_targetNumIndicesPerLeaf) return nodeIndex; - -#ifdef VERBOSE_OUTPUT - osg::notify(osg::NOTICE)<<" divide leaf"<_indices; - -#ifdef VERBOSE_OUTPUT - osg::notify(osg::NOTICE)<<" divide leaf->_indices.size()="<_indices.size()< leftLeaf = createKDPrimitiveLeaf(); - osg::ref_ptr rightLeaf = createKDPrimitiveLeaf(); - - for(int i = 0; i0) - { - leftLeaf->_indices.push_back(i1); leftLeaf->_indices.push_back(i2); - leftLeaf->_indices.push_back(i3); - } - - if (numRight>0) - { - rightLeaf->_indices.push_back(i1); - rightLeaf->_indices.push_back(i2); - rightLeaf->_indices.push_back(i3); - } -#if 0 - if (numRight>0 && numLeft>0) - { - std::cout<<"In both"<_indices.empty()) - { -#ifdef VERBOSE_OUTPUT - osg::notify(osg::NOTICE)<<"LeftLeaf empty"<_indices.empty()) - { -#ifdef VERBOSE_OUTPUT - osg::notify(osg::NOTICE)<<"RightLeaf empty"<_vertexIndices.size()="<_vertexIndices.size()<mid) { --right; } - - if (left scene = osgDB::readNodeFiles(arguments); if (!scene) @@ -841,17 +68,28 @@ int main(int argc, char **argv) scene->accept(updateVisitor); scene->getBound(); + if (arguments.read("--fd")) + { + fixeddivision::KDTreeBuilder builder; - osg::Timer_t start = osg::Timer::instance()->tick(); - - - scene->accept(builder); - - osg::Timer_t end = osg::Timer::instance()->tick(); - double time = osg::Timer::instance()->delta_s(start,end); - osg::notify(osg::NOTICE)<<"Time to build "<tick(); + + + scene->accept(builder); + + osg::Timer_t end = osg::Timer::instance()->tick(); + double time = osg::Timer::instance()->delta_s(start,end); + osg::notify(osg::NOTICE)<<"Time to build "<