X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Frenderers%2Fimage%2Fimage-renderer.cpp;h=90dd61636bf08f2114a2bbe14d0ac82d4b510600;hb=87b87263ddda2188a86217cca356932e36e4cd94;hp=b9fcec970dbc167e40c57fdf1c4d6044cd456a49;hpb=8a37fe59c9b77bc32c6998721d335cc1c41c44db;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 b9fcec9..90dd616 100644 --- a/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp +++ b/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp @@ -25,6 +25,7 @@ #include // INTERNAL HEADER +#include #include #include #include @@ -45,38 +46,29 @@ namespace const char HTTP_URL[] = "http://"; const char HTTPS_URL[] = "https://"; -const char * const RENDERER_TYPE("rendererType"); -const char * const RENDERER_TYPE_VALUE("imageRenderer"); - // property names -const char * const IMAGE_URL_NAME( "imageUrl" ); -const char * const IMAGE_FITTING_MODE( "imageFittingMode" ); -const char * const IMAGE_SAMPLING_MODE( "imageSamplingMode" ); -const char * const IMAGE_DESIRED_WIDTH( "imageDesiredWidth" ); -const char * const IMAGE_DESIRED_HEIGHT( "imageDesiredHeight" ); +const char * const IMAGE_FITTING_MODE( "fittingMode" ); +const char * const IMAGE_SAMPLING_MODE( "samplingMode" ); +const char * const IMAGE_DESIRED_WIDTH( "desiredWidth" ); +const char * const IMAGE_DESIRED_HEIGHT( "desiredHeight" ); // fitting modes -const char * const SHRINK_TO_FIT("shrinkToFit"); -const char * const SCALE_TO_FILL("scaleToFill"); -const char * const FIT_WIDTH("fitWidth"); -const char * const FIT_HEIGHT("fitHeight"); -const char * const DEFAULT("default"); +const char * const SHRINK_TO_FIT("SHRINK_TO_FIT"); +const char * const SCALE_TO_FILL("SCALE_TO_FILL"); +const char * const FIT_WIDTH("FIT_WIDTH"); +const char * const FIT_HEIGHT("FIT_HEIGHT"); +const char * const DEFAULT("DEFAULT"); // sampling modes -const char * const BOX("box"); -const char * const NEAREST("nearest"); -const char * const LINEAR("linear"); -const char * const BOX_THEN_NEAREST("boxThenNearest"); -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 char * const BOX("BOX"); +const char * const NEAREST("NEAREST"); +const char * const LINEAR("LINEAR"); +const char * const BOX_THEN_NEAREST("BOX_THEN_NEAREST"); +const char * const BOX_THEN_LINEAR("BOX_THEN_LINEAR"); +const char * const NO_FILTER("NO_FILTER"); +const char * const DONT_CARE("DONT_CARE"); -// Set this uniform to 1.0 for conventional alpha blending; if pre-multiplied alpha blending, set this uniform to 0.0 -const std::string ALPHA_BLENDING_UNIFORM_NAME = "uAlphaBlending"; +const std::string PIXEL_AREA_UNIFORM_NAME = "pixelArea"; const Vector4 FULL_TEXTURE_RECT(0.f, 0.f, 1.f, 1.f); @@ -105,42 +97,13 @@ const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER( varying mediump vec2 vTexCoord;\n uniform sampler2D sTexture;\n uniform lowp vec4 uColor;\n - uniform lowp float uAlphaBlending; // Set to 1.0 for conventional alpha blending; if pre-multiplied alpha blending, set to 0.0 \n void main()\n {\n - gl_FragColor = texture2D( sTexture, vTexCoord ) * vec4( uColor.rgb*max( uAlphaBlending, uColor.a ), uColor.a );\n + gl_FragColor = texture2D( sTexture, vTexCoord ) * uColor;\n }\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; @@ -150,54 +113,13 @@ Geometry CreateGeometry( RendererFactoryCache& factoryCache, ImageDimensions gri geometry = factoryCache.GetGeometry( RendererFactoryCache::QUAD_GEOMETRY ); if( !geometry ) { - geometry = factoryCache.CreateQuadGeometry(); + geometry = Geometry::QUAD(); 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; @@ -211,7 +133,6 @@ ImageRenderer::ImageRenderer( RendererFactoryCache& factoryCache, ImageAtlasMana mDesiredSize(), mFittingMode( FittingMode::DEFAULT ), mSamplingMode( SamplingMode::DEFAULT ), - mIsAlphaPreMultiplied( false ), mNativeFragmentShaderCode( ), mNativeImageFlag( false ) { @@ -429,13 +350,16 @@ Renderer ImageRenderer::CreateRenderer() const { 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 ); + TextureSet textureSet = TextureSet::New(); + + Renderer renderer = Renderer::New( geometry, shader ); + renderer.SetTextures( textureSet ); + + return renderer; } Renderer ImageRenderer::CreateNativeImageRenderer() const @@ -450,7 +374,6 @@ Renderer ImageRenderer::CreateNativeImageRenderer() const 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 { @@ -468,13 +391,15 @@ Renderer ImageRenderer::CreateNativeImageRenderer() const { 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 ); + TextureSet textureSet = TextureSet::New(); + Renderer renderer = Renderer::New( geometry, shader ); + renderer.SetTextures( textureSet ); + + return renderer; } void ImageRenderer::InitializeRenderer( const std::string& imageUrl ) @@ -495,11 +420,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 @@ -508,8 +435,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 ); @@ -553,7 +480,6 @@ void ImageRenderer::DoSetOnStage( Actor& actor ) InitializeRenderer( mImage ); } - EnablePreMultipliedAlpha( mIsAlphaPreMultiplied ); } void ImageRenderer::DoSetOffStage( Actor& actor ) @@ -563,7 +489,6 @@ void ImageRenderer::DoSetOffStage( Actor& actor ) { actor.RemoveRenderer( mImpl->mRenderer ); CleanCache(mImageUrl); - mImage.Reset(); } else @@ -576,7 +501,7 @@ void ImageRenderer::DoSetOffStage( Actor& actor ) void ImageRenderer::DoCreatePropertyMap( Property::Map& map ) const { map.Clear(); - map.Insert( RENDERER_TYPE, RENDERER_TYPE_VALUE ); + map.Insert( RENDERER_TYPE, IMAGE_RENDERER ); if( !mImageUrl.empty() ) { map.Insert( IMAGE_URL_NAME, mImageUrl ); @@ -678,7 +603,6 @@ Shader ImageRenderer::GetImageShader( RendererFactoryCache& factoryCache ) factoryCache.SaveShader( RendererFactoryCache::IMAGE_SHADER, shader ); 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 ); } return shader; } @@ -804,52 +728,14 @@ void ImageRenderer::SetImage( Actor& actor, const Image& image ) } } -void ImageRenderer::EnablePreMultipliedAlpha( bool preMultipled ) -{ - mIsAlphaPreMultiplied = preMultipled; - if( mImpl->mRenderer ) - { - Material material = mImpl->mRenderer.GetMaterial(); - - if( preMultipled ) - { - material.SetBlendFunc( BlendingFactor::ONE, BlendingFactor::ONE_MINUS_SRC_ALPHA, - BlendingFactor::ONE, BlendingFactor::ONE ); - if( !mImpl->mCustomShader || mImpl->mCustomShader->mVertexShader.empty()) - { - material.RegisterProperty( ALPHA_BLENDING_UNIFORM_NAME, 0.f ); - } - } - else - { - // using default blend func - material.SetBlendFunc( BlendingFactor::SRC_ALPHA, BlendingFactor::ONE_MINUS_SRC_ALPHA, - BlendingFactor::ONE, BlendingFactor::ONE_MINUS_SRC_ALPHA ); - - Property::Index index = material.GetPropertyIndex( ALPHA_BLENDING_UNIFORM_NAME ); - if( index != Property::INVALID_INDEX ) // only set value when the property already exist on the Material - { - material.SetProperty( index, 1.f ); - } - } - } -} - 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 ); } } } @@ -868,7 +754,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 ); @@ -881,7 +767,7 @@ 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 ); } }