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

Added removeNullTriangles() method to help removed triangles with coincedent corners.

Browse Source
This commit is contained in:
Robert Osfield
2006-11-22 15:38:59 +00:00
parent a22bede80f
commit 0a696dbdc7
2 changed files with 187 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
include/osgShadow/OccluderGeometry
View File

@@ -20,6 +20,7 @@
#include <osgShadow/Export>
namespace osgShadow {
/** OccluderGeometry provides a sepecialised geometry representation of objects in scene that occlude light and therefore cast shadows.
@@ -41,29 +42,70 @@ class OSGSHADOW_EXPORT OccluderGeometry : public osg::Drawable
virtual const char* className() const { return "OccluderGeometry"; }
typedef std::vector<osg::Vec3> Vec3List;
typedef std::vector<GLuint> UIntList;
struct Point
{
Point() {}
UIntList _edges;
};
typedef std::vector<Point> PointList;
struct Edge
{
Edge():
_p1(0),
_p2(0),
_t1(0),
_t2(0) {}
_t1(-1),
_t2(-1) {}
Edge(unsigned int p1, unsigned int p2, unsigned int t1, unsigned int t2):
Edge(unsigned int p1, unsigned int p2):
_p1(p1),
_p2(p2),
_t1(t1),
_t2(t2) {}
_t1(-1),
_t2(-1)
{
if (p1>p2)
{
// swap ordering so p1 is less than or equal to p2
_p1 = p2;
_p2 = p1;
}
}
inline bool operator < (const Edge& rhs) const
{
if (_p1 < rhs._p1) return true;
if (_p1 > rhs._p1) return false;
return (_p2 < rhs._p2);
}
bool addTriangle(unsigned int tri) const
{
if (_t1<0)
{
_t1 = tri;
return true;
}
else if (_t2<0)
{
_t2 = tri;
return true;
}
// argg more than two triangles assigned
return false;
}
unsigned int _p1;
unsigned int _p2;
unsigned int _t1;
unsigned int _t2;
mutable int _t1;
mutable int _t2;
};
typedef std::vector<osg::Vec3> Vec3List;
typedef std::vector<GLuint> UIntList;
typedef std::vector<Edge> EdgeList;
/** Compute an occluder geometry containing all the geometry in specified subgraph.*/
@@ -96,6 +138,7 @@ class OSGSHADOW_EXPORT OccluderGeometry : public osg::Drawable
void setUpInternalStructures();
void removeDuplicateVertices();
void removeNullTriangles();
void computeNormals();
void buildEdgeMaps();
@@ -104,6 +147,9 @@ class OSGSHADOW_EXPORT OccluderGeometry : public osg::Drawable
Vec3List _triangleNormals;
UIntList _triangleIndices;
PointList _points;
EdgeList _edges;
};
}

132
src/osgShadow/OccluderGeometry.cpp
View File

@@ -301,10 +301,14 @@ void OccluderGeometry::processGeometry(osg::Drawable* drawable, osg::Matrix* mat
void OccluderGeometry::setUpInternalStructures()
{
removeDuplicateVertices();
removeNullTriangles();
computeNormals();
buildEdgeMaps();
dirtyBound();
dirtyDisplayList();
}
@@ -427,6 +431,46 @@ void OccluderGeometry::removeDuplicateVertices()
osg::notify(osg::NOTICE)<<"OccluderGeometry::removeDuplicates() after = "<<_vertices.size()<<std::endl;
}
void OccluderGeometry::removeNullTriangles()
{
osg::notify(osg::NOTICE)<<"OccluderGeometry::removeNullTriangles()"<<std::endl;
UIntList::iterator lastValidItr = _triangleIndices.begin();
for(UIntList::iterator titr = _triangleIndices.begin();
titr != _triangleIndices.end();
)
{
UIntList::iterator currItr = titr;
GLuint p1 = *titr++;
GLuint p2 = *titr++;
GLuint p3 = *titr++;
if ((p1 != p2) && (p1 != p3) && (p2 != p3))
{
if (lastValidItr!=currItr)
{
*lastValidItr++ = p1;
*lastValidItr++ = p2;
*lastValidItr++ = p3;
}
else
{
lastValidItr = titr;
}
}
else
{
osg::notify(osg::NOTICE)<<"Null triangle"<<std::endl;
}
}
if (lastValidItr != _triangleIndices.end())
{
osg::notify(osg::NOTICE)<<"Pruning end - before "<<_triangleIndices.size()<<std::endl;
_triangleIndices.erase(lastValidItr,_triangleIndices.end());
osg::notify(osg::NOTICE)<<"Pruning end - after "<<_triangleIndices.size()<<std::endl;
}
}
void OccluderGeometry::computeNormals()
{
osg::notify(osg::NOTICE)<<"OccluderGeometry::computeNormals()"<<std::endl;
@@ -478,6 +522,94 @@ void OccluderGeometry::computeNormals()
void OccluderGeometry::buildEdgeMaps()
{
osg::notify(osg::NOTICE)<<"OccluderGeometry::buildEdgeMaps()"<<std::endl;
typedef std::set<Edge> EdgeSet;
EdgeSet edgeSet;
unsigned int numTriangleErrors = 0;
unsigned int triNo=0;
for(UIntList::iterator titr = _triangleIndices.begin();
titr != _triangleIndices.end();
++triNo)
{
GLuint p1 = *titr++;
GLuint p2 = *titr++;
GLuint p3 = *titr++;
{
Edge edge12(p1,p2);
EdgeSet::iterator itr = edgeSet.find(edge12);
if (itr == edgeSet.end())
{
if (!edge12.addTriangle(triNo)) ++numTriangleErrors;
edgeSet.insert(edge12);
}
else
{
if (!itr->addTriangle(triNo)) ++numTriangleErrors;
}
}
{
Edge edge23(p2,p3);
EdgeSet::iterator itr = edgeSet.find(edge23);
if (itr == edgeSet.end())
{
if (!edge23.addTriangle(triNo)) ++numTriangleErrors;
edgeSet.insert(edge23);
}
else
{
if (!itr->addTriangle(triNo)) ++numTriangleErrors;
}
}
{
Edge edge31(p3,p1);
EdgeSet::iterator itr = edgeSet.find(edge31);
if (itr == edgeSet.end())
{
if (!edge31.addTriangle(triNo)) ++numTriangleErrors;
edgeSet.insert(edge31);
}
else
{
if (!itr->addTriangle(triNo)) ++numTriangleErrors;
}
}
}
_edges.clear();
_edges.reserve(edgeSet.size());
unsigned int numEdgesWithNoTriangles = 0;
unsigned int numEdgesWithOneTriangles = 0;
unsigned int numEdgesWithTwoTriangles = 0;
for(EdgeSet::iterator eitr = edgeSet.begin();
eitr != edgeSet.end();
++eitr)
{
_edges.push_back(*eitr);
unsigned int numTriangles = ((eitr->_t1>=0)? 1:0) + ((eitr->_t2>=0)? 1:0);
switch(numTriangles)
{
case(0): ++numEdgesWithNoTriangles; break;
case(1): ++numEdgesWithOneTriangles; break;
default: ++numEdgesWithTwoTriangles; break;
}
}
osg::notify(osg::NOTICE)<<"Num of indices "<<_triangleIndices.size()<<std::endl;
osg::notify(osg::NOTICE)<<"Num of triangles "<<triNo<<std::endl;
osg::notify(osg::NOTICE)<<"Num of numTriangleErrors "<<numTriangleErrors<<std::endl;
osg::notify(osg::NOTICE)<<"Num of edges "<<edgeSet.size()<<std::endl;
osg::notify(osg::NOTICE)<<"Num of numEdgesWithNoTriangles "<<numEdgesWithNoTriangles<<std::endl;
osg::notify(osg::NOTICE)<<"Num of numEdgesWithOneTriangles "<<numEdgesWithOneTriangles<<std::endl;
osg::notify(osg::NOTICE)<<"Num of numEdgesWithTwoTriangles "<<numEdgesWithTwoTriangles<<std::endl;
}
void OccluderGeometry::drawImplementation(osg::RenderInfo& renderInfo) const