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

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

diff --git a/dali-toolkit/devel-api/shader-effects/alpha-discard-effect.h b/dali-toolkit/devel-api/shader-effects/alpha-discard-effect.h
index 0b557a0..e782f78 100644 (file)
--- a/dali-toolkit/devel-api/shader-effects/alpha-discard-effect.h
+++ b/dali-toolkit/devel-api/shader-effects/alpha-discard-effect.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_ALPHA_DISCARD_EFFECT_H__
-#define __DALI_TOOLKIT_ALPHA_DISCARD_EFFECT_H__
+#ifndef DALI_TOOLKIT_ALPHA_DISCARD_EFFECT_H
+#define DALI_TOOLKIT_ALPHA_DISCARD_EFFECT_H
 
 /*
- * Copyright (c) 2015 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.
@@ -19,14 +19,15 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/shader-effects/shader-effect.h>
+#include <dali/public-api/object/property-map.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 /**
  * @brief Creates a new Alpha discard effect
  *
@@ -39,35 +40,12 @@ namespace Toolkit
  *   Property::Map alphaDiscardEffect = CreateAlphaDiscardEffect();
  *   actor.SetProperty( ImageView::Property::IMAGE, alphaDiscardEffect );
  *
- * @return A handle to a newly allocated ShaderEffect.
+ * @return A property map of the required shaders.
  */
-inline Property::Map CreateAlphaDiscardEffect()
-{
-  const char* ALPHA_DISCARD_FRAGMENT_SHADER_SOURCE =
-      "varying mediump vec2 vTexCoord;                                \n"
-      "                                                               \n"
-      "uniform sampler2D sTexture;                                    \n"
-      "uniform lowp vec4 uColor;                                      \n"
-      "void main()                                                    \n"
-      "{                                                              \n"
-      "  mediump vec4 color = texture2D( sTexture, vTexCoord );       \n"
-      "  if(color.a <= 0.0001)                                        \n"
-      "  {                                                            \n"
-      "    discard;                                                   \n"
-      "  }                                                            \n"
-      "  gl_FragColor = color * uColor;                               \n"
-      "}                                                              \n";
-
-  Property::Map map;
-
-  Property::Map customShader;
-  customShader[ "fragmentShader" ] = ALPHA_DISCARD_FRAGMENT_SHADER_SOURCE;
-
-  map[ "shader" ] = customShader;
-  return map;}
+DALI_TOOLKIT_API Property::Map CreateAlphaDiscardEffect();
 
 } // namespace Toolkit
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_ALPHA_DISCARD_EFFECT_H__
+#endif // DALI_TOOLKIT_ALPHA_DISCARD_EFFECT_H