X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fpage-turn-view%2Fpage-turn-effect.cpp;h=f4ada4f2ddbae2ef12808261272e1d982713fa95;hb=5437f8308b17393381dcf586e2a9aadd9aa4bdf3;hp=3684e70022e5e3beb8876553ad7e562700b460ba;hpb=ae34cf6aef4b3b807bd1e099baa48230b6b32156;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-effect.cpp b/dali-toolkit/internal/controls/page-turn-view/page-turn-effect.cpp index 3684e70..f4ada4f 100644 --- a/dali-toolkit/internal/controls/page-turn-view/page-turn-effect.cpp +++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-effect.cpp @@ -127,7 +127,7 @@ ShaderEffect Dali::Toolkit::Internal::CreatePageTurnEffect() \n void main()\n {\n - vec4 position = vec4( aPosition.xy, 0.0, 1.0);\n + vec4 position = vec4( aPosition, 1.0);\n vec2 currentCenter = vec2( uCommonParameters[1][2], uCommonParameters[1][3]);\n vec2 originalCenter = vec2( uCommonParameters[0][2], uCommonParameters[0][3]);\n vec3 normal = vec3(0.0,0.0,1.0);\n @@ -246,10 +246,9 @@ ShaderEffect Dali::Toolkit::Internal::CreatePageTurnEffect() // change the coordinate origin from the top-left of the page to its center position.xy -= uPageSize * 0.5; \n }\n - position.z += aPosition.z;\n gl_Position = uMvpMatrix * position;\n // varying parameters for fragment shader - vTexCoord = aTexCoord; + vTexCoord = mix( sTextureRect.xy, sTextureRect.zw, aTexCoord );\n; vNormal = uNormalMatrix*normal;\n vPosition = uModelView * position;\n }\n