From 8cdac1d9755ee9a16a74317d610ebb4d72621324 Mon Sep 17 00:00:00 2001 From: Agnelo Vaz Date: Tue, 13 Dec 2016 14:32:41 +0000 Subject: [PATCH] TextVisual no longer uses Atlas Seems the texture atlas has an offset whilst packing with is propagating a pixel alignment error Change-Id: I3f1e362ee94baf7e86b42c370ac70053d8d38a7c --- .../internal/visuals/text/text-visual.cpp | 30 ++++++++----------- 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/dali-toolkit/internal/visuals/text/text-visual.cpp b/dali-toolkit/internal/visuals/text/text-visual.cpp index aad172d376..2e7fa6dee9 100644 --- a/dali-toolkit/internal/visuals/text/text-visual.cpp +++ b/dali-toolkit/internal/visuals/text/text-visual.cpp @@ -436,29 +436,23 @@ void TextVisual::UpdateRenderer() PixelData data = mTypesetter->Render( relayoutSize ); Vector4 atlasRect = FULL_TEXTURE_RECT; - TextureSet textureSet = mFactoryCache.GetAtlasManager()->Add( atlasRect, data ); - if( textureSet ) - { - mImpl->mFlags |= Impl::IS_ATLASING_APPLIED; - } - else - { - // It may happen the image atlas can't handle a pixel data it exceeds the maximum size. - // In that case, create a texture. TODO: should tile the text. + // Texture set not retrieved from Atlas Manager whilst pixel offset visible. - Texture texture = Texture::New( Dali::TextureType::TEXTURE_2D, - data.GetPixelFormat(), - data.GetWidth(), - data.GetHeight() ); + // It may happen the image atlas can't handle a pixel data it exceeds the maximum size. + // In that case, create a texture. TODO: should tile the text. - texture.Upload( data ); + Texture texture = Texture::New( Dali::TextureType::TEXTURE_2D, + data.GetPixelFormat(), + data.GetWidth(), + data.GetHeight() ); - textureSet = TextureSet::New(); - textureSet.SetTexture( 0u, texture ); + texture.Upload( data ); - mImpl->mFlags &= ~Impl::IS_ATLASING_APPLIED; - } + TextureSet textureSet = TextureSet::New(); + textureSet.SetTexture( 0u, texture ); + + mImpl->mFlags &= ~Impl::IS_ATLASING_APPLIED; mImpl->mRenderer.RegisterProperty( ATLAS_RECT_UNIFORM_NAME, atlasRect ); -- 2.34.1