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

Cleaned up handling of Drawables so it utilizes the Node inheritance properly.

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14822 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield 2015-04-07 15:49:06 +00:00
parent 814693ffc1
commit 6cff8650f2
4 changed files with 13 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/osgUtil/Optimizer
View File

@ -461,15 +461,15 @@ class OSGUTIL_EXPORT Optimizer
protected:
void addStateSet(osg::StateSet* stateset,osg::Object* obj);
void addStateSet(osg::StateSet* stateset, osg::Node* node);
inline bool optimize(osg::Object::DataVariance variance)
{
return _optimize[variance];
}
typedef std::set<osg::Object*> ObjectSet;
typedef std::map<osg::StateSet*,ObjectSet> StateSetMap;
typedef std::set<osg::Node*> NodeSet;
typedef std::map<osg::StateSet*, NodeSet> StateSetMap;
// note, one element for DYNAMIC, STATIC and UNSPECIFIED
bool _optimize[3];

15
src/osgDB/SharedStateManager.cpp
View File

@ -162,19 +162,8 @@ osg::StateAttribute *SharedStateManager::find(osg::StateAttribute *sa)
//----------------------------------------------------------------
void SharedStateManager::setStateSet(osg::StateSet* ss, osg::Object* object)
{
osg::Drawable* drawable = dynamic_cast<osg::Drawable*>(object);
if (drawable)
{
drawable->setStateSet(ss);
}
else
{
osg::Node* node = dynamic_cast<osg::Node*>(object);
if (node)
{
node->setStateSet(ss);
}
}
osg::Node* node = dynamic_cast<osg::Node*>(object);
if (node) node->setStateSet(ss);
}

10
src/osgGA/StateSetManipulator.cpp
View File

@ -72,14 +72,8 @@ void StateSetManipulator::clone()
itr != parents.end();
++itr)
{
osg::Object* object = *itr;
osg::Node* node = dynamic_cast<osg::Node*>(object);
if (node) node->setStateSet(newStateSet.get());
else
{
osg::Drawable* drawable = dynamic_cast<osg::Drawable*>(object);
if (drawable) drawable->setStateSet(newStateSet.get());
}
osg::Node* node = *itr;
node->setStateSet(newStateSet.get());
}
_stateset = newStateSet;

25
src/osgUtil/Optimizer.cpp
View File

@ -438,9 +438,9 @@ void Optimizer::StateVisitor::reset()
_statesets.clear();
}
void Optimizer::StateVisitor::addStateSet(osg::StateSet* stateset,osg::Object* obj)
void Optimizer::StateVisitor::addStateSet(osg::StateSet* stateset, osg::Node* node)
{
_statesets[stateset].insert(obj);
_statesets[stateset].insert(node);
}
void Optimizer::StateVisitor::apply(osg::Node& node)
@ -688,26 +688,13 @@ void Optimizer::StateVisitor::optimize()
if (**current==**first_unique)
{
OSG_INFO << " found duplicate "<<(*current)->className()<<" first="<<*first_unique<<" current="<<*current<< std::endl;
ObjectSet& objSet = _statesets[*current];
for(ObjectSet::iterator sitr=objSet.begin();
sitr!=objSet.end();
NodeSet& nodeSet = _statesets[*current];
for(NodeSet::iterator sitr=nodeSet.begin();
sitr!=nodeSet.end();
++sitr)
{
OSG_INFO << " replace duplicate "<<*current<<" with "<<*first_unique<< std::endl;
osg::Object* obj = *sitr;
osg::Drawable* drawable = dynamic_cast<osg::Drawable*>(obj);
if (drawable)
{
drawable->setStateSet(*first_unique);
}
else
{
osg::Node* node = dynamic_cast<osg::Node*>(obj);
if (node)
{
node->setStateSet(*first_unique);
}
}
(*sitr)->setStateSet(*first_unique);
}
}
else first_unique = current;