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=6ecb818ca9aa470d0bef4dcb1695c448b5cb92c6;hp=a4cf8c0413a105dda89ab73c1c3289c85d7c4cd3;hb=5a2a5883422f4d114902ac57d57d7d1e973fbb2e;hpb=16a4ae532b2d38157fa31a2fe21d29bfb4c7be75 diff --git a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp index a4cf8c0..6ecb818 100644 --- a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp +++ b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp @@ -26,7 +26,8 @@ // INTERNAL INCLUDES #include -#include +#include +#include #include #include #include @@ -109,7 +110,7 @@ const char* VERTEX_SHADER_3X3 = DALI_COMPOSE_SHADER( vec2 visualOffset = mix( offset, offset/uSize.xy, offsetSizeMode.xy);\n mediump vec2 scale = vec2( length( uModelMatrix[ 0 ].xyz ), length( uModelMatrix[ 1 ].xyz ) );\n - mediump vec2 size = visualSize.xy * scale;\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 @@ -117,7 +118,7 @@ const char* VERTEX_SHADER_3X3 = DALI_COMPOSE_SHADER( \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 + anchorPoint*size + (visualOffset + origin)*uSize.xy;\ + vertexPosition.xy = vertexPosition.xy + anchorPoint*size + (visualOffset + origin)*uSize.xy;\ \n vertexPosition = uMvpMatrix * vertexPosition;\n \n @@ -131,10 +132,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 ); @@ -225,47 +232,52 @@ void RegisterStretchProperties( Renderer& renderer, const char * uniformName, co /////////////////NPatchVisual//////////////// -NPatchVisualPtr NPatchVisual::New( VisualFactoryCache& factoryCache, const std::string& imageUrl ) +NPatchVisualPtr NPatchVisual::New( VisualFactoryCache& factoryCache, const std::string& imageUrl, const Property::Map& properties ) { - NPatchVisual* nPatchVisual = new NPatchVisual( factoryCache ); + NPatchVisualPtr nPatchVisual( new NPatchVisual( factoryCache ) ); nPatchVisual->mImageUrl = imageUrl; - - NinePatchImage image = NinePatchImage::New( imageUrl ); - nPatchVisual->InitializeFromImage( image ); + nPatchVisual->SetProperties( properties ); return nPatchVisual; } -NPatchVisualPtr NPatchVisual::New( VisualFactoryCache& factoryCache, NinePatchImage image ) +NPatchVisualPtr NPatchVisual::New( VisualFactoryCache& factoryCache, const std::string& imageUrl ) { - NPatchVisual* nPatchVisual = new NPatchVisual( factoryCache ); - nPatchVisual->mImage = image; - - nPatchVisual->InitializeFromImage( image ); + NPatchVisualPtr nPatchVisual( new NPatchVisual( factoryCache ) ); + nPatchVisual->mImageUrl = imageUrl; return nPatchVisual; } -NPatchVisual::NPatchVisual( VisualFactoryCache& factoryCache ) -: Visual::Base( factoryCache ), - mImage(), - mCroppedImage(), - mImageUrl(), - mStretchPixelsX(), - mStretchPixelsY(), - mImageSize(), - mBorderOnly( false ) +NPatchVisualPtr NPatchVisual::New( VisualFactoryCache& factoryCache, NinePatchImage image ) { + NPatchVisualPtr nPatchVisual( new NPatchVisual( factoryCache ) ); + nPatchVisual->mImageUrl = image.GetUrl(); + + return nPatchVisual; } -NPatchVisual::~NPatchVisual() +void NPatchVisual::GetNaturalSize( Vector2& naturalSize ) { + naturalSize.x = 0u; + naturalSize.y = 0u; + // load now if not already loaded + if( NPatchLoader::UNINITIALIZED_ID == mId ) + { + mId = mLoader.Load( mImageUrl ); + } + const NPatchLoader::Data* data; + if( mLoader.GetNPatchData( mId, data ) ) + { + naturalSize.x = data->croppedWidth; + naturalSize.y = data->croppedHeight; + } } void NPatchVisual::DoSetProperties( const Property::Map& propertyMap ) { // URL is already passed in via constructor - //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 ) { @@ -273,77 +285,122 @@ void NPatchVisual::DoSetProperties( const Property::Map& propertyMap ) } } -void NPatchVisual::GetNaturalSize( Vector2& naturalSize ) const +void NPatchVisual::DoSetOnStage( Actor& actor ) { - if( mImage ) - { - naturalSize.x = mImage.GetWidth(); - naturalSize.y = mImage.GetHeight(); - } - else if( !mImageUrl.empty() ) + // load when first go on stage + if( NPatchLoader::UNINITIALIZED_ID == mId ) { - ImageDimensions dimentions = ResourceImage::GetImageSize( mImageUrl ); - naturalSize.x = dimentions.GetWidth(); - naturalSize.y = dimentions.GetHeight(); + mId = mLoader.Load( mImageUrl ); } - else + + Geometry geometry = CreateGeometry(); + Shader shader = CreateShader(); + mImpl->mRenderer = Renderer::New( geometry, shader ); + + ApplyTextureAndUniforms(); + + actor.AddRenderer( mImpl->mRenderer ); +} + +void NPatchVisual::DoSetOffStage( Actor& actor ) +{ + actor.RemoveRenderer( mImpl->mRenderer ); + mImpl->mRenderer.Reset(); +} + +void NPatchVisual::OnSetTransform() +{ + if( mImpl->mRenderer ) { - naturalSize = Vector2::ZERO; + mImpl->mTransform.RegisterUniforms( mImpl->mRenderer, Direction::LEFT_TO_RIGHT ); } } +void NPatchVisual::DoCreatePropertyMap( Property::Map& map ) const +{ + map.Clear(); + map.Insert( Toolkit::DevelVisual::Property::TYPE, Toolkit::Visual::IMAGE ); + map.Insert( Toolkit::ImageVisual::Property::URL, mImageUrl ); + map.Insert( Toolkit::ImageVisual::Property::BORDER_ONLY, mBorderOnly ); +} + +NPatchVisual::NPatchVisual( VisualFactoryCache& factoryCache ) +: Visual::Base( factoryCache ), + mLoader( factoryCache.GetNPatchLoader() ), + mImageUrl(), + mId( NPatchLoader::UNINITIALIZED_ID ), + mBorderOnly( false ) +{ +} + +NPatchVisual::~NPatchVisual() +{ +} + Geometry NPatchVisual::CreateGeometry() { Geometry geometry; - if( mStretchPixelsX.Size() == 1 && mStretchPixelsY.Size() == 1 ) + const NPatchLoader::Data* data; + if( mLoader.GetNPatchData( mId, data ) ) { - if( !mBorderOnly ) + if( data->stretchPixelsX.Size() == 1 && data->stretchPixelsY.Size() == 1 ) { - geometry = mFactoryCache.GetGeometry( VisualFactoryCache::NINE_PATCH_GEOMETRY ); - if( !geometry ) + if( DALI_UNLIKELY( mBorderOnly ) ) { - geometry = CreateGeometry( Uint16Pair( 3, 3 ) ); - mFactoryCache.SaveGeometry( VisualFactoryCache::NINE_PATCH_GEOMETRY, geometry ); + geometry = GetNinePatchGeometry( VisualFactoryCache::NINE_PATCH_BORDER_GEOMETRY ); } - } - else - { - geometry = mFactoryCache.GetGeometry( VisualFactoryCache::NINE_PATCH_BORDER_GEOMETRY ); - if( !geometry ) + else { - geometry = CreateGeometryBorder( Uint16Pair( 3, 3 ) ); - mFactoryCache.SaveGeometry( VisualFactoryCache::NINE_PATCH_BORDER_GEOMETRY, geometry ); + 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 ); + } } - else if( mStretchPixelsX.Size() > 0 || mStretchPixelsY.Size() > 0) + else { - Uint16Pair gridSize( 2 * mStretchPixelsX.Size() + 1, 2 * mStretchPixelsY.Size() + 1 ); - geometry = !mBorderOnly ? CreateGeometry( gridSize ) : CreateGeometryBorder( gridSize ); + // no N patch data so use default geometry + geometry = GetNinePatchGeometry( VisualFactoryCache::NINE_PATCH_GEOMETRY ); } - return geometry; } Shader NPatchVisual::CreateShader() { Shader shader; - if( !mImpl->mCustomShader ) + 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; + + // ask loader for the regions + if( mLoader.GetNPatchData( mId, data ) ) { - if( mStretchPixelsX.Size() == 1 && mStretchPixelsY.Size() == 1 ) + xStretchCount = data->stretchPixelsX.Count(); + yStretchCount = data->stretchPixelsY.Count(); + } + + if( DALI_LIKELY( !mImpl->mCustomShader ) ) + { + if( DALI_LIKELY( ( xStretchCount == 1 && yStretchCount == 1 ) || + ( xStretchCount == 0 && yStretchCount == 0 ) ) ) { shader = mFactoryCache.GetShader( VisualFactoryCache::NINE_PATCH_SHADER ); - if( !shader ) + if( DALI_UNLIKELY( !shader ) ) { shader = Shader::New( VERTEX_SHADER_3X3, FRAGMENT_SHADER ); mFactoryCache.SaveShader( VisualFactoryCache::NINE_PATCH_SHADER, shader ); } } - else if( mStretchPixelsX.Size() > 0 || mStretchPixelsY.Size() > 0) + else if( xStretchCount > 0 || yStretchCount > 0) { std::stringstream vertexShader; - vertexShader << "#define FACTOR_SIZE_X " << mStretchPixelsX.Size() + 2 << "\n" - << "#define FACTOR_SIZE_Y " << mStretchPixelsY.Size() + 2 << "\n" + vertexShader << "#define FACTOR_SIZE_X " << xStretchCount + 2 << "\n" + << "#define FACTOR_SIZE_Y " << yStretchCount + 2 << "\n" << VERTEX_SHADER; shader = Shader::New( vertexShader.str(), FRAGMENT_SHADER ); @@ -360,15 +417,16 @@ Shader NPatchVisual::CreateShader() } hints = mImpl->mCustomShader->mHints; - if( mStretchPixelsX.Size() == 1 && mStretchPixelsY.Size() == 1 ) + if( ( xStretchCount == 1 && yStretchCount == 1 ) || + ( xStretchCount == 0 && yStretchCount == 0 ) ) { shader = Shader::New( VERTEX_SHADER_3X3, fragmentShader, hints ); } - else if( mStretchPixelsX.Size() > 0 || mStretchPixelsY.Size() > 0) + else if( xStretchCount > 0 || yStretchCount > 0) { std::stringstream vertexShader; - vertexShader << "#define FACTOR_SIZE_X " << mStretchPixelsX.Size() + 2 << "\n" - << "#define FACTOR_SIZE_Y " << mStretchPixelsY.Size() + 2 << "\n" + vertexShader << "#define FACTOR_SIZE_X " << xStretchCount + 2 << "\n" + << "#define FACTOR_SIZE_Y " << yStretchCount + 2 << "\n" << VERTEX_SHADER; shader = Shader::New( vertexShader.str(), fragmentShader, hints ); @@ -378,190 +436,72 @@ Shader NPatchVisual::CreateShader() return shader; } -void NPatchVisual::InitializeRenderer() -{ - Geometry geometry = CreateGeometry(); - Shader shader = CreateShader(); - - if( !geometry || !shader ) - { - 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(); - } - - TextureSet textureSet = TextureSet::New(); - mImpl->mRenderer = Renderer::New( geometry, shader ); - mImpl->mRenderer.SetTextures( textureSet ); - - //Register transform properties - mImpl->mTransform.RegisterUniforms( mImpl->mRenderer, Direction::LEFT_TO_RIGHT ); -} - - -void NPatchVisual::DoSetOnStage( Actor& actor ) +void NPatchVisual::ApplyTextureAndUniforms() { - if( !mCroppedImage ) + const NPatchLoader::Data* data; + if( mLoader.GetNPatchData( mId, data ) ) { - if( !mImageUrl.empty() ) - { - NinePatchImage nPatch = NinePatchImage::New( mImageUrl ); - InitializeFromImage( nPatch ); - } - else if( mImage ) + TextureSet textures( data->textureSet ); + mImpl->mRenderer.SetTextures( textures ); + if( data->stretchPixelsX.Size() == 1 && data->stretchPixelsY.Size() == 1 ) { - InitializeFromImage( mImage ); - } - } - - //initialize the renderer after initializing from the image since we need to know the grid size from the image before creating the geometry - InitializeRenderer(); - - if( mCroppedImage ) - { - ApplyImageToSampler(); - } - - actor.AddRenderer( mImpl->mRenderer ); -} - -void NPatchVisual::DoSetOffStage( Actor& actor ) -{ - mCroppedImage.Reset(); - actor.RemoveRenderer( mImpl->mRenderer ); - mImpl->mRenderer.Reset(); -} - -void NPatchVisual::DoCreatePropertyMap( Property::Map& map ) const -{ - map.Clear(); - map.Insert( Toolkit::VisualProperty::TYPE, Toolkit::Visual::IMAGE ); - if( !mImageUrl.empty() ) - { - map.Insert( Toolkit::ImageVisual::Property::URL, mImageUrl ); - } - else if( mImage ) - { - map.Insert( Toolkit::ImageVisual::Property::URL, mImage.GetUrl() ); - } - map.Insert( Toolkit::ImageVisual::Property::BORDER_ONLY, mBorderOnly ); -} - -void NPatchVisual::DoSetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue ) -{ - // TODO -} - -Dali::Property::Value NPatchVisual::DoGetProperty( Dali::Property::Index index ) -{ - // TODO - return Dali::Property::Value(); -} - -void NPatchVisual::OnSetTransform() -{ - if( mImpl->mRenderer ) - { - mImpl->mTransform.RegisterUniforms( mImpl->mRenderer, Direction::LEFT_TO_RIGHT ); - } -} - - -void NPatchVisual::ChangeRenderer( bool oldBorderOnly, size_t oldGridX, size_t oldGridY ) -{ - //check to see if the border style has changed + //special case for 9 patch + Uint16Pair stretchX = data->stretchPixelsX[ 0 ]; + Uint16Pair stretchY = data->stretchPixelsY[ 0 ]; - bool borderOnlyChanged = oldBorderOnly != mBorderOnly; - bool gridChanged = oldGridX != mStretchPixelsX.Size() || oldGridY != mStretchPixelsY.Size(); + uint16_t stretchWidth = stretchX.GetY() - stretchX.GetX(); + uint16_t stretchHeight = stretchY.GetY() - stretchY.GetX(); - if( borderOnlyChanged || gridChanged ) - { - Geometry geometry = CreateGeometry(); - if( geometry ) - { - mImpl->mRenderer.SetGeometry( geometry ); + 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( "uStretchTotal", Vector2( stretchWidth, stretchHeight ) ); } else { - InitializeFromBrokenImage(); - } - } + mImpl->mRenderer.RegisterProperty( "uNinePatchFactorsX[0]", Vector2::ZERO ); + mImpl->mRenderer.RegisterProperty( "uNinePatchFactorsY[0]", Vector2::ZERO ); - if( gridChanged ) - { - Shader shader = CreateShader(); - TextureSet textureSet; - if( shader ) - { - textureSet = mImpl->mRenderer.GetTextures(); - if( !textureSet ) - { - InitializeFromBrokenImage(); - } - mImpl->mRenderer.SetShader( shader ); + RegisterStretchProperties( mImpl->mRenderer, "uNinePatchFactorsX", data->stretchPixelsX, data->croppedWidth ); + RegisterStretchProperties( mImpl->mRenderer, "uNinePatchFactorsY", data->stretchPixelsY, data->croppedHeight ); } } -} - -void NPatchVisual::InitializeFromImage( NinePatchImage nPatch ) -{ - mCroppedImage = nPatch.CreateCroppedBufferImage(); - if( !mCroppedImage ) + else { - DALI_LOG_ERROR("'%s' specify a valid 9 patch image\n", mImageUrl.c_str() ); - InitializeFromBrokenImage(); - return; + DALI_LOG_ERROR("The N patch image '%s' is not a valid N patch image\n", mImageUrl.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() ) ); } - mImageSize = ImageDimensions( mCroppedImage.GetWidth(), mCroppedImage.GetHeight() ); - - mStretchPixelsX = nPatch.GetStretchPixelsX(); - mStretchPixelsY = nPatch.GetStretchPixelsY(); -} - -void NPatchVisual::InitializeFromBrokenImage() -{ - mCroppedImage = VisualFactoryCache::GetBrokenVisualImage(); - mImageSize = ImageDimensions( mCroppedImage.GetWidth(), mCroppedImage.GetHeight() ); - - mStretchPixelsX.Clear(); - mStretchPixelsX.PushBack( Uint16Pair( 0, mImageSize.GetWidth() ) ); - mStretchPixelsY.Clear(); - mStretchPixelsY.PushBack( Uint16Pair( 0, mImageSize.GetHeight() ) ); + //Register transform properties + mImpl->mTransform.RegisterUniforms( mImpl->mRenderer, Direction::LEFT_TO_RIGHT ); } -void NPatchVisual::ApplyImageToSampler() +Geometry NPatchVisual::GetNinePatchGeometry( VisualFactoryCache::GeometryType subType ) { - TextureSet textureSet = mImpl->mRenderer.GetTextures(); - if( textureSet ) + Geometry geometry = mFactoryCache.GetGeometry( subType ); + if( !geometry ) { - TextureSetImage( textureSet, 0u, mCroppedImage ); - - if( mStretchPixelsX.Size() == 1 && mStretchPixelsY.Size() == 1 ) + if( DALI_LIKELY( VisualFactoryCache::NINE_PATCH_GEOMETRY == subType ) ) { - //special case for 9 patch - Uint16Pair stretchX = mStretchPixelsX[ 0 ]; - Uint16Pair stretchY = mStretchPixelsY[ 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( "uStretchTotal", Vector2( stretchWidth, stretchHeight ) ); + geometry = CreateGridGeometry( Uint16Pair( 3, 3 ) ); } - else + else if( VisualFactoryCache::NINE_PATCH_BORDER_GEOMETRY == subType ) { - 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() ); + 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(); @@ -579,7 +519,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 ); @@ -596,7 +535,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(); @@ -636,7 +575,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 );