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

Changed the Optimizer::StateVisitor so that it can individually decide whether

Browse Source 
to optimize away duplicate state with dynamic, static and unspecified DataVarience.  By default
the code now optimizes away duplicate state with either static and unspecied state, previously 
it was just handling static state.
This commit is contained in:
Robert Osfield
2008-06-29 12:22:50 +00:00
parent 8820d0bb1d
commit 5e0169f664
3 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/osgUtil/Optimizer
View File

@@ -432,8 +432,16 @@ class OSGUTIL_EXPORT Optimizer
public:
/// default to traversing all children.
StateVisitor(Optimizer* optimizer=0):
BaseOptimizerVisitor(optimizer, SHARE_DUPLICATE_STATE) {}
StateVisitor(bool combineDynamicState,
bool combineStaticState,
bool combineUnspecifiedState,
Optimizer* optimizer=0):
BaseOptimizerVisitor(optimizer, SHARE_DUPLICATE_STATE)
{
_optimize[osg::Object::DYNAMIC] = combineDynamicState;
_optimize[osg::Object::STATIC] = combineStaticState;
_optimize[osg::Object::UNSPECIFIED] = combineUnspecifiedState;
}
/** empty visitor, make it ready for next traversal.*/
virtual void reset();
@@ -447,10 +455,18 @@ class OSGUTIL_EXPORT Optimizer
protected:
void addStateSet(osg::StateSet* stateset,osg::Object* obj);
inline bool optimize(osg::Object::DataVariance variance)
{
return _optimize[variance];
}
typedef std::set<osg::Object*> ObjectSet;
typedef std::map<osg::StateSet*,ObjectSet> StateSetMap;
// note, one element for DYNAMIC, STATIC and UNSPECIFIED
bool _optimize[3];
StateSetMap _statesets;
};