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

Renamed PermissableOptions to setPermissableOptimizations.

Browse Source
This commit is contained in:
Robert Osfield
2003-12-11 23:33:27 +00:00
parent 1881610a35
commit 7e012ccfc4
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/osgUtil/Optimizer
View File

@@ -77,32 +77,32 @@ class OSGUTIL_EXPORT Optimizer
virtual void optimize(osg::Node* node, unsigned int options);
inline void setPermissableOptionsForObject(const osg::Object* object, unsigned int options)
inline void setPermissableOptimizationsForObject(const osg::Object* object, unsigned int options)
{
_permissableOptionsMap[object] = options;
_permissableOptimizationsMap[object] = options;
}
inline unsigned int getPermissableOptionsForObject(const osg::Object* object) const
inline unsigned int getPermissableOptimizationsForObject(const osg::Object* object) const
{
PermissableOptionsMap::const_iterator itr = _permissableOptionsMap.find(object);
if (itr!=_permissableOptionsMap.end()) return itr->second;
PermissableOptimizationsMap::const_iterator itr = _permissableOptimizationsMap.find(object);
if (itr!=_permissableOptimizationsMap.end()) return itr->second;
else return 0xffffffff;
}
inline bool isOperationPermissableForObject(const osg::Object* object,unsigned int option) const
{
return (option & getPermissableOptionsForObject(object))!=0;
return (option & getPermissableOptimizationsForObject(object))!=0;
}
typedef std::map<const osg::Object*,unsigned int> PermissableOptionsMap;
typedef std::map<const osg::Object*,unsigned int> PermissableOptimizationsMap;
PermissableOptionsMap& getPrimissableOptionsMap() { return _permissableOptionsMap; }
const PermissableOptionsMap& getPrimissableOptionsMap() const { return _permissableOptionsMap; }
PermissableOptimizationsMap& getPrimissableOptionsMap() { return _permissableOptimizationsMap; }
const PermissableOptimizationsMap& getPrimissableOptionsMap() const { return _permissableOptimizationsMap; }
protected:
PermissableOptionsMap _permissableOptionsMap;
PermissableOptimizationsMap _permissableOptimizationsMap;
public:

2
src/osgUtil/Optimizer.cpp
View File

@@ -52,7 +52,7 @@ static bool isNodeEmpty(const osg::Node& node)
void Optimizer::reset()
{
_permissableOptionsMap.clear();
_permissableOptimizationsMap.clear();
}
static osg::ApplicationUsageProxy Optimizer_e0(osg::ApplicationUsage::ENVIRONMENTAL_VARIABLE,"OSG_OPTIMIZER \"<type> [<type>]\"","DEFAULT | FLATTEN_STATIC_TRANSFORMS | REMOVE_REDUNDANT_NODES | COMBINE_ADJACENT_LODS | SHARE_DUPLICATE_STATE | MERGE_GEOMETRY | SPATIALIZE_GROUPS | COPY_SHARED_NODES | TRISTRIP_GEOMETRY");