Remove/Move experimental features

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

diff --git a/dali-toolkit/devel-api/shader-effects/shear-effect.h b/dali-toolkit/devel-api/shader-effects/shear-effect.h
index 6a07449..bb0900b 100644 (file)
--- a/dali-toolkit/devel-api/shader-effects/shear-effect.h
+++ b/dali-toolkit/devel-api/shader-effects/shear-effect.h
@@ -2,7 +2,7 @@
 #define __DALI_TOOLKIT_SHEAR_EFFECT_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>
 
 namespace Dali
 {
@@ -49,21 +49,20 @@ inline ShaderEffect CreateShearEffect()
       "\n"
       "void main()\n"
       "{\n"
-      "mediump vec4 world = uModelView * vec4(aPosition,1.0);\n"
+      "mediump vec4 world = uModelView * vec4(aPosition, 1.0);\n"
       "\n"
       "world.x = world.x + tan(radians(uAngleXAxis)) * (world.y - uCenter.y * world.w);\n"
       "world.y = world.y + tan(radians(uAngleYAxis)) * (world.x - uCenter.x * world.w);\n"
       "\n"
       "gl_Position = uProjection * world;\n"
       "\n"
-      "vTexCoord = aTexCoord;\n"
+      "vTexCoord = mix( sTextureRect.xy, sTextureRect.zw, aTexCoord );\n"
       "}" );
 
   // Create the implementation, temporarily owned on stack,
   ShaderEffect shaderEffect =  Dali::ShaderEffect::New(
       vertexShader,
       "",
-      Dali::GeometryType( GEOMETRY_TYPE_IMAGE ),
       ShaderEffect::GeometryHints( ShaderEffect::HINT_GRID ));