Changeset 11164 for OpenSceneGraph/trunk/src/osgWrappers/introspection/osgUtil/ShaderGen.cpp

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/src/osgWrappers/introspection/osgUtil/ShaderGen.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/src/osgWrappers/introspection/osgUtil/ShaderGen.cpp

@@ -33 +33 @@
 END_REFLECTOR
 
-TYPE_NAME_ALIAS(std::map< unsigned int COMMA  osg::ref_ptr< osg::StateSet > >, osgUtil::ShaderGenCache::StateSetMap)
+TYPE_NAME_ALIAS(std::map< int COMMA  osg::ref_ptr< osg::StateSet > >, osgUtil::ShaderGenCache::StateSetMap)
 
 BEGIN_OBJECT_REFLECTOR(osgUtil::ShaderGenCache)
@@ -41 +41 @@
                        "",
                        "");
-        I_Method2(void, setStateSet, IN, unsigned int, stateMask, IN, osg::StateSet *, program,
+        I_Method2(void, setStateSet, IN, int, stateMask, IN, osg::StateSet *, program,
                   Properties::NON_VIRTUAL,
-                  __void__setStateSet__unsigned_int__osg_StateSet_P1,
+                  __void__setStateSet__int__osg_StateSet_P1,
                   "",
                   "");
-        I_Method1(osg::StateSet *, getStateSet, IN, unsigned int, stateMask,
+        I_Method1(osg::StateSet *, getStateSet, IN, int, stateMask,
                   Properties::NON_VIRTUAL,
-                  __osg_StateSet_P1__getStateSet__unsigned_int,
+                  __osg_StateSet_P1__getStateSet__int,
                   "",
                   "");
-        I_Method1(osg::StateSet *, getOrCreateStateSet, IN, unsigned int, stateMask,
+        I_Method1(osg::StateSet *, getOrCreateStateSet, IN, int, stateMask,
                   Properties::NON_VIRTUAL,
-                  __osg_StateSet_P1__getOrCreateStateSet__unsigned_int,
+                  __osg_StateSet_P1__getOrCreateStateSet__int,
                   "",
                   "");
-        I_ProtectedMethod1(osg::StateSet *, createStateSet, IN, unsigned int, stateMask,
+        I_ProtectedMethod1(osg::StateSet *, createStateSet, IN, int, stateMask,
                            Properties::NON_VIRTUAL,
                            Properties::CONST,
-                           __osg_StateSet_P1__createStateSet__unsigned_int,
+                           __osg_StateSet_P1__createStateSet__int,
                            "",
                            "");
         I_IndexedProperty(osg::StateSet *, StateSet, 
-                          __osg_StateSet_P1__getStateSet__unsigned_int, 
-                          __void__setStateSet__unsigned_int__osg_StateSet_P1, 
+                          __osg_StateSet_P1__getStateSet__int, 
+                          __void__setStateSet__int__osg_StateSet_P1, 
                           0);
 END_REFLECTOR
@@ -128 +128 @@
 END_REFLECTOR
 
-STD_MAP_REFLECTOR(std::map< unsigned int COMMA  osg::ref_ptr< osg::StateSet > >)
+STD_MAP_REFLECTOR(std::map< int COMMA  osg::ref_ptr< osg::StateSet > >)