Updated visuals to separate alpha channel from mixColor

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / visuals / visual-properties-devel.h

diff --git a/dali-toolkit/devel-api/visuals/visual-properties-devel.h b/dali-toolkit/devel-api/visuals/visual-properties-devel.h
index 8f7248f..b70d254 100644 (file)
--- a/dali-toolkit/devel-api/visuals/visual-properties-devel.h
+++ b/dali-toolkit/devel-api/visuals/visual-properties-devel.h
@@ -57,22 +57,38 @@ enum Type
   /**
    * @brief The transform used by the visual.
    * @details Name "transform", type Property::Map.
-
+   *
    * @note Optional.
    * @see DevelVisual::Transform::Property
    */
-  TRANSFORM = SHADER + 1, // Dali::Toolkit::Visual::Property::SHADER + 1
+  TRANSFORM = SHADER + 1,
 
   /**
    * @brief Enables/disables premultiplied alpha.
    * The premultiplied alpha is false by default unless this behaviour is modified
    * by the derived Visual type.
-
+   *
    * @details Name "premultipliedAlpha", type Property::Boolean.
-
+   *
    * @note Optional.
    */
-  PREMULTIPLIED_ALPHA = SHADER + 2, // Dali::Toolkit::Visual::Property::SHADER + 2
+  PREMULTIPLIED_ALPHA = SHADER + 2,
+
+  /**
+   * @brief Mix color is a blend color for any visual.
+   * @details Name "mixColor", type Property::VECTOR3 or Property::VECTOR4
+   *
+   * @note Optional
+   */
+  MIX_COLOR = SHADER + 3,
+
+  /**
+   * @brief Opacity is the alpha component of the mixColor, above.
+   * @details Name "opacity", type Property::FLOAT
+   *
+   * @note Optional
+   */
+  OPACITY = SHADER + 4
 };
 
 } //namespace Property