X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fvisuals%2Fvisual-properties-devel.h;h=b70d2542119fb6614b5d5a0cd694ea0ad8326085;hb=660728e83fd72194f53642fd74c09db561f88496;hp=8f7248fcf4ff06d932624f2eb7bb3e9ff0cc2ec8;hpb=02a86c5687ddabb8ff0d5e423f5adf5d53228f73;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git 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 --- 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