X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fshader-effects%2Fdissolve-local-effect.h;h=de4c109ab1a78fe9a28da49295992bda5dbdce28;hb=49557ae728fe830bf27a23ab230d72294b3a1a39;hp=a5097959fca7aca55bbabae5651d6e4e83a57bb4;hpb=1c5674a11a51310ee689d6daf4e6b7d94dec607e;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/devel-api/shader-effects/dissolve-local-effect.h b/dali-toolkit/devel-api/shader-effects/dissolve-local-effect.h index a509795..de4c109 100644 --- a/dali-toolkit/devel-api/shader-effects/dissolve-local-effect.h +++ b/dali-toolkit/devel-api/shader-effects/dissolve-local-effect.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_SHADER_EFFECT_LOCAL_DISSOLVE_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 #include namespace Dali @@ -63,7 +63,7 @@ inline ShaderEffect CreateDissolveLocalEffect( unsigned int numberOfDimples ) " }\n" " vPercentage = clamp( percentage, 0.0, 1.0 );\n" " gl_Position = uProjection * position;\n" - " vTexCoord = aTexCoord;\n" + " vTexCoord = mix( sTextureRect.xy, sTextureRect.zw, aTexCoord );\n" "}\n"); vertexShaderStringStream << vertexShader; @@ -87,7 +87,6 @@ inline ShaderEffect CreateDissolveLocalEffect( unsigned int numberOfDimples ) ShaderEffect shaderEffect = ShaderEffect::New( vertexShaderStringStream.str(), fragmentShader, - GeometryType( GEOMETRY_TYPE_IMAGE), ShaderEffect::GeometryHints( ShaderEffect::HINT_GRID | ShaderEffect::HINT_BLENDING ) ); //Register uniform properties