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

osg: KdTree: encode original primitive index into _vertexIndices

Browse Source
This commit is contained in:
blobfish 2017-06-01 15:25:38 -04:00
parent b52bc2bcd1
commit bb804c2045
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/osg/KdTree
View File

@ -69,41 +69,45 @@ class OSG_EXPORT KdTree : public osg::Shape
inline unsigned int addPoint(unsigned int p0) inline unsigned int addPoint(unsigned int p0)
{ {
unsigned int i = _vertexIndices.size(); unsigned int i = _vertexIndices.size();
_primitiveIndices.push_back(i); _vertexIndices.push_back(_primitiveIndices.size());
_vertexIndices.push_back(1); _vertexIndices.push_back(1);
_vertexIndices.push_back(p0); _vertexIndices.push_back(p0);
_primitiveIndices.push_back(i);
return i; return i;
} }
inline unsigned int addLine(unsigned int p0, unsigned int p1) inline unsigned int addLine(unsigned int p0, unsigned int p1)
{ {
unsigned int i = _vertexIndices.size(); unsigned int i = _vertexIndices.size();
_primitiveIndices.push_back(i); _vertexIndices.push_back(_primitiveIndices.size());
_vertexIndices.push_back(2); _vertexIndices.push_back(2);
_vertexIndices.push_back(p0); _vertexIndices.push_back(p0);
_vertexIndices.push_back(p1); _vertexIndices.push_back(p1);
_primitiveIndices.push_back(i);
return i; return i;
} }
inline unsigned int addTriangle(unsigned int p0, unsigned int p1, unsigned int p2) inline unsigned int addTriangle(unsigned int p0, unsigned int p1, unsigned int p2)
{ {
unsigned int i = _vertexIndices.size(); unsigned int i = _vertexIndices.size();
_primitiveIndices.push_back(i); _vertexIndices.push_back(_primitiveIndices.size());
_vertexIndices.push_back(3); _vertexIndices.push_back(3);
_vertexIndices.push_back(p0); _vertexIndices.push_back(p0);
_vertexIndices.push_back(p1); _vertexIndices.push_back(p1);
_vertexIndices.push_back(p2); _vertexIndices.push_back(p2);
_primitiveIndices.push_back(i);
return i; return i;
} }
inline unsigned int addQuad(unsigned int p0, unsigned int p1, unsigned int p2, unsigned int p3) inline unsigned int addQuad(unsigned int p0, unsigned int p1, unsigned int p2, unsigned int p3)
{ {
unsigned int i = _vertexIndices.size(); unsigned int i = _vertexIndices.size();
_primitiveIndices.push_back(i); _vertexIndices.push_back(_primitiveIndices.size());
_vertexIndices.push_back(4); _vertexIndices.push_back(4);
_vertexIndices.push_back(p0); _vertexIndices.push_back(p0);
_vertexIndices.push_back(p1); _vertexIndices.push_back(p1);
_vertexIndices.push_back(p2); _vertexIndices.push_back(p2);
_vertexIndices.push_back(p3); _vertexIndices.push_back(p3);
_primitiveIndices.push_back(i);
return i; return i;
} }
@ -154,13 +158,14 @@ class OSG_EXPORT KdTree : public osg::Shape
for(int i=istart; i<iend; ++i) for(int i=istart; i<iend; ++i)
{ {
unsigned int primitiveIndex = _primitiveIndices[i]; unsigned int primitiveIndex = _primitiveIndices[i];
unsigned int originalPIndex = _vertexIndices[primitiveIndex++];
unsigned int numVertices = _vertexIndices[primitiveIndex++]; unsigned int numVertices = _vertexIndices[primitiveIndex++];
switch(numVertices) switch(numVertices)
{ {
case(1): functor.intersect(_vertices.get(), i, _vertexIndices[primitiveIndex]); break; case(1): functor.intersect(_vertices.get(), originalPIndex, _vertexIndices[primitiveIndex]); break;
case(2): functor.intersect(_vertices.get(), i, _vertexIndices[primitiveIndex], _vertexIndices[primitiveIndex+1]); break; case(2): functor.intersect(_vertices.get(), originalPIndex, _vertexIndices[primitiveIndex], _vertexIndices[primitiveIndex+1]); break;
case(3): functor.intersect(_vertices.get(), i, _vertexIndices[primitiveIndex], _vertexIndices[primitiveIndex+1], _vertexIndices[primitiveIndex+2]); break; case(3): functor.intersect(_vertices.get(), originalPIndex, _vertexIndices[primitiveIndex], _vertexIndices[primitiveIndex+1], _vertexIndices[primitiveIndex+2]); break;
case(4): functor.intersect(_vertices.get(), i, _vertexIndices[primitiveIndex], _vertexIndices[primitiveIndex+1], _vertexIndices[primitiveIndex+2], _vertexIndices[primitiveIndex+3]); break; case(4): functor.intersect(_vertices.get(), originalPIndex, _vertexIndices[primitiveIndex], _vertexIndices[primitiveIndex+1], _vertexIndices[primitiveIndex+2], _vertexIndices[primitiveIndex+3]); break;
default : OSG_NOTICE<<"Warning: KdTree::intersect() encounted unsupported primitive size of "<<numVertices<<std::endl; break; default : OSG_NOTICE<<"Warning: KdTree::intersect() encounted unsupported primitive size of "<<numVertices<<std::endl; break;
} }
} }

1
src/osg/KdTree.cpp
View File

@ -287,6 +287,7 @@ int BuildKdTree::divide(KdTree::BuildOptions& options, osg::BoundingBox& bb, int
for(int i=istart; i<=iend; ++i) for(int i=istart; i<=iend; ++i)
{ {
unsigned int primitiveIndex = _kdTree.getPrimitiveIndices()[_primitiveIndices[i]]; unsigned int primitiveIndex = _kdTree.getPrimitiveIndices()[_primitiveIndices[i]];
primitiveIndex++; //skip original Primitive index
unsigned int numPoints = _kdTree.getVertexIndices()[primitiveIndex++]; unsigned int numPoints = _kdTree.getVertexIndices()[primitiveIndex++];
for(; numPoints>0; --numPoints) for(; numPoints>0; --numPoints)