Text - FONT_STYLE and INPUT_FONT_STYLE properties refactor.

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / shader-effects / dissolve-local-effect.h

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 (file)
--- 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 <dali/public-api/shader-effects/shader-effect.h>
+#include <dali/devel-api/shader-effects/shader-effect.h>
 #include <sstream>
 
 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