Show
Ignore:
Timestamp:
03/05/10 13:55:08 (4 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/include/osg/CullSettings

    r10838 r11164  
    8080 
    8181            NO_VARIABLES                            = 0x00000000, 
    82             ALL_VARIABLES                           = 0xFFFFFFFF 
    83         }; 
     82            ALL_VARIABLES                           = 0x7FFFFFFF 
     83        }; 
     84 
     85        typedef int InheritanceMask; 
    8486 
    8587        /** Set the inheritance mask used in inheritCullSettings to control which variables get overwritten by the passed in CullSettings object.*/ 
    86         void setInheritanceMask(unsigned int mask) { _inheritanceMask = mask; } 
     88        void setInheritanceMask(InheritanceMask mask) { _inheritanceMask = mask; } 
    8789 
    8890        /** Get the inheritance mask used in inheritCullSettings to control which variables get overwritten by the passed in CullSettings object.*/ 
    89         unsigned int getInheritanceMask() const { return _inheritanceMask; } 
     91        InheritanceMask getInheritanceMask() const { return _inheritanceMask; } 
    9092         
    9193        /** Set the local cull settings values from specified CullSettings object.*/ 
     
    191193        }; 
    192194         
    193         typedef unsigned int CullingMode; 
     195        typedef int CullingMode; 
    194196 
    195197        /** Set the culling mode for the CullVisitor to use.*/ 
     
    245247    protected: 
    246248 
    247         unsigned int                                _inheritanceMask; 
     249        InheritanceMask                             _inheritanceMask; 
    248250        InheritanceMaskActionOnAttributeSetting     _inheritanceMaskActionOnAttributeSetting; 
    249251