Index: /OpenSceneGraph/trunk/include/osgPresentation/SlideEventHandler =================================================================== --- /OpenSceneGraph/trunk/include/osgPresentation/SlideEventHandler (revision 10396) +++ /OpenSceneGraph/trunk/include/osgPresentation/SlideEventHandler (revision 11164) @@ -261,13 +261,6 @@ void setLoopPresentation(bool loop) { _loopPresentation = loop; } bool getLoopPresentation() const { return _loopPresentation; } - + void dispatchEvent(const KeyPosition& keyPosition); - - enum ObjectMask - { - MOVIE = 1<<0, - OBJECTS = 1<<1, - ALL_OBJECTS = MOVIE | OBJECTS - }; protected: Index: /OpenSceneGraph/trunk/include/osgUtil/ShaderGen =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/ShaderGen (revision 9940) +++ /OpenSceneGraph/trunk/include/osgUtil/ShaderGen (revision 11164) @@ -39,14 +39,14 @@ }; - typedef std::map > StateSetMap; + typedef std::map > StateSetMap; ShaderGenCache() {}; - void setStateSet(unsigned int stateMask, osg::StateSet *program); - osg::StateSet *getStateSet(unsigned int stateMask) const; - osg::StateSet *getOrCreateStateSet(unsigned int stateMask); + void setStateSet(int stateMask, osg::StateSet *program); + osg::StateSet *getStateSet(int stateMask) const; + osg::StateSet *getOrCreateStateSet(int stateMask); protected: - osg::StateSet *createStateSet(unsigned int stateMask) const; + osg::StateSet *createStateSet(int stateMask) const; mutable OpenThreads::Mutex _mutex; StateSetMap _stateSetMap; Index: /OpenSceneGraph/trunk/include/osg/CullSettings =================================================================== --- /OpenSceneGraph/trunk/include/osg/CullSettings (revision 10838) +++ /OpenSceneGraph/trunk/include/osg/CullSettings (revision 11164) @@ -80,12 +80,14 @@ 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,5 +193,5 @@ }; - typedef unsigned int CullingMode; + typedef int CullingMode; /** Set the culling mode for the CullVisitor to use.*/ @@ -245,5 +247,5 @@ protected: - unsigned int _inheritanceMask; + InheritanceMask _inheritanceMask; InheritanceMaskActionOnAttributeSetting _inheritanceMaskActionOnAttributeSetting; Index: /OpenSceneGraph/trunk/include/osg/CullingSet =================================================================== --- /OpenSceneGraph/trunk/include/osg/CullingSet (revision 5328) +++ /OpenSceneGraph/trunk/include/osg/CullingSet (revision 11164) @@ -121,5 +121,5 @@ typedef std::vector OccluderList; - typedef unsigned int Mask; + typedef int Mask; enum MaskValues @@ -141,5 +141,5 @@ SHADOW_OCCLUSION_CULLING }; - + void setCullingMask(Mask mask) { _mask = mask; } Mask getCullingMask() const { return _mask; } Index: /OpenSceneGraph/trunk/include/osgGA/GUIEventAdapter =================================================================== --- /OpenSceneGraph/trunk/include/osgGA/GUIEventAdapter (revision 10211) +++ /OpenSceneGraph/trunk/include/osgGA/GUIEventAdapter (revision 11164) @@ -380,14 +380,14 @@ /// set current mouse button state. - void setButtonMask(unsigned int mask) { _buttonMask = mask; } + void setButtonMask(int mask) { _buttonMask = mask; } /// get current mouse button state. - unsigned int getButtonMask() const { return _buttonMask; } + int getButtonMask() const { return _buttonMask; } /// set modifier key mask. - void setModKeyMask(unsigned int mask) { _modKeyMask = mask; } + void setModKeyMask(int mask) { _modKeyMask = mask; } /// get modifier key mask. - unsigned int getModKeyMask() const { return _modKeyMask; } + int getModKeyMask() const { return _modKeyMask; } /// set scrolling motion (for EventType::SCROLL). @@ -465,6 +465,6 @@ float _mx; float _my; - unsigned int _buttonMask; - unsigned int _modKeyMask; + int _buttonMask; + int _modKeyMask; MouseYOrientation _mouseYOrientation; Index: /OpenSceneGraph/trunk/include/osgSim/ObjectRecordData =================================================================== --- /OpenSceneGraph/trunk/include/osgSim/ObjectRecordData (revision 9458) +++ /OpenSceneGraph/trunk/include/osgSim/ObjectRecordData (revision 11164) @@ -53,13 +53,10 @@ META_Object( osgSim, ObjectRecordData ); - enum Flags - { - DONT_DISPLAY_IN_DAYLIGHT = 0x80000000u >> 0, - DONT_DISPLAY_AT_DUSK = 0x80000000u >> 1, - DONT_DISPLAY_AT_NIGHT = 0x80000000u >> 2, - DONT_ILLUMINATE = 0x80000000u >> 3, - FLAT_SHADED = 0x80000000u >> 4, - GROUPS_SHADOW_OBJECT = 0x80000000u >> 5 - }; + static const unsigned int DONT_DISPLAY_IN_DAYLIGHT = 0x80000000u >> 0; + static const unsigned int DONT_DISPLAY_AT_DUSK = 0x80000000u >> 1; + static const unsigned int DONT_DISPLAY_AT_NIGHT = 0x80000000u >> 2; + static const unsigned int DONT_ILLUMINATE = 0x80000000u >> 3; + static const unsigned int FLAT_SHADED = 0x80000000u >> 4; + static const unsigned int GROUPS_SHADOW_OBJECT = 0x80000000u >> 5; unsigned int _flags; Index: /OpenSceneGraph/trunk/include/osgSim/SphereSegment =================================================================== --- /OpenSceneGraph/trunk/include/osgSim/SphereSegment (revision 9409) +++ /OpenSceneGraph/trunk/include/osgSim/SphereSegment (revision 11164) @@ -195,8 +195,8 @@ @see DrawMask */ - void setDrawMask(DrawMask dm); + void setDrawMask(int dm); /** Get the DrawMask */ - DrawMask getDrawMask() const { return _drawMask; } + int getDrawMask() const { return _drawMask; } /** Set the color of the surface. */ @@ -306,9 +306,9 @@ // Draw details - DrawMask _drawMask; - osg::Vec4 _surfaceColor; - osg::Vec4 _spokeColor; - osg::Vec4 _edgeLineColor; - osg::Vec4 _planeColor; + int _drawMask; + osg::Vec4 _surfaceColor; + osg::Vec4 _spokeColor; + osg::Vec4 _edgeLineColor; + osg::Vec4 _planeColor; }; Index: /OpenSceneGraph/trunk/src/osgUtil/ShaderGen.cpp =================================================================== --- /OpenSceneGraph/trunk/src/osgUtil/ShaderGen.cpp (revision 10768) +++ /OpenSceneGraph/trunk/src/osgUtil/ShaderGen.cpp (revision 11164) @@ -85,5 +85,5 @@ } -void ShaderGenCache::setStateSet(unsigned int stateMask, osg::StateSet *stateSet) +void ShaderGenCache::setStateSet(int stateMask, osg::StateSet *stateSet) { OpenThreads::ScopedLock lock(_mutex); @@ -91,5 +91,5 @@ } -osg::StateSet *ShaderGenCache::getStateSet(unsigned int stateMask) const +osg::StateSet *ShaderGenCache::getStateSet(int stateMask) const { OpenThreads::ScopedLock lock(_mutex); @@ -98,5 +98,5 @@ } -osg::StateSet *ShaderGenCache::getOrCreateStateSet(unsigned int stateMask) +osg::StateSet *ShaderGenCache::getOrCreateStateSet(int stateMask) { OpenThreads::ScopedLock lock(_mutex); @@ -111,5 +111,5 @@ } -osg::StateSet *ShaderGenCache::createStateSet(unsigned int stateMask) const +osg::StateSet *ShaderGenCache::createStateSet(int stateMask) const { osg::StateSet *stateSet = new osg::StateSet; @@ -364,5 +364,5 @@ return; - unsigned int stateMask = 0; + int stateMask = 0; //if (state->getMode(GL_BLEND) & osg::StateAttribute::ON) // stateMask |= ShaderGen::BLEND; Index: /OpenSceneGraph/trunk/src/osgSim/SphereSegment.cpp =================================================================== --- /OpenSceneGraph/trunk/src/osgSim/SphereSegment.cpp (revision 10658) +++ /OpenSceneGraph/trunk/src/osgSim/SphereSegment.cpp (revision 11164) @@ -875,5 +875,5 @@ } -void SphereSegment::setDrawMask(DrawMask dm) +void SphereSegment::setDrawMask(int dm) { _drawMask=dm; Index: /OpenSceneGraph/trunk/src/osgWrappers/introspection/osgPresentation/SlideEventHandler.cpp =================================================================== --- /OpenSceneGraph/trunk/src/osgWrappers/introspection/osgPresentation/SlideEventHandler.cpp (revision 10967) +++ /OpenSceneGraph/trunk/src/osgWrappers/introspection/osgPresentation/SlideEventHandler.cpp (revision 11164) @@ -319,11 +319,4 @@ I_EnumLabel(osgPresentation::SlideEventHandler::FIRST_POSITION); I_EnumLabel(osgPresentation::SlideEventHandler::LAST_POSITION); -END_REFLECTOR - -BEGIN_ENUM_REFLECTOR(osgPresentation::SlideEventHandler::ObjectMask) - I_DeclaringFile("osgPresentation/SlideEventHandler"); - I_EnumLabel(osgPresentation::SlideEventHandler::MOVIE); - I_EnumLabel(osgPresentation::SlideEventHandler::OBJECTS); - I_EnumLabel(osgPresentation::SlideEventHandler::ALL_OBJECTS); END_REFLECTOR Index: /OpenSceneGraph/trunk/src/osgWrappers/introspection/osgUtil/ShaderGen.cpp =================================================================== --- /OpenSceneGraph/trunk/src/osgWrappers/introspection/osgUtil/ShaderGen.cpp (revision 10967) +++ /OpenSceneGraph/trunk/src/osgWrappers/introspection/osgUtil/ShaderGen.cpp (revision 11164) @@ -33,5 +33,5 @@ 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,28 +41,28 @@ "", ""); - 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,4 +128,4 @@ 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 > >) Index: /OpenSceneGraph/trunk/src/osgWrappers/introspection/osg/CullSettings.cpp =================================================================== --- /OpenSceneGraph/trunk/src/osgWrappers/introspection/osg/CullSettings.cpp (revision 10967) +++ /OpenSceneGraph/trunk/src/osgWrappers/introspection/osg/CullSettings.cpp (revision 11164) @@ -77,5 +77,7 @@ 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,12 +101,12 @@ "", ""); - 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,7 +321,7 @@ __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, Index: /OpenSceneGraph/trunk/src/osgWrappers/introspection/osg/CullingSet.cpp =================================================================== --- /OpenSceneGraph/trunk/src/osgWrappers/introspection/osg/CullingSet.cpp (revision 10967) +++ /OpenSceneGraph/trunk/src/osgWrappers/introspection/osg/CullingSet.cpp (revision 11164) @@ -50,5 +50,5 @@ TYPE_NAME_ALIAS(std::vector< osg::ShadowVolumeOccluder >, osg::CullingSet::OccluderList) -TYPE_NAME_ALIAS(unsigned int, osg::CullingSet::Mask) +TYPE_NAME_ALIAS(int, osg::CullingSet::Mask) BEGIN_OBJECT_REFLECTOR(osg::CullingSet) Index: /OpenSceneGraph/trunk/src/osgWrappers/introspection/osgGA/GUIEventAdapter.cpp =================================================================== --- /OpenSceneGraph/trunk/src/osgWrappers/introspection/osgGA/GUIEventAdapter.cpp (revision 10967) +++ /OpenSceneGraph/trunk/src/osgWrappers/introspection/osgGA/GUIEventAdapter.cpp (revision 11164) @@ -418,22 +418,22 @@ "get mouse-Y orientation (mouse-Y increases upwards or downwards). ", ""); - I_Method1(void, setButtonMask, IN, unsigned int, mask, - Properties::NON_VIRTUAL, - __void__setButtonMask__unsigned_int, + I_Method1(void, setButtonMask, IN, int, mask, + Properties::NON_VIRTUAL, + __void__setButtonMask__int, "set current mouse button state. ", ""); - I_Method0(unsigned int, getButtonMask, - Properties::NON_VIRTUAL, - __unsigned_int__getButtonMask, + I_Method0(int, getButtonMask, + Properties::NON_VIRTUAL, + __int__getButtonMask, "get current mouse button state. ", ""); - I_Method1(void, setModKeyMask, IN, unsigned int, mask, - Properties::NON_VIRTUAL, - __void__setModKeyMask__unsigned_int, + I_Method1(void, setModKeyMask, IN, int, mask, + Properties::NON_VIRTUAL, + __void__setModKeyMask__int, "set modifier key mask. ", ""); - I_Method0(unsigned int, getModKeyMask, - Properties::NON_VIRTUAL, - __unsigned_int__getModKeyMask, + I_Method0(int, getModKeyMask, + Properties::NON_VIRTUAL, + __int__getModKeyMask, "get modifier key mask. ", ""); @@ -525,7 +525,7 @@ __int__getButton, __void__setButton__int); - I_SimpleProperty(unsigned int, ButtonMask, - __unsigned_int__getButtonMask, - __void__setButtonMask__unsigned_int); + I_SimpleProperty(int, ButtonMask, + __int__getButtonMask, + __void__setButtonMask__int); I_SimpleProperty(osgGA::GUIEventAdapter::EventType, EventType, __EventType__getEventType, @@ -540,7 +540,7 @@ __int__getKey, __void__setKey__int); - I_SimpleProperty(unsigned int, ModKeyMask, - __unsigned_int__getModKeyMask, - __void__setModKeyMask__unsigned_int); + I_SimpleProperty(int, ModKeyMask, + __int__getModKeyMask, + __void__setModKeyMask__int); I_SimpleProperty(osgGA::GUIEventAdapter::MouseYOrientation, MouseYOrientation, __MouseYOrientation__getMouseYOrientation, Index: /OpenSceneGraph/trunk/src/osgWrappers/introspection/osgSim/ObjectRecordData.cpp =================================================================== --- /OpenSceneGraph/trunk/src/osgWrappers/introspection/osgSim/ObjectRecordData.cpp (revision 10967) +++ /OpenSceneGraph/trunk/src/osgWrappers/introspection/osgSim/ObjectRecordData.cpp (revision 11164) @@ -22,14 +22,4 @@ #undef OUT #endif - -BEGIN_ENUM_REFLECTOR(osgSim::ObjectRecordData::Flags) - I_DeclaringFile("osgSim/ObjectRecordData"); - I_EnumLabel(osgSim::ObjectRecordData::DONT_DISPLAY_IN_DAYLIGHT); - I_EnumLabel(osgSim::ObjectRecordData::DONT_DISPLAY_AT_DUSK); - I_EnumLabel(osgSim::ObjectRecordData::DONT_DISPLAY_AT_NIGHT); - I_EnumLabel(osgSim::ObjectRecordData::DONT_ILLUMINATE); - I_EnumLabel(osgSim::ObjectRecordData::FLAT_SHADED); - I_EnumLabel(osgSim::ObjectRecordData::GROUPS_SHADOW_OBJECT); -END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgSim::ObjectRecordData) Index: /OpenSceneGraph/trunk/src/osgWrappers/introspection/osgSim/SphereSegment.cpp =================================================================== --- /OpenSceneGraph/trunk/src/osgWrappers/introspection/osgSim/SphereSegment.cpp (revision 10967) +++ /OpenSceneGraph/trunk/src/osgWrappers/introspection/osgSim/SphereSegment.cpp (revision 11164) @@ -109,12 +109,12 @@ "Get the density of the sphere segment. ", ""); - I_Method1(void, setDrawMask, IN, osgSim::SphereSegment::DrawMask, dm, - Properties::NON_VIRTUAL, - __void__setDrawMask__DrawMask, + I_Method1(void, setDrawMask, IN, int, dm, + Properties::NON_VIRTUAL, + __void__setDrawMask__int, "Specify the DrawMask. ", " param dm Bitmask specifying which parts of the sphere segment should be drawn. see DrawMask "); - I_Method0(osgSim::SphereSegment::DrawMask, getDrawMask, - Properties::NON_VIRTUAL, - __DrawMask__getDrawMask, + I_Method0(int, getDrawMask, + Properties::NON_VIRTUAL, + __int__getDrawMask, "Get the DrawMask. ", ""); @@ -223,7 +223,7 @@ __int__getDensity, __void__setDensity__int); - I_SimpleProperty(osgSim::SphereSegment::DrawMask, DrawMask, - __DrawMask__getDrawMask, - __void__setDrawMask__DrawMask); + I_SimpleProperty(int, DrawMask, + __int__getDrawMask, + __void__setDrawMask__int); I_SimpleProperty(osg::Vec4, EdgeLineColor, __osg_Vec4__getEdgeLineColor,