X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fatlas-manager%2Fatlas-manager-impl.cpp;h=a3b9e863977f8e2850fc4a1431a2ca2e2447bc4c;hp=15e968474fe7d9ffb9af33088f41d7048975c299;hb=e17b07e400e696c5427f5ddbafb5274cd22f9bb7;hpb=2834ffdeb2f24bcea9d6321e524af0877977545d diff --git a/dali-toolkit/internal/atlas-manager/atlas-manager-impl.cpp b/dali-toolkit/internal/atlas-manager/atlas-manager-impl.cpp index 15e9684..a3b9e86 100644 --- a/dali-toolkit/internal/atlas-manager/atlas-manager-impl.cpp +++ b/dali-toolkit/internal/atlas-manager/atlas-manager-impl.cpp @@ -20,6 +20,8 @@ // EXTERNAL INCLUDE #include #include +#include +#include #include namespace Dali @@ -33,18 +35,67 @@ namespace Internal namespace { - const Vector2 DEFAULT_ATLAS_SIZE( 512.0f, 512.0f ); - const Vector2 DEFAULT_BLOCK_SIZE( 32.0f, 32.0f ); - const uint32_t PIXEL_PADDING( 2u ); + const uint32_t DEFAULT_ATLAS_WIDTH( 512u ); + const uint32_t DEFAULT_ATLAS_HEIGHT( 512u ); + const uint32_t DEFAULT_BLOCK_WIDTH( 16u ); + const uint32_t DEFAULT_BLOCK_HEIGHT( 16u ); + const uint32_t SINGLE_PIXEL_PADDING( 1u ); + const uint32_t DOUBLE_PIXEL_PADDING( SINGLE_PIXEL_PADDING << 1 ); + const uint32_t FILLED_PIXEL( -1 ); + Toolkit::AtlasManager::AtlasSize EMPTY_SIZE; + + #define MAKE_SHADER(A)#A + + const char* VERTEX_SHADER = MAKE_SHADER( + attribute mediump vec2 aPosition; + attribute mediump vec2 aTexCoord; + uniform mediump mat4 uMvpMatrix; + uniform mediump vec3 uSize; + varying mediump vec2 vTexCoord; + + void main() + { + mediump vec4 position = vec4( aPosition, 0.0, 1.0 ); + position.xyz *= uSize; + gl_Position = uMvpMatrix * position; + vTexCoord = aTexCoord; + } + ); + + const char* FRAGMENT_SHADER_L8 = MAKE_SHADER( + uniform lowp vec4 uColor; + uniform sampler2D sTexture; + varying mediump vec2 vTexCoord; + + void main() + { + mediump vec4 color = texture2D( sTexture, vTexCoord ); + gl_FragColor = vec4( uColor.rgb, uColor.a * color.r ); + } + ); + + const char* FRAGMENT_SHADER_RGBA = MAKE_SHADER( + uniform sampler2D sTexture; + varying mediump vec2 vTexCoord; + + void main() + { + gl_FragColor = texture2D( sTexture, vTexCoord ); + } + ); + } AtlasManager::AtlasManager() -: mNewAtlasSize( DEFAULT_ATLAS_SIZE ), - mNewBlockSize( DEFAULT_BLOCK_SIZE ), - mAddFailPolicy( Toolkit::AtlasManager::FAIL_ON_ADD_CREATES ), - mEdgeBuffer( NULL ), - mEdgeBufferSize( 0 ) +: mAddFailPolicy( Toolkit::AtlasManager::FAIL_ON_ADD_CREATES ), + mFilledPixel( FILLED_PIXEL ) { + mNewAtlasSize.mWidth = DEFAULT_ATLAS_WIDTH; + mNewAtlasSize.mHeight = DEFAULT_ATLAS_HEIGHT; + mNewAtlasSize.mBlockWidth = DEFAULT_BLOCK_WIDTH; + mNewAtlasSize.mBlockHeight = DEFAULT_BLOCK_HEIGHT; + mShaderL8 = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER_L8 ); + mShaderRgba = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER_RGBA ); } AtlasManagerPtr AtlasManager::New() @@ -55,19 +106,43 @@ AtlasManagerPtr AtlasManager::New() AtlasManager::~AtlasManager() { - delete[] mEdgeBuffer; + for ( SizeType i = 0; i < mAtlasList.size(); ++i ) + { + mAtlasList[ i ].mAtlas.UploadedSignal().Disconnect( this, &AtlasManager::OnUpload ); + delete[] mAtlasList[ i ].mStripBuffer; + } + + // Are there any upload signals pending? Free up those buffer images now. + for ( SizeType i = 0; i < mUploadedImages.Size(); ++i ) + { + delete[] mUploadedImages[ i ]; + } } -Toolkit::AtlasManager::AtlasId AtlasManager::CreateAtlas( SizeType width, - SizeType height, - SizeType blockWidth, - SizeType blockHeight, - Pixel::Format pixelformat ) +void AtlasManager::OnUpload( Image image ) { + if ( mUploadedImages.Size() ) + { + delete[] mUploadedImages[ 0 ]; + mUploadedImages.Erase( mUploadedImages.Begin() ); + } + else + { + DALI_LOG_ERROR("Atlas Image Upload List should not be empty\n"); + } +} + +Toolkit::AtlasManager::AtlasId AtlasManager::CreateAtlas( const Toolkit::AtlasManager::AtlasSize& size, Pixel::Format pixelformat ) +{ + SizeType width = size.mWidth; + SizeType height = size.mHeight; + SizeType blockWidth = size.mBlockWidth; + SizeType blockHeight = size.mBlockHeight; + // Check to see if the atlas is large enough to hold a single block even ? if ( blockWidth > width || blockHeight > height ) { - DALI_LOG_ERROR("Atlas %i x %i too small. Dimensions need to be at least %i x %i\n", + DALI_LOG_ERROR("Atlas %i x %i too small. Dimensions need to be at least %ix%i\n", width, height, blockWidth, blockHeight ); return 0; } @@ -75,33 +150,35 @@ Toolkit::AtlasManager::AtlasId AtlasManager::CreateAtlas( SizeType width, Dali::Atlas atlas = Dali::Atlas::New( width, height, pixelformat ); AtlasDescriptor atlasDescriptor; atlasDescriptor.mAtlas = atlas; - atlasDescriptor.mWidth = width; - atlasDescriptor.mHeight = height; - atlasDescriptor.mBlockWidth = blockWidth; - atlasDescriptor.mBlockHeight = blockHeight; + atlasDescriptor.mSize = size; atlasDescriptor.mPixelFormat = pixelformat; - std::stringstream materialLabel; - materialLabel << "Atlas Material - "; - materialLabel << mAtlasList.size(); - atlasDescriptor.mMaterial = Material::New( materialLabel.str() ); - atlasDescriptor.mMaterial.SetDiffuseTexture( atlas ); atlasDescriptor.mNextFreeBlock = 1u; // indicate next free block will be the first ( +1 ) - - // What size do we need for this atlas' edge buffer ( assume RGBA pixel format )? - uint32_t neededEdgeSize = ( blockWidth > blockHeight ? blockWidth : blockHeight ) << 2; - - // Is the current edge buffer large enough? - if ( neededEdgeSize > mEdgeBufferSize ) - { - delete[] mEdgeBuffer; - mEdgeBuffer = new PixelBuffer[ neededEdgeSize ]; - memset( mEdgeBuffer, 0, neededEdgeSize ); - mEdgeBufferSize = neededEdgeSize; - } - - atlasDescriptor.mEdgeX = BufferImage::New( mEdgeBuffer, blockWidth, PIXEL_PADDING, pixelformat ); - atlasDescriptor.mEdgeY = BufferImage::New( mEdgeBuffer, PIXEL_PADDING, blockHeight, pixelformat ); - + atlas.UploadedSignal().Connect( this, &AtlasManager::OnUpload ); + + // What size do we need for this atlas' strip buffer ( assume 32bit pixel format )? + SizeType neededStripSize =( blockWidth > blockHeight - DOUBLE_PIXEL_PADDING ? blockWidth : blockHeight - DOUBLE_PIXEL_PADDING ) << 2; + atlasDescriptor.mStripBuffer = new PixelBuffer[ neededStripSize ]; + memset( atlasDescriptor.mStripBuffer, 0, neededStripSize ); + + atlasDescriptor.mHorizontalStrip = BufferImage::New( atlasDescriptor.mStripBuffer, + blockWidth, + SINGLE_PIXEL_PADDING, + pixelformat ); + + atlasDescriptor.mVerticalStrip = BufferImage::New( atlasDescriptor.mStripBuffer, + SINGLE_PIXEL_PADDING, + blockHeight - DOUBLE_PIXEL_PADDING, + pixelformat ); + mUploadedImages.PushBack( NULL ); + atlasDescriptor.mFilledPixelImage = BufferImage::New( reinterpret_cast< PixelBuffer* >( &mFilledPixel ), 1, 1, pixelformat ); + atlas.Upload( atlasDescriptor.mFilledPixelImage, 0, 0 ); + + Sampler sampler = Sampler::New( atlas, "sTexture" ); + sampler.SetProperty( Sampler::Property::AFFECTS_TRANSPARENCY, true ); + atlasDescriptor.mMaterial = Material::New( pixelformat == Pixel::L8 ? mShaderL8 : mShaderRgba ); + atlasDescriptor.mMaterial.AddSampler( sampler ); + atlasDescriptor.mSampler = sampler; + atlasDescriptor.mMaterial.SetBlendMode( BlendingMode::ON ); mAtlasList.push_back( atlasDescriptor ); return mAtlasList.size(); } @@ -147,7 +224,7 @@ void AtlasManager::Add( const BufferImage& image, { if ( Toolkit::AtlasManager::FAIL_ON_ADD_CREATES == mAddFailPolicy ) { - SizeType newAtlas = CreateAtlas( mNewAtlasSize.x, mNewAtlasSize.y, mNewBlockSize.x, mNewBlockSize.y, pixelFormat ); + SizeType newAtlas = CreateAtlas( mNewAtlasSize, pixelFormat ); if ( !newAtlas-- ) { return; @@ -161,7 +238,7 @@ void AtlasManager::Add( const BufferImage& image, if ( Toolkit::AtlasManager::FAIL_ON_ADD_FAILS == mAddFailPolicy || !foundAtlas-- ) { // Haven't found an atlas for this image!!!!!! - return; + return; } } @@ -232,15 +309,17 @@ AtlasManager::SizeType AtlasManager::CheckAtlas( SizeType atlas, if ( pixelFormat == mAtlasList[ atlas ].mPixelFormat ) { // Check to see if there are any unused blocks in this atlas to accomodate our image - SizeType blocksInX = mAtlasList[ atlas ].mWidth / mAtlasList[ atlas ].mBlockWidth; - SizeType blocksInY = mAtlasList[ atlas ].mHeight / mAtlasList[ atlas ].mBlockHeight; + SizeType blocksInX = mAtlasList[ atlas ].mSize.mWidth / mAtlasList[ atlas ].mSize.mBlockWidth; + SizeType blocksInY = mAtlasList[ atlas ].mSize.mHeight / mAtlasList[ atlas ].mSize.mBlockHeight; totalBlocks = blocksInX * blocksInY; - SizeType blocksFree = mAtlasList[ atlas ].mNextFreeBlock ? totalBlocks - mAtlasList[ atlas ].mNextFreeBlock + 1u : 0; + SizeType blocksFree = mAtlasList[ atlas ].mNextFreeBlock ? + totalBlocks - mAtlasList[ atlas ].mNextFreeBlock + 1u : + mAtlasList[ atlas ].mFreeBlocksList.Size(); // Check to see if the image will fit in these blocks, if not we'll need to create a new atlas if ( blocksFree - && width + PIXEL_PADDING <= mAtlasList[ atlas ].mBlockWidth - && height + PIXEL_PADDING <= mAtlasList[ atlas ].mBlockHeight ) + && width + DOUBLE_PIXEL_PADDING <= mAtlasList[ atlas ].mSize.mBlockWidth + && height + DOUBLE_PIXEL_PADDING <= mAtlasList[ atlas ].mSize.mBlockHeight ) { blockArea = 1u; return ( atlas + 1u ); @@ -255,25 +334,21 @@ void AtlasManager::CreateMesh( SizeType atlas, const Vector2& position, SizeType widthInBlocks, SizeType heightInBlocks, - Dali::MeshData& meshData, + Toolkit::AtlasManager::Mesh2D& mesh, AtlasSlotDescriptor& desc ) { - Dali::MeshData::Vertex vertex; - Dali::MeshData::VertexContainer vertices; - Dali::MeshData::FaceIndices faces; - Dali::MeshData::FaceIndex faceIndex = 0; - meshData.SetHasNormals( false ); - meshData.SetHasColor( true ); - meshData.SetHasTextureCoords( true ); - SizeType blockWidth = mAtlasList[ atlas ].mBlockWidth; - SizeType blockHeight = mAtlasList[ atlas ].mBlockHeight; + Toolkit::AtlasManager::Vertex2D vertex; + uint32_t faceIndex = 0; // TODO change to unsigned short when property type is available + + SizeType blockWidth = mAtlasList[ atlas ].mSize.mBlockWidth; + SizeType blockHeight = mAtlasList[ atlas ].mSize.mBlockHeight; float vertexBlockWidth = static_cast< float >( blockWidth ); float vertexBlockHeight = static_cast< float >( blockHeight ); - SizeType width = mAtlasList[ atlas ].mWidth; - SizeType height = mAtlasList[ atlas ].mHeight; + SizeType width = mAtlasList[ atlas ].mSize.mWidth; + SizeType height = mAtlasList[ atlas ].mSize.mHeight; SizeType atlasWidthInBlocks = width / blockWidth; @@ -328,6 +403,10 @@ void AtlasManager::CreateMesh( SizeType atlas, float fBlockX = texelBlockWidth * static_cast< float >( block % atlasWidthInBlocks ); float fBlockY = texelBlockHeight * static_cast< float >( block / atlasWidthInBlocks ); + // Add on texture filtering compensation + fBlockX += texelX; + fBlockY += texelY; + if ( ( widthInBlocks - 1u ) == x && vertexEdgeWidth > 0.0f ) { ndcWidth = texelEdgeWidth; @@ -340,49 +419,45 @@ void AtlasManager::CreateMesh( SizeType atlas, } // Top left - vertex.x = topLeft.x; - vertex.y = topLeft.y; - vertex.z = 0.0f; - vertex.u = fBlockX; - vertex.v = fBlockY; + vertex.mPosition.x = topLeft.x; + vertex.mPosition.y = topLeft.y; + vertex.mTexCoords.x = fBlockX; + vertex.mTexCoords.y = fBlockY; - vertices.push_back( vertex ); + mesh.mVertices.PushBack( vertex ); // Top Right - vertex.x = topLeft.x + ndcVWidth; - vertex.y = topLeft.y; - vertex.z = 0.0f; - vertex.u = fBlockX + ndcWidth; - vertex.v = fBlockY; + vertex.mPosition.x = topLeft.x + ndcVWidth; + vertex.mPosition.y = topLeft.y; + vertex.mTexCoords.x = fBlockX + ndcWidth; + vertex.mTexCoords.y = fBlockY; - vertices.push_back( vertex ); + mesh.mVertices.PushBack( vertex ); // Bottom Left - vertex.x = topLeft.x; - vertex.y = topLeft.y + ndcVHeight; - vertex.z = 0.0f; - vertex.u = fBlockX; - vertex.v = fBlockY + ndcHeight; + vertex.mPosition.x = topLeft.x; + vertex.mPosition.y = topLeft.y + ndcVHeight; + vertex.mTexCoords.x = fBlockX; + vertex.mTexCoords.y = fBlockY + ndcHeight; - vertices.push_back( vertex ); + mesh.mVertices.PushBack( vertex ); // Bottom Right topLeft.x += ndcVWidth; - vertex.x = topLeft.x; - vertex.y = topLeft.y + ndcVHeight; - vertex.z = 0.0f; - vertex.u = fBlockX + ndcWidth; - vertex.v = fBlockY + ndcHeight; + vertex.mPosition.x = topLeft.x; + vertex.mPosition.y = topLeft.y + ndcVHeight; + vertex.mTexCoords.x = fBlockX + ndcWidth; + vertex.mTexCoords.y = fBlockY + ndcHeight; - vertices.push_back( vertex ); + mesh.mVertices.PushBack( vertex ); // Six indices in counter clockwise winding - faces.push_back( faceIndex + 1u ); - faces.push_back( faceIndex ); - faces.push_back( faceIndex + 2u ); - faces.push_back( faceIndex + 2u ); - faces.push_back( faceIndex + 3u ); - faces.push_back( faceIndex + 1u ); + mesh.mIndices.PushBack( faceIndex + 1u ); + mesh.mIndices.PushBack( faceIndex ); + mesh.mIndices.PushBack( faceIndex + 2u ); + mesh.mIndices.PushBack( faceIndex + 2u ); + mesh.mIndices.PushBack( faceIndex + 3u ); + mesh.mIndices.PushBack( faceIndex + 1u ); faceIndex += 4; } @@ -394,63 +469,55 @@ void AtlasManager::CreateMesh( SizeType atlas, // If there's only one block then skip this next vertex optimisation if ( widthInBlocks * heightInBlocks > 1 ) { - Dali::MeshData::VertexContainer optimizedVertices; - OptimizeVertices( vertices, faces, optimizedVertices ); - meshData.SetVertices( optimizedVertices ); - } - else - { - meshData.SetVertices( vertices ); + Toolkit::AtlasManager::Mesh2D optimizedMesh; + OptimizeMesh( mesh, optimizedMesh ); } - - meshData.SetFaceIndices( faces ); - meshData.SetMaterial( mAtlasList[ atlas ].mMaterial ); - //PrintMeshData( meshData ); + //PrintMeshData( mesh ); } -void AtlasManager::PrintMeshData( const MeshData& meshData ) +void AtlasManager::PrintMeshData( const Toolkit::AtlasManager::Mesh2D& mesh ) { - std::cout << "\nMesh Data for Image: VertexCount = " << meshData.GetVertexCount(); - std::cout << ", Triangles = " << meshData.GetFaceCount() << std::endl; - - Dali::MeshData::VertexContainer vertices = meshData.GetVertices(); - Dali::MeshData::FaceIndices faces = meshData.GetFaces(); + uint32_t vertexCount = mesh.mVertices.Size(); + uint32_t indexCount = mesh.mIndices.Size(); + std::cout << "\nMesh Data for Image: VertexCount = " << vertexCount; + std::cout << ", Triangles = " << indexCount / 3 << std::endl; - for ( SizeType v = 0; v < vertices.size(); ++v ) + for ( SizeType v = 0; v < vertexCount; ++v ) { - std::cout << " Vertex(" << v << ") x = " << vertices[v].x << ", "; - std::cout << "y = " << vertices[v].y << ", " << "z = " << vertices[v].z << ", "; - std::cout << "u = " << vertices[v].u << ", " << "v = " << vertices[v].v << std::endl; + std::cout << " Vertex(" << v << ") x = " << mesh.mVertices[v].mPosition.x << ", "; + std::cout << "y = " << mesh.mVertices[v].mPosition.y << ", "; + std::cout << "u = " << mesh.mVertices[v].mTexCoords.x << ", "; + std::cout << "v = " << mesh.mVertices[v].mTexCoords.y << std::endl; } std::cout << "\n Indices: "; - for ( SizeType i = 0; i < faces.size(); ++i ) + for ( SizeType i = 0; i < indexCount; ++i ) { - std::cout << " " << faces[ i ]; + std::cout << " " << mesh.mIndices[ i ]; } std::cout << std::endl; } -void AtlasManager::OptimizeVertices( const MeshData::VertexContainer& in, - MeshData::FaceIndices& faces, - MeshData::VertexContainer& out ) +void AtlasManager::OptimizeMesh( const Toolkit::AtlasManager::Mesh2D& in, + Toolkit::AtlasManager::Mesh2D& out ) { unsigned short vertexIndex = 0; // We could check to see if blocks are next to each other, but it's probably just as quick to compare verts - for ( SizeType i = 0; i < faces.size(); ++i ) + for ( SizeType i = 0; i < in.mIndices.Size(); ++i ) { // Fetch a vertex, has it already been assigned? bool foundVertex = false; - Dali::MeshData::Vertex v = in[ faces [ i ] ]; - for ( SizeType j = 0; j < vertexIndex; ++j ) + Toolkit::AtlasManager::Vertex2D v = in.mVertices[ in.mIndices[ i ] ]; + for ( SizeType j = 0; j < out.mVertices.Size(); ++j ) { - if ( v.x == out[ j ].x && v.y == out[ j ].y && v.z == out[ j ].z && - v.u == out[ j ].u && v.v == out[ j ].v && v.nX == out[ j ].nX && - v.nY == out[ j ].nY && v.nZ == out[ j ].nZ ) + if ( ( fabsf( v.mPosition.x - out.mVertices[ j ].mPosition.x ) < Math::MACHINE_EPSILON_1000 ) && + ( fabsf( v.mPosition.y - out.mVertices[ j ].mPosition.y ) < Math::MACHINE_EPSILON_1000 ) && + ( fabsf( v.mTexCoords.x - out.mVertices[ j ].mTexCoords.x ) < Math::MACHINE_EPSILON_1000 ) && + ( fabsf( v.mTexCoords.y - out.mVertices[ j ].mTexCoords.y ) < Math::MACHINE_EPSILON_1000 ) ) { // Yes, so store this down as the vertex to use - faces[ i ] = j; + out.mIndices.PushBack( j ); foundVertex = true; break; } @@ -459,108 +526,70 @@ void AtlasManager::OptimizeVertices( const MeshData::VertexContainer& in, // Did we find a vertex ? if ( !foundVertex ) { - // Add a new vertex - faces[ i ] = vertexIndex++; - out.push_back( v ); + // No so add a new one + out.mVertices.PushBack( v ); + vertexIndex++; } } } -void AtlasManager::StitchMesh( MeshData& first, - const MeshData& second, +void AtlasManager::StitchMesh( Toolkit::AtlasManager::Mesh2D& first, + const Toolkit::AtlasManager::Mesh2D& second, bool optimize ) { + uint32_t vc = first.mVertices.Size(); - // Would be much quicker to be able to get a non-const reference to these containers and update in situ - MeshData::VertexContainer v1 = first.GetVertices(); - MeshData::VertexContainer v2 = second.GetVertices(); - MeshData::FaceIndices f1 = first.GetFaces(); - MeshData::FaceIndices f2 = second.GetFaces(); - - uint32_t vc1 = first.GetVertexCount(); - uint32_t vc2 = second.GetVertexCount(); - - for ( uint32_t v = 0; v < vc2; ++v ) + for ( uint32_t v = 0; v < second.mVertices.Size(); ++v ) { - v1.push_back( v2[ v ] ); + first.mVertices.PushBack( second.mVertices[ v ] ); } - for ( uint32_t f = 0; f < f2.size(); ++f ) + for ( uint32_t i = 0; i < second.mIndices.Size(); ++i ) { - f1.push_back( f2[ f ] + vc1 ); + first.mIndices.PushBack( second.mIndices[ i ] + vc ); } if ( optimize ) { - MeshData::VertexContainer optimizedVertices; - OptimizeVertices( v1, f1, optimizedVertices ); - first.SetVertices( optimizedVertices ); - } - else - { - first.SetVertices( v1 ); + Toolkit::AtlasManager::Mesh2D optimizedMesh; + OptimizeMesh( first, optimizedMesh ); + first = optimizedMesh; } - - first.SetFaceIndices( f1 ); - - // TODO rather than set the material to the second, check to see if there's a match and return if not - first.SetMaterial( second.GetMaterial() ); } -void AtlasManager::StitchMesh( const MeshData& first, - const MeshData& second, - MeshData& out, +void AtlasManager::StitchMesh( const Toolkit::AtlasManager::Mesh2D& first, + const Toolkit::AtlasManager::Mesh2D& second, + Toolkit::AtlasManager::Mesh2D& out, bool optimize ) { - // TODO Would be much quicker to be able to get a non-const reference to these containers and update in situ - MeshData::VertexContainer v1 = first.GetVertices(); - MeshData::VertexContainer v2 = second.GetVertices(); - MeshData::FaceIndices f1 = first.GetFaces(); - MeshData::FaceIndices f2 = second.GetFaces(); - - uint32_t vc1 = first.GetVertexCount(); - uint32_t vc2 = second.GetVertexCount(); - - MeshData::VertexContainer vertices; + uint32_t vc = first.mVertices.Size(); - MeshData::FaceIndices faces; - - MeshData::Vertex vertex; - - for ( uint32_t v = 0; v < vc1; ++v ) + for ( uint32_t v = 0; v < vc; ++v ) { - vertices.push_back( v1[ v ] ); + out.mVertices.PushBack( first.mVertices[ v ] ); } - for ( uint32_t v = 0; v < vc2; ++v ) + for ( uint32_t v = 0; v < second.mVertices.Size(); ++v ) { - vertices.push_back( v2[ v ] ); + out.mVertices.PushBack( second.mVertices[ v ] ); } - for ( uint32_t f = 0; f < f1.size(); ++f ) + for ( uint32_t i = 0; i < first.mIndices.Size(); ++i ) { - faces.push_back( f1[ f ] ); + out.mIndices.PushBack( first.mIndices[ i ] ); } - for ( uint32_t f = 0; f < f2.size(); ++f ) + for ( uint32_t i = 0; i < second.mIndices.Size(); ++i ) { - faces.push_back( f2[ f ] + vc1 ); + out.mIndices.PushBack( second.mIndices[ i ] + vc ); } if ( optimize ) { - MeshData::VertexContainer optimizedVertices; - OptimizeVertices( vertices, faces, optimizedVertices ); - out.SetVertices( optimizedVertices ); + Toolkit::AtlasManager::Mesh2D optimizedMesh; + OptimizeMesh( out, optimizedMesh ); + out = optimizedMesh; } - else - { - out.SetVertices( vertices ); - } - - // TODO rather than set the material to the second, check to see if there's a match and return if not - out.SetMaterial( second.GetMaterial() ); - out.SetFaceIndices( faces ); } void AtlasManager::UploadImage( const BufferImage& image, @@ -576,9 +605,9 @@ void AtlasManager::UploadImage( const BufferImage& image, return; } - SizeType atlasBlockWidth = mAtlasList[ atlas ].mBlockWidth; - SizeType atlasBlockHeight = mAtlasList[ atlas ].mBlockHeight; - SizeType atlasWidthInBlocks = mAtlasList[ atlas ].mWidth / mAtlasList[ atlas ].mBlockWidth; + SizeType atlasBlockWidth = mAtlasList[ atlas ].mSize.mBlockWidth; + SizeType atlasBlockHeight = mAtlasList[ atlas ].mSize.mBlockHeight; + SizeType atlasWidthInBlocks = mAtlasList[ atlas ].mSize.mWidth / mAtlasList[ atlas ].mSize.mBlockWidth; SizeType block = desc.mBlocksList[ 0 ]; SizeType blockX = block % atlasWidthInBlocks; @@ -589,29 +618,82 @@ void AtlasManager::UploadImage( const BufferImage& image, SizeType width = image.GetWidth(); SizeType height = image.GetHeight(); - if ( !mAtlasList[ atlas ].mAtlas.Upload( image, blockOffsetX, blockOffsetY ) ) + // Blit image 1 pixel to the right and down into the block to compensate for texture filtering + if ( !mAtlasList[ atlas ].mAtlas.Upload( image, + blockOffsetX + SINGLE_PIXEL_PADDING, + blockOffsetY + SINGLE_PIXEL_PADDING ) ) { - DALI_LOG_ERROR("Uploading block to Atlas Failed!.\n"); + DALI_LOG_ERROR("Uploading image to Atlas Failed!.\n"); } - if ( blockOffsetY + height + PIXEL_PADDING <= mAtlasList[ atlas ].mHeight ) + else { - if ( !mAtlasList[ atlas ].mAtlas.Upload( mAtlasList[ atlas ].mEdgeX, blockOffsetX, blockOffsetY + height ) ) + mUploadedImages.PushBack( const_cast< BufferImage& >( image ).GetBuffer() ); + } + + // If this is the first block then we need to keep the first pixel free for underline texture + if ( block ) + { + + // Blit top strip + if ( !mAtlasList[ atlas ].mAtlas.Upload( mAtlasList[ atlas ].mHorizontalStrip, + blockOffsetX, + blockOffsetY ) ) { - DALI_LOG_ERROR("Uploading edgeX to Atlas Failed!.\n"); + DALI_LOG_ERROR("Uploading top strip to Atlas Failed!\n"); + } + else + { + mUploadedImages.PushBack( NULL ); + } + + // Blit left strip + if ( !mAtlasList[ atlas ].mAtlas.Upload( mAtlasList[ atlas ].mVerticalStrip, + blockOffsetX, + blockOffsetY + SINGLE_PIXEL_PADDING ) ) + { + DALI_LOG_ERROR("Uploading left strip to Atlas Failed!\n"); + } + else + { + mUploadedImages.PushBack( NULL ); + } + } + + // Blit bottom strip + if ( blockOffsetY + height + DOUBLE_PIXEL_PADDING <= mAtlasList[ atlas ].mSize.mHeight ) + { + if ( !mAtlasList[ atlas ].mAtlas.Upload( mAtlasList[ atlas ].mHorizontalStrip, + blockOffsetX, + blockOffsetY + height + SINGLE_PIXEL_PADDING ) ) + { + DALI_LOG_ERROR("Uploading bottom strip to Atlas Failed!.\n"); + } + else + { + mUploadedImages.PushBack( NULL ); } } - if ( blockOffsetX + width + PIXEL_PADDING <= mAtlasList[ atlas ].mWidth ) + + // Blit right strip + if ( blockOffsetX + width + DOUBLE_PIXEL_PADDING <= mAtlasList[ atlas ].mSize.mWidth ) { - if ( !mAtlasList[ atlas ].mAtlas.Upload( mAtlasList[ atlas ].mEdgeY, blockOffsetX + width, blockOffsetY ) ) + if ( !mAtlasList[ atlas ].mAtlas.Upload( mAtlasList[ atlas ].mVerticalStrip, + blockOffsetX + width + SINGLE_PIXEL_PADDING, + blockOffsetY + SINGLE_PIXEL_PADDING ) ) + { + DALI_LOG_ERROR("Uploading right strip to Atlas Failed!.\n"); + } + else { - DALI_LOG_ERROR("Uploading edgeY to Atlas Failed!.\n"); + mUploadedImages.PushBack( NULL ); } } } void AtlasManager::GenerateMeshData( ImageId id, const Vector2& position, - MeshData& meshData ) + Toolkit::AtlasManager::Mesh2D& meshData, + bool addReference ) { // Read the atlas Id to use for this image SizeType imageId = id - 1u; @@ -619,21 +701,24 @@ void AtlasManager::GenerateMeshData( ImageId id, SizeType width = mImageList[ imageId ].mImageWidth; SizeType height = mImageList[ imageId ].mImageHeight; - SizeType widthInBlocks = width / mAtlasList[ atlas ].mBlockWidth; - if ( width % mAtlasList[ atlas ].mBlockWidth ) + SizeType widthInBlocks = width / mAtlasList[ atlas ].mSize.mBlockWidth; + if ( width % mAtlasList[ atlas ].mSize.mBlockWidth ) { widthInBlocks++; } - SizeType heightInBlocks = height / mAtlasList[ atlas ].mBlockHeight; - if ( height % mAtlasList[ atlas ].mBlockHeight ) + SizeType heightInBlocks = height / mAtlasList[ atlas ].mSize.mBlockHeight; + if ( height % mAtlasList[ atlas ].mSize.mBlockHeight ) { heightInBlocks++; } CreateMesh( atlas, width, height, position, widthInBlocks, heightInBlocks, meshData, mImageList[ imageId ] ); - // Mesh created so increase the reference count - mImageList[ imageId ].mCount++; + // Mesh created so increase the reference count, if we're asked to + if ( addReference ) + { + mImageList[ imageId ].mCount++; + } } Dali::Atlas AtlasManager::GetAtlasContainer( AtlasId atlas ) const @@ -667,7 +752,7 @@ bool AtlasManager::Remove( ImageId id ) return false; } - if ( 1u == --mImageList[ imageId ].mCount ) + if ( 2u > --mImageList[ imageId ].mCount ) { // 'Remove the blocks' from this image and add to the atlas' freelist removed = true; @@ -693,24 +778,20 @@ AtlasManager::AtlasId AtlasManager::GetAtlas( ImageId id ) const } } -void AtlasManager::SetAtlasSize( const Vector2& size, - const Vector2& blockSize ) +void AtlasManager::SetNewAtlasSize( const Toolkit::AtlasManager::AtlasSize& size ) { mNewAtlasSize = size; - mNewBlockSize = blockSize; + mNewAtlasSize.mBlockWidth += DOUBLE_PIXEL_PADDING; + mNewAtlasSize.mBlockHeight += DOUBLE_PIXEL_PADDING; } -Vector2 AtlasManager::GetBlockSize( AtlasId atlas ) +const Toolkit::AtlasManager::AtlasSize& AtlasManager::GetAtlasSize( AtlasId atlas ) { - if ( atlas && atlas <= mAtlasList.size() ) - { - return Vector2( static_cast< float >( mAtlasList[ atlas - 1u ].mBlockWidth ), - static_cast< float >( mAtlasList[ atlas - 1u ].mBlockHeight) ); - } - else + if ( atlas && atlas-- <= mAtlasList.size() ) { - return Vector2( 0.0f, 0.0f ); + return mAtlasList[ atlas ].mSize; } + return EMPTY_SIZE; } AtlasManager::SizeType AtlasManager::GetFreeBlocks( AtlasId atlas ) const @@ -718,27 +799,24 @@ AtlasManager::SizeType AtlasManager::GetFreeBlocks( AtlasId atlas ) const if ( atlas && atlas <= mAtlasList.size() ) { uint32_t index = atlas - 1u; - uint32_t width = mAtlasList[ index ].mWidth; - uint32_t height = mAtlasList[ index ].mHeight; - uint32_t blockWidth = mAtlasList[ index ].mBlockWidth; - uint32_t blockHeight = mAtlasList[ index ].mBlockHeight; + uint32_t width = mAtlasList[ index ].mSize.mWidth; + uint32_t height = mAtlasList[ index ].mSize.mHeight; + uint32_t blockWidth = mAtlasList[ index ].mSize.mBlockWidth; + uint32_t blockHeight = mAtlasList[ index ].mSize.mBlockHeight; - //Work out how many blocks wide and high our bitmap is in the atlas' block size SizeType widthInBlocks = width / blockWidth; - if ( width % blockWidth ) - { - widthInBlocks++; - } SizeType heightInBlocks = height / blockHeight; - if ( height % blockHeight ) - { - heightInBlocks++; - } - uint32_t blockCount = widthInBlocks * heightInBlocks; // Check free previously unallocated blocks and any free blocks - blockCount -= mAtlasList[ index ].mNextFreeBlock - mAtlasList[ index ].mFreeBlocksList.Size(); + if ( mAtlasList[ index ].mNextFreeBlock ) + { + blockCount -= mAtlasList[ index ].mNextFreeBlock -1u - mAtlasList[ index ].mFreeBlocksList.Size(); + } + else + { + blockCount = mAtlasList[ index ].mFreeBlocksList.Size(); + } return blockCount; } else @@ -763,6 +841,55 @@ Pixel::Format AtlasManager::GetPixelFormat( AtlasId atlas ) return mAtlasList[ atlas -1u ].mPixelFormat; } +void AtlasManager::GetMetrics( Toolkit::AtlasManager::Metrics& metrics ) +{ + Toolkit::AtlasManager::AtlasMetricsEntry entry; + uint32_t textureMemoryUsed = 0; + uint32_t atlasCount = mAtlasList.size(); + metrics.mAtlasCount = atlasCount; + metrics.mAtlasMetrics.Resize(0); + + for ( uint32_t i = 0; i < atlasCount; ++i ) + { + entry.mSize = mAtlasList[ i ].mSize; + entry.mTotalBlocks = ( entry.mSize.mWidth / entry.mSize.mBlockWidth ) * ( entry.mSize.mHeight / entry.mSize.mBlockHeight ); + uint32_t reuseBlocks = mAtlasList[ i ].mFreeBlocksList.Size(); + entry.mBlocksUsed = mAtlasList[ i ].mNextFreeBlock ? mAtlasList[ i ].mNextFreeBlock - reuseBlocks - 1u: entry.mTotalBlocks - reuseBlocks; + entry.mPixelFormat = GetPixelFormat( i + 1 ); + + metrics.mAtlasMetrics.PushBack( entry ); + + uint32_t size = entry.mSize.mWidth * entry.mSize.mHeight; + if ( entry.mPixelFormat == Pixel::BGRA8888 ) + { + size <<= 2; + } + + textureMemoryUsed += size; + + } + metrics.mTextureMemoryUsed = textureMemoryUsed; +} + +Material AtlasManager::GetMaterial( AtlasId atlas ) const +{ + if ( atlas && atlas <= mAtlasList.size() ) + { + return mAtlasList[ atlas -1u ].mMaterial; + } + Material null; + return null; +} + +Sampler AtlasManager::GetSampler( AtlasId atlas ) const +{ + if ( atlas && atlas <= mAtlasList.size() ) + { + return mAtlasList[ atlas -1u ].mSampler; + } + Sampler null; + return null; +} } // namespace Internal