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=6920c7f832962275fd2a786aef2e29d395bf4e20;hp=77d522e3d234d44c61ee8790ef52908a1b24624c;hb=c1df31569e5f3e30a3b35c960d88c3252880af81;hpb=d6fead18ff8cc7fca3feb1aa1789e47583796814 diff --git a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp index 77d522e..6920c7f 100644 --- a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp +++ b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,13 +19,16 @@ #include "npatch-visual.h" // EXTERNAL INCLUDES -#include #include #include #include +#include -// INTERNAL IINCLUDES +// INTERNAL INCLUDES #include +#include +#include +#include #include #include #include @@ -44,7 +47,8 @@ namespace Internal namespace { -const char * const BORDER_ONLY("borderOnly"); +const char * const BORDER_ONLY( "borderOnly" ); +const char * const BORDER( "border" ); const char* VERTEX_SHADER = DALI_COMPOSE_SHADER( attribute mediump vec2 aPosition;\n @@ -54,6 +58,14 @@ const char* VERTEX_SHADER = DALI_COMPOSE_SHADER( 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 mediump vec4 offsetSizeMode;\n + uniform mediump vec2 origin;\n + uniform mediump vec2 anchorPoint;\n + void main()\n {\n mediump vec2 fixedFactor = vec2( uNinePatchFactorsX[ int( ( aPosition.x + 1.0 ) * 0.5 ) ].x, uNinePatchFactorsY[ int( ( aPosition.y + 1.0 ) * 0.5 ) ].x );\n @@ -62,8 +74,13 @@ 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 - mediump vec4 vertexPosition = vec4( ( fixedFactor + ( uSize.xy - fixedTotal ) * stretch / stretchTotal ), 0.0, 1.0 );\n - vertexPosition.xy -= uSize.xy * vec2( 0.5, 0.5 );\n + + vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw );\n + vec2 visualOffset = mix( offset, offset/uSize.xy, offsetSizeMode.xy);\n + + mediump vec4 vertexPosition = vec4( ( fixedFactor + ( visualSize.xy - fixedTotal ) * stretch / stretchTotal ) + anchorPoint*visualSize + (visualOffset + origin)*uSize.xy, 0.0, 1.0 );\n + vertexPosition.xy -= visualSize.xy * vec2( 0.5, 0.5 );\n + vertexPosition = uMvpMatrix * vertexPosition;\n \n vTexCoord = ( fixedFactor + stretch ) / ( fixedTotal + stretchTotal );\n @@ -81,18 +98,28 @@ const char* VERTEX_SHADER_3X3 = DALI_COMPOSE_SHADER( 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 mediump vec4 offsetSizeMode;\n + uniform mediump vec2 origin;\n + uniform mediump vec2 anchorPoint;\n + void main()\n {\n - mediump vec2 scale = vec2( length( uModelMatrix[ 0 ].xyz ), length( uModelMatrix[ 1 ].xyz ) );\n - mediump vec2 size = uSize.xy * scale;\n + vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw );\n + vec2 visualOffset = mix( offset, offset/uSize.xy, offsetSizeMode.xy);\n + + mediump vec2 size = visualSize.xy;\n \n mediump vec2 fixedFactor = vec2( uFixed[ int( ( aPosition.x + 1.0 ) * 0.5 ) ].x, uFixed[ int( ( aPosition.y + 1.0 ) * 0.5 ) ].y );\n mediump vec2 stretch = floor( aPosition * 0.5 );\n mediump vec2 fixedTotal = uFixed[ 2 ];\n \n - mediump vec4 vertexPosition = vec4( fixedFactor + ( size - fixedTotal ) * stretch, 0.0, 1.0 );\n + mediump vec4 vertexPosition = vec4( fixedFactor + ( size - fixedTotal ) * stretch, 0.0, 1.0 ); vertexPosition.xy -= size * vec2( 0.5, 0.5 );\n - vertexPosition.xy = vertexPosition.xy / scale;\n + vertexPosition.xy = vertexPosition.xy + anchorPoint*size + (visualOffset + origin)*uSize.xy;\ \n vertexPosition = uMvpMatrix * vertexPosition;\n \n @@ -106,10 +133,16 @@ const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER( varying mediump vec2 vTexCoord;\n uniform sampler2D sTexture;\n uniform lowp vec4 uColor;\n - \n + uniform lowp vec3 mixColor;\n + uniform lowp float opacity;\n + uniform lowp float preMultipliedAlpha;\n + lowp vec4 visualMixColor()\n + {\n + return vec4( mixColor * mix( 1.0, opacity, preMultipliedAlpha ), opacity );\n + }\n void main()\n {\n - gl_FragColor = texture2D( sTexture, vTexCoord ) * uColor;\n + gl_FragColor = texture2D( sTexture, vTexCoord ) * uColor * visualMixColor();\n }\n ); @@ -200,358 +233,254 @@ void RegisterStretchProperties( Renderer& renderer, const char * uniformName, co /////////////////NPatchVisual//////////////// -NPatchVisual::NPatchVisual( VisualFactoryCache& factoryCache ) -: Visual::Base( factoryCache ), - mBorderOnly( false ) +NPatchVisualPtr NPatchVisual::New( VisualFactoryCache& factoryCache, const VisualUrl& imageUrl, const Property::Map& properties ) { -} + NPatchVisualPtr nPatchVisual( new NPatchVisual( factoryCache ) ); + nPatchVisual->mImageUrl = imageUrl; + nPatchVisual->SetProperties( properties ); -NPatchVisual::~NPatchVisual() -{ + return nPatchVisual; } -void NPatchVisual::DoInitialize( Actor& actor, const Property::Map& propertyMap ) +NPatchVisualPtr NPatchVisual::New( VisualFactoryCache& factoryCache, const VisualUrl& imageUrl ) { - Property::Value* imageURLValue = propertyMap.Find( Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME ); - if( imageURLValue ) - { - //Read the borderOnly property first since InitialiseFromImage relies on mBorderOnly to be properly set - Property::Value* borderOnlyValue = propertyMap.Find( Toolkit::ImageVisual::Property::BORDER_ONLY, BORDER_ONLY ); - if( borderOnlyValue ) - { - borderOnlyValue->Get( mBorderOnly ); - } + NPatchVisualPtr nPatchVisual( new NPatchVisual( factoryCache ) ); + nPatchVisual->mImageUrl = imageUrl; - if( imageURLValue->Get( mImageUrl ) ) - { - NinePatchImage nPatch = NinePatchImage::New( mImageUrl ); - InitializeFromImage( nPatch ); - } - else - { - InitializeFromBrokenImage(); - DALI_LOG_ERROR( "The property '%s' is not a string\n", IMAGE_URL_NAME ); - } - } + return nPatchVisual; } -void NPatchVisual::GetNaturalSize( Vector2& naturalSize ) const +NPatchVisualPtr NPatchVisual::New( VisualFactoryCache& factoryCache, NinePatchImage image ) { - if( mImage ) - { - naturalSize.x = mImage.GetWidth(); - naturalSize.y = mImage.GetHeight(); - } - else if( !mImageUrl.empty() ) - { - ImageDimensions dimentions = ResourceImage::GetImageSize( mImageUrl ); - naturalSize.x = dimentions.GetWidth(); - naturalSize.y = dimentions.GetHeight(); - } - else - { - naturalSize = Vector2::ZERO; - } + NPatchVisualPtr nPatchVisual( new NPatchVisual( factoryCache ) ); + VisualUrl visualUrl( image.GetUrl() ); + nPatchVisual->mImageUrl = visualUrl; + return nPatchVisual; } -Geometry NPatchVisual::CreateGeometry() +void NPatchVisual::GetNaturalSize( Vector2& naturalSize ) { - Geometry geometry; - if( mStretchPixelsX.Size() == 1 && mStretchPixelsY.Size() == 1 ) + naturalSize.x = 0u; + naturalSize.y = 0u; + + // load now if not already loaded + if( NPatchLoader::UNINITIALIZED_ID == mId && mImageUrl.IsLocal() ) { - if( !mBorderOnly ) - { - geometry = mFactoryCache.GetGeometry( VisualFactoryCache::NINE_PATCH_GEOMETRY ); - if( !geometry ) - { - geometry = CreateGeometry( Uint16Pair( 3, 3 ) ); - mFactoryCache.SaveGeometry( VisualFactoryCache::NINE_PATCH_GEOMETRY, geometry ); - } - } - else - { - geometry = mFactoryCache.GetGeometry( VisualFactoryCache::NINE_PATCH_BORDER_GEOMETRY ); - if( !geometry ) - { - geometry = CreateGeometryBorder( Uint16Pair( 3, 3 ) ); - mFactoryCache.SaveGeometry( VisualFactoryCache::NINE_PATCH_BORDER_GEOMETRY, geometry ); - } - } + mId = mLoader.Load( mImageUrl.GetUrl(), mBorder ); } - else if( mStretchPixelsX.Size() > 0 || mStretchPixelsY.Size() > 0) + const NPatchLoader::Data* data; + if( mLoader.GetNPatchData( mId, data ) ) { - Uint16Pair gridSize( 2 * mStretchPixelsX.Size() + 1, 2 * mStretchPixelsY.Size() + 1 ); - geometry = !mBorderOnly ? CreateGeometry( gridSize ) : CreateGeometryBorder( gridSize ); + naturalSize.x = data->croppedWidth; + naturalSize.y = data->croppedHeight; } - - return geometry; } -Shader NPatchVisual::CreateShader() +void NPatchVisual::DoSetProperties( const Property::Map& propertyMap ) { - Shader shader; - if( !mImpl->mCustomShader ) - { - if( mStretchPixelsX.Size() == 1 && mStretchPixelsY.Size() == 1 ) - { - shader = mFactoryCache.GetShader( VisualFactoryCache::NINE_PATCH_SHADER ); - if( !shader ) - { - shader = Shader::New( VERTEX_SHADER_3X3, FRAGMENT_SHADER ); - mFactoryCache.SaveShader( VisualFactoryCache::NINE_PATCH_SHADER, shader ); - } - } - else if( mStretchPixelsX.Size() > 0 || mStretchPixelsY.Size() > 0) - { - std::stringstream vertexShader; - vertexShader << "#define FACTOR_SIZE_X " << mStretchPixelsX.Size() + 2 << "\n" - << "#define FACTOR_SIZE_Y " << mStretchPixelsY.Size() + 2 << "\n" - << VERTEX_SHADER; + // URL is already passed in via constructor - shader = Shader::New( vertexShader.str(), FRAGMENT_SHADER ); - } - } - else + Property::Value* borderOnlyValue = propertyMap.Find( Toolkit::ImageVisual::Property::BORDER_ONLY, BORDER_ONLY ); + if( borderOnlyValue ) { - const char* fragmentShader = FRAGMENT_SHADER; - Dali::Shader::Hint::Value hints = Dali::Shader::Hint::NONE; - - if( !mImpl->mCustomShader->mFragmentShader.empty() ) - { - fragmentShader = mImpl->mCustomShader->mFragmentShader.c_str(); - } - hints = mImpl->mCustomShader->mHints; - - if( mStretchPixelsX.Size() == 1 && mStretchPixelsY.Size() == 1 ) - { - shader = Shader::New( VERTEX_SHADER_3X3, fragmentShader, hints ); - } - else if( mStretchPixelsX.Size() > 0 || mStretchPixelsY.Size() > 0) - { - std::stringstream vertexShader; - vertexShader << "#define FACTOR_SIZE_X " << mStretchPixelsX.Size() + 2 << "\n" - << "#define FACTOR_SIZE_Y " << mStretchPixelsY.Size() + 2 << "\n" - << VERTEX_SHADER; - - shader = Shader::New( vertexShader.str(), fragmentShader, hints ); - } + borderOnlyValue->Get( mBorderOnly ); } - return shader; -} - -void NPatchVisual::InitializeRenderer() -{ - Geometry geometry = CreateGeometry(); - Shader shader = CreateShader(); - - if( !geometry || !shader ) + Property::Value* borderValue = propertyMap.Find( Toolkit::DevelImageVisual::Property::BORDER, BORDER ); + if( borderValue && ! borderValue->Get( mBorder ) ) // If value exists and is rect, just set mBorder { - DALI_LOG_ERROR("The 9 patch image '%s' doesn't have any valid stretch borders and so is not a valid 9 patch image\n", mImageUrl.c_str() ); - InitializeFromBrokenImage(); + // Not a rect so try vector4 + Vector4 border; + if( borderValue->Get( border ) ) + { + mBorder.left = static_cast< int >( border.x ); + mBorder.right = static_cast< int >( border.y ); + mBorder.bottom = static_cast< int >( border.z ); + mBorder.top = static_cast< int >( border.w ); + } } - - TextureSet textureSet = TextureSet::New(); - mImpl->mRenderer = Renderer::New( geometry, shader ); - mImpl->mRenderer.SetTextures( textureSet ); } - void NPatchVisual::DoSetOnStage( Actor& actor ) { - if( !mCroppedImage ) + // load when first go on stage + if( NPatchLoader::UNINITIALIZED_ID == mId && mImageUrl.IsLocal() ) { - if( !mImageUrl.empty() ) - { - NinePatchImage nPatch = NinePatchImage::New( mImageUrl ); - InitializeFromImage( nPatch ); - } - else if( mImage ) - { - InitializeFromImage( mImage ); - } + mId = mLoader.Load( mImageUrl.GetUrl(), mBorder ); } - //initialize the renderer after initializing from the image since we need to know the grid size from the image before creating the geometry - InitializeRenderer(); + Geometry geometry = CreateGeometry(); + Shader shader = CreateShader(); + mImpl->mRenderer = Renderer::New( geometry, shader ); - if( mCroppedImage ) - { - ApplyImageToSampler(); - } + ApplyTextureAndUniforms(); actor.AddRenderer( mImpl->mRenderer ); + + // npatch loaded and ready to display + ResourceReady(); } void NPatchVisual::DoSetOffStage( Actor& actor ) { - mCroppedImage.Reset(); actor.RemoveRenderer( mImpl->mRenderer ); mImpl->mRenderer.Reset(); } -void NPatchVisual::DoCreatePropertyMap( Property::Map& map ) const +void NPatchVisual::OnSetTransform() { - map.Clear(); - map.Insert( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE ); - if( !mImageUrl.empty() ) - { - map.Insert( Toolkit::ImageVisual::Property::URL, mImageUrl ); - } - else if( mImage ) + if( mImpl->mRenderer ) { - map.Insert( Toolkit::ImageVisual::Property::URL, mImage.GetUrl() ); + mImpl->mTransform.RegisterUniforms( mImpl->mRenderer, Direction::LEFT_TO_RIGHT ); } - map.Insert( Toolkit::ImageVisual::Property::BORDER_ONLY, mBorderOnly ); } -void NPatchVisual::DoSetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue ) +void NPatchVisual::DoCreatePropertyMap( Property::Map& map ) const { - // TODO + map.Clear(); + map.Insert( Toolkit::DevelVisual::Property::TYPE, Toolkit::DevelVisual::N_PATCH ); + map.Insert( Toolkit::ImageVisual::Property::URL, mImageUrl.GetUrl() ); + map.Insert( Toolkit::ImageVisual::Property::BORDER_ONLY, mBorderOnly ); + map.Insert( Toolkit::DevelImageVisual::Property::BORDER, mBorder ); } -Dali::Property::Value NPatchVisual::DoGetProperty( Dali::Property::Index index ) +void NPatchVisual::DoCreateInstancePropertyMap( Property::Map& map ) const { - // TODO - return Dali::Property::Value(); + // Do nothing } -void NPatchVisual::ChangeRenderer( bool oldBorderOnly, size_t oldGridX, size_t oldGridY ) +NPatchVisual::NPatchVisual( VisualFactoryCache& factoryCache ) +: Visual::Base( factoryCache ), + mLoader( factoryCache.GetNPatchLoader() ), + mImageUrl(), + mId( NPatchLoader::UNINITIALIZED_ID ), + mBorderOnly( false ), + mBorder() { - //check to see if the border style has changed +} - bool borderOnlyChanged = oldBorderOnly != mBorderOnly; - bool gridChanged = oldGridX != mStretchPixelsX.Size() || oldGridY != mStretchPixelsY.Size(); +NPatchVisual::~NPatchVisual() +{ +} - if( borderOnlyChanged || gridChanged ) +Geometry NPatchVisual::CreateGeometry() +{ + Geometry geometry; + const NPatchLoader::Data* data; + if( mLoader.GetNPatchData( mId, data ) ) { - Geometry geometry = CreateGeometry(); - if( geometry ) + if( data->stretchPixelsX.Size() == 1 && data->stretchPixelsY.Size() == 1 ) { - mImpl->mRenderer.SetGeometry( geometry ); + if( DALI_UNLIKELY( mBorderOnly ) ) + { + geometry = GetNinePatchGeometry( VisualFactoryCache::NINE_PATCH_BORDER_GEOMETRY ); + } + else + { + geometry = GetNinePatchGeometry( VisualFactoryCache::NINE_PATCH_GEOMETRY ); + } } - else + else if( data->stretchPixelsX.Size() > 0 || data->stretchPixelsY.Size() > 0) { - InitializeFromBrokenImage(); + Uint16Pair gridSize( 2 * data->stretchPixelsX.Size() + 1, 2 * data->stretchPixelsY.Size() + 1 ); + geometry = !mBorderOnly ? CreateGridGeometry( gridSize ) : CreateBorderGeometry( gridSize ); } } - - if( gridChanged ) + else { - Shader shader = CreateShader(); - TextureSet textureSet; - if( shader ) - { - textureSet = mImpl->mRenderer.GetTextures(); - if( !textureSet ) - { - InitializeFromBrokenImage(); - } - mImpl->mRenderer.SetShader( shader ); - } + // no N patch data so use default geometry + geometry = GetNinePatchGeometry( VisualFactoryCache::NINE_PATCH_GEOMETRY ); } + return geometry; } -void NPatchVisual::SetImage( const std::string& imageUrl, bool borderOnly ) +Shader NPatchVisual::CreateShader() { - bool oldBorderOnly = mBorderOnly; - size_t oldGridX = mStretchPixelsX.Size(); - size_t oldGridY = mStretchPixelsY.Size(); + Shader shader; + 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 + NinePatchImage::StretchRanges::SizeType xStretchCount = 0; + NinePatchImage::StretchRanges::SizeType yStretchCount = 0; - mBorderOnly = borderOnly; - mImage.Reset(); - if( mImageUrl == imageUrl ) + // ask loader for the regions + if( mLoader.GetNPatchData( mId, data ) ) { - return; + xStretchCount = data->stretchPixelsX.Count(); + yStretchCount = data->stretchPixelsY.Count(); } - mImageUrl = imageUrl; - if( mImpl->mRenderer ) + if( DALI_LIKELY( !mImpl->mCustomShader ) ) { - NinePatchImage nPatch = NinePatchImage::New( mImageUrl ); - InitializeFromImage( nPatch ); - - ChangeRenderer( oldBorderOnly, oldGridX, oldGridY ); - - if( mCroppedImage ) + if( DALI_LIKELY( ( xStretchCount == 1 && yStretchCount == 1 ) || + ( xStretchCount == 0 && yStretchCount == 0 ) ) ) { - ApplyImageToSampler(); + shader = mFactoryCache.GetShader( VisualFactoryCache::NINE_PATCH_SHADER ); + if( DALI_UNLIKELY( !shader ) ) + { + shader = Shader::New( VERTEX_SHADER_3X3, FRAGMENT_SHADER ); + mFactoryCache.SaveShader( VisualFactoryCache::NINE_PATCH_SHADER, shader ); + } } - } -} - -void NPatchVisual::SetImage( NinePatchImage image, bool borderOnly ) -{ - bool oldBorderOnly = mBorderOnly; - size_t oldGridX = mStretchPixelsX.Size(); - size_t oldGridY = mStretchPixelsY.Size(); + else if( xStretchCount > 0 || yStretchCount > 0) + { + std::stringstream vertexShader; + vertexShader << "#define FACTOR_SIZE_X " << xStretchCount + 2 << "\n" + << "#define FACTOR_SIZE_Y " << yStretchCount + 2 << "\n" + << VERTEX_SHADER; - mBorderOnly = borderOnly; - mImageUrl.empty(); - if( mImage == image ) - { - return; + shader = Shader::New( vertexShader.str(), FRAGMENT_SHADER ); + } } - - mImage = image; - if( mImpl->mRenderer ) + else { - InitializeFromImage( mImage ); - ChangeRenderer( oldBorderOnly, oldGridX, oldGridY ); + const char* fragmentShader = FRAGMENT_SHADER; + Dali::Shader::Hint::Value hints = Dali::Shader::Hint::NONE; - if( mCroppedImage ) + if( !mImpl->mCustomShader->mFragmentShader.empty() ) { - ApplyImageToSampler(); + fragmentShader = mImpl->mCustomShader->mFragmentShader.c_str(); } - } -} - -void NPatchVisual::InitializeFromImage( NinePatchImage nPatch ) -{ - mCroppedImage = nPatch.CreateCroppedBufferImage(); - if( !mCroppedImage ) - { - DALI_LOG_ERROR("'%s' specify a valid 9 patch image\n", mImageUrl.c_str() ); - InitializeFromBrokenImage(); - return; - } - - mImageSize = ImageDimensions( mCroppedImage.GetWidth(), mCroppedImage.GetHeight() ); + hints = mImpl->mCustomShader->mHints; - mStretchPixelsX = nPatch.GetStretchPixelsX(); - mStretchPixelsY = nPatch.GetStretchPixelsY(); -} + if( ( xStretchCount == 1 && yStretchCount == 1 ) || + ( xStretchCount == 0 && yStretchCount == 0 ) ) + { + shader = Shader::New( VERTEX_SHADER_3X3, fragmentShader, hints ); + } + else if( xStretchCount > 0 || yStretchCount > 0) + { + std::stringstream vertexShader; + vertexShader << "#define FACTOR_SIZE_X " << xStretchCount + 2 << "\n" + << "#define FACTOR_SIZE_Y " << yStretchCount + 2 << "\n" + << VERTEX_SHADER; -void NPatchVisual::InitializeFromBrokenImage() -{ - mCroppedImage = VisualFactoryCache::GetBrokenVisualImage(); - mImageSize = ImageDimensions( mCroppedImage.GetWidth(), mCroppedImage.GetHeight() ); + shader = Shader::New( vertexShader.str(), fragmentShader, hints ); + } + } - mStretchPixelsX.Clear(); - mStretchPixelsX.PushBack( Uint16Pair( 0, mImageSize.GetWidth() ) ); - mStretchPixelsY.Clear(); - mStretchPixelsY.PushBack( Uint16Pair( 0, mImageSize.GetHeight() ) ); + return shader; } -void NPatchVisual::ApplyImageToSampler() +void NPatchVisual::ApplyTextureAndUniforms() { - TextureSet textureSet = mImpl->mRenderer.GetTextures(); - if( textureSet ) + const NPatchLoader::Data* data; + if( mLoader.GetNPatchData( mId, data ) ) { - TextureSetImage( textureSet, 0u, mCroppedImage ); - - if( mStretchPixelsX.Size() == 1 && mStretchPixelsY.Size() == 1 ) + TextureSet textures( data->textureSet ); + mImpl->mRenderer.SetTextures( textures ); + if( data->stretchPixelsX.Size() == 1 && data->stretchPixelsY.Size() == 1 ) { //special case for 9 patch - Uint16Pair stretchX = mStretchPixelsX[ 0 ]; - Uint16Pair stretchY = mStretchPixelsY[ 0 ]; + Uint16Pair stretchX = data->stretchPixelsX[ 0 ]; + Uint16Pair stretchY = data->stretchPixelsY[ 0 ]; uint16_t stretchWidth = stretchX.GetY() - stretchX.GetX(); uint16_t stretchHeight = stretchY.GetY() - stretchY.GetX(); mImpl->mRenderer.RegisterProperty( "uFixed[0]", Vector2::ZERO ); mImpl->mRenderer.RegisterProperty( "uFixed[1]", Vector2( stretchX.GetX(), stretchY.GetX()) ); - mImpl->mRenderer.RegisterProperty( "uFixed[2]", Vector2( mImageSize.GetWidth() - stretchWidth, mImageSize.GetHeight() - stretchHeight ) ); + mImpl->mRenderer.RegisterProperty( "uFixed[2]", Vector2( data->croppedWidth - stretchWidth, data->croppedHeight - stretchHeight ) ); mImpl->mRenderer.RegisterProperty( "uStretchTotal", Vector2( stretchWidth, stretchHeight ) ); } else @@ -559,13 +488,46 @@ void NPatchVisual::ApplyImageToSampler() mImpl->mRenderer.RegisterProperty( "uNinePatchFactorsX[0]", Vector2::ZERO ); mImpl->mRenderer.RegisterProperty( "uNinePatchFactorsY[0]", Vector2::ZERO ); - RegisterStretchProperties( mImpl->mRenderer, "uNinePatchFactorsX", mStretchPixelsX, mImageSize.GetWidth() ); - RegisterStretchProperties( mImpl->mRenderer, "uNinePatchFactorsY", mStretchPixelsY, mImageSize.GetHeight() ); + RegisterStretchProperties( mImpl->mRenderer, "uNinePatchFactorsX", data->stretchPixelsX, data->croppedWidth ); + RegisterStretchProperties( mImpl->mRenderer, "uNinePatchFactorsY", data->stretchPixelsY, data->croppedHeight ); + } + } + else + { + DALI_LOG_ERROR("The N patch image '%s' is not a valid N patch image\n", mImageUrl.GetUrl().c_str() ); + TextureSet textureSet = TextureSet::New(); + mImpl->mRenderer.SetTextures( textureSet ); + Image croppedImage = VisualFactoryCache::GetBrokenVisualImage(); + TextureSetImage( textureSet, 0u, croppedImage ); + mImpl->mRenderer.RegisterProperty( "uFixed[0]", Vector2::ZERO ); + mImpl->mRenderer.RegisterProperty( "uFixed[1]", Vector2::ZERO ); + mImpl->mRenderer.RegisterProperty( "uFixed[2]", Vector2::ZERO ); + mImpl->mRenderer.RegisterProperty( "uStretchTotal", Vector2( croppedImage.GetWidth(), croppedImage.GetHeight() ) ); + } + + //Register transform properties + mImpl->mTransform.RegisterUniforms( mImpl->mRenderer, Direction::LEFT_TO_RIGHT ); +} + +Geometry NPatchVisual::GetNinePatchGeometry( VisualFactoryCache::GeometryType subType ) +{ + Geometry geometry = mFactoryCache.GetGeometry( subType ); + if( !geometry ) + { + if( DALI_LIKELY( VisualFactoryCache::NINE_PATCH_GEOMETRY == subType ) ) + { + geometry = CreateGridGeometry( Uint16Pair( 3, 3 ) ); } + else if( VisualFactoryCache::NINE_PATCH_BORDER_GEOMETRY == subType ) + { + geometry = CreateBorderGeometry( Uint16Pair( 3, 3 ) ); + } + mFactoryCache.SaveGeometry( subType, geometry ); } + return geometry; } -Geometry NPatchVisual::CreateGeometry( Uint16Pair gridSize ) +Geometry NPatchVisual::CreateGridGeometry( Uint16Pair gridSize ) { uint16_t gridWidth = gridSize.GetWidth(); uint16_t gridHeight = gridSize.GetHeight(); @@ -583,7 +545,6 @@ Geometry NPatchVisual::CreateGeometry( Uint16Pair gridSize ) } // Create indices - //TODO: compare performance with triangle strip when Geometry supports it Vector< unsigned short > indices; indices.Reserve( gridWidth * gridHeight * 6 ); @@ -600,7 +561,7 @@ Geometry NPatchVisual::CreateGeometry( Uint16Pair gridSize ) return GenerateGeometry( vertices, indices ); } -Geometry NPatchVisual::CreateGeometryBorder( Uint16Pair gridSize ) +Geometry NPatchVisual::CreateBorderGeometry( Uint16Pair gridSize ) { uint16_t gridWidth = gridSize.GetWidth(); uint16_t gridHeight = gridSize.GetHeight(); @@ -640,7 +601,6 @@ Geometry NPatchVisual::CreateGeometryBorder( Uint16Pair gridSize ) } // Create indices - //TODO: compare performance with triangle strip when Geometry supports it Vector< unsigned short > indices; indices.Reserve( gridWidth * gridHeight * 6 );