X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fshader-effects%2Fsoft-button-effect.h;h=03eb3134600b16047acf6ee3cfdf3f5ee92c2f27;hb=f4c1e7f52d49c3ce033b9ee4c3c7414b06a22d45;hp=710537eaf654db42d08f803fc17e3945287b5ba3;hpb=554197093ef815554c87fb863e8970331f87f63d;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/devel-api/shader-effects/soft-button-effect.h b/dali-toolkit/devel-api/shader-effects/soft-button-effect.h index 710537e..03eb313 100644 --- a/dali-toolkit/devel-api/shader-effects/soft-button-effect.h +++ b/dali-toolkit/devel-api/shader-effects/soft-button-effect.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_SHADER_EFFECT_SOFT_BUTTON_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 { @@ -117,7 +117,7 @@ inline ShaderEffect CreateSoftButtonEffect(SoftButtonEffectType type) "void main()\n" "{\n" - " vTexCoord = aTexCoord;\n" + " vTexCoord = mix( sTextureRect.xy, sTextureRect.zw, aTexCoord );\n" // Get the rect coords of the effect region in -1..1 range, i.e. circle centred around the center of the rect // Done in the vertex shader itself to make use of gl interpolation for varying. " vCentredCoord = vec2( ( (vTexCoord.x - uEffectRegion.x)/(uEffectRegion.z - uEffectRegion.x) * 2.0 - 1.0 ), ( (vTexCoord.y - uEffectRegion.y)/(uEffectRegion.w - uEffectRegion.y) * 2.0 - 1.0 ) );\n"