From 8592f2596ececd2c3547082014cf24d3b82af30c Mon Sep 17 00:00:00 2001 From: Ferran Sole Date: Tue, 1 Nov 2016 08:53:39 +0000 Subject: [PATCH] Fixed bug in 3x3 NPatch shader and Color visual shader Change-Id: Ice69e0f6220f9d5c6b7b968683c462451e4b3b41 --- dali-toolkit/internal/visuals/border/border-visual.cpp | 6 +++--- dali-toolkit/internal/visuals/color/color-visual.cpp | 2 +- dali-toolkit/internal/visuals/npatch/npatch-visual.cpp | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dali-toolkit/internal/visuals/border/border-visual.cpp b/dali-toolkit/internal/visuals/border/border-visual.cpp index 1191683..3286712 100644 --- a/dali-toolkit/internal/visuals/border/border-visual.cpp +++ b/dali-toolkit/internal/visuals/border/border-visual.cpp @@ -64,16 +64,16 @@ const char* VERTEX_SHADER = DALI_COMPOSE_SHADER( uniform mediump vec2 origin;\n uniform mediump vec2 anchorPoint;\n - vec4 ComputeVertexPosition()\n + vec2 ComputeVertexPosition()\n {\n vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw );\n vec2 visualOffset = mix( offset, offset/uSize.xy, offsetSizeMode.xy);\n - return vec4( (aPosition + anchorPoint)*visualSize + (visualOffset + origin)*uSize.xy, 0.0, 1.0 );\n + return (aPosition + anchorPoint)*visualSize + (visualOffset + origin)*uSize.xy;\n }\n void main()\n {\n - vec2 position = ComputeVertexPosition().xy + aDrift*borderSize;\n + vec2 position = ComputeVertexPosition() + aDrift*borderSize;\n gl_Position = uMvpMatrix * vec4(position, 0.0, 1.0);\n }\n ); diff --git a/dali-toolkit/internal/visuals/color/color-visual.cpp b/dali-toolkit/internal/visuals/color/color-visual.cpp index 4dca2be..82c6254 100644 --- a/dali-toolkit/internal/visuals/color/color-visual.cpp +++ b/dali-toolkit/internal/visuals/color/color-visual.cpp @@ -74,7 +74,7 @@ const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER( \n void main()\n {\n - gl_FragColor = mixColor;\n + gl_FragColor = mixColor*uColor;\n }\n ); } diff --git a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp index 4cba737..4cf199a 100644 --- a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp +++ b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp @@ -115,9 +115,9 @@ const char* VERTEX_SHADER_3X3 = DALI_COMPOSE_SHADER( mediump vec2 stretch = floor( aPosition * 0.5 );\n mediump vec2 fixedTotal = uFixed[ 2 ];\n \n - mediump vec4 vertexPosition = vec4( fixedFactor + ( size - fixedTotal ) * stretch + anchorPoint*visualSize + (visualOffset + origin)*uSize.xy, 0.0, 1.0 );\n - vertexPosition.xy -= visualSize * vec2( 0.5, 0.5 );\n - vertexPosition.xy = vertexPosition.xy / scale;\n + mediump vec4 vertexPosition = vec4( fixedFactor + ( size - fixedTotal ) * stretch, 0.0, 1.0 ); + vertexPosition.xy -= size * vec2( 0.5, 0.5 );\n + vertexPosition.xy = vertexPosition.xy / scale + anchorPoint*size + (visualOffset + origin)*uSize.xy;\ \n vertexPosition = uMvpMatrix * vertexPosition;\n \n -- 2.7.4