Changeset 11164 for OpenSceneGraph/trunk/src/osgWrappers/introspection/osg/CullSettings.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/osg/CullSettings.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/src/osgWrappers/introspection/osg/CullSettings.cpp

@@ -77 +77 @@
 END_REFLECTOR
 
-TYPE_NAME_ALIAS(unsigned int, osg::CullSettings::CullingMode)
+TYPE_NAME_ALIAS(int, osg::CullSettings::InheritanceMask)
+
+TYPE_NAME_ALIAS(int, osg::CullSettings::CullingMode)
 
 BEGIN_VALUE_REFLECTOR(osg::CullSettings)
@@ -99 +101 @@
                   "",
                   "");
-        I_Method1(void, setInheritanceMask, IN, unsigned int, mask,
-                  Properties::NON_VIRTUAL,
-                  __void__setInheritanceMask__unsigned_int,
+        I_Method1(void, setInheritanceMask, IN, osg::CullSettings::InheritanceMask, mask,
+                  Properties::NON_VIRTUAL,
+                  __void__setInheritanceMask__InheritanceMask,
                   "Set the inheritance mask used in inheritCullSettings to control which variables get overwritten by the passed in CullSettings object. ",
                   "");
-        I_Method0(unsigned int, getInheritanceMask,
-                  Properties::NON_VIRTUAL,
-                  __unsigned_int__getInheritanceMask,
+        I_Method0(osg::CullSettings::InheritanceMask, getInheritanceMask,
+                  Properties::NON_VIRTUAL,
+                  __InheritanceMask__getInheritanceMask,
                   "Get the inheritance mask used in inheritCullSettings to control which variables get overwritten by the passed in CullSettings object. ",
                   "");
@@ -319 +321 @@
                          __bool__getImpostorsActive, 
                          __void__setImpostorsActive__bool);
-        I_SimpleProperty(unsigned int, InheritanceMask, 
-                         __unsigned_int__getInheritanceMask, 
-                         __void__setInheritanceMask__unsigned_int);
+        I_SimpleProperty(osg::CullSettings::InheritanceMask, InheritanceMask, 
+                         __InheritanceMask__getInheritanceMask, 
+                         __void__setInheritanceMask__InheritanceMask);
         I_SimpleProperty(osg::CullSettings::InheritanceMaskActionOnAttributeSetting, InheritanceMaskActionOnAttributeSetting, 
                          __InheritanceMaskActionOnAttributeSetting__getInheritanceMaskActionOnAttributeSetting,