Added support for up sampling by dividing longest edges.
This commit is contained in:
Robert Osfield
parent
4bc13ec71b
commit
3936bcde9e
@ -133,7 +133,6 @@ int main( int argc, char **argv )
|
||||
|
||||
std::cout << "Time to load = "<<osg::Timer::instance()->delta_s(start_tick,end_tick)<<std::endl;
|
||||
|
||||
osgUtil::Simplifier simplifier(sampleRatio, maxError);
|
||||
|
||||
//loadedModel->accept(simplifier);
|
||||
|
||||
@ -166,10 +165,9 @@ int main( int argc, char **argv )
|
||||
{
|
||||
if (keyFlag == 1) ratio *= multiplier;
|
||||
if (keyFlag == 2) ratio /= multiplier;
|
||||
if (ratio>1.0f) ratio=1.0f;
|
||||
if (ratio<minRatio) ratio=minRatio;
|
||||
|
||||
simplifier.setSampleRatio(ratio);
|
||||
osgUtil::Simplifier simplifier(ratio, maxError);
|
||||
|
||||
std::cout<<"Runing osgUtil::Simplifier with SampleRatio="<<ratio<<" maxError="<<maxError<<" ...";
|
||||
std::cout.flush();
|
||||
|
||||
@ -63,8 +63,8 @@ class OSGUTIL_EXPORT Simplifier : public osg::NodeVisitor
|
||||
|
||||
virtual bool continueSimplificationImplementation(float nextError, unsigned int numOriginalPrimitives, unsigned int numRemainingPrimitives) const
|
||||
{
|
||||
if (nextError<=getMaximumError()) return true;
|
||||
return (float)numRemainingPrimitives > (float)numOriginalPrimitives * getSampleRatio();
|
||||
if (getSampleRatio()<1.0) return ((float)numRemainingPrimitives > ((float)numOriginalPrimitives) * getSampleRatio()) && nextError<=getMaximumError();
|
||||
else return ((float)numRemainingPrimitives < ((float)numOriginalPrimitives) * getSampleRatio());
|
||||
}
|
||||
|
||||
|
||||
@ -88,6 +88,7 @@ class OSGUTIL_EXPORT Simplifier : public osg::NodeVisitor
|
||||
/** simply the geometry, whilst protecting key points from being modified.*/
|
||||
void simplify(osg::Geometry& geometry, const IndexList& protectedPoints);
|
||||
|
||||
|
||||
protected:
|
||||
|
||||
float _sampleRatio;
|
||||
|
||||
@ -52,13 +52,17 @@ public:
|
||||
struct Point;
|
||||
|
||||
|
||||
EdgeCollapse() {}
|
||||
EdgeCollapse():
|
||||
_computeErrorMetricUsingLength(false) { osg::notify(osg::NOTICE)<<"EdgeCollapse() CONSTRUCTOR"<<std::endl; }
|
||||
|
||||
~EdgeCollapse();
|
||||
|
||||
void setGeometry(osg::Geometry* geometry, const Simplifier::IndexList& protectedPoints);
|
||||
osg::Geometry* getGeometry() { return _geometry; }
|
||||
|
||||
void setComputeErrorMetricUsingLength(bool flag) { _computeErrorMetricUsingLength = flag; }
|
||||
bool getComputeErrorMetricUsingLength() const { return _computeErrorMetricUsingLength; }
|
||||
|
||||
unsigned int getNumOfTriangles() { return _triangleSet.size(); }
|
||||
|
||||
Point* computeInterpolatedPoint(Edge* edge,float r) const
|
||||
@ -90,6 +94,12 @@ public:
|
||||
}
|
||||
|
||||
float computeErrorMetric(Edge* edge,Point* point) const
|
||||
{
|
||||
if (_computeErrorMetricUsingLength)
|
||||
{
|
||||
return (edge->_p1->_vertex - edge->_p2->_vertex).length();
|
||||
}
|
||||
else if (point)
|
||||
{
|
||||
typedef std::set< osg::ref_ptr<Triangle> > LocalTriangleSet ;
|
||||
LocalTriangleSet triangles;
|
||||
@ -113,6 +123,11 @@ public:
|
||||
|
||||
return error;
|
||||
}
|
||||
else
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
void updateErrorMetricForEdge(Edge* edge)
|
||||
{
|
||||
@ -130,14 +145,21 @@ public:
|
||||
_edgeSet.erase(keep_local_reference_to_edge);
|
||||
}
|
||||
|
||||
|
||||
edge->_proposedPoint = computeOptimalPoint(edge);
|
||||
|
||||
if (_computeErrorMetricUsingLength)
|
||||
{
|
||||
edge->setErrorMetric( computeErrorMetric( edge, edge->_proposedPoint.get()));
|
||||
}
|
||||
else
|
||||
{
|
||||
edge->updateMaxNormalDeviationOnEdgeCollapse();
|
||||
|
||||
if (edge->getMaxNormalDeviationOnEdgeCollapse()<=1.0f && !edge->isAdjacentToBoundary())
|
||||
edge->setErrorMetric( computeErrorMetric( edge, edge->_proposedPoint.get()));
|
||||
else
|
||||
edge->setErrorMetric( FLT_MAX );
|
||||
}
|
||||
|
||||
_edgeSet.insert(keep_local_reference_to_edge);
|
||||
}
|
||||
@ -156,6 +178,12 @@ public:
|
||||
{
|
||||
Edge* edge = itr->get();
|
||||
|
||||
if (_computeErrorMetricUsingLength)
|
||||
{
|
||||
edge->setErrorMetric( computeErrorMetric( edge, edge->_proposedPoint.get()));
|
||||
}
|
||||
else
|
||||
{
|
||||
edge->_proposedPoint = computeOptimalPoint(edge);
|
||||
edge->updateMaxNormalDeviationOnEdgeCollapse();
|
||||
|
||||
@ -164,6 +192,7 @@ public:
|
||||
else
|
||||
edge->setErrorMetric( FLT_MAX );
|
||||
|
||||
}
|
||||
_edgeSet.insert(edge);
|
||||
}
|
||||
}
|
||||
@ -187,6 +216,26 @@ public:
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
bool divideLongestEdge()
|
||||
{
|
||||
if (!_edgeSet.empty())
|
||||
{
|
||||
Edge* edge = const_cast<Edge*>(_edgeSet.rbegin()->get());
|
||||
|
||||
if (edge->getErrorMetric()==FLT_MAX)
|
||||
{
|
||||
osg::notify(osg::INFO)<<"divideLongestEdge() return false due to edge->getErrorMetric()==FLT_MAX"<<std::endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
osg::ref_ptr<Point> pNew = edge->_proposedPoint.valid()? edge->_proposedPoint : computeInterpolatedPoint(edge,0.5f);
|
||||
return (divideEdge(edge,pNew.get()));
|
||||
}
|
||||
osg::notify(osg::INFO)<<"divideLongestEdge() return false due to _edgeSet.empty()"<<std::endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
void copyBackToGeometry();
|
||||
|
||||
typedef std::vector<float> FloatList;
|
||||
@ -487,7 +536,7 @@ public:
|
||||
// detect if triangle is degenerate.
|
||||
if (p1==p2 || p2==p3 || p1==p3)
|
||||
{
|
||||
osg::notify(osg::NOTICE)<<" **** addTriangle failed - p1==p2 || p2==p3 || p1==p3"<<std::endl;
|
||||
// osg::notify(osg::NOTICE)<<" **** addTriangle failed - p1==p2 || p2==p3 || p1==p3"<<std::endl;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -639,6 +688,8 @@ public:
|
||||
edge->_p2 = p1;
|
||||
}
|
||||
|
||||
edge->setErrorMetric( computeErrorMetric( edge.get(), edge->_proposedPoint.get()));
|
||||
|
||||
EdgeSet::iterator itr = _edgeSet.find(edge);
|
||||
if (itr==_edgeSet.end())
|
||||
{
|
||||
@ -664,11 +715,11 @@ public:
|
||||
edge->_triangles.erase(triangle);
|
||||
if (edge->_triangles.empty())
|
||||
{
|
||||
// edge no longer in use, so need to delete.
|
||||
_edgeSet.erase(itr);
|
||||
|
||||
edge->_p1 = 0;
|
||||
edge->_p2 = 0;
|
||||
|
||||
// edge no longer in use, so need to delete.
|
||||
_edgeSet.erase(itr);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -911,6 +962,125 @@ public:
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
bool divideEdge(Edge* edge, Point* pNew)
|
||||
{
|
||||
// osg::notify(osg::NOTICE)<<"divideEdge("<<edge<<") before _edgeSet.size()="<<_edgeSet.size()<<" _triangleSet.size()="<<_triangleSet.size()<<std::endl;
|
||||
|
||||
// first collect the triangles associaged with edges that need deleting
|
||||
osg::ref_ptr<Edge> keep_edge_locally_referenced_to_prevent_premature_deletion = edge;
|
||||
TriangleSet triangles = edge->_triangles;
|
||||
|
||||
// osg::notify(osg::NOTICE)<<" numTriangles on edges "<<triangles.size()<<std::endl;
|
||||
|
||||
// unsigned int numTriangles1 = _triangleSet.size();
|
||||
// unsigned int numBoundaryEdges1 = computeNumBoundaryEdges();
|
||||
// unsigned int numEdges1 = _edgeSet.size();
|
||||
|
||||
typedef std::set< osg::ref_ptr<Edge> > LocalEdgeList;
|
||||
LocalEdgeList edges2UpdateErrorMetric;
|
||||
TriangleSet::iterator titr;
|
||||
|
||||
|
||||
// for each deleted triangle insert two new triangles
|
||||
for(titr = triangles.begin();
|
||||
titr != triangles.end();
|
||||
++titr)
|
||||
{
|
||||
Triangle* tri = const_cast<Triangle*>(titr->get());
|
||||
int edgeToReplace = 0;
|
||||
if (edge->_p1 == tri->_p1)
|
||||
{
|
||||
if (edge->_p2 == tri->_p2.get()) edgeToReplace = 1; // edge p1,p2
|
||||
else if (edge->_p2 == tri->_p3.get()) edgeToReplace = 3; // edge p3, p1
|
||||
}
|
||||
else if (edge->_p1 == tri->_p2.get())
|
||||
{
|
||||
if (edge->_p2 == tri->_p3.get()) edgeToReplace = 2; // edge p2,p3
|
||||
else if (edge->_p2 == tri->_p1.get()) edgeToReplace = 1; // edge p1, p2
|
||||
}
|
||||
else if (edge->_p1 == tri->_p3.get())
|
||||
{
|
||||
if (edge->_p2 == tri->_p1.get()) edgeToReplace = 3; // edge p3,p1
|
||||
else if (edge->_p2 == tri->_p2.get()) edgeToReplace = 2; // edge p2, p3
|
||||
}
|
||||
|
||||
Triangle* newTri1 = 0;
|
||||
Triangle* newTri2 = 0;
|
||||
switch(edgeToReplace)
|
||||
{
|
||||
case(0): // error, shouldn't get here.
|
||||
osg::notify(osg::NOTICE)<<"Error EdgeCollapse::divideEdge(Edge*,Point*) passed invalid edge."<<std::endl;
|
||||
return false;
|
||||
case(1): // p1, p2
|
||||
// osg::notify(osg::NOTICE)<<" // p1, p2 "<<std::endl;
|
||||
// osg::notify(osg::NOTICE)<<" newTri1 = addTriangle(tri->_p1.get(), pNew, tri->_p3.get());"<<std::endl;
|
||||
newTri1 = addTriangle(tri->_p1.get(), pNew, tri->_p3.get());
|
||||
// osg::notify(osg::NOTICE)<<" newTri2 = addTriangle(pNew, tri->_p2.get(), tri->_p3.get());"<<std::endl;
|
||||
newTri2 = addTriangle(pNew, tri->_p2.get(), tri->_p3.get());
|
||||
break;
|
||||
case(2): // p2, p3
|
||||
// osg::notify(osg::NOTICE)<<" // p2, p3"<<std::endl;
|
||||
// osg::notify(osg::NOTICE)<<" newTri1 = addTriangle(tri->_p1.get(), tri->_p2.get(), pNew);"<<std::endl;
|
||||
newTri1 = addTriangle(tri->_p1.get(), tri->_p2.get(), pNew);
|
||||
//osg::notify(osg::NOTICE)<<" newTri2 = addTriangle(tri->_p1.get(), pNew, tri->_p3.get());"<<std::endl;
|
||||
newTri2 = addTriangle(tri->_p1.get(), pNew, tri->_p3.get());
|
||||
break;
|
||||
case(3): // p3, p1
|
||||
// osg::notify(osg::NOTICE)<<" // p3, p1"<<std::endl;
|
||||
// osg::notify(osg::NOTICE)<<" newTri1 = addTriangle(tri->_p1.get(), tri->_p2.get(), pNew);"<<std::endl;
|
||||
newTri1 = addTriangle(tri->_p1.get(), tri->_p2.get(), pNew);
|
||||
// osg::notify(osg::NOTICE)<<" newTri2 = addTriangle(pNew, tri->_p2.get(), tri->_p3.get());"<<std::endl;
|
||||
newTri2 = addTriangle(pNew, tri->_p2.get(), tri->_p3.get());
|
||||
break;
|
||||
}
|
||||
|
||||
if (newTri1)
|
||||
{
|
||||
edges2UpdateErrorMetric.insert(newTri1->_e1.get());
|
||||
edges2UpdateErrorMetric.insert(newTri1->_e2.get());
|
||||
edges2UpdateErrorMetric.insert(newTri1->_e3.get());
|
||||
}
|
||||
if (newTri2)
|
||||
{
|
||||
edges2UpdateErrorMetric.insert(newTri2->_e1.get());
|
||||
edges2UpdateErrorMetric.insert(newTri2->_e2.get());
|
||||
edges2UpdateErrorMetric.insert(newTri2->_e3.get());
|
||||
}
|
||||
}
|
||||
|
||||
// unsigned int numTriangles2 = _triangleSet.size();
|
||||
// unsigned int numEdges2 = _edgeSet.size();
|
||||
// unsigned int numBoundaryEdges2 = computeNumBoundaryEdges();
|
||||
|
||||
// remove all the triangles associated with edge
|
||||
for(titr = triangles.begin();
|
||||
titr != triangles.end();
|
||||
++titr)
|
||||
{
|
||||
removeTriangle(const_cast<Triangle*>(titr->get()));
|
||||
}
|
||||
|
||||
for(LocalEdgeList::iterator itr=edges2UpdateErrorMetric.begin();
|
||||
itr!=edges2UpdateErrorMetric.end();
|
||||
++itr)
|
||||
{
|
||||
//osg::notify(osg::NOTICE)<<"updateErrorMetricForEdge("<<itr->get()<<")"<<std::endl;
|
||||
if (itr->valid()) updateErrorMetricForEdge(const_cast<Edge*>(itr->get()));
|
||||
}
|
||||
|
||||
// unsigned int numBoundaryEdges3 = computeNumBoundaryEdges();
|
||||
// unsigned int numEdges3 = _edgeSet.size();
|
||||
// unsigned int numTriangles3 = _triangleSet.size();
|
||||
|
||||
// osg::notify(osg::NOTICE)<<" numTriangles1="<<numTriangles1<<" numTriangles2="<<numTriangles2<<" numTriangles3="<<numTriangles3<<std::endl;
|
||||
// osg::notify(osg::NOTICE)<<" numEdges1="<<numEdges1<<" numEdges2="<<numEdges2<<" numEdges3="<<numEdges3<<std::endl;
|
||||
// osg::notify(osg::NOTICE)<<" numBoundaryEdges1="<<numBoundaryEdges1<<" numBoundaryEdges2="<<numBoundaryEdges2<<" numBoundaryEdges3="<<numBoundaryEdges3<<std::endl;
|
||||
// osg::notify(osg::NOTICE)<<"divideEdge("<<edge<<") after _edgeSet.size()="<<_edgeSet.size()<<" _triangleSet.size()="<<_triangleSet.size()<<std::endl;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
unsigned int testEdge(Edge* edge)
|
||||
{
|
||||
unsigned int numErrors = 0;
|
||||
@ -1043,6 +1213,7 @@ public:
|
||||
|
||||
osg::Geometry* _geometry;
|
||||
|
||||
bool _computeErrorMetricUsingLength;
|
||||
EdgeSet _edgeSet;
|
||||
TriangleSet _triangleSet;
|
||||
PointSet _pointSet;
|
||||
@ -1530,12 +1701,14 @@ void Simplifier::simplify(osg::Geometry& geometry, const IndexList& protectedPoi
|
||||
osg::notify(osg::INFO)<<"++++++++++++++simplifier************"<<std::endl;
|
||||
|
||||
EdgeCollapse ec;
|
||||
ec.setComputeErrorMetricUsingLength(getSampleRatio()>=1.0);
|
||||
ec.setGeometry(&geometry, protectedPoints);
|
||||
|
||||
ec.updateErrorMetricForAllEdges();
|
||||
|
||||
unsigned int numOriginalPrimitives = ec._triangleSet.size();
|
||||
|
||||
if (getSampleRatio()<1.0)
|
||||
{
|
||||
while (!ec._edgeSet.empty() &&
|
||||
continueSimplification((*ec._edgeSet.begin())->getErrorMetric() , numOriginalPrimitives, ec._triangleSet.size()) &&
|
||||
ec.collapseMinimumErrorEdge())
|
||||
@ -1544,6 +1717,20 @@ void Simplifier::simplify(osg::Geometry& geometry, const IndexList& protectedPoi
|
||||
}
|
||||
|
||||
osg::notify(osg::INFO)<<"******* AFTER EDGE COLLAPSE *********"<<ec._triangleSet.size()<<std::endl;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
// up sampling...
|
||||
while (!ec._edgeSet.empty() &&
|
||||
continueSimplification((*ec._edgeSet.rbegin())->getErrorMetric() , numOriginalPrimitives, ec._triangleSet.size()) &&
|
||||
// ec._triangleSet.size() < targetNumTriangles &&
|
||||
ec.divideLongestEdge())
|
||||
{
|
||||
//osg::notify(osg::INFO)<<" Edge divided ec._triangleSet.size()="<<ec._triangleSet.size()<<" error="<<(*ec._edgeSet.rbegin())->getErrorMetric()<<" vs "<<getMaximumError()<<std::endl;
|
||||
}
|
||||
osg::notify(osg::INFO)<<"******* AFTER EDGE DIVIDE *********"<<ec._triangleSet.size()<<std::endl;
|
||||
}
|
||||
|
||||
osg::notify(osg::INFO)<<"Number of triangle errors after edge collapse= "<<ec.testAllTriangles()<<std::endl;
|
||||
osg::notify(osg::INFO)<<"Number of edge errors before edge collapse= "<<ec.testAllEdges()<<std::endl;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user