projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TextColor Animatable
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
rendering
/
vector-based
/
vector-based-renderer.cpp
diff --git
a/dali-toolkit/internal/text/rendering/vector-based/vector-based-renderer.cpp
b/dali-toolkit/internal/text/rendering/vector-based/vector-based-renderer.cpp
index
82bf555
..
7fccc8d
100644
(file)
--- a/
dali-toolkit/internal/text/rendering/vector-based/vector-based-renderer.cpp
+++ b/
dali-toolkit/internal/text/rendering/vector-based/vector-based-renderer.cpp
@@
-19,10
+19,10
@@
#include <dali-toolkit/internal/text/rendering/vector-based/vector-based-renderer.h>
// EXTERNAL INCLUDES
#include <dali-toolkit/internal/text/rendering/vector-based/vector-based-renderer.h>
// EXTERNAL INCLUDES
-#include <dali/integration-api/debug.h>
-#include <dali/devel-api/rendering/renderer.h>
-#include <dali/devel-api/rendering/geometry.h>
+#include <dali/public-api/rendering/geometry.h>
+#include <dali/public-api/rendering/renderer.h>
#include <dali/devel-api/text-abstraction/font-client.h>
#include <dali/devel-api/text-abstraction/font-client.h>
+#include <dali/integration-api/debug.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/text/glyph-run.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/text/glyph-run.h>
@@
-64,7
+64,7
@@
void AddVertex( Vector<Vertex2D>& vertices, float x, float y, float u, float v,
vertices.PushBack( meshVertex );
}
vertices.PushBack( meshVertex );
}
-void AddTriangle( Vector<unsigned
in
t>& indices, unsigned int v0, unsigned int v1, unsigned int v2 )
+void AddTriangle( Vector<unsigned
shor
t>& indices, unsigned int v0, unsigned int v1, unsigned int v2 )
{
indices.PushBack( v0 );
indices.PushBack( v1 );
{
indices.PushBack( v0 );
indices.PushBack( v1 );
@@
-79,7
+79,7
@@
bool CreateGeometry( const Vector<GlyphInfo>& glyphs,
VectorBlobAtlas& atlas,
Dali::TextAbstraction::FontClient& fontClient,
Vector< Vertex2D >& vertices,
VectorBlobAtlas& atlas,
Dali::TextAbstraction::FontClient& fontClient,
Vector< Vertex2D >& vertices,
- Vector< unsigned
in
t >& indices,
+ Vector< unsigned
shor
t >& indices,
const Vector4* const colorsBuffer,
const ColorIndex* const colorIndicesBuffer,
const Vector4& defaultColor )
const Vector4* const colorsBuffer,
const ColorIndex* const colorIndicesBuffer,
const Vector4& defaultColor )
@@
-161,7
+161,6
@@
struct VectorBasedRenderer::Impl
mQuadVertexFormat[ "aPosition" ] = Property::VECTOR2;
mQuadVertexFormat[ "aTexCoord" ] = Property::VECTOR2;
mQuadVertexFormat[ "aColor" ] = Property::VECTOR4;
mQuadVertexFormat[ "aPosition" ] = Property::VECTOR2;
mQuadVertexFormat[ "aTexCoord" ] = Property::VECTOR2;
mQuadVertexFormat[ "aColor" ] = Property::VECTOR4;
- mQuadIndexFormat[ "indices" ] = Property::INTEGER;
}
Actor mActor; ///< The actor parent which renders the text
}
Actor mActor; ///< The actor parent which renders the text
@@
-169,7
+168,6
@@
struct VectorBasedRenderer::Impl
TextAbstraction::FontClient mFontClient; ///> The font client used to supply glyph information
Property::Map mQuadVertexFormat; ///> Describes the vertex format for text
TextAbstraction::FontClient mFontClient; ///> The font client used to supply glyph information
Property::Map mQuadVertexFormat; ///> Describes the vertex format for text
- Property::Map mQuadIndexFormat; ///> Describes the index format for text
Shader mShaderEffect;
Shader mShaderEffect;
@@
-183,7
+181,11
@@
Text::RendererPtr VectorBasedRenderer::New()
return Text::RendererPtr( new VectorBasedRenderer() );
}
return Text::RendererPtr( new VectorBasedRenderer() );
}
-Actor VectorBasedRenderer::Render( Text::ViewInterface& view, int /*depth*/ )
+Actor VectorBasedRenderer::Render( Text::ViewInterface& view,
+ Actor textControl,
+ Property::Index animatablePropertyIndex,
+ float& alignmentOffset,
+ int /*depth*/ )
{
UnparentAndReset( mImpl->mActor );
{
UnparentAndReset( mImpl->mActor );
@@
-207,8
+209,10
@@
Actor VectorBasedRenderer::Render( Text::ViewInterface& view, int /*depth*/ )
numberOfGlyphs = view.GetGlyphs( glyphs.Begin(),
positions.Begin(),
numberOfGlyphs = view.GetGlyphs( glyphs.Begin(),
positions.Begin(),
+ alignmentOffset,
0u,
numberOfGlyphs );
0u,
numberOfGlyphs );
+
glyphs.Resize( numberOfGlyphs );
positions.Resize( numberOfGlyphs );
glyphs.Resize( numberOfGlyphs );
positions.Resize( numberOfGlyphs );
@@
-217,10
+221,10
@@
Actor VectorBasedRenderer::Render( Text::ViewInterface& view, int /*depth*/ )
const Vector4& defaultColor = view.GetTextColor();
Vector< Vertex2D > vertices;
const Vector4& defaultColor = view.GetTextColor();
Vector< Vertex2D > vertices;
- Vector< unsigned
in
t > indices;
+ Vector< unsigned
shor
t > indices;
const Vector2& controlSize = view.GetControlSize();
const Vector2& controlSize = view.GetControlSize();
- float xOffset =
controlSize.width
* -0.5f;
+ float xOffset =
-alignmentOffset + controlSize.width
* -0.5f;
float yOffset = controlSize.height * -0.5f;
if( ! mImpl->mAtlas ||
float yOffset = controlSize.height * -0.5f;
if( ! mImpl->mAtlas ||
@@
-272,14
+276,13
@@
Actor VectorBasedRenderer::Render( Text::ViewInterface& view, int /*depth*/ )
if( 0 != vertices.Count() )
{
PropertyBuffer quadVertices = PropertyBuffer::New( mImpl->mQuadVertexFormat );
if( 0 != vertices.Count() )
{
PropertyBuffer quadVertices = PropertyBuffer::New( mImpl->mQuadVertexFormat );
- PropertyBuffer quadIndices = PropertyBuffer::New( mImpl->mQuadIndexFormat );
quadVertices.SetData( &vertices[ 0 ], vertices.Size() );
quadVertices.SetData( &vertices[ 0 ], vertices.Size() );
- quadIndices.SetData( &indices[ 0 ], indices.Size() );
+
Geometry quadGeometry = Geometry::New();
quadGeometry.AddVertexBuffer( quadVertices );
Geometry quadGeometry = Geometry::New();
quadGeometry.AddVertexBuffer( quadVertices );
- quadGeometry.SetIndexBuffer(
quadIndices
);
+ quadGeometry.SetIndexBuffer(
&indices[ 0 ], indices.Size()
);
TextureSet texture = mImpl->mAtlas->GetTextureSet();
TextureSet texture = mImpl->mAtlas->GetTextureSet();