From 1e037324275491726454a6134b2e14d6c77a3996 Mon Sep 17 00:00:00 2001 From: Chu Hoang Date: Mon, 20 Jul 2015 17:02:29 +0100 Subject: [PATCH] Changed ImageView to use a unit square mesh and instead to size the mesh in the shader to the actor size. Change-Id: I4adce952422a8c5d05e85778e253ead18e891fbf --- dali-toolkit/internal/controls/image-view/image-view-impl.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp index 7cfdb07..b6b97a4 100644 --- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp +++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp @@ -36,7 +36,7 @@ const char* VERTEX_SHADER = MAKE_SHADER( void main() { mediump vec4 vertexPosition = vec4(aPosition, 0.0, 1.0); - // TODO scale by the actor size when we are using RendererFactor generated renderers with a shared unit sized mesh: vertexPosition.xyz *= uSize; + vertexPosition.xyz *= uSize; vertexPosition = uMvpMatrix * vertexPosition; vTexCoord = aTexCoord; @@ -59,8 +59,8 @@ const char* FRAGMENT_SHADER = MAKE_SHADER( Geometry CreateGeometry( int width, int height ) { // Create vertices - const float halfWidth = width * .5f; - const float halfHeight = height * .5f; + const float halfWidth = 0.5f; + const float halfHeight = 0.5f; struct TexturedQuadVertex { Vector2 position; Vector2 textureCoordinates; }; TexturedQuadVertex texturedQuadVertexData[4] = { { Vector2(-halfWidth, -halfHeight), Vector2(0.f, 0.f) }, { Vector2( halfWidth, -halfHeight), Vector2(1.f, 0.f) }, @@ -74,6 +74,7 @@ Geometry CreateGeometry( int width, int height ) texturedQuadVertices.SetData(texturedQuadVertexData); // Create indices + //TODO: replace with triangle strip when Geometry supports it unsigned int indexData[6] = { 0, 3, 1, 0, 2, 3 }; Property::Map indexFormat; indexFormat["indices"] = Property::INTEGER; -- 2.7.4