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=bd374aa77c048b559e98f44ba186938af394f13c;hp=af093931308bb8a04f5ab16770350a4a258a31dd;hb=54342c70a267a34b3345b24c404f1064fed99338;hpb=f00334715a31692c0bfd7eb0a7fc67c5ae09f327 diff --git a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp old mode 100755 new mode 100644 index af09393..bd374aa --- a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp +++ b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp @@ -19,10 +19,7 @@ #include "npatch-visual.h" // EXTERNAL INCLUDES -#include -#include -#include -#include +#include #include #include @@ -36,6 +33,7 @@ #include #include #include +#include namespace Dali { @@ -48,28 +46,23 @@ namespace Internal namespace { -const char * const BORDER_ONLY( "borderOnly" ); -const char * const BORDER( "border" ); -const char * const AUXILIARY_IMAGE_NAME( "auxiliaryImage" ); -const char * const AUXILIARY_IMAGE_ALPHA_NAME( "auxiliaryImageAlpha" ); -const char * const SYNCHRONOUS_LOADING( "synchronousLoading" ); - const char* VERTEX_SHADER = DALI_COMPOSE_SHADER( attribute mediump vec2 aPosition;\n 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 + uniform mediump vec2 extraSize;\n void main()\n {\n @@ -79,7 +72,7 @@ const char* VERTEX_SHADER = DALI_COMPOSE_SHADER( mediump vec2 fixedTotal = vec2( uNinePatchFactorsX[ FACTOR_SIZE_X - 1 ].x, uNinePatchFactorsY[ FACTOR_SIZE_Y - 1 ].x );\n mediump vec2 stretchTotal = vec2( uNinePatchFactorsX[ FACTOR_SIZE_X - 1 ].y, uNinePatchFactorsY[ FACTOR_SIZE_Y - 1 ].y );\n \n - vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw );\n + vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw ) + extraSize;\n vec2 visualOffset = mix( offset, offset/uSize.xy, offsetSizeMode.xy);\n \n mediump vec4 gridPosition = vec4( fixedFactor + ( visualSize.xy - fixedTotal ) * stretch / stretchTotal, 0.0, 1.0 );\n @@ -100,20 +93,21 @@ 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 + uniform mediump vec2 extraSize;\n \n void main()\n {\n - vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw );\n + vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw ) + extraSize;\n vec2 visualOffset = mix( offset, offset/uSize.xy, offsetSizeMode.xy);\n \n mediump vec2 size = visualSize.xy;\n @@ -186,15 +180,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() ); @@ -227,13 +221,13 @@ void AddVertex( Vector< Vector2 >& vertices, unsigned int x, unsigned int y ) vertices.PushBack( Vector2( x, y ) ); } -void RegisterStretchProperties( Renderer& renderer, const char * uniformName, const NPatchLoader::StretchRanges& stretchPixels, uint16_t imageExtent) +void RegisterStretchProperties( Renderer& renderer, const char * uniformName, const NPatchUtility::StretchRanges& stretchPixels, uint16_t imageExtent) { uint16_t prevEnd = 0; uint16_t prevFix = 0; uint16_t prevStretch = 0; unsigned int i = 1; - for( NPatchLoader::StretchRanges::ConstIterator it = stretchPixels.Begin(); it != stretchPixels.End(); ++it, ++i ) + for( NPatchUtility::StretchRanges::ConstIterator it = stretchPixels.Begin(); it != stretchPixels.End(); ++it, ++i ) { uint16_t start = it->GetX(); uint16_t end = it->GetY(); @@ -279,14 +273,6 @@ NPatchVisualPtr NPatchVisual::New( VisualFactoryCache& factoryCache, const Visua return nPatchVisual; } -NPatchVisualPtr NPatchVisual::New( VisualFactoryCache& factoryCache, NinePatchImage image ) -{ - NPatchVisualPtr nPatchVisual( new NPatchVisual( factoryCache ) ); - VisualUrl visualUrl( image.GetUrl() ); - nPatchVisual->mImageUrl = visualUrl; - return nPatchVisual; -} - void NPatchVisual::LoadImages() { TextureManager& textureManager = mFactoryCache.GetTextureManager(); @@ -402,7 +388,7 @@ void NPatchVisual::DoSetProperties( const Property::Map& propertyMap ) } } -void NPatchVisual::DoSetOnStage( Actor& actor ) +void NPatchVisual::DoSetOnScene( Actor& actor ) { // load when first go on stage LoadImages(); @@ -418,6 +404,11 @@ void NPatchVisual::DoSetOnStage( Actor& actor ) mPlacementActor = actor; if( data->loadCompleted ) { + if( RenderingAddOn::Get().IsValid() ) + { + RenderingAddOn::Get().SubmitRenderTask( mImpl->mRenderer, data->renderingMap ); + } + ApplyTextureAndUniforms(); actor.AddRenderer( mImpl->mRenderer ); mPlacementActor.Reset(); @@ -428,7 +419,7 @@ void NPatchVisual::DoSetOnStage( Actor& actor ) } } -void NPatchVisual::DoSetOffStage( Actor& actor ) +void NPatchVisual::DoSetOffScene( Actor& actor ) { actor.RemoveRenderer( mImpl->mRenderer ); mImpl->mRenderer.Reset(); @@ -446,6 +437,8 @@ 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 ); @@ -468,7 +461,7 @@ void NPatchVisual::DoCreateInstancePropertyMap( Property::Map& map ) const } NPatchVisual::NPatchVisual( VisualFactoryCache& factoryCache ) -: Visual::Base( factoryCache, Visual::FittingMode::FILL ), +: Visual::Base( factoryCache, Visual::FittingMode::FILL, Toolkit::Visual::N_PATCH ), mPlacementActor(), mLoader( factoryCache.GetNPatchLoader() ), mImageUrl(), @@ -499,13 +492,38 @@ Geometry NPatchVisual::CreateGeometry() } else { - geometry = GetNinePatchGeometry( VisualFactoryCache::NINE_PATCH_GEOMETRY ); + if( data->renderingMap ) + { + uint32_t elementCount[2]; + geometry = RenderingAddOn::Get().CreateGeometryGrid(data->renderingMap, Uint16Pair(3, 3), elementCount ); + if( mImpl->mRenderer ) + { + RenderingAddOn::Get().SubmitRenderTask(mImpl->mRenderer, data->renderingMap); + } + } + else + { + geometry = GetNinePatchGeometry( VisualFactoryCache::NINE_PATCH_GEOMETRY ); + } } } else if( data->stretchPixelsX.Size() > 0 || data->stretchPixelsY.Size() > 0) { Uint16Pair gridSize( 2 * data->stretchPixelsX.Size() + 1, 2 * data->stretchPixelsY.Size() + 1 ); - geometry = !mBorderOnly ? CreateGridGeometry( gridSize ) : CreateBorderGeometry( gridSize ); + if( !data->renderingMap ) + { + geometry = !mBorderOnly ? CreateGridGeometry( gridSize ) : CreateBorderGeometry( gridSize ); + } + else + { + uint32_t elementCount[2]; + geometry = !mBorderOnly ? + RenderingAddOn::Get().CreateGeometryGrid(data->renderingMap, gridSize, elementCount ) : CreateBorderGeometry(gridSize ); + if( mImpl->mRenderer ) + { + RenderingAddOn::Get().SubmitRenderTask(mImpl->mRenderer, data->renderingMap); + } + } } } else @@ -522,8 +540,8 @@ Shader NPatchVisual::CreateShader() const NPatchLoader::Data* data; // 0 is either no data (load failed?) or no stretch regions on image // for both cases we use the default shader - NPatchLoader::StretchRanges::SizeType xStretchCount = 0; - NPatchLoader::StretchRanges::SizeType yStretchCount = 0; + NPatchUtility::StretchRanges::SizeType xStretchCount = 0; + NPatchUtility::StretchRanges::SizeType yStretchCount = 0; auto fragmentShader = mAuxiliaryPixelBuffer ? FRAGMENT_MASK_SHADER : FRAGMENT_SHADER; @@ -633,8 +651,8 @@ void NPatchVisual::ApplyTextureAndUniforms() DALI_LOG_ERROR("The N patch image '%s' is not a valid N patch image\n", mImageUrl.GetUrl().c_str() ); textureSet = TextureSet::New(); - Image croppedImage = mFactoryCache.GetBrokenVisualImage(); - TextureSetImage( textureSet, 0u, croppedImage ); + Texture croppedImage = mFactoryCache.GetBrokenVisualImage(); + textureSet.SetTexture( 0u, croppedImage ); mImpl->mRenderer.RegisterProperty( "uFixed[0]", Vector2::ZERO ); mImpl->mRenderer.RegisterProperty( "uFixed[1]", Vector2::ZERO ); mImpl->mRenderer.RegisterProperty( "uFixed[2]", Vector2::ZERO ); @@ -660,8 +678,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 ); @@ -821,7 +839,7 @@ Geometry NPatchVisual::CreateBorderGeometry( Uint16Pair gridSize ) void NPatchVisual::SetResource() { const NPatchLoader::Data* data; - if( mLoader.GetNPatchData( mId, data ) ) + if( mImpl->mRenderer && mLoader.GetNPatchData( mId, data ) ) { Geometry geometry = CreateGeometry(); Shader shader = CreateShader();