X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fshader-effects%2Fspot-effect.h;h=48cf30568cfee40a700fec016ffba1e95920d4d6;hb=e35b08ebd60473aef7500601706f665ac8cf7d39;hp=c41e0f42732fdb05518c0247bdd795f29d305964;hpb=c3f7ea6cb0c0b75c2276193aff88b5c7a679a2d5;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/devel-api/shader-effects/spot-effect.h b/dali-toolkit/devel-api/shader-effects/spot-effect.h index c41e0f4..48cf305 100644 --- a/dali-toolkit/devel-api/shader-effects/spot-effect.h +++ b/dali-toolkit/devel-api/shader-effects/spot-effect.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_SHADER_EFFECT_SPOT_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 { @@ -57,7 +57,7 @@ inline ShaderEffect CreateSpotEffect() " vRange = max(0.1, range);\n" " \n" " gl_Position = uMvpMatrix * world;\n" - " vTexCoord = aTexCoord;\n" + " vTexCoord = mix( sTextureRect.xy, sTextureRect.zw, aTexCoord );\n" "}"); std::string fragmentShader( @@ -70,7 +70,6 @@ inline ShaderEffect CreateSpotEffect() Dali::ShaderEffect shaderEffect = Dali::ShaderEffect::New( vertexShader, fragmentShader, - Dali::GeometryType( GEOMETRY_TYPE_IMAGE ), ShaderEffect::GeometryHints( ShaderEffect::HINT_GRID )); shaderEffect.SetUniform( "uCenter", Vector2(0.0f, 0.0f) );