Changeset 11164 for OpenSceneGraph/trunk/include/osgUtil/ShaderGen

Timestamp:

03/05/10 13:55:08 (3 years ago)

Author:

robert

Message:

Replaced use of unsigned int/enum mask combinations with int/enum mask combinations to avoid the need for casting enums to unsigned ints,
and to avoid associated warnings.

Update wrappers to reflect these changes.

Files:

• OpenSceneGraph/trunk/include/osgUtil/ShaderGen (modified) (1 diff)

OpenSceneGraph/trunk/include/osgUtil/ShaderGen

@@ -39 +39 @@
     };
 
-    typedef std::map<unsigned int, osg::ref_ptr<osg::StateSet> > StateSetMap;
+    typedef std::map<int, osg::ref_ptr<osg::StateSet> > StateSetMap;
 
     ShaderGenCache() {};
 
-    void setStateSet(unsigned int stateMask, osg::StateSet *program);
-    osg::StateSet *getStateSet(unsigned int stateMask) const;
-    osg::StateSet *getOrCreateStateSet(unsigned int stateMask);
+    void setStateSet(int stateMask, osg::StateSet *program);
+    osg::StateSet *getStateSet(int stateMask) const;
+    osg::StateSet *getOrCreateStateSet(int stateMask);
 
 protected:
-    osg::StateSet *createStateSet(unsigned int stateMask) const;
+    osg::StateSet *createStateSet(int stateMask) const;
     mutable OpenThreads::Mutex _mutex;
     StateSetMap _stateSetMap;