Show
Ignore:
Timestamp:
10/21/14 17:10:27 (24 hours ago)
Author:
robert
Message:

Added shaders to support experimental shader based displacement mapping technique osgTerrain::ShaderTerrain?.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osg/ImageUtils.cpp

    r13204 r13205  
    616616 
    617617 
    618 struct ModulateAlphaByColourOperator 
    619 { 
    620     ModulateAlphaByColourOperator(const osg::Vec4& colour):_colour(colour) { _lum = _colour.length(); } 
     618 
     619struct ModulateAlphaByColorOperator 
     620{ 
     621    ModulateAlphaByColorOperator(const osg::Vec4& colour):_colour(colour) { _lum = _colour.length(); } 
    621622 
    622623    osg::Vec4 _colour; 
     
    651652            return image; 
    652653        } 
    653         case (MODULATE_ALPHA_BY_COLOUR): 
     654        case (MODULATE_ALPHA_BY_COLOR): 
    654655        { 
    655656            OSG_NOTICE<<"doing conversion MODULATE_ALPHA_BY_COLOUR"<<std::endl; 
    656             osg::modifyImage(image, ModulateAlphaByColourOperator(colour)); 
     657            osg::modifyImage(image, ModulateAlphaByColorOperator(colour)); 
    657658            return image; 
    658659        }