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=0cd4c1bf58d092550dc5e8662548f0a8bb9e6c52;hp=ea4aaa2a021e92103cfcd60958a4640ec222428e;hb=dbc35ad10b31e70a99ef60c23fb0f5248a8ed271;hpb=7cfada64ad44d4a47785d49993b298f1c2dbd4a0 diff --git a/dali-toolkit/internal/visuals/image/image-visual.cpp b/dali-toolkit/internal/visuals/image/image-visual.cpp index ea4aaa2..0cd4c1b 100644 --- a/dali-toolkit/internal/visuals/image/image-visual.cpp +++ b/dali-toolkit/internal/visuals/image/image-visual.cpp @@ -21,11 +21,10 @@ // EXTERNAL HEADERS #include // for strlen() #include -#include -#include -#include -#include +#include #include +#include +#include #include #include #include @@ -99,8 +98,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,19 +143,13 @@ 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, ImageDimensions size, FittingMode::Type fittingMode, Dali::SamplingMode::Type samplingMode ) -: Visual::Base( factoryCache, Visual::FittingMode::FILL ), - mImage(), +: Visual::Base( factoryCache, Visual::FittingMode::FILL, Toolkit::Visual::IMAGE ), mPixelArea( FULL_TEXTURE_RECT ), mPlacementActor(), mImageUrl( imageUrl ), @@ -182,32 +173,6 @@ ImageVisual::ImageVisual( VisualFactoryCache& factoryCache, EnablePreMultipliedAlpha( mFactoryCache.GetPreMultiplyOnLoad() ); } -ImageVisual::ImageVisual( VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const Image& image ) -: Visual::Base( factoryCache, Visual::FittingMode::FILL ), - 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 +447,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(); @@ -507,9 +466,12 @@ void ImageVisual::GetNaturalSize( Vector2& naturalSize ) if( textureSet ) { auto texture = textureSet.GetTexture(0); - naturalSize.x = texture.GetWidth(); - naturalSize.y = texture.GetHeight(); - return; + if( texture ) + { + naturalSize.x = texture.GetWidth(); + naturalSize.y = texture.GetHeight(); + return; + } } } @@ -537,7 +499,7 @@ void ImageVisual::GetNaturalSize( Vector2& naturalSize ) } else { - Image brokenImage = mFactoryCache.GetBrokenVisualImage(); + Texture brokenImage = mFactoryCache.GetBrokenVisualImage(); naturalSize.x = brokenImage.GetWidth(); naturalSize.y = brokenImage.GetWidth(); @@ -551,44 +513,31 @@ void ImageVisual::GetNaturalSize( Vector2& naturalSize ) void ImageVisual::CreateRenderer( TextureSet& textureSet ) { Geometry geometry; - Shader shader; - if( !mImpl->mCustomShader ) + // Get the geometry + if( mImpl->mCustomShader ) { - geometry = CreateGeometry( mFactoryCache, ImageDimensions( 1, 1 ) ); - - shader = mImageVisualShaderFactory.GetShader( mFactoryCache, - mImpl->mFlags & Impl::IS_ATLASING_APPLIED, - mWrapModeU <= WrapMode::CLAMP_TO_EDGE && mWrapModeV <= WrapMode::CLAMP_TO_EDGE, - IsRoundedCornerRequired() ); + geometry = CreateGeometry( mFactoryCache, mImpl->mCustomShader->mGridSize ); } - else + else // Get any geometry associated with the texture { - geometry = CreateGeometry( mFactoryCache, mImpl->mCustomShader->mGridSize ); - if( mImpl->mCustomShader->mVertexShader.empty() && mImpl->mCustomShader->mFragmentShader.empty() ) - { - // Use custom hints - shader = Shader::New( mImageVisualShaderFactory.GetVertexShaderSource(), mImageVisualShaderFactory.GetFragmentShaderSource(), mImpl->mCustomShader->mHints ); - shader.RegisterProperty( PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT ); - } - else + TextureManager& textureManager = mFactoryCache.GetTextureManager(); + + uint32_t firstElementCount {0u}; + uint32_t secondElementCount {0u}; + geometry = textureManager.GetRenderGeometry(mTextureId, firstElementCount, secondElementCount); + + if(!firstElementCount && !secondElementCount) // Otherwise use quad { - shader = Shader::New( mImpl->mCustomShader->mVertexShader.empty() ? mImageVisualShaderFactory.GetVertexShaderSource() : mImpl->mCustomShader->mVertexShader, - mImpl->mCustomShader->mFragmentShader.empty() ? mImageVisualShaderFactory.GetFragmentShaderSource() : mImpl->mCustomShader->mFragmentShader, - mImpl->mCustomShader->mHints ); - if( mImpl->mCustomShader->mVertexShader.empty() ) - { - shader.RegisterProperty( PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT ); - } + geometry = CreateGeometry( mFactoryCache, ImageDimensions( 1, 1 ) ); } } - // Set pixel align off as default. - // ToDo: Pixel align causes issues such as rattling image animation. - // We should trun it off until issues are resolved - shader.RegisterProperty( PIXEL_ALIGNED_UNIFORM_NAME, PIXEL_ALIGN_OFF ); + Shader shader = GetShader(); + // Create the renderer mImpl->mRenderer = Renderer::New( geometry, shader ); + if( textureSet ) { mImpl->mRenderer.SetTextures( textureSet ); @@ -601,59 +550,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 ) @@ -703,13 +599,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 ); @@ -730,35 +640,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 ) +void ImageVisual::DoSetOnScene( Actor& actor ) { if( mImageUrl.IsValid() ) { InitializeRenderer(); } - else if( mImage ) - { - InitializeRenderer( mImage ); - } if( !mImpl->mRenderer ) { @@ -768,7 +655,7 @@ void ImageVisual::DoSetOnStage( Actor& actor ) mPlacementActor = actor; // Search the Actor tree to find if Layer UI behaviour set. Layer layer = actor.GetLayer(); - if( layer && layer.GetBehavior() == Layer::LAYER_3D ) + if( layer && layer.GetProperty( Layer::Property::BEHAVIOR ) == Layer::LAYER_3D ) { // Layer 3D set, do not align pixels mImpl->mRenderer.RegisterProperty( PIXEL_ALIGNED_UNIFORM_NAME, PIXEL_ALIGN_OFF ); @@ -789,9 +676,9 @@ void ImageVisual::DoSetOnStage( Actor& actor ) } } -void ImageVisual::DoSetOffStage( Actor& actor ) +void ImageVisual::DoSetOffScene( Actor& actor ) { - // Visual::Base::SetOffStage only calls DoSetOffStage if mRenderer exists (is on onstage) + // Visual::Base::SetOffScene only calls DoSetOffScene if mRenderer exists (is on onstage) // Image release is dependent on the ReleasePolicy, renderer is destroyed. actor.RemoveRenderer( mImpl->mRenderer); @@ -801,11 +688,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(); @@ -824,17 +706,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 ); @@ -866,11 +737,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 ) @@ -903,17 +769,12 @@ bool ImageVisual::IsResourceReady() const mImpl->mResourceStatus == Toolkit::Visual::ResourceStatus::FAILED ); } -void ImageVisual::ApplyImageToSampler( const Image& image ) +void ImageVisual::UpdateShader() { - if( image ) + if(mImpl->mRenderer) { - 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 ); + Shader shader = GetShader(); + mImpl->mRenderer.SetShader(shader); } } @@ -957,22 +818,20 @@ void ImageVisual::UploadComplete( bool loadingSuccess, int32_t textureId, Textur mPlacementActor.Reset(); } - if( loadingSuccess ) + if( !loadingSuccess ) { - Sampler sampler = Sampler::New(); - sampler.SetWrapMode( mWrapModeU, mWrapModeV ); - textureSet.SetSampler( 0u, sampler ); - mImpl->mRenderer.SetTextures(textureSet); - } - else - { - 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. @@ -990,6 +849,37 @@ void ImageVisual::UploadComplete( bool loadingSuccess, int32_t textureId, Textur { resourceStatus = Toolkit::Visual::ResourceStatus::FAILED; } + + // use geometry if needed + if( loadingSuccess ) + { + uint32_t firstElementCount{0u}; + uint32_t secondElementCount{0u}; + auto geometry = mFactoryCache.GetTextureManager().GetRenderGeometry(mTextureId, firstElementCount, secondElementCount); + if (mImpl->mRenderer && geometry) + { + mImpl->mRenderer.SetGeometry(geometry); + Dali::DevelRenderer::DrawCommand drawCommand{}; + drawCommand.drawType = DevelRenderer::DrawType::INDEXED; + + if (firstElementCount) + { + drawCommand.firstIndex = 0; + drawCommand.elementCount = firstElementCount; + drawCommand.queue = DevelRenderer::RENDER_QUEUE_OPAQUE; + DevelRenderer::AddDrawCommand(mImpl->mRenderer, drawCommand); + } + + if (secondElementCount) + { + drawCommand.firstIndex = firstElementCount; + drawCommand.elementCount = secondElementCount; + drawCommand.queue = DevelRenderer::RENDER_QUEUE_TRANSPARENT; + DevelRenderer::AddDrawCommand(mImpl->mRenderer, drawCommand); + } + } + } + // Signal to observers ( control ) that resources are ready. Must be all resources. ResourceReady( resourceStatus ); mLoading = false; @@ -1022,6 +912,76 @@ void ImageVisual::RemoveTexture() } } +Shader ImageVisual::GetShader() +{ + Shader shader; + + std::string_view vertexShaderView; + bool usesWholeTexture = true; + if(mImpl->mCustomShader && !mImpl->mCustomShader->mVertexShader.empty()) + { + vertexShaderView = mImpl->mCustomShader->mVertexShader; + usesWholeTexture = false; // Impossible to tell. + } + else + { + vertexShaderView = mImageVisualShaderFactory.GetVertexShaderSource(); + } + + std::string_view fragmentShaderView; + if(mImpl->mCustomShader && !mImpl->mCustomShader->mFragmentShader.empty()) + { + fragmentShaderView = mImpl->mCustomShader->mFragmentShader; + } + else + { + fragmentShaderView = mImageVisualShaderFactory.GetFragmentShaderSource(); + } + + // If the texture is native, we may need to change prefix and sampler in + // the fragment shader + bool modifiedFragmentShader = false; + std::string fragmentShaderString; + if(mTextures && DevelTexture::IsNative(mTextures.GetTexture(0))) + { + Texture nativeTexture = mTextures.GetTexture(0); + fragmentShaderString = std::string(fragmentShaderView); + modifiedFragmentShader = DevelTexture::ApplyNativeFragmentShader(nativeTexture, fragmentShaderString); + fragmentShaderView = fragmentShaderString; + } + + const bool useStandardShader = !mImpl->mCustomShader && !modifiedFragmentShader; + if(useStandardShader) + { + // Create and cache the standard shader + shader = mImageVisualShaderFactory.GetShader( + mFactoryCache, + mImpl->mFlags & Impl::IS_ATLASING_APPLIED, + mWrapModeU <= WrapMode::CLAMP_TO_EDGE && mWrapModeV <= WrapMode::CLAMP_TO_EDGE, + IsRoundedCornerRequired() ); + } + else if(mImpl->mCustomShader) + { + shader = Shader::New(vertexShaderView, fragmentShaderView, mImpl->mCustomShader->mHints); + } + else + { + shader = Shader::New(vertexShaderView, fragmentShaderView); + } + + if(usesWholeTexture) + { + shader.RegisterProperty( PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT ); + } + + // Set pixel align off as default. + // ToDo: Pixel align causes issues such as rattling image animation. + // We should trun it off until issues are resolved + shader.RegisterProperty( PIXEL_ALIGNED_UNIFORM_NAME, PIXEL_ALIGN_OFF ); + + return shader; +} + } // namespace Internal } // namespace Toolkit