[dali_2.3.19] Merge branch 'devel/master'

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

diff --git a/dali-toolkit/devel-api/shader-effects/image-region-effect.h b/dali-toolkit/devel-api/shader-effects/image-region-effect.h
index 30d5f4e..65504c1 100644 (file)
--- a/dali-toolkit/devel-api/shader-effects/image-region-effect.h
+++ b/dali-toolkit/devel-api/shader-effects/image-region-effect.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_IMAGE_REGION_EFFECT_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 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.
@@ -22,7 +22,7 @@
 #include <dali/public-api/object/property-map.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/visuals/visual-properties.h>
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
 
 namespace Dali
 {
@@ -41,43 +41,7 @@ namespace Toolkit
  *
  * @return A property map of the required shader
  */
-inline Property::Map CreateImageRegionEffect()
-{
-  std::string vertexShader(
-    "attribute mediump vec2 aPosition;\n"
-    "\n"
-    "uniform mediump mat4 uMvpMatrix;\n"
-    "uniform vec3 uSize;\n"
-    "uniform vec4 uTextureRect;"
-    "\n"
-    "varying vec2 vTexCoord;\n"
-
-    "uniform mediump vec2 uTopLeft;\n"
-    "uniform mediump vec2 uBottomRight;\n"
-    "void main()\n"
-    "{\n"
-    "  mediump vec4 position = vec4(aPosition, 0.0, 1.0);\n"
-    "  position.xyz *= uSize;\n"
-    "  gl_Position = uMvpMatrix * position;\n"
-    // The line below is doing the same as the following commented lines:
-    //"  vec2 imageSize = uTextureRect.zw - uTextureRect.xy;\n"
-    //"  vec2 topLeft = uTextureRect.xy + uTopLeft * imageSize;\n"
-    //"  vec2 bottomRight = uTextureRect.xy + uBottomRight * imageSize;\n"
-    //"  vec2 texCoord = (aTexCoord - uTextureRect.xy) / imageSize;\n"
-    //"  vTexCoord = topLeft + texCoord * ( bottomRight - topLeft );\n"
-
-    "  vec2 texCoord = aPosition + vec2(0.5);\n"
-    "  vTexCoord = uTextureRect.xy + uTopLeft * ( uTextureRect.zw - uTextureRect.xy ) + ( texCoord - uTextureRect.xy ) * ( uBottomRight - uTopLeft );\n"
-    "}\n");
-
-  Property::Map map;
-
-  Property::Map customShader;
-  customShader[Visual::Shader::Property::VERTEX_SHADER] = vertexShader;
-
-  map[Toolkit::Visual::Property::SHADER] = customShader;
-  return map;
-}
+DALI_TOOLKIT_API Property::Map CreateImageRegionEffect();
 
 } // namespace Toolkit