X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Frenderers%2Fimage%2Fimage-renderer.cpp;h=b9fcec970dbc167e40c57fdf1c4d6044cd456a49;hp=7862d5326809420c683e4ddb66c12dff2ce1b684;hb=8a37fe59c9b77bc32c6998721d335cc1c41c44db;hpb=b591ef50e17d16b10cf49affe0122f4727245c65 diff --git a/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp b/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp index 7862d53..b9fcec9 100644 --- a/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp +++ b/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp @@ -21,6 +21,7 @@ // EXTERNAL HEADER #include // for strncasecmp #include +#include #include // INTERNAL HEADER @@ -79,6 +80,8 @@ const std::string ALPHA_BLENDING_UNIFORM_NAME = "uAlphaBlending"; const Vector4 FULL_TEXTURE_RECT(0.f, 0.f, 1.f, 1.f); +const char* DEFAULT_SAMPLER_TYPENAME = "sampler2D"; + const char* VERTEX_SHADER = DALI_COMPOSE_SHADER( attribute mediump vec2 aPosition;\n uniform mediump mat4 uMvpMatrix;\n @@ -110,6 +113,7 @@ const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER( }\n ); + Geometry GenerateGeometry( const Vector< Vector2 >& vertices, const Vector< unsigned int >& indices ) { Property::Map vertexFormat; @@ -207,7 +211,9 @@ ImageRenderer::ImageRenderer( RendererFactoryCache& factoryCache, ImageAtlasMana mDesiredSize(), mFittingMode( FittingMode::DEFAULT ), mSamplingMode( SamplingMode::DEFAULT ), - mIsAlphaPreMultiplied( false ) + mIsAlphaPreMultiplied( false ), + mNativeFragmentShaderCode( ), + mNativeImageFlag( false ) { } @@ -336,6 +342,13 @@ void ImageRenderer::DoInitialize( Actor& actor, const Property::Map& propertyMap } } + NativeImage nativeImage = NativeImage::DownCast( mImage ); + + if( nativeImage ) + { + SetNativeFragmentShaderCode( nativeImage ); + } + // if actor is on stage, create new renderer and apply to actor if( actor && actor.OnStage() ) { @@ -387,9 +400,17 @@ Renderer ImageRenderer::CreateRenderer() const Geometry geometry; Shader shader; + // If mImage is nativeImage with custom sampler or prefix, mNativeFragmentShaderCode will be applied. + // Renderer can't be shared between NativeImage and other image types. + if( !mNativeFragmentShaderCode.empty() ) + { + return CreateNativeImageRenderer(); + } + if( !mImpl->mCustomShader ) { geometry = CreateGeometry( mFactoryCache, ImageDimensions( 1, 1 ) ); + shader = GetImageShader(mFactoryCache); } else @@ -417,6 +438,45 @@ Renderer ImageRenderer::CreateRenderer() const return Renderer::New( geometry, material ); } +Renderer ImageRenderer::CreateNativeImageRenderer() const +{ + Geometry geometry; + Shader shader; + + if( !mImpl->mCustomShader ) + { + geometry = CreateGeometry( mFactoryCache, ImageDimensions( 1, 1 ) ); + + shader = Shader::New( VERTEX_SHADER, mNativeFragmentShaderCode ); + shader.RegisterProperty( ATLAS_RECT_UNIFORM_NAME, FULL_TEXTURE_RECT ); + shader.RegisterProperty( PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT ); + shader.RegisterProperty( ALPHA_BLENDING_UNIFORM_NAME, 1.f ); + } + else + { + geometry = CreateGeometry( mFactoryCache, mImpl->mCustomShader->mGridSize ); + if( mImpl->mCustomShader->mVertexShader.empty() && mImpl->mCustomShader->mFragmentShader.empty() ) + { + shader = Shader::New( VERTEX_SHADER, mNativeFragmentShaderCode ); + } + else + { + shader = Shader::New( mImpl->mCustomShader->mVertexShader.empty() ? VERTEX_SHADER : mImpl->mCustomShader->mVertexShader, + mNativeFragmentShaderCode, + mImpl->mCustomShader->mHints ); + if( mImpl->mCustomShader->mVertexShader.empty() ) + { + shader.RegisterProperty( ATLAS_RECT_UNIFORM_NAME, FULL_TEXTURE_RECT ); + shader.RegisterProperty( PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT ); + shader.RegisterProperty( ALPHA_BLENDING_UNIFORM_NAME, 1.f ); + } + } + } + + Material material = Material::New( shader ); + return Renderer::New( geometry, material ); +} + void ImageRenderer::InitializeRenderer( const std::string& imageUrl ) { if( imageUrl.empty() ) @@ -669,11 +729,35 @@ void ImageRenderer::SetImage( Actor& actor, const Image& image ) { if( mImage != image ) { + NativeImage newNativeImage = NativeImage::DownCast( image ); + bool newRendererFlag = true; + + if( newNativeImage && !mNativeImageFlag ) + { + SetNativeFragmentShaderCode( newNativeImage ); + } + + if( ( newNativeImage && mNativeImageFlag ) || ( !newNativeImage && !mNativeImageFlag ) ) + { + newRendererFlag = false; + } + + if( newNativeImage ) + { + mNativeImageFlag = true; + } + else + { + mNativeFragmentShaderCode.clear(); + mNativeImageFlag = false; + } + mImage = image; if( mImpl->mRenderer ) { - if( GetIsFromCache() ) // if renderer is from cache, remove the old one + // if renderer is from cache, remove the old one, and create new renderer + if( GetIsFromCache() ) { //remove old renderer if( actor ) @@ -693,6 +777,20 @@ void ImageRenderer::SetImage( Actor& actor, const Image& image ) SetOnStage(actor); } } + // if input image is nativeImage and mImage is regular image or the reverse, remove the old one, and create new renderer + else if( newRendererFlag ) + { + //remove old renderer + if( actor ) + { + actor.RemoveRenderer( mImpl->mRenderer ); + } + + if( actor && actor.OnStage() ) // if actor on stage, create a new renderer and apply to actor + { + SetOnStage(actor); + } + } else // if renderer is not from cache, reuse the same renderer and only change the texture { ApplyImageToSampler( image ); @@ -787,6 +885,33 @@ void ImageRenderer::CleanCache(const std::string& url) } } +void ImageRenderer::SetNativeFragmentShaderCode( Dali::NativeImage& nativeImage ) +{ + const char* fragmentPreFix = nativeImage.GetCustomFragmentPreFix(); + const char* customSamplerTypename = nativeImage.GetCustomSamplerTypename(); + + if( fragmentPreFix ) + { + mNativeFragmentShaderCode = fragmentPreFix; + mNativeFragmentShaderCode += "\n"; + } + + if( mImpl->mCustomShader && !mImpl->mCustomShader->mFragmentShader.empty() ) + { + mNativeFragmentShaderCode += mImpl->mCustomShader->mFragmentShader; + } + else + { + mNativeFragmentShaderCode += FRAGMENT_SHADER; + } + + if( customSamplerTypename ) + { + mNativeFragmentShaderCode.replace( mNativeFragmentShaderCode.find( DEFAULT_SAMPLER_TYPENAME ), strlen( DEFAULT_SAMPLER_TYPENAME ), customSamplerTypename ); + } + +} + } // namespace Internal } // namespace Toolkit