X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fshader-effects%2Fbendy-effect.h;h=78f4e6985d77a74e564dcccd96c4ceda9ea73200;hb=refs%2Fchanges%2F49%2F88249%2F1;hp=79edb1639e012f0a21cfd90d660513c2370bf226;hpb=c3f7ea6cb0c0b75c2276193aff88b5c7a679a2d5;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/devel-api/shader-effects/bendy-effect.h b/dali-toolkit/devel-api/shader-effects/bendy-effect.h index 79edb16..78f4e69 100644 --- a/dali-toolkit/devel-api/shader-effects/bendy-effect.h +++ b/dali-toolkit/devel-api/shader-effects/bendy-effect.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_SHADER_EFFECT_BENDY_H__ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -19,7 +19,7 @@ */ // EXTERNAL INCLUDES -#include +#include namespace Dali { @@ -52,7 +52,7 @@ inline ShaderEffect CreateBendyEffect() "void main()\n" "{\n" " mediump float lighting = 0.25;\n" - " mediump vec4 position = uModelView * vec4(aPosition,1.0);\n" + " mediump vec4 position = uModelView * vec4(aPosition, 1.0);\n" "\n" " mediump vec2 d = position.xy - uCenter;\n" " mediump float dist = max( 0.0, dot(d,uDirection) );\n" @@ -70,7 +70,7 @@ inline ShaderEffect CreateBendyEffect() "\n" "vShade = 1.0 - abs(sn) * lighting;\n" "\n" - "vTexCoord = aTexCoord;\n" + "vTexCoord = mix( sTextureRect.xy, sTextureRect.zw, aTexCoord );\n" "}" ); std::string fragmentShader( @@ -85,7 +85,6 @@ inline ShaderEffect CreateBendyEffect() Dali::ShaderEffect shaderEffect = Dali::ShaderEffect::New( vertextShader, fragmentShader, - GeometryType( GEOMETRY_TYPE_IMAGE ), ShaderEffect::GeometryHints( ShaderEffect::HINT_GRID | ShaderEffect::HINT_DEPTH_BUFFER )); shaderEffect.SetUniform( "uCenter", Vector2(0.0f, 0.0f), ShaderEffect::COORDINATE_TYPE_VIEWPORT_POSITION );