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

Fix MergeGeometryVisitor to work with a Group instead of Geode

Browse Source
This commit is contained in:
scrawl 2017-02-24 01:05:57 +01:00
parent a918306a99
commit e0f7d3241a
2 changed files with 19 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/osgUtil/Optimizer
View File

@ -532,10 +532,10 @@ class OSGUTIL_EXPORT Optimizer
return _targetMaximumNumberOfVertices; return _targetMaximumNumberOfVertices;
} }
virtual void apply(osg::Geode& geode) { mergeGeode(geode); } virtual void apply(osg::Group& group) { mergeGroup(group); traverse(group); }
virtual void apply(osg::Billboard&) { /* don't do anything*/ } virtual void apply(osg::Billboard&) { /* don't do anything*/ }
bool mergeGeode(osg::Geode& geode); bool mergeGroup(osg::Group& group);
static bool geometryContainsSharedArrays(osg::Geometry& geom); static bool geometryContainsSharedArrays(osg::Geometry& geom);

55
src/osgUtil/Optimizer.cpp
View File

@ -1782,15 +1782,13 @@ bool isAbleToMerge(const osg::Geometry& g1, const osg::Geometry& g2)
return true; return true;
} }
bool Optimizer::MergeGeometryVisitor::mergeGeode(osg::Geode& geode) bool Optimizer::MergeGeometryVisitor::mergeGroup(osg::Group& group)
{ {
if (!isOperationPermissibleForObject(&geode)) return false; if (!isOperationPermissibleForObject(&group)) return false;
if (geode.getNumDrawables()>=2) if (group.getNumChildren()>=2)
{ {
// OSG_NOTICE<<"Before "<<geode.getNumDrawables()<<std::endl;
typedef std::vector<osg::Geometry*> DuplicateList; typedef std::vector<osg::Geometry*> DuplicateList;
typedef std::vector< osg::ref_ptr<osg::Drawable> > DrawableList; typedef std::vector< osg::ref_ptr<osg::Drawable> > DrawableList;
typedef std::map<osg::Geometry*,DuplicateList,LessGeometry> GeometryDuplicateMap; typedef std::map<osg::Geometry*,DuplicateList,LessGeometry> GeometryDuplicateMap;
@ -1801,9 +1799,9 @@ bool Optimizer::MergeGeometryVisitor::mergeGeode(osg::Geode& geode)
DrawableList standardDrawables; DrawableList standardDrawables;
unsigned int i; unsigned int i;
for(i=0;i<geode.getNumDrawables();++i) for(i=0;i<group.getNumChildren();++i)
{ {
osg::Drawable* drawable = geode.getDrawable(i); osg::Drawable* drawable = group.getChild(i)->asDrawable();
if (drawable) if (drawable)
{ {
osg::Geometry* geom = drawable->asGeometry(); osg::Geometry* geom = drawable->asGeometry();
@ -1945,26 +1943,6 @@ bool Optimizer::MergeGeometryVisitor::mergeGeode(osg::Geode& geode)
if (needToDoMerge) if (needToDoMerge)
{ {
// first take a reference to all the drawables to prevent them being deleted prematurely
DrawableList keepDrawables;
keepDrawables.resize(geode.getNumDrawables());
for(i=0; i<geode.getNumDrawables(); ++i)
{
osg::Drawable* drawable = geode.getDrawable(i);
if (drawable) keepDrawables[i] = geode.getDrawable(i);
}
// now clear the drawable list of the Geode so we don't have to remove items one by one (which is slow)
geode.removeDrawables(0, geode.getNumDrawables());
// add back in the standard drawables which arn't possible to merge.
for(DrawableList::iterator sitr = standardDrawables.begin();
sitr != standardDrawables.end();
++sitr)
{
geode.addDrawable(sitr->get());
}
// now do the merging of geometries // now do the merging of geometries
for(MergeList::iterator mitr = mergeList.begin(); for(MergeList::iterator mitr = mergeList.begin();
mitr != mergeList.end(); mitr != mergeList.end();
@ -1974,18 +1952,15 @@ bool Optimizer::MergeGeometryVisitor::mergeGeode(osg::Geode& geode)
if (duplicateList.size()>1) if (duplicateList.size()>1)
{ {
osg::Geometry* lhs = duplicateList.front(); osg::Geometry* lhs = duplicateList.front();
geode.addDrawable(lhs);
for(DuplicateList::iterator ditr = duplicateList.begin()+1; for(DuplicateList::iterator ditr = duplicateList.begin()+1;
ditr != duplicateList.end(); ditr != duplicateList.end();
++ditr) ++ditr)
{ {
mergeGeometry(*lhs,**ditr); mergeGeometry(*lhs,**ditr);
group.removeChild(*ditr);
} }
} }
else if (duplicateList.size()>0)
{
geode.addDrawable(duplicateList.front());
}
} }
} }
@ -2035,16 +2010,17 @@ bool Optimizer::MergeGeometryVisitor::mergeGeode(osg::Geode& geode)
} }
#endif #endif
// OSG_NOTICE<<"After "<<geode.getNumDrawables()<<std::endl;
} }
// convert all polygon primitives which has 3 indices into TRIANGLES, 4 indices into QUADS. // convert all polygon primitives which has 3 indices into TRIANGLES, 4 indices into QUADS.
unsigned int i; unsigned int i;
for(i=0;i<geode.getNumDrawables();++i) for(i=0;i<group.getNumChildren();++i)
{ {
osg::Geometry* geom = geode.getDrawable(i)->asGeometry(); osg::Drawable* drawable = group.getChild(i)->asDrawable();
if (!drawable)
continue;
osg::Geometry* geom = drawable->asGeometry();
if (geom) if (geom)
{ {
osg::Geometry::PrimitiveSetList& primitives = geom->getPrimitiveSetList(); osg::Geometry::PrimitiveSetList& primitives = geom->getPrimitiveSetList();
@ -2069,9 +2045,12 @@ bool Optimizer::MergeGeometryVisitor::mergeGeode(osg::Geode& geode)
} }
// now merge any compatible primitives. // now merge any compatible primitives.
for(i=0;i<geode.getNumDrawables();++i) for(i=0;i<group.getNumChildren();++i)
{ {
osg::Geometry* geom = geode.getDrawable(i)->asGeometry(); osg::Drawable* drawable = group.getChild(i)->asDrawable();
if (!drawable)
continue;
osg::Geometry* geom = drawable->asGeometry();
if (geom) if (geom)
{ {
if (geom->getNumPrimitiveSets()>0 && if (geom->getNumPrimitiveSets()>0 &&