X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Frenderers%2Fnpatch%2Fnpatch-renderer.cpp;h=677d5ad6823318888236488b6603ace09410bb87;hp=10f851f5943c9e83d4e99e29d4c52a84d27a54d3;hb=05d9f7a25bd9f4320a0e1fece8ec0ede819afe7d;hpb=18c250b7c2de9dba09bff61a6425c67f490e5d41 diff --git a/dali-toolkit/internal/controls/renderers/npatch/npatch-renderer.cpp b/dali-toolkit/internal/controls/renderers/npatch/npatch-renderer.cpp index 10f851f..677d5ad 100644 --- a/dali-toolkit/internal/controls/renderers/npatch/npatch-renderer.cpp +++ b/dali-toolkit/internal/controls/renderers/npatch/npatch-renderer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -22,10 +22,12 @@ #include #include #include +#include // INTERNAL IINCLUDES #include #include +#include #include #include @@ -41,13 +43,7 @@ namespace Internal namespace { -const char * const RENDERER_TYPE("renderer-type"); -const char * const RENDERER_TYPE_VALUE("n-patch-renderer"); - -const char * const IMAGE_URL_NAME("image-url"); -const char * const BORDER_ONLY("border-only"); - -std::string TEXTURE_UNIFORM_NAME = "sTexture"; +const char * const BORDER_ONLY("borderOnly"); const char* VERTEX_SHADER = DALI_COMPOSE_SHADER( attribute mediump vec2 aPosition;\n @@ -123,28 +119,24 @@ const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER( * @param[in] indices The indices to generate the geometry from * @return The geometry formed from the vertices and indices */ -Geometry GenerateGeometry( const Vector< Vector2 >& vertices, const Vector< unsigned int >& indices ) +Geometry GenerateGeometry( const Vector< Vector2 >& vertices, const Vector< unsigned short >& indices ) { Property::Map vertexFormat; vertexFormat[ "aPosition" ] = Property::VECTOR2; - PropertyBuffer vertexPropertyBuffer = PropertyBuffer::New( vertexFormat, vertices.Size() ); + PropertyBuffer vertexPropertyBuffer = PropertyBuffer::New( vertexFormat ); if( vertices.Size() > 0 ) { - vertexPropertyBuffer.SetData( &vertices[ 0 ] ); + vertexPropertyBuffer.SetData( &vertices[ 0 ], vertices.Size() ); } - Property::Map indexFormat; - indexFormat[ "indices" ] = Property::INTEGER; - PropertyBuffer indexPropertyBuffer = PropertyBuffer::New( indexFormat, indices.Size() ); + // Create the geometry object + Geometry geometry = Geometry::New(); + geometry.AddVertexBuffer( vertexPropertyBuffer ); if( indices.Size() > 0 ) { - indexPropertyBuffer.SetData( &indices[ 0 ] ); + geometry.SetIndexBuffer( &indices[ 0 ], indices.Size() ); } - // Create the geometry object - Geometry geometry = Geometry::New(); - geometry.AddVertexBuffer( vertexPropertyBuffer ); - geometry.SetIndexBuffer( indexPropertyBuffer ); return geometry; } @@ -156,7 +148,7 @@ Geometry GenerateGeometry( const Vector< Vector2 >& vertices, const Vector< unsi * @param[in] rowIdx The row index to start the quad * @param[in] nextRowIdx The index to the next row */ -void AddQuadIndices( Vector< unsigned int >& indices, unsigned int rowIdx, unsigned int nextRowIdx ) +void AddQuadIndices( Vector< unsigned short >& indices, unsigned int rowIdx, unsigned int nextRowIdx ) { indices.PushBack( rowIdx ); indices.PushBack( nextRowIdx + 1 ); @@ -172,7 +164,7 @@ void AddVertex( Vector< Vector2 >& vertices, unsigned int x, unsigned int y ) vertices.PushBack( Vector2( x, y ) ); } -void RegisterStretchProperties( Material& material, const char * uniformName, const NinePatchImage::StretchRanges& stretchPixels, uint16_t imageExtent) +void RegisterStretchProperties( Renderer& renderer, const char * uniformName, const NinePatchImage::StretchRanges& stretchPixels, uint16_t imageExtent) { uint16_t prevEnd = 0; uint16_t prevFix = 0; @@ -188,7 +180,7 @@ void RegisterStretchProperties( Material& material, const char * uniformName, co std::stringstream uniform; uniform << uniformName << "[" << i << "]"; - material.RegisterProperty( uniform.str(), Vector2( fix, stretch ) ); + renderer.RegisterProperty( uniform.str(), Vector2( fix, stretch ) ); prevEnd = end; prevFix = fix; @@ -199,7 +191,7 @@ void RegisterStretchProperties( Material& material, const char * uniformName, co prevFix += imageExtent - prevEnd; std::stringstream uniform; uniform << uniformName << "[" << i << "]"; - material.RegisterProperty( uniform.str(), Vector2( prevFix, prevStretch ) ); + renderer.RegisterProperty( uniform.str(), Vector2( prevFix, prevStretch ) ); } } @@ -217,12 +209,12 @@ NPatchRenderer::~NPatchRenderer() { } -void NPatchRenderer::DoInitialize( const Property::Map& propertyMap ) +void NPatchRenderer::DoInitialize( Actor& actor, const Property::Map& propertyMap ) { Property::Value* imageURLValue = propertyMap.Find( IMAGE_URL_NAME ); if( imageURLValue ) { - //Read the border-only property first since InitialiseFromImage relies on mBorderOnly to be properly set + //Read the borderOnly property first since InitialiseFromImage relies on mBorderOnly to be properly set Property::Value* borderOnlyValue = propertyMap.Find( BORDER_ONLY ); if( borderOnlyValue ) { @@ -232,11 +224,11 @@ void NPatchRenderer::DoInitialize( const Property::Map& propertyMap ) if( imageURLValue->Get( mImageUrl ) ) { NinePatchImage nPatch = NinePatchImage::New( mImageUrl ); - InitialiseFromImage( nPatch ); + InitializeFromImage( nPatch ); } else { - CreateErrorImage(); + InitializeFromBrokenImage(); DALI_LOG_ERROR( "The property '%s' is not a string\n", IMAGE_URL_NAME ); } } @@ -248,17 +240,17 @@ void NPatchRenderer::GetNaturalSize( Vector2& naturalSize ) const { naturalSize.x = mImage.GetWidth(); naturalSize.y = mImage.GetHeight(); - return; } else if( !mImageUrl.empty() ) { ImageDimensions dimentions = ResourceImage::GetImageSize( mImageUrl ); naturalSize.x = dimentions.GetWidth(); naturalSize.y = dimentions.GetHeight(); - return; } - - naturalSize = Vector2::ZERO; + else + { + naturalSize = Vector2::ZERO; + } } void NPatchRenderer::SetClipRect( const Rect& clipRect ) @@ -272,10 +264,9 @@ void NPatchRenderer::SetOffset( const Vector2& offset ) //ToDo: renderer applies the offset } -void NPatchRenderer::InitializeRenderer( Renderer& renderer ) +Geometry NPatchRenderer::CreateGeometry() { Geometry geometry; - Shader shader; if( mStretchPixelsX.Size() == 1 && mStretchPixelsY.Size() == 1 ) { if( !mBorderOnly ) @@ -296,48 +287,86 @@ void NPatchRenderer::InitializeRenderer( Renderer& renderer ) mFactoryCache.SaveGeometry( RendererFactoryCache::NINE_PATCH_BORDER_GEOMETRY, geometry ); } } - - shader = mFactoryCache.GetShader( RendererFactoryCache::NINE_PATCH_SHADER ); - if( !shader ) - { - shader = Shader::New( VERTEX_SHADER_3X3, FRAGMENT_SHADER ); - mFactoryCache.SaveShader( RendererFactoryCache::NINE_PATCH_SHADER, shader ); - } } else if( mStretchPixelsX.Size() > 0 || mStretchPixelsY.Size() > 0) { Uint16Pair gridSize( 2 * mStretchPixelsX.Size() + 1, 2 * mStretchPixelsY.Size() + 1 ); geometry = !mBorderOnly ? CreateGeometry( gridSize ) : CreateGeometryBorder( gridSize ); + } - std::stringstream vertexShader; - vertexShader << "#define FACTOR_SIZE_X " << mStretchPixelsX.Size() + 2 << "\n" - << "#define FACTOR_SIZE_Y " << mStretchPixelsY.Size() + 2 << "\n" - << VERTEX_SHADER; + return geometry; +} - shader = Shader::New( vertexShader.str(), FRAGMENT_SHADER ); - } - else +Shader NPatchRenderer::CreateShader() +{ + Shader shader; + if( !mImpl->mCustomShader ) { - 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() ); - CreateErrorImage(); - } + if( mStretchPixelsX.Size() == 1 && mStretchPixelsY.Size() == 1 ) + { + shader = mFactoryCache.GetShader( RendererFactoryCache::NINE_PATCH_SHADER ); + if( !shader ) + { + shader = Shader::New( VERTEX_SHADER_3X3, FRAGMENT_SHADER ); + mFactoryCache.SaveShader( RendererFactoryCache::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; - if( !renderer ) - { - Material material = Material::New( shader ); - renderer = Renderer::New( geometry, material ); + shader = Shader::New( vertexShader.str(), FRAGMENT_SHADER ); + } } else { - mImpl->mRenderer.SetGeometry( geometry ); - Material material = mImpl->mRenderer.GetMaterial(); - if( material ) + const char* fragmentShader = FRAGMENT_SHADER; + Dali::Shader::ShaderHints 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 ) { - material.SetShader( shader ); + 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 ); } } + + return shader; +} + +void NPatchRenderer::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 ); } + void NPatchRenderer::DoSetOnStage( Actor& actor ) { if( !mCroppedImage ) @@ -345,16 +374,17 @@ void NPatchRenderer::DoSetOnStage( Actor& actor ) if( !mImageUrl.empty() ) { NinePatchImage nPatch = NinePatchImage::New( mImageUrl ); - InitialiseFromImage( nPatch ); + InitializeFromImage( nPatch ); } else if( mImage ) { - InitialiseFromImage( mImage ); + InitializeFromImage( mImage ); } - - InitializeRenderer( mImpl->mRenderer ); } + //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(); @@ -364,12 +394,14 @@ void NPatchRenderer::DoSetOnStage( Actor& actor ) void NPatchRenderer::DoSetOffStage( Actor& actor ) { mCroppedImage.Reset(); + actor.RemoveRenderer( mImpl->mRenderer ); + mImpl->mRenderer.Reset(); } void NPatchRenderer::DoCreatePropertyMap( Property::Map& map ) const { map.Clear(); - map.Insert( RENDERER_TYPE, RENDERER_TYPE_VALUE ); + map.Insert( RENDERER_TYPE, IMAGE_RENDERER ); if( !mImageUrl.empty() ) { map.Insert( IMAGE_URL_NAME, mImageUrl ); @@ -381,8 +413,48 @@ void NPatchRenderer::DoCreatePropertyMap( Property::Map& map ) const map.Insert( BORDER_ONLY, mBorderOnly ); } +void NPatchRenderer::ChangeRenderer( bool oldBorderOnly, size_t oldGridX, size_t oldGridY ) +{ + //check to see if the border style has changed + + bool borderOnlyChanged = oldBorderOnly != mBorderOnly; + bool gridChanged = oldGridX != mStretchPixelsX.Size() || oldGridY != mStretchPixelsY.Size(); + + if( borderOnlyChanged || gridChanged ) + { + Geometry geometry = CreateGeometry(); + if( geometry ) + { + mImpl->mRenderer.SetGeometry( geometry ); + } + else + { + InitializeFromBrokenImage(); + } + } + + if( gridChanged ) + { + Shader shader = CreateShader(); + TextureSet textureSet; + if( shader ) + { + textureSet = mImpl->mRenderer.GetTextures(); + if( !textureSet ) + { + InitializeFromBrokenImage(); + } + mImpl->mRenderer.SetShader( shader ); + } + } +} + void NPatchRenderer::SetImage( const std::string& imageUrl, bool borderOnly ) { + bool oldBorderOnly = mBorderOnly; + size_t oldGridX = mStretchPixelsX.Size(); + size_t oldGridY = mStretchPixelsY.Size(); + mBorderOnly = borderOnly; mImage.Reset(); if( mImageUrl == imageUrl ) @@ -391,17 +463,26 @@ void NPatchRenderer::SetImage( const std::string& imageUrl, bool borderOnly ) } mImageUrl = imageUrl; - NinePatchImage nPatch = NinePatchImage::New( mImageUrl ); - InitialiseFromImage( nPatch ); - - if( mCroppedImage && mImpl->mIsOnStage ) + if( mImpl->mRenderer ) { - ApplyImageToSampler(); + NinePatchImage nPatch = NinePatchImage::New( mImageUrl ); + InitializeFromImage( nPatch ); + + ChangeRenderer( oldBorderOnly, oldGridX, oldGridY ); + + if( mCroppedImage ) + { + ApplyImageToSampler(); + } } } void NPatchRenderer::SetImage( NinePatchImage image, bool borderOnly ) { + bool oldBorderOnly = mBorderOnly; + size_t oldGridX = mStretchPixelsX.Size(); + size_t oldGridY = mStretchPixelsY.Size(); + mBorderOnly = borderOnly; mImageUrl.empty(); if( mImage == image ) @@ -410,21 +491,25 @@ void NPatchRenderer::SetImage( NinePatchImage image, bool borderOnly ) } mImage = image; - InitialiseFromImage( mImage ); - - if( mCroppedImage && mImpl->mIsOnStage ) + if( mImpl->mRenderer ) { - ApplyImageToSampler(); + InitializeFromImage( mImage ); + ChangeRenderer( oldBorderOnly, oldGridX, oldGridY ); + + if( mCroppedImage ) + { + ApplyImageToSampler(); + } } } -void NPatchRenderer::InitialiseFromImage( NinePatchImage nPatch ) +void NPatchRenderer::InitializeFromImage( NinePatchImage nPatch ) { mCroppedImage = nPatch.CreateCroppedBufferImage(); if( !mCroppedImage ) { DALI_LOG_ERROR("'%s' specify a valid 9 patch image\n", mImageUrl.c_str() ); - CreateErrorImage(); + InitializeFromBrokenImage(); return; } @@ -434,43 +519,23 @@ void NPatchRenderer::InitialiseFromImage( NinePatchImage nPatch ) mStretchPixelsY = nPatch.GetStretchPixelsY(); } -void NPatchRenderer::CreateErrorImage() +void NPatchRenderer::InitializeFromBrokenImage() { - mImageSize = ImageDimensions( 1, 1 ); - - BufferImage bufferImage = BufferImage::New( mImageSize.GetWidth(), mImageSize.GetHeight(), Pixel::RGBA8888 ); - mCroppedImage = bufferImage; - PixelBuffer* pixbuf = bufferImage.GetBuffer(); - - for( size_t i = 0; i < mImageSize.GetWidth() * mImageSize.GetHeight() * 4u; ) - { - pixbuf[ i++ ] = 0; - pixbuf[ i++ ] = 0; - pixbuf[ i++ ] = 0; - pixbuf[ i++ ] = 255; - } + mCroppedImage = RendererFactory::GetBrokenRendererImage(); + mImageSize = ImageDimensions( mCroppedImage.GetWidth(), mCroppedImage.GetHeight() ); mStretchPixelsX.Clear(); mStretchPixelsX.PushBack( Uint16Pair( 0, mImageSize.GetWidth() ) ); mStretchPixelsY.Clear(); mStretchPixelsY.PushBack( Uint16Pair( 0, mImageSize.GetHeight() ) ); - } void NPatchRenderer::ApplyImageToSampler() { - Material material = mImpl->mRenderer.GetMaterial(); - if( material ) + TextureSet textureSet = mImpl->mRenderer.GetTextures(); + if( textureSet ) { - int index = material.GetTextureIndex( TEXTURE_UNIFORM_NAME ); - if( index > -1 ) - { - material.SetTextureImage( index, mCroppedImage ); - } - else - { - material.AddTexture( mCroppedImage, TEXTURE_UNIFORM_NAME ); - } + TextureSetImage( textureSet, 0u, mCroppedImage ); if( mStretchPixelsX.Size() == 1 && mStretchPixelsY.Size() == 1 ) { @@ -481,18 +546,18 @@ void NPatchRenderer::ApplyImageToSampler() uint16_t stretchWidth = stretchX.GetY() - stretchX.GetX(); uint16_t stretchHeight = stretchY.GetY() - stretchY.GetX(); - material.RegisterProperty( "uFixed[0]", Vector2::ZERO ); - material.RegisterProperty( "uFixed[1]", Vector2( stretchX.GetX(), stretchY.GetX()) ); - material.RegisterProperty( "uFixed[2]", Vector2( mImageSize.GetWidth() - stretchWidth, mImageSize.GetHeight() - stretchHeight ) ); - material.RegisterProperty( "uStretchTotal", Vector2( stretchWidth, stretchHeight ) ); + 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 ) ); } else { - material.RegisterProperty( "uNinePatchFactorsX[0]", Vector2::ZERO ); - material.RegisterProperty( "uNinePatchFactorsY[0]", Vector2::ZERO ); + mImpl->mRenderer.RegisterProperty( "uNinePatchFactorsX[0]", Vector2::ZERO ); + mImpl->mRenderer.RegisterProperty( "uNinePatchFactorsY[0]", Vector2::ZERO ); - RegisterStretchProperties( material, "uNinePatchFactorsX", mStretchPixelsX, mImageSize.GetWidth() ); - RegisterStretchProperties( material, "uNinePatchFactorsY", mStretchPixelsY, mImageSize.GetHeight() ); + RegisterStretchProperties( mImpl->mRenderer, "uNinePatchFactorsX", mStretchPixelsX, mImageSize.GetWidth() ); + RegisterStretchProperties( mImpl->mRenderer, "uNinePatchFactorsY", mStretchPixelsY, mImageSize.GetHeight() ); } } } @@ -516,7 +581,7 @@ Geometry NPatchRenderer::CreateGeometry( Uint16Pair gridSize ) // Create indices //TODO: compare performance with triangle strip when Geometry supports it - Vector< unsigned int > indices; + Vector< unsigned short > indices; indices.Reserve( gridWidth * gridHeight * 6 ); unsigned int rowIdx = 0; @@ -573,7 +638,7 @@ Geometry NPatchRenderer::CreateGeometryBorder( Uint16Pair gridSize ) // Create indices //TODO: compare performance with triangle strip when Geometry supports it - Vector< unsigned int > indices; + Vector< unsigned short > indices; indices.Reserve( gridWidth * gridHeight * 6 ); //top