Changeset 11164 for OpenSceneGraph/trunk/include/osg/CullSettings

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/osg/CullSettings (modified) (3 diffs)

OpenSceneGraph/trunk/include/osg/CullSettings

@@ -80 +80 @@
 
             NO_VARIABLES                            = 0x00000000,
-            ALL_VARIABLES                           = 0xFFFFFFFF
-        };
+            ALL_VARIABLES                           = 0x7FFFFFFF
+        };
+
+        typedef int InheritanceMask;
 
         /** Set the inheritance mask used in inheritCullSettings to control which variables get overwritten by the passed in CullSettings object.*/
-        void setInheritanceMask(unsigned int mask) { _inheritanceMask = mask; }
+        void setInheritanceMask(InheritanceMask mask) { _inheritanceMask = mask; }
 
         /** Get the inheritance mask used in inheritCullSettings to control which variables get overwritten by the passed in CullSettings object.*/
-        unsigned int getInheritanceMask() const { return _inheritanceMask; }
+        InheritanceMask getInheritanceMask() const { return _inheritanceMask; }
         
         /** Set the local cull settings values from specified CullSettings object.*/
@@ -191 +193 @@
         };
         
-        typedef unsigned int CullingMode;
+        typedef int CullingMode;
 
         /** Set the culling mode for the CullVisitor to use.*/
@@ -245 +247 @@
     protected:
 
-        unsigned int                                _inheritanceMask;
+        InheritanceMask                             _inheritanceMask;
         InheritanceMaskActionOnAttributeSetting     _inheritanceMaskActionOnAttributeSetting;