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/src/osgUtil/ShaderGen.cpp

    r10768 r11164  
    8585} 
    8686 
    87 void ShaderGenCache::setStateSet(unsigned int stateMask, osg::StateSet *stateSet) 
     87void ShaderGenCache::setStateSet(int stateMask, osg::StateSet *stateSet) 
    8888{ 
    8989    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex); 
     
    9191} 
    9292 
    93 osg::StateSet *ShaderGenCache::getStateSet(unsigned int stateMask) const 
     93osg::StateSet *ShaderGenCache::getStateSet(int stateMask) const 
    9494{ 
    9595    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex); 
     
    9898} 
    9999 
    100 osg::StateSet *ShaderGenCache::getOrCreateStateSet(unsigned int stateMask) 
     100osg::StateSet *ShaderGenCache::getOrCreateStateSet(int stateMask) 
    101101{ 
    102102    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex); 
     
    111111} 
    112112 
    113 osg::StateSet *ShaderGenCache::createStateSet(unsigned int stateMask) const 
     113osg::StateSet *ShaderGenCache::createStateSet(int stateMask) const 
    114114{ 
    115115    osg::StateSet *stateSet = new osg::StateSet; 
     
    364364        return; 
    365365 
    366     unsigned int stateMask = 0; 
     366    int stateMask = 0; 
    367367    //if (state->getMode(GL_BLEND) & osg::StateAttribute::ON) 
    368368    //    stateMask |= ShaderGen::BLEND;