X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fimage%2Fimage-visual.cpp;h=194b9ba52556cb79d4f40ba9ff3fe53cb246f5de;hp=eb5713e2d416456c49d604493351c5786e9c83ff;hb=5af3c7c9147d2697cf2324738d357c52ce9598b9;hpb=248c644059d4784ab65fe3d2690022c2888edd3b diff --git a/dali-toolkit/internal/visuals/image/image-visual.cpp b/dali-toolkit/internal/visuals/image/image-visual.cpp index eb5713e..194b9ba 100644 --- a/dali-toolkit/internal/visuals/image/image-visual.cpp +++ b/dali-toolkit/internal/visuals/image/image-visual.cpp @@ -22,9 +22,6 @@ #include // for strlen() #include #include -#include -#include -#include #include #include #include @@ -99,8 +96,6 @@ DALI_ENUM_TO_STRING_TABLE_END( RELEASE_POLICY ) const Vector4 FULL_TEXTURE_RECT(0.f, 0.f, 1.f, 1.f); -const char* DEFAULT_SAMPLER_TYPENAME = "sampler2D"; - const float PIXEL_ALIGN_ON = 1.0f; const float PIXEL_ALIGN_OFF = 0.0f; @@ -146,11 +141,6 @@ ImageVisualPtr ImageVisual::New( VisualFactoryCache& factoryCache, return new ImageVisual( factoryCache, shaderFactory, imageUrl, size, fittingMode, samplingMode ); } -ImageVisualPtr ImageVisual::New( VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const Image& image ) -{ - return new ImageVisual( factoryCache, shaderFactory, image ); -} - ImageVisual::ImageVisual( VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl, @@ -158,7 +148,6 @@ ImageVisual::ImageVisual( VisualFactoryCache& factoryCache, FittingMode::Type fittingMode, Dali::SamplingMode::Type samplingMode ) : Visual::Base( factoryCache, Visual::FittingMode::FILL, Toolkit::Visual::IMAGE ), - mImage(), mPixelArea( FULL_TEXTURE_RECT ), mPlacementActor(), mImageUrl( imageUrl ), @@ -182,32 +171,6 @@ ImageVisual::ImageVisual( VisualFactoryCache& factoryCache, EnablePreMultipliedAlpha( mFactoryCache.GetPreMultiplyOnLoad() ); } -ImageVisual::ImageVisual( VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const Image& image ) -: Visual::Base( factoryCache, Visual::FittingMode::FILL, Toolkit::Visual::IMAGE ), - mImage( image ), - mPixelArea( FULL_TEXTURE_RECT ), - mPlacementActor(), - mImageUrl(), - mMaskingData( ), - mDesiredSize(), - mTextureId( TextureManager::INVALID_TEXTURE_ID ), - mTextures(), - mImageVisualShaderFactory( shaderFactory ), - mFittingMode( FittingMode::DEFAULT ), - mSamplingMode( SamplingMode::DEFAULT ), - mWrapModeU( WrapMode::DEFAULT ), - mWrapModeV( WrapMode::DEFAULT ), - mLoadPolicy( Toolkit::ImageVisual::LoadPolicy::ATTACHED ), - mReleasePolicy( Toolkit::ImageVisual::ReleasePolicy::DESTROYED ), - mAtlasRect( 0.0f, 0.0f, 0.0f, 0.0f ), - mAttemptAtlasing( false ), - mLoading( false ), - mOrientationCorrection( true ) -{ - // PreMultiplied alpha should be disabled when the Image is used. - EnablePreMultipliedAlpha( false ); -} - ImageVisual::~ImageVisual() { if( Stage::IsInstalled() ) @@ -482,13 +445,7 @@ void ImageVisual::AllocateMaskData() void ImageVisual::GetNaturalSize( Vector2& naturalSize ) { - if(mImage) - { - naturalSize.x = mImage.GetWidth(); - naturalSize.y = mImage.GetHeight(); - return; - } - else if( mDesiredSize.GetWidth()>0 && mDesiredSize.GetHeight()>0) + if( mDesiredSize.GetWidth()>0 && mDesiredSize.GetHeight()>0) { naturalSize.x = mDesiredSize.GetWidth(); naturalSize.y = mDesiredSize.GetHeight(); @@ -540,7 +497,7 @@ void ImageVisual::GetNaturalSize( Vector2& naturalSize ) } else { - Image brokenImage = mFactoryCache.GetBrokenVisualImage(); + Texture brokenImage = mFactoryCache.GetBrokenVisualImage(); naturalSize.x = brokenImage.GetWidth(); naturalSize.y = brokenImage.GetWidth(); @@ -604,60 +561,6 @@ void ImageVisual::CreateRenderer( TextureSet& textureSet ) EnablePreMultipliedAlpha( IsPreMultipliedAlphaEnabled() ); } -void ImageVisual::CreateNativeImageRenderer( NativeImage& nativeImage ) -{ - Geometry geometry; - Shader shader; - - std::string fragmentShader; - const char* fragmentPreFix = nativeImage.GetCustomFragmentPreFix(); - const char* customSamplerTypename = nativeImage.GetCustomSamplerTypename(); - - if( fragmentPreFix ) - { - fragmentShader = fragmentPreFix; - fragmentShader += "\n"; - } - - if( mImpl->mCustomShader && !mImpl->mCustomShader->mFragmentShader.empty() ) - { - fragmentShader += mImpl->mCustomShader->mFragmentShader; - } - else - { - fragmentShader += mImageVisualShaderFactory.GetFragmentShaderSource(); - } - - if( customSamplerTypename ) - { - fragmentShader.replace( fragmentShader.find( DEFAULT_SAMPLER_TYPENAME ), strlen( DEFAULT_SAMPLER_TYPENAME ), customSamplerTypename ); - } - - if( !mImpl->mCustomShader ) - { - geometry = CreateGeometry( mFactoryCache, ImageDimensions( 1, 1 ) ); - - shader = Shader::New( mImageVisualShaderFactory.GetVertexShaderSource(), fragmentShader ); - shader.RegisterProperty( PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT ); - } - else - { - geometry = CreateGeometry( mFactoryCache, mImpl->mCustomShader->mGridSize ); - shader = Shader::New( mImpl->mCustomShader->mVertexShader.empty() ? mImageVisualShaderFactory.GetVertexShaderSource() : mImpl->mCustomShader->mVertexShader, - fragmentShader, - mImpl->mCustomShader->mHints ); - if( mImpl->mCustomShader->mVertexShader.empty() ) - { - shader.RegisterProperty( PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT ); - } - } - - mImpl->mRenderer = Renderer::New( geometry, shader ); - - //Register transform properties - mImpl->mTransform.RegisterUniforms( mImpl->mRenderer, Direction::LEFT_TO_RIGHT ); -} - void ImageVisual::LoadTexture( bool& atlasing, Vector4& atlasRect, TextureSet& textures, bool orientationCorrection, TextureManager::ReloadPolicy forceReload ) { @@ -706,13 +609,27 @@ bool ImageVisual::AttemptAtlasing() void ImageVisual::InitializeRenderer() { auto attemptAtlasing = AttemptAtlasing(); - // texture set has to be created first as we need to know if atlasing succeeded or not - // when selecting the shader - if( mTextureId == TextureManager::INVALID_TEXTURE_ID && ! mTextures ) // Only load the texture once + // Load Texture if mTextures is empty. + // mTextures is already set, the mTexture can be used to create Renderer. + // There are two cases mTextures is empty. + // 1. mTextureId == TextureManager::INVALID_TEXTURE_ID + // - Visual is on stage with LoadPolicy::ATTACHED + // 2. mTextureId != TextureManager::INVALID_TEXTURE_ID + // - If ReleasePolicy is DESTROYED, InitializeRenderer called every on stage called. + // - Then every resources those contained in Visual are Reset but mTextureId is remained when the Off stage time, + // - So, mTextures needed to be get from texture manager to created resources like mImpl->mRenderer. + if( ! mTextures ) { - LoadTexture( attemptAtlasing, mAtlasRect, mTextures, mOrientationCorrection, - TextureManager::ReloadPolicy::CACHED ); + if( mTextureId == TextureManager::INVALID_TEXTURE_ID ) + { + LoadTexture( attemptAtlasing, mAtlasRect, mTextures, mOrientationCorrection, + TextureManager::ReloadPolicy::CACHED ); + } + else + { + mTextures = mFactoryCache.GetTextureManager().GetTextureSet( mTextureId ); + } } CreateRenderer( mTextures ); @@ -733,35 +650,12 @@ void ImageVisual::InitializeRenderer() } } -void ImageVisual::InitializeRenderer( const Image& image ) -{ - TextureSet textures = TextureSet::New(); - - NativeImage nativeImage = NativeImage::DownCast( image ); - if( nativeImage ) - { - CreateNativeImageRenderer( nativeImage ); - DALI_ASSERT_DEBUG( textures ); - mImpl->mRenderer.SetTextures( textures ); - } - else - { - // reuse existing code for regular images - CreateRenderer( textures ); // Textures will be retreived from Image - } - ApplyImageToSampler( image ); -} - void ImageVisual::DoSetOnStage( Actor& actor ) { if( mImageUrl.IsValid() ) { InitializeRenderer(); } - else if( mImage ) - { - InitializeRenderer( mImage ); - } if( !mImpl->mRenderer ) { @@ -804,11 +698,6 @@ void ImageVisual::DoSetOffStage( Actor& actor ) mImpl->mResourceStatus = Toolkit::Visual::ResourceStatus::PREPARING; } - if( mImageUrl.IsValid() ) - { - // Legacy support for deprecated Dali::Image - mImage.Reset(); - } mLoading = false; mImpl->mRenderer.Reset(); mPlacementActor.Reset(); @@ -827,17 +716,6 @@ void ImageVisual::DoCreatePropertyMap( Property::Map& map ) const map.Insert( Toolkit::ImageVisual::Property::DESIRED_WIDTH, mDesiredSize.GetWidth() ); map.Insert( Toolkit::ImageVisual::Property::DESIRED_HEIGHT, mDesiredSize.GetHeight() ); } - else if( mImage ) - { - map.Insert( Toolkit::ImageVisual::Property::DESIRED_WIDTH, static_cast(mImage.GetWidth()) ); - map.Insert( Toolkit::ImageVisual::Property::DESIRED_HEIGHT, static_cast(mImage.GetHeight()) ); - - ResourceImage resourceImage = ResourceImage::DownCast(mImage); - if( resourceImage ) - { - map.Insert( Toolkit::ImageVisual::Property::URL, resourceImage.GetUrl() ); - } - } map.Insert( Toolkit::ImageVisual::Property::FITTING_MODE, mFittingMode ); map.Insert( Toolkit::ImageVisual::Property::SAMPLING_MODE, mSamplingMode ); @@ -869,11 +747,6 @@ void ImageVisual::DoCreateInstancePropertyMap( Property::Map& map ) const map.Insert( Toolkit::ImageVisual::Property::DESIRED_WIDTH, mDesiredSize.GetWidth() ); map.Insert( Toolkit::ImageVisual::Property::DESIRED_HEIGHT, mDesiredSize.GetHeight() ); } - else if( mImage ) - { - map.Insert( Toolkit::ImageVisual::Property::DESIRED_WIDTH, static_cast(mImage.GetWidth()) ); - map.Insert( Toolkit::ImageVisual::Property::DESIRED_HEIGHT, static_cast(mImage.GetHeight()) ); - } } void ImageVisual::OnDoAction( const Dali::Property::Index actionName, const Dali::Property::Value& attributes ) @@ -906,20 +779,6 @@ bool ImageVisual::IsResourceReady() const mImpl->mResourceStatus == Toolkit::Visual::ResourceStatus::FAILED ); } -void ImageVisual::ApplyImageToSampler( const Image& image ) -{ - if( image ) - { - TextureSet textureSet = mImpl->mRenderer.GetTextures(); - DALI_ASSERT_DEBUG( textureSet ); // texture set should always exist by this time - - TextureSetImage( textureSet, 0u, image ); - Sampler sampler = Sampler::New(); - sampler.SetWrapMode( mWrapModeU, mWrapModeV ); - textureSet.SetSampler( 0u, sampler ); - } -} - // From existing atlas manager void ImageVisual::UploadCompleted() { @@ -960,22 +819,20 @@ void ImageVisual::UploadComplete( bool loadingSuccess, int32_t textureId, Textur mPlacementActor.Reset(); } - if( loadingSuccess ) - { - Sampler sampler = Sampler::New(); - sampler.SetWrapMode( mWrapModeU, mWrapModeV ); - textureSet.SetSampler( 0u, sampler ); - mImpl->mRenderer.SetTextures(textureSet); - } - else + if( !loadingSuccess ) { - Image brokenImage = mFactoryCache.GetBrokenVisualImage(); + Texture brokenImage = mFactoryCache.GetBrokenVisualImage(); textureSet = TextureSet::New(); + textureSet.SetTexture(0u, brokenImage); mImpl->mRenderer.SetTextures( textureSet ); - - ApplyImageToSampler( brokenImage ); } + + Sampler sampler = Sampler::New(); + sampler.SetWrapMode( mWrapModeU, mWrapModeV ); + textureSet.SetSampler( 0u, sampler ); + mImpl->mRenderer.SetTextures(textureSet); + } // Storing TextureSet needed when renderer staged.