X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Frendering%2Fatlas%2Ftext-atlas-renderer.cpp;h=dddb301f564473d2a2dbe4ba766d4d67c7f2927e;hp=c6d1f80507f26493e5c0da8106039d1827e57ef3;hb=d82494a77e405d5924cf1af3fe55b2d9b9577e3f;hpb=d616a2005dbbe888fa5b25bab86ce12d1ee4613a diff --git a/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp b/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp old mode 100644 new mode 100755 index c6d1f80..dddb301 --- a/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp +++ b/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -49,7 +49,7 @@ attribute mediump vec2 aPosition; attribute mediump vec2 aTexCoord; attribute mediump vec4 aColor; uniform mediump vec2 uOffset; -uniform mediump mat4 uMvpMatrix; +uniform highp mat4 uMvpMatrix; varying mediump vec2 vTexCoord; varying mediump vec4 vColor; @@ -93,7 +93,7 @@ const float HALF( 0.5f ); const float ONE( 1.0f ); const uint32_t DEFAULT_ATLAS_WIDTH = 512u; const uint32_t DEFAULT_ATLAS_HEIGHT = 512u; -const uint32_t NO_OUTLINE = 0; +const uint16_t NO_OUTLINE = 0u; } struct AtlasRenderer::Impl @@ -168,17 +168,21 @@ struct AtlasRenderer::Impl struct TextCacheEntry { TextCacheEntry() - : mFontId( 0 ), - mIndex( 0 ), - mOutlineWidth( 0 ), - mImageId( 0 ) + : mFontId{ 0u }, + mIndex{ 0u }, + mImageId{ 0u }, + mOutlineWidth{ 0u }, + isItalic{ false }, + isBold{ false } { } FontId mFontId; Text::GlyphIndex mIndex; - uint32_t mOutlineWidth; uint32_t mImageId; + uint16_t mOutlineWidth; + bool isItalic:1; + bool isBold:1; }; Impl() @@ -211,9 +215,9 @@ struct AtlasRenderer::Impl return false; } - void CacheGlyph( const GlyphInfo& glyph, FontId lastFontId, uint32_t outline, AtlasManager::AtlasSlot& slot ) + void CacheGlyph( const GlyphInfo& glyph, FontId lastFontId, const AtlasGlyphManager::GlyphStyle& style, AtlasManager::AtlasSlot& slot ) { - const bool glyphNotCached = !mGlyphManager.IsCached( glyph.fontId, glyph.index, outline, slot ); // Check FontGlyphRecord vector for entry with glyph index and fontId + const bool glyphNotCached = !mGlyphManager.IsCached( glyph.fontId, glyph.index, style, slot ); // Check FontGlyphRecord vector for entry with glyph index and fontId DALI_LOG_INFO( gLogFilter, Debug::Verbose, "AddGlyphs fontID[%u] glyphIndex[%u] [%s]\n", glyph.fontId, glyph.index, (glyphNotCached)?"not cached":"cached" ); @@ -243,7 +247,7 @@ struct AtlasRenderer::Impl PixelData bitmap; // Whether the glyph is an outline. - const bool isOutline = 0u != outline; + const bool isOutline = 0u != style.outline; // Whether the current glyph is a color one. const bool isColorGlyph = mFontClient.IsColorGlyph( glyph.fontId, glyph.index ); @@ -257,8 +261,10 @@ struct AtlasRenderer::Impl mFontClient.CreateBitmap( glyph.fontId, glyph.index, + glyph.isItalicRequired, + glyph.isBoldRequired, glyphBufferData, - outline ); + style.outline ); // Create the pixel data. bitmap = PixelData::New( glyphBufferData.buffer, @@ -290,21 +296,21 @@ struct AtlasRenderer::Impl blockSize.mNeededBlockHeight ); // Locate a new slot for our glyph - mGlyphManager.Add( glyph, outline, bitmap, slot ); // slot will be 0 is glyph not added + mGlyphManager.Add( glyph, style, bitmap, slot ); // slot will be 0 is glyph not added } } } else { // We have 2+ copies of the same glyph - mGlyphManager.AdjustReferenceCount( glyph.fontId, glyph.index, outline, 1 ); //increment + mGlyphManager.AdjustReferenceCount( glyph.fontId, glyph.index, style, 1 ); //increment } } void GenerateMesh( const GlyphInfo& glyph, const Vector2& position, const Vector4& color, - uint32_t outline, + uint16_t outline, AtlasManager::AtlasSlot& slot, bool underlineGlyph, float currentUnderlinePosition, @@ -322,6 +328,8 @@ struct AtlasRenderer::Impl textCacheEntry.mImageId = slot.mImageId; textCacheEntry.mIndex = glyph.index; textCacheEntry.mOutlineWidth = outline; + textCacheEntry.isItalic = glyph.isItalicRequired; + textCacheEntry.isBold = glyph.isBoldRequired; newTextCache.PushBack( textCacheEntry ); @@ -443,7 +451,7 @@ struct AtlasRenderer::Impl const bool underlineEnabled = view.IsUnderlineEnabled(); const Vector4& underlineColor( view.GetUnderlineColor() ); const float underlineHeight = view.GetUnderlineHeight(); - const unsigned int outlineWidth = view.GetOutlineWidth(); + const uint16_t outlineWidth = view.GetOutlineWidth(); const Vector4& outlineColor( view.GetOutlineColor() ); const bool isOutline = 0u != outlineWidth; @@ -526,13 +534,18 @@ struct AtlasRenderer::Impl lastUnderlinedFontId = glyph.fontId; } // underline + AtlasGlyphManager::GlyphStyle style; + style.isItalic = glyph.isItalicRequired; + style.isBold = glyph.isBoldRequired; + // Retrieves and caches the glyph's bitmap. - CacheGlyph( glyph, lastFontId, NO_OUTLINE, slot ); + CacheGlyph( glyph, lastFontId, style, slot ); // Retrieves and caches the outline glyph's bitmap. if( isOutline ) { - CacheGlyph( glyph, lastFontId, outlineWidth, slotOutline ); + style.outline = outlineWidth; + CacheGlyph( glyph, lastFontId, style, slotOutline ); } // Move the origin (0,0) of the mesh to the center of the actor @@ -653,7 +666,11 @@ struct AtlasRenderer::Impl { for( Vector< TextCacheEntry >::Iterator oldTextIter = mTextCache.Begin(); oldTextIter != mTextCache.End(); ++oldTextIter ) { - mGlyphManager.AdjustReferenceCount( oldTextIter->mFontId, oldTextIter->mIndex, oldTextIter->mOutlineWidth, -1/*decrement*/ ); + AtlasGlyphManager::GlyphStyle style; + style.outline = oldTextIter->mOutlineWidth; + style.isItalic = oldTextIter->isItalic; + style.isBold = oldTextIter->isBold; + mGlyphManager.AdjustReferenceCount( oldTextIter->mFontId, oldTextIter->mIndex, style, -1/*decrement*/ ); } mTextCache.Resize( 0 ); }