X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dali-toolkit%2Finternal%2Fcontrols%2Frenderers%2Fimage%2Fimage-renderer.cpp;h=10a6bc679ea55d3db1e97b24c448185c881752b4;hb=6c6cdc0f1c2e6373e4eb3bf74397abba5befe026;hp=8b13a4e5c7987e02eeb3afe7c86a072c9ba38efb;hpb=62e7c0f3e8795fc597fbaa1a76abd42fb837e536;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp b/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp index 8b13a4e..10a6bc6 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 @@ -45,7 +46,7 @@ const char HTTP_URL[] = "http://"; const char HTTPS_URL[] = "https://"; const char * const RENDERER_TYPE("rendererType"); -const char * const RENDERER_TYPE_VALUE("imageRenderer"); +const char * const RENDERER_TYPE_VALUE("image"); // property names const char * const IMAGE_URL_NAME( "imageUrl" ); @@ -73,8 +74,11 @@ const char * const DONT_CARE("dontCare"); const std::string TEXTURE_UNIFORM_NAME = "sTexture"; const std::string ATLAS_RECT_UNIFORM_NAME = "uAtlasRect"; const std::string PIXEL_AREA_UNIFORM_NAME = "pixelArea"; + 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 @@ -105,22 +109,23 @@ const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER( }\n ); + Geometry GenerateGeometry( const Vector< Vector2 >& vertices, const Vector< unsigned int >& indices ) { Property::Map vertexFormat; vertexFormat[ "aPosition" ] = Property::VECTOR2; - PropertyBuffer vertexPropertyBuffer = PropertyBuffer::New( vertexFormat, vertices.Size() ); + PropertyBuffer vertexPropertyBuffer = PropertyBuffer::New( vertexFormat ); if( vertices.Size() > 0 ) { - vertexPropertyBuffer.SetData( &vertices[ 0 ] ); + vertexPropertyBuffer.SetData( &vertices[ 0 ], vertices.Size() ); } Property::Map indexFormat; indexFormat[ "indices" ] = Property::INTEGER; - PropertyBuffer indexPropertyBuffer = PropertyBuffer::New( indexFormat, indices.Size() ); + PropertyBuffer indexPropertyBuffer = PropertyBuffer::New( indexFormat ); if( indices.Size() > 0 ) { - indexPropertyBuffer.SetData( &indices[ 0 ] ); + indexPropertyBuffer.SetData( &indices[ 0 ], indices.Size() ); } // Create the geometry object @@ -201,7 +206,10 @@ ImageRenderer::ImageRenderer( RendererFactoryCache& factoryCache, ImageAtlasMana mAtlasManager( atlasManager ), mDesiredSize(), mFittingMode( FittingMode::DEFAULT ), - mSamplingMode( SamplingMode::DEFAULT ) + mSamplingMode( SamplingMode::DEFAULT ), + mIsAlphaPreMultiplied( false ), + mNativeFragmentShaderCode( ), + mNativeImageFlag( false ) { } @@ -330,6 +338,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() ) { @@ -381,9 +396,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 @@ -410,6 +433,43 @@ 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 ); + } + 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 ); + } + } + } + + Material material = Material::New( shader ); + return Renderer::New( geometry, material ); +} + void ImageRenderer::InitializeRenderer( const std::string& imageUrl ) { if( imageUrl.empty() ) @@ -485,6 +545,8 @@ void ImageRenderer::DoSetOnStage( Actor& actor ) { InitializeRenderer( mImage ); } + + mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA, mIsAlphaPreMultiplied); } void ImageRenderer::DoSetOffStage( Actor& actor ) @@ -659,11 +721,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 ) @@ -683,6 +769,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 ); @@ -696,6 +796,15 @@ void ImageRenderer::SetImage( Actor& actor, const Image& image ) } } +void ImageRenderer::EnablePreMultipliedAlpha( bool preMultipled ) +{ + mIsAlphaPreMultiplied = preMultipled; + if( mImpl->mRenderer ) + { + mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA, mIsAlphaPreMultiplied); + } +} + void ImageRenderer::ApplyImageToSampler( const Image& image ) { if( image ) @@ -746,6 +855,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