X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fnpatch%2Fnpatch-visual.cpp;h=6dcf02077e915c73a38f4e26eeb0c8ba2ec4b488;hp=6ba1a994e8206a3583419b66314fa381a195612e;hb=e9ce8b35ce64531e5c6c6214527a5bf9b9747a36;hpb=e5d4cd830e75a208dd18c743e1564a4ed1fde780 diff --git a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp index 6ba1a99..6dcf020 100644 --- a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp +++ b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp @@ -19,12 +19,11 @@ #include "npatch-visual.h" // EXTERNAL INCLUDES -#include +#include #include #include // INTERNAL INCLUDES -#include #include #include #include @@ -33,6 +32,7 @@ #include #include #include +#include namespace Dali { @@ -50,14 +50,14 @@ const char* VERTEX_SHADER = DALI_COMPOSE_SHADER( varying mediump vec2 vTexCoord;\n varying mediump vec2 vMaskTexCoord;\n uniform highp mat4 uMvpMatrix;\n - uniform mediump vec3 uSize;\n + uniform highp vec3 uSize;\n uniform mediump vec2 uNinePatchFactorsX[ FACTOR_SIZE_X ];\n uniform mediump vec2 uNinePatchFactorsY[ FACTOR_SIZE_Y ];\n \n // Visual size and offset uniform mediump vec2 offset;\n - uniform mediump vec2 size;\n + uniform highp vec2 size;\n uniform mediump vec4 offsetSizeMode;\n uniform mediump vec2 origin;\n uniform mediump vec2 anchorPoint;\n @@ -92,13 +92,13 @@ const char* VERTEX_SHADER_3X3 = DALI_COMPOSE_SHADER( varying mediump vec2 vTexCoord;\n varying mediump vec2 vMaskTexCoord;\n uniform highp mat4 uMvpMatrix;\n - uniform mediump vec3 uSize;\n + uniform highp vec3 uSize;\n uniform mediump vec2 uFixed[ 3 ];\n uniform mediump vec2 uStretchTotal;\n \n //Visual size and offset uniform mediump vec2 offset;\n - uniform mediump vec2 size;\n + uniform highp vec2 size;\n uniform mediump vec4 offsetSizeMode;\n uniform mediump vec2 origin;\n uniform mediump vec2 anchorPoint;\n @@ -179,15 +179,15 @@ Geometry GenerateGeometry( const Vector< Vector2 >& vertices, const Vector< unsi { Property::Map vertexFormat; vertexFormat[ "aPosition" ] = Property::VECTOR2; - PropertyBuffer vertexPropertyBuffer = PropertyBuffer::New( vertexFormat ); + VertexBuffer vertexBuffer = VertexBuffer::New( vertexFormat ); if( vertices.Size() > 0 ) { - vertexPropertyBuffer.SetData( &vertices[ 0 ], vertices.Size() ); + vertexBuffer.SetData( &vertices[ 0 ], vertices.Size() ); } // Create the geometry object Geometry geometry = Geometry::New(); - geometry.AddVertexBuffer( vertexPropertyBuffer ); + geometry.AddVertexBuffer( vertexBuffer ); if( indices.Size() > 0 ) { geometry.SetIndexBuffer( &indices[ 0 ], indices.Size() ); @@ -277,15 +277,15 @@ void NPatchVisual::LoadImages() TextureManager& textureManager = mFactoryCache.GetTextureManager(); bool synchronousLoading = mImpl->mFlags & Impl::IS_SYNCHRONOUS_RESOURCE_LOADING; - if( NPatchLoader::UNINITIALIZED_ID == mId && mImageUrl.IsLocalResource() ) + if( mId == NPatchData::INVALID_NPATCH_DATA_ID && mImageUrl.IsLocalResource() ) { bool preMultiplyOnLoad = IsPreMultipliedAlphaEnabled() && !mImpl->mCustomShader ? true : false; mId = mLoader.Load( textureManager, this, mImageUrl.GetUrl(), mBorder, preMultiplyOnLoad, synchronousLoading ); - const NPatchLoader::Data* data; - if( mLoader.GetNPatchData( mId, data ) && data->loadCompleted ) + const NPatchData* data; + if( mLoader.GetNPatchData( mId, data ) && data->GetLoadingState() == NPatchData::LoadingState::LOAD_COMPLETE ) { - EnablePreMultipliedAlpha( preMultiplyOnLoad ); + EnablePreMultipliedAlpha( data->IsPreMultiplied() ); } } @@ -305,11 +305,11 @@ void NPatchVisual::GetNaturalSize( Vector2& naturalSize ) naturalSize.y = 0u; // load now if not already loaded - const NPatchLoader::Data* data; - if( mLoader.GetNPatchData( mId, data ) && data->loadCompleted ) + const NPatchData* data; + if( mLoader.GetNPatchData( mId, data ) && data->GetLoadingState() != NPatchData::LoadingState::LOADING ) { - naturalSize.x = data->croppedWidth; - naturalSize.y = data->croppedHeight; + naturalSize.x = data->GetCroppedWidth(); + naturalSize.y = data->GetCroppedHeight(); } else { @@ -385,14 +385,20 @@ void NPatchVisual::DoSetProperties( const Property::Map& propertyMap ) mImpl->mFlags &= ~Impl::IS_SYNCHRONOUS_RESOURCE_LOADING; } } + + Property::Value* releasePolicy = propertyMap.Find( Toolkit::ImageVisual::Property::RELEASE_POLICY, RELEASE_POLICY_NAME ); + if( releasePolicy ) + { + releasePolicy->Get( mReleasePolicy ); + } } -void NPatchVisual::DoSetOnStage( Actor& actor ) +void NPatchVisual::DoSetOnScene( Actor& actor ) { // load when first go on stage LoadImages(); - const NPatchLoader::Data* data; + const NPatchData* data; if( mLoader.GetNPatchData( mId, data ) ) { Geometry geometry = CreateGeometry(); @@ -401,8 +407,13 @@ void NPatchVisual::DoSetOnStage( Actor& actor ) mImpl->mRenderer = Renderer::New( geometry, shader ); mPlacementActor = actor; - if( data->loadCompleted ) + if( data->GetLoadingState() != NPatchData::LoadingState::LOADING ) { + if( RenderingAddOn::Get().IsValid() ) + { + RenderingAddOn::Get().SubmitRenderTask( mImpl->mRenderer, data->GetRenderingMap() ); + } + ApplyTextureAndUniforms(); actor.AddRenderer( mImpl->mRenderer ); mPlacementActor.Reset(); @@ -413,8 +424,15 @@ void NPatchVisual::DoSetOnStage( Actor& actor ) } } -void NPatchVisual::DoSetOffStage( Actor& actor ) +void NPatchVisual::DoSetOffScene( Actor& actor ) { + if((mId != NPatchData::INVALID_NPATCH_DATA_ID) && mReleasePolicy == Toolkit::ImageVisual::ReleasePolicy::DETACHED) + { + mLoader.Remove(mId, this); + mImpl->mResourceStatus = Toolkit::Visual::ResourceStatus::PREPARING; + mId = NPatchData::INVALID_NPATCH_DATA_ID; + } + actor.RemoveRenderer( mImpl->mRenderer ); mImpl->mRenderer.Reset(); mPlacementActor.Reset(); @@ -431,10 +449,13 @@ void NPatchVisual::OnSetTransform() void NPatchVisual::DoCreatePropertyMap( Property::Map& map ) const { map.Clear(); + bool sync = IsSynchronousLoadingRequired(); + map.Insert( Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, sync ); map.Insert( Toolkit::Visual::Property::TYPE, Toolkit::Visual::N_PATCH ); map.Insert( Toolkit::ImageVisual::Property::URL, mImageUrl.GetUrl() ); map.Insert( Toolkit::ImageVisual::Property::BORDER_ONLY, mBorderOnly ); map.Insert( Toolkit::ImageVisual::Property::BORDER, mBorder ); + map.Insert( Toolkit::ImageVisual::Property::RELEASE_POLICY, mReleasePolicy ); if( mAuxiliaryUrl.IsValid() ) { @@ -458,25 +479,31 @@ NPatchVisual::NPatchVisual( VisualFactoryCache& factoryCache ) mLoader( factoryCache.GetNPatchLoader() ), mImageUrl(), mAuxiliaryUrl(), - mId( NPatchLoader::UNINITIALIZED_ID ), + mId(NPatchData::INVALID_NPATCH_DATA_ID), mBorderOnly( false ), mBorder(), - mAuxiliaryImageAlpha( 0.0f ) + mAuxiliaryImageAlpha( 0.0f ), + mReleasePolicy( Toolkit::ImageVisual::ReleasePolicy::DETACHED ) { EnablePreMultipliedAlpha( mFactoryCache.GetPreMultiplyOnLoad() ); } NPatchVisual::~NPatchVisual() { + if((mId != NPatchData::INVALID_NPATCH_DATA_ID) && ( mReleasePolicy != Toolkit::ImageVisual::ReleasePolicy::NEVER )) + { + mLoader.Remove(mId, this); + mId = NPatchData::INVALID_NPATCH_DATA_ID; + } } Geometry NPatchVisual::CreateGeometry() { Geometry geometry; - const NPatchLoader::Data* data; - if( mLoader.GetNPatchData( mId, data ) && data->loadCompleted ) + const NPatchData* data; + if( mLoader.GetNPatchData( mId, data ) && data->GetLoadingState() == NPatchData::LoadingState::LOAD_COMPLETE ) { - if( data->stretchPixelsX.Size() == 1 && data->stretchPixelsY.Size() == 1 ) + if( data->GetStretchPixelsX().Size() == 1 && data->GetStretchPixelsY().Size() == 1 ) { if( DALI_UNLIKELY( mBorderOnly ) ) { @@ -484,13 +511,38 @@ Geometry NPatchVisual::CreateGeometry() } else { - geometry = GetNinePatchGeometry( VisualFactoryCache::NINE_PATCH_GEOMETRY ); + if( data->GetRenderingMap() ) + { + uint32_t elementCount[2]; + geometry = RenderingAddOn::Get().CreateGeometryGrid(data->GetRenderingMap(), Uint16Pair(3, 3), elementCount ); + if( mImpl->mRenderer ) + { + RenderingAddOn::Get().SubmitRenderTask(mImpl->mRenderer, data->GetRenderingMap()); + } + } + else + { + geometry = GetNinePatchGeometry( VisualFactoryCache::NINE_PATCH_GEOMETRY ); + } } } - else if( data->stretchPixelsX.Size() > 0 || data->stretchPixelsY.Size() > 0) + else if( data->GetStretchPixelsX().Size() > 0 || data->GetStretchPixelsY().Size() > 0) { - Uint16Pair gridSize( 2 * data->stretchPixelsX.Size() + 1, 2 * data->stretchPixelsY.Size() + 1 ); - geometry = !mBorderOnly ? CreateGridGeometry( gridSize ) : CreateBorderGeometry( gridSize ); + Uint16Pair gridSize( 2 * data->GetStretchPixelsX().Size() + 1, 2 * data->GetStretchPixelsY().Size() + 1 ); + if( !data->GetRenderingMap() ) + { + geometry = !mBorderOnly ? CreateGridGeometry( gridSize ) : CreateBorderGeometry( gridSize ); + } + else + { + uint32_t elementCount[2]; + geometry = !mBorderOnly ? + RenderingAddOn::Get().CreateGeometryGrid(data->GetRenderingMap(), gridSize, elementCount ) : CreateBorderGeometry(gridSize ); + if( mImpl->mRenderer ) + { + RenderingAddOn::Get().SubmitRenderTask(mImpl->mRenderer, data->GetRenderingMap()); + } + } } } else @@ -504,7 +556,7 @@ Geometry NPatchVisual::CreateGeometry() Shader NPatchVisual::CreateShader() { Shader shader; - const NPatchLoader::Data* data; + const NPatchData* data; // 0 is either no data (load failed?) or no stretch regions on image // for both cases we use the default shader NPatchUtility::StretchRanges::SizeType xStretchCount = 0; @@ -518,8 +570,8 @@ Shader NPatchVisual::CreateShader() // ask loader for the regions if( mLoader.GetNPatchData( mId, data ) ) { - xStretchCount = data->stretchPixelsX.Count(); - yStretchCount = data->stretchPixelsY.Count(); + xStretchCount = data->GetStretchPixelsX().Count(); + yStretchCount = data->GetStretchPixelsY().Count(); } if( DALI_LIKELY( !mImpl->mCustomShader ) ) @@ -583,25 +635,25 @@ Shader NPatchVisual::CreateShader() void NPatchVisual::ApplyTextureAndUniforms() { - const NPatchLoader::Data* data; + const NPatchData* data; TextureSet textureSet; - if( mLoader.GetNPatchData( mId, data ) && data->loadCompleted ) + if( mLoader.GetNPatchData( mId, data ) && data->GetLoadingState() == NPatchData::LoadingState::LOAD_COMPLETE ) { - textureSet = data->textureSet; + textureSet = data->GetTextures(); - if( data->stretchPixelsX.Size() == 1 && data->stretchPixelsY.Size() == 1 ) + if( data->GetStretchPixelsX().Size() == 1 && data->GetStretchPixelsY().Size() == 1 ) { //special case for 9 patch - Uint16Pair stretchX = data->stretchPixelsX[ 0 ]; - Uint16Pair stretchY = data->stretchPixelsY[ 0 ]; + Uint16Pair stretchX = data->GetStretchPixelsX()[ 0 ]; + Uint16Pair stretchY = data->GetStretchPixelsY()[ 0 ]; uint16_t stretchWidth = ( stretchX.GetY() >= stretchX.GetX() ) ? stretchX.GetY() - stretchX.GetX() : 0; uint16_t stretchHeight = ( stretchY.GetY() >= stretchY.GetX() ) ? stretchY.GetY() - stretchY.GetX() : 0; mImpl->mRenderer.RegisterProperty( "uFixed[0]", Vector2::ZERO ); mImpl->mRenderer.RegisterProperty( "uFixed[1]", Vector2( stretchX.GetX(), stretchY.GetX()) ); - mImpl->mRenderer.RegisterProperty( "uFixed[2]", Vector2( data->croppedWidth - stretchWidth, data->croppedHeight - stretchHeight ) ); + mImpl->mRenderer.RegisterProperty( "uFixed[2]", Vector2( data->GetCroppedWidth() - stretchWidth, data->GetCroppedHeight() - stretchHeight ) ); mImpl->mRenderer.RegisterProperty( "uStretchTotal", Vector2( stretchWidth, stretchHeight ) ); } else @@ -609,8 +661,8 @@ void NPatchVisual::ApplyTextureAndUniforms() mImpl->mRenderer.RegisterProperty( "uNinePatchFactorsX[0]", Vector2::ZERO ); mImpl->mRenderer.RegisterProperty( "uNinePatchFactorsY[0]", Vector2::ZERO ); - RegisterStretchProperties( mImpl->mRenderer, "uNinePatchFactorsX", data->stretchPixelsX, data->croppedWidth ); - RegisterStretchProperties( mImpl->mRenderer, "uNinePatchFactorsY", data->stretchPixelsY, data->croppedHeight ); + RegisterStretchProperties( mImpl->mRenderer, "uNinePatchFactorsX", data->GetStretchPixelsX(), data->GetCroppedWidth() ); + RegisterStretchProperties( mImpl->mRenderer, "uNinePatchFactorsY", data->GetStretchPixelsY(), data->GetCroppedHeight() ); } } else @@ -631,10 +683,10 @@ void NPatchVisual::ApplyTextureAndUniforms() // If the auxiliary image is smaller than the un-stretched NPatch, use CPU resizing to enlarge it to the // same size as the unstretched NPatch. This will give slightly higher quality results than just relying // on GL interpolation alone. - if( mAuxiliaryPixelBuffer.GetWidth() < data->croppedWidth && - mAuxiliaryPixelBuffer.GetHeight() < data->croppedHeight ) + if( mAuxiliaryPixelBuffer.GetWidth() < data->GetCroppedWidth() && + mAuxiliaryPixelBuffer.GetHeight() < data->GetCroppedHeight() ) { - mAuxiliaryPixelBuffer.Resize( data->croppedWidth, data->croppedHeight ); + mAuxiliaryPixelBuffer.Resize( data->GetCroppedWidth(), data->GetCroppedHeight() ); } // Note, this resets mAuxiliaryPixelBuffer handle @@ -645,8 +697,8 @@ void NPatchVisual::ApplyTextureAndUniforms() auxiliaryPixelData.GetHeight() ); texture.Upload( auxiliaryPixelData ); textureSet.SetTexture( 1, texture ); - DevelHandle::RegisterProperty( mImpl->mRenderer, DevelImageVisual::Property::AUXILIARY_IMAGE_ALPHA, - AUXILIARY_IMAGE_ALPHA_NAME, mAuxiliaryImageAlpha ); + mImpl->mRenderer.RegisterProperty( DevelImageVisual::Property::AUXILIARY_IMAGE_ALPHA, + AUXILIARY_IMAGE_ALPHA_NAME, mAuxiliaryImageAlpha ); } mImpl->mRenderer.SetTextures( textureSet ); @@ -805,7 +857,7 @@ Geometry NPatchVisual::CreateBorderGeometry( Uint16Pair gridSize ) void NPatchVisual::SetResource() { - const NPatchLoader::Data* data; + const NPatchData* data; if( mImpl->mRenderer && mLoader.GetNPatchData( mId, data ) ) { Geometry geometry = CreateGeometry(); @@ -827,29 +879,32 @@ void NPatchVisual::SetResource() } } +void NPatchVisual::UploadComplete( bool loadSuccess, int32_t textureId, TextureSet textureSet, bool useAtlasing, const Vector4& atlasRect, bool preMultiplied ) +{ + EnablePreMultipliedAlpha( preMultiplied ); + if(!loadSuccess) + { + // Image loaded and ready to display + ResourceReady( Toolkit::Visual::ResourceStatus::FAILED ); + } + + if( mAuxiliaryPixelBuffer || !mAuxiliaryUrl.IsValid() ) + { + SetResource(); + } +} + void NPatchVisual::LoadComplete( bool loadSuccess, Devel::PixelBuffer pixelBuffer, const VisualUrl& url, bool preMultiplied ) { - if( url.GetUrl() == mAuxiliaryUrl.GetUrl() ) + if( loadSuccess && url.GetUrl() == mAuxiliaryUrl.GetUrl() ) { mAuxiliaryPixelBuffer = pixelBuffer; - const NPatchLoader::Data* data; - if( mLoader.GetNPatchData( mId, data ) && data->loadCompleted ) - { - SetResource(); - } + SetResource(); } else { - if( loadSuccess ) - { - mLoader.SetNPatchData( mId, pixelBuffer ); - EnablePreMultipliedAlpha( preMultiplied ); - } - - if( mAuxiliaryPixelBuffer || !mAuxiliaryUrl.IsValid() ) - { - SetResource(); - } + // Image loaded and ready to display + ResourceReady( Toolkit::Visual::ResourceStatus::FAILED ); } }