Change-Id: I08d3017b3e66ce4741dd32876f52b569874129b3
Shader shaderEffectCustom = Shader::New( vertexShaderStringStream.str(),
fragmentShaderStringStream.str(),
Shader shaderEffectCustom = Shader::New( vertexShaderStringStream.str(),
fragmentShaderStringStream.str(),
- Shader::ShaderHints( Shader::HINT_OUTPUT_IS_TRANSPARENT ) );
+ Shader::Hint::OUTPUT_IS_TRANSPARENT );
GlyphyShader handle( shaderEffectCustom );
GlyphyShader handle( shaderEffectCustom );
*/
void CreateRenderer( FrameBufferImage frameBufferImage, Dali::Renderer& renderer )
{
*/
void CreateRenderer( FrameBufferImage frameBufferImage, Dali::Renderer& renderer )
{
- Shader shader = Shader::New( VERTEX_SHADER_SCROLL , FRAGMENT_SHADER, Shader::HINT_NONE );
+ Shader shader = Shader::New( VERTEX_SHADER_SCROLL , FRAGMENT_SHADER, Shader::Hint::NONE );
Sampler sampler = Sampler::New();
sampler.SetFilterMode(FilterMode::NEAREST, FilterMode::NEAREST );
Sampler sampler = Sampler::New();
sampler.SetFilterMode(FilterMode::NEAREST, FilterMode::NEAREST );
else
{
const char* fragmentShader = FRAGMENT_SHADER;
else
{
const char* fragmentShader = FRAGMENT_SHADER;
- Dali::Shader::ShaderHints hints = Dali::Shader::HINT_NONE;
+ Dali::Shader::Hint::Value hints = Dali::Shader::Hint::NONE;
if( !mImpl->mCustomShader->mFragmentShader.empty() )
{
if( !mImpl->mCustomShader->mFragmentShader.empty() )
{
/**
* where hints should be contain strings of the following shader hints:
/**
* where hints should be contain strings of the following shader hints:
- * "none" | corresponds to HINT_NONE
- * "outputIsTransparent" | corresponds to HINT_OUTPUT_IS_TRANSPARENT
- * "modifiesGeometry" | corresponds to HINT_MODIFIES_GEOMETRY
+ * "none" | corresponds to Shader::Hint::NONE
+ * "outputIsTransparent" | corresponds to Shader::Hint::OUTPUT_IS_TRANSPARENT
+ * "modifiesGeometry" | corresponds to Shader::Hint::MODIFIES_GEOMETRY
-Shader::ShaderHints HintFromString( std::string hintString )
+Shader::Hint::Value HintFromString( std::string hintString )
{
if( hintString == "none" )
{
{
if( hintString == "none" )
{
- return Shader::HINT_NONE;
+ return Shader::Hint::NONE;
}
else if( hintString == "outputIsTransparent" )
{
}
else if( hintString == "outputIsTransparent" )
{
- return Shader::HINT_OUTPUT_IS_TRANSPARENT;
+ return Shader::Hint::OUTPUT_IS_TRANSPARENT;
}
else if( hintString == "modifiesGeometry" )
{
}
else if( hintString == "modifiesGeometry" )
{
- return Shader::HINT_MODIFIES_GEOMETRY;
+ return Shader::Hint::MODIFIES_GEOMETRY;
}
else
{
DALI_LOG_ERROR( "'%s' hint string is not recognised", hintString.c_str() );
}
}
else
{
DALI_LOG_ERROR( "'%s' hint string is not recognised", hintString.c_str() );
}
- return Shader::HINT_NONE;
+ return Shader::Hint::NONE;
Internal::Visual::Impl::CustomShader::CustomShader( const Property::Map& map )
: mGridSize( 1, 1 ),
Internal::Visual::Impl::CustomShader::CustomShader( const Property::Map& map )
: mGridSize( 1, 1 ),
- mHints( Shader::HINT_NONE )
+ mHints( Shader::Hint::NONE )
{
SetPropertyMap( map );
}
{
SetPropertyMap( map );
}
mVertexShader.clear();
mFragmentShader.clear();
mGridSize = ImageDimensions( 1, 1 );
mVertexShader.clear();
mFragmentShader.clear();
mGridSize = ImageDimensions( 1, 1 );
- mHints = Shader::HINT_NONE;
+ mHints = Shader::Hint::NONE;
Property::Value* vertexShaderValue = shaderMap.Find( CUSTOM_VERTEX_SHADER );
if( vertexShaderValue )
Property::Value* vertexShaderValue = shaderMap.Find( CUSTOM_VERTEX_SHADER );
if( vertexShaderValue )
}
else if( hintsValue->Get( hintsArray ) )
{
}
else if( hintsValue->Get( hintsArray ) )
{
- int hints = Shader::HINT_NONE;
+ int hints = Shader::Hint::NONE;
for( Property::Array::SizeType i = 0; i < hintsArray.Count(); ++i)
{
Property::Value hintValue = hintsArray[ i ];
for( Property::Array::SizeType i = 0; i < hintsArray.Count(); ++i)
{
Property::Value hintValue = hintsArray[ i ];
DALI_LOG_ERROR( "'%s' parameter does not correctly specify an hint string at index %d", CUSTOM_SHADER_HINTS, i );
}
DALI_LOG_ERROR( "'%s' parameter does not correctly specify an hint string at index %d", CUSTOM_SHADER_HINTS, i );
}
- mHints = static_cast< Shader::ShaderHints >( hints );
+ mHints = static_cast< Shader::Hint::Value >( hints );
customShader.Insert(CUSTOM_SUBDIVIDE_GRID_Y, mGridSize.GetHeight() );
}
customShader.Insert(CUSTOM_SUBDIVIDE_GRID_Y, mGridSize.GetHeight() );
}
- if( mHints != Dali::Shader::HINT_NONE )
+ if( mHints != Dali::Shader::Hint::NONE )
{
customShader.Insert(CUSTOM_SHADER_HINTS, static_cast< int >(mHints) );
}
{
customShader.Insert(CUSTOM_SHADER_HINTS, static_cast< int >(mHints) );
}
std::string mVertexShader;
std::string mFragmentShader;
Dali::ImageDimensions mGridSize;
std::string mVertexShader;
std::string mFragmentShader;
Dali::ImageDimensions mGridSize;
- Dali::Shader::ShaderHints mHints; //(bitfield) values from enum Shader::Hints
+ Dali::Shader::Hint::Value mHints; //(bitfield) values from enum Shader::Hint
CustomShader( const Property::Map& map );
void SetPropertyMap( const Property::Map& map );
CustomShader( const Property::Map& map );
void SetPropertyMap( const Property::Map& map );
const char * const CUSTOM_FRAGMENT_SHADER( "fragmentShader" );
const char * const CUSTOM_SUBDIVIDE_GRID_X( "subdivideGridX" );
const char * const CUSTOM_SUBDIVIDE_GRID_Y( "subdivideGridY" );
const char * const CUSTOM_FRAGMENT_SHADER( "fragmentShader" );
const char * const CUSTOM_SUBDIVIDE_GRID_X( "subdivideGridX" );
const char * const CUSTOM_SUBDIVIDE_GRID_Y( "subdivideGridY" );
-const char * const CUSTOM_SHADER_HINTS( "hints" ); ///< type INTEGER; (bitfield) values from enum Shader::Hints
+const char * const CUSTOM_SHADER_HINTS( "hints" ); ///< type INTEGER; (bitfield) values from enum Shader::Hint
struct ShaderHintPair
{
const char* name;
struct ShaderHintPair
{
const char* name;
- Shader::ShaderHints hint;
+ Shader::Hint::Value hint;
};
const ShaderHintPair ShaderHintTable[]=
{
};
const ShaderHintPair ShaderHintTable[]=
{
- {"outputIsTransparent", Shader::HINT_OUTPUT_IS_TRANSPARENT },
- {"modifiesGeometry", Shader::HINT_MODIFIES_GEOMETRY },
+ {"outputIsTransparent", Shader::Hint::OUTPUT_IS_TRANSPARENT },
+ {"modifiesGeometry", Shader::Hint::MODIFIES_GEOMETRY },
};
const unsigned int ShaderHintTableCount = sizeof(ShaderHintTable)/sizeof(ShaderHintTable[0]);
};
const unsigned int ShaderHintTableCount = sizeof(ShaderHintTable)/sizeof(ShaderHintTable[0]);
struct ShaderParameters
{
ShaderParameters()
struct ShaderParameters
{
ShaderParameters()
- : mHints( Shader::HINT_NONE )
+ : mHints( Shader::Hint::NONE )
- Shader::ShaderHints GetShaderHint( const std::string& hint )
+ Shader::Hint::Value GetShaderHint( const std::string& hint )
{
for( unsigned int i = 0 ; i < ShaderHintTableCount; ++i )
{
{
for( unsigned int i = 0 ; i < ShaderHintTableCount; ++i )
{
return ShaderHintTable[i].hint;
}
}
return ShaderHintTable[i].hint;
}
}
- return Shader::HINT_NONE;
+ return Shader::Hint::NONE;
}
void ProcessHintsArray( const HintsArray& hintsArray )
{
for( HintsArray::const_iterator iter = hintsArray.begin(); iter != hintsArray.end() ; ++iter )
{
}
void ProcessHintsArray( const HintsArray& hintsArray )
{
for( HintsArray::const_iterator iter = hintsArray.begin(); iter != hintsArray.end() ; ++iter )
{
- mHints= static_cast<Shader::ShaderHints>( mHints | GetShaderHint( *iter ) );
+ mHints= static_cast<Shader::Hint::Value>( mHints | GetShaderHint( *iter ) );
std::string mVertex;
std::string mFragment;
std::string mVertex;
std::string mFragment;
- Shader::ShaderHints mHints;
+ Shader::Hint::Value mHints;