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=c2bec8574a9f62e24a6a29893a76b0d6f8c8f0c1;hp=8b13a4e5c7987e02eeb3afe7c86a072c9ba38efb;hb=a2de9cf491172cd5da9dc9ed60b17683dab6d7bc;hpb=62e7c0f3e8795fc597fbaa1a76abd42fb837e536 diff --git a/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp b/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp index 8b13a4e..c2bec85 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" ); @@ -70,11 +71,13 @@ const char * const BOX_THEN_LINEAR("boxThenLinear"); const char * const NO_FILTER("noFilter"); 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,33 +108,6 @@ 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() ); - if( vertices.Size() > 0 ) - { - vertexPropertyBuffer.SetData( &vertices[ 0 ] ); - } - - Property::Map indexFormat; - indexFormat[ "indices" ] = Property::INTEGER; - PropertyBuffer indexPropertyBuffer = PropertyBuffer::New( indexFormat, indices.Size() ); - if( indices.Size() > 0 ) - { - indexPropertyBuffer.SetData( &indices[ 0 ] ); - } - - // Create the geometry object - Geometry geometry = Geometry::New(); - geometry.AddVertexBuffer( vertexPropertyBuffer ); - geometry.SetIndexBuffer( indexPropertyBuffer ); - geometry.SetGeometryType( Geometry::TRIANGLE_STRIP ); - - return geometry; -} - Geometry CreateGeometry( RendererFactoryCache& factoryCache, ImageDimensions gridSize ) { Geometry geometry; @@ -141,54 +117,13 @@ Geometry CreateGeometry( RendererFactoryCache& factoryCache, ImageDimensions gri geometry = factoryCache.GetGeometry( RendererFactoryCache::QUAD_GEOMETRY ); if( !geometry ) { - geometry = factoryCache.CreateQuadGeometry(); + geometry = RendererFactoryCache::CreateQuadGeometry(); factoryCache.SaveGeometry( RendererFactoryCache::QUAD_GEOMETRY, geometry ); } } else { - uint16_t gridWidth = gridSize.GetWidth(); - uint16_t gridHeight = gridSize.GetHeight(); - - // Create vertices - Vector< Vector2 > vertices; - vertices.Reserve( ( gridWidth + 1 ) * ( gridHeight + 1 ) ); - - for( int y = 0; y < gridHeight + 1; ++y ) - { - for( int x = 0; x < gridWidth + 1; ++x ) - { - vertices.PushBack( Vector2( (float)x/gridWidth - 0.5f, (float)y/gridHeight - 0.5f) ); - } - } - - // Create indices - Vector< unsigned int > indices; - indices.Reserve( (gridWidth+2)*gridHeight*2 - 2); - - for( unsigned int row = 0u; row < gridHeight; ++row ) - { - unsigned int rowStartIndex = row*(gridWidth+1u); - unsigned int nextRowStartIndex = rowStartIndex + gridWidth +1u; - - if( row != 0u ) // degenerate index on non-first row - { - indices.PushBack( rowStartIndex ); - } - - for( unsigned int column = 0u; column < gridWidth+1u; column++) // main strip - { - indices.PushBack( rowStartIndex + column); - indices.PushBack( nextRowStartIndex + column); - } - - if( row != gridHeight-1u ) // degenerate index on non-last row - { - indices.PushBack( nextRowStartIndex + gridWidth ); - } - } - - return GenerateGeometry( vertices, indices ); + geometry = RendererFactoryCache::CreateGridGeometry( gridSize ); } return geometry; @@ -201,7 +136,9 @@ ImageRenderer::ImageRenderer( RendererFactoryCache& factoryCache, ImageAtlasMana mAtlasManager( atlasManager ), mDesiredSize(), mFittingMode( FittingMode::DEFAULT ), - mSamplingMode( SamplingMode::DEFAULT ) + mSamplingMode( SamplingMode::DEFAULT ), + mNativeFragmentShaderCode( ), + mNativeImageFlag( false ) { } @@ -330,6 +267,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 +325,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 @@ -406,8 +358,52 @@ Renderer ImageRenderer::CreateRenderer() const } } - Material material = Material::New( shader ); - return Renderer::New( geometry, material ); + TextureSet textureSet = TextureSet::New(); + + Renderer renderer = Renderer::New( geometry, shader ); + renderer.SetTextures( textureSet ); + + return renderer; +} + +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 ); + } + } + } + + TextureSet textureSet = TextureSet::New(); + Renderer renderer = Renderer::New( geometry, shader ); + renderer.SetTextures( textureSet ); + + return renderer; } void ImageRenderer::InitializeRenderer( const std::string& imageUrl ) @@ -428,11 +424,13 @@ void ImageRenderer::InitializeRenderer( const std::string& imageUrl ) if( !mImpl->mRenderer ) { Vector4 atlasRect; - Material material = mAtlasManager.Add(atlasRect, imageUrl, mDesiredSize, mFittingMode, mSamplingMode ); - if( material ) + TextureSet textureSet = mAtlasManager.Add(atlasRect, imageUrl, mDesiredSize, mFittingMode, mSamplingMode ); + if( textureSet ) { Geometry geometry = CreateGeometry( mFactoryCache, ImageDimensions( 1, 1 ) ); - mImpl->mRenderer = Renderer::New( geometry, material ); + Shader shader( GetImageShader(mFactoryCache) ); + mImpl->mRenderer = Renderer::New( geometry, shader ); + mImpl->mRenderer.SetTextures( textureSet ); mImpl->mRenderer.RegisterProperty( ATLAS_RECT_UNIFORM_NAME, atlasRect ); } else // big image, atlasing is not applied @@ -441,8 +439,8 @@ void ImageRenderer::InitializeRenderer( const std::string& imageUrl ) ResourceImage image = Dali::ResourceImage::New( imageUrl, mDesiredSize, mFittingMode, mSamplingMode ); image.LoadingFinishedSignal().Connect( this, &ImageRenderer::OnImageLoaded ); - Material material = mImpl->mRenderer.GetMaterial(); - material.AddTexture( image, TEXTURE_UNIFORM_NAME ); + TextureSet textureSet = mImpl->mRenderer.GetTextures(); + textureSet.SetImage( 0u, image ); } mFactoryCache.SaveRenderer( imageUrl, mImpl->mRenderer ); @@ -485,6 +483,7 @@ void ImageRenderer::DoSetOnStage( Actor& actor ) { InitializeRenderer( mImage ); } + } void ImageRenderer::DoSetOffStage( Actor& actor ) @@ -494,7 +493,6 @@ void ImageRenderer::DoSetOffStage( Actor& actor ) { actor.RemoveRenderer( mImpl->mRenderer ); CleanCache(mImageUrl); - mImage.Reset(); } else @@ -659,11 +657,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 +705,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 ); @@ -700,17 +736,10 @@ void ImageRenderer::ApplyImageToSampler( const Image& image ) { if( image ) { - Material material = mImpl->mRenderer.GetMaterial(); - if( material ) + TextureSet textureSet = mImpl->mRenderer.GetTextures(); + if( textureSet ) { - int index = material.GetTextureIndex( TEXTURE_UNIFORM_NAME ); - if( index != -1 ) - { - material.SetTextureImage( index, image ); - return; - } - - material.AddTexture( image, TEXTURE_UNIFORM_NAME ); + textureSet.SetImage( 0u, image ); } } } @@ -729,7 +758,7 @@ void ImageRenderer::OnImageLoaded( ResourceImage image ) void ImageRenderer::CleanCache(const std::string& url) { - Material material = mImpl->mRenderer.GetMaterial(); + TextureSet textureSet = mImpl->mRenderer.GetTextures(); Vector4 atlasRect( 0.f, 0.f, 1.f, 1.f ); Property::Index index = mImpl->mRenderer.GetPropertyIndex( ATLAS_RECT_UNIFORM_NAME ); @@ -742,8 +771,35 @@ void ImageRenderer::CleanCache(const std::string& url) mImpl->mRenderer.Reset(); if( mFactoryCache.CleanRendererCache( url ) && index != Property::INVALID_INDEX ) { - mAtlasManager.Remove( material, atlasRect ); + mAtlasManager.Remove( textureSet, atlasRect ); + } +} + +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