Changeset 11164 for OpenSceneGraph/trunk/src/osgUtil/ShaderGen.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/osgUtil/ShaderGen.cpp (modified) (5 diffs)

OpenSceneGraph/trunk/src/osgUtil/ShaderGen.cpp

@@ -85 +85 @@
 }
 
-void ShaderGenCache::setStateSet(unsigned int stateMask, osg::StateSet *stateSet)
+void ShaderGenCache::setStateSet(int stateMask, osg::StateSet *stateSet)
 {
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
@@ -91 +91 @@
 }
 
-osg::StateSet *ShaderGenCache::getStateSet(unsigned int stateMask) const
+osg::StateSet *ShaderGenCache::getStateSet(int stateMask) const
 {
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
@@ -98 +98 @@
 }
 
-osg::StateSet *ShaderGenCache::getOrCreateStateSet(unsigned int stateMask)
+osg::StateSet *ShaderGenCache::getOrCreateStateSet(int stateMask)
 {
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
@@ -111 +111 @@
 }
 
-osg::StateSet *ShaderGenCache::createStateSet(unsigned int stateMask) const
+osg::StateSet *ShaderGenCache::createStateSet(int stateMask) const
 {
     osg::StateSet *stateSet = new osg::StateSet;
@@ -364 +364 @@
         return;
 
-    unsigned int stateMask = 0;
+    int stateMask = 0;
     //if (state->getMode(GL_BLEND) & osg::StateAttribute::ON)
     //    stateMask |= ShaderGen::BLEND;