Show
Ignore:
Timestamp:
03/05/10 13:55:08 (5 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:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgWrappers/introspection/osg/CullSettings.cpp

    r10967 r11164  
    7777END_REFLECTOR 
    7878 
    79 TYPE_NAME_ALIAS(unsigned int, osg::CullSettings::CullingMode) 
     79TYPE_NAME_ALIAS(int, osg::CullSettings::InheritanceMask) 
     80 
     81TYPE_NAME_ALIAS(int, osg::CullSettings::CullingMode) 
    8082 
    8183BEGIN_VALUE_REFLECTOR(osg::CullSettings) 
     
    99101                  "", 
    100102                  ""); 
    101         I_Method1(void, setInheritanceMask, IN, unsigned int, mask, 
    102                   Properties::NON_VIRTUAL, 
    103                   __void__setInheritanceMask__unsigned_int, 
     103        I_Method1(void, setInheritanceMask, IN, osg::CullSettings::InheritanceMask, mask, 
     104                  Properties::NON_VIRTUAL, 
     105                  __void__setInheritanceMask__InheritanceMask, 
    104106                  "Set the inheritance mask used in inheritCullSettings to control which variables get overwritten by the passed in CullSettings object. ", 
    105107                  ""); 
    106         I_Method0(unsigned int, getInheritanceMask, 
    107                   Properties::NON_VIRTUAL, 
    108                   __unsigned_int__getInheritanceMask, 
     108        I_Method0(osg::CullSettings::InheritanceMask, getInheritanceMask, 
     109                  Properties::NON_VIRTUAL, 
     110                  __InheritanceMask__getInheritanceMask, 
    109111                  "Get the inheritance mask used in inheritCullSettings to control which variables get overwritten by the passed in CullSettings object. ", 
    110112                  ""); 
     
    319321                         __bool__getImpostorsActive,  
    320322                         __void__setImpostorsActive__bool); 
    321         I_SimpleProperty(unsigned int, InheritanceMask,  
    322                          __unsigned_int__getInheritanceMask,  
    323                          __void__setInheritanceMask__unsigned_int); 
     323        I_SimpleProperty(osg::CullSettings::InheritanceMask, InheritanceMask,  
     324                         __InheritanceMask__getInheritanceMask,  
     325                         __void__setInheritanceMask__InheritanceMask); 
    324326        I_SimpleProperty(osg::CullSettings::InheritanceMaskActionOnAttributeSetting, InheritanceMaskActionOnAttributeSetting,  
    325327                         __InheritanceMaskActionOnAttributeSetting__getInheritanceMaskActionOnAttributeSetting,