projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Blend Equation Advanced Supporting
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
visual-base-impl.h
diff --git
a/dali-toolkit/internal/visuals/visual-base-impl.h
b/dali-toolkit/internal/visuals/visual-base-impl.h
index
6105867
..
8fa2e5e
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-base-impl.h
+++ b/
dali-toolkit/internal/visuals/visual-base-impl.h
@@
-130,15
+130,15
@@
public:
int GetDepthIndex() const;
/**
int GetDepthIndex() const;
/**
- * @copydoc Toolkit::Visual::Base::SetOnS
tag
e
+ * @copydoc Toolkit::Visual::Base::SetOnS
cen
e
* @pre Impl->mGeometry must be created before this method is called
*/
* @pre Impl->mGeometry must be created before this method is called
*/
- void SetOnS
tag
e( Actor& actor );
+ void SetOnS
cen
e( Actor& actor );
/**
/**
- * @copydoc Toolkit::Visual::Base::SetOffS
tag
e
+ * @copydoc Toolkit::Visual::Base::SetOffS
cen
e
*/
*/
- void SetOffS
tag
e( Actor& actor );
+ void SetOffS
cen
e( Actor& actor );
/**
* @copydoc Toolkit::Visual::Base::CreatePropertyMap
/**
* @copydoc Toolkit::Visual::Base::CreatePropertyMap
@@
-170,6
+170,13
@@
public:
bool IsPreMultipliedAlphaEnabled() const;
/**
bool IsPreMultipliedAlphaEnabled() const;
/**
+ * @brief Query whether advanced blend equation is applied.
+ *
+ * @return True is advanced blend equation is applied, false otherwise.
+ */
+ bool IsAdvancedBlendEquationApplied() const;
+
+ /**
* @brief Sets properties of custom shader
* @param[in] propertyMap Property map containing the custom shader data
*/
* @brief Sets properties of custom shader
* @param[in] propertyMap Property map containing the custom shader data
*/
@@
-293,7
+300,7
@@
public:
/**
* @brief A reference counted object may only be deleted by calling Unreference().
*/
/**
* @brief A reference counted object may only be deleted by calling Unreference().
*/
-
virtual ~Base()
;
+
~Base() override
;
protected:
protected:
@@
-327,20
+334,20
@@
protected:
virtual void OnSetTransform() = 0;
/**
virtual void OnSetTransform() = 0;
/**
- * @brief Called by SetOnS
tage() allowing sub classes to respond to the SetOnStag
e event
+ * @brief Called by SetOnS
cene() allowing sub classes to respond to the SetOnScen
e event
*
* @note The derived class is required to create the renderer, and add it to the actor when all the resources are in place.
*
* @param[in] actor The actor applying this visual.
*/
*
* @note The derived class is required to create the renderer, and add it to the actor when all the resources are in place.
*
* @param[in] actor The actor applying this visual.
*/
- virtual void DoSetOnS
tag
e( Actor& actor ) = 0;
+ virtual void DoSetOnS
cen
e( Actor& actor ) = 0;
/**
/**
- * @brief Called by SetOffS
tage() allowing sub classes to respond to the SetOffStag
e event
+ * @brief Called by SetOffS
cene() allowing sub classes to respond to the SetOffScen
e event
*
* @param[in] actor The actor applying this visual.
*/
*
* @param[in] actor The actor applying this visual.
*/
- virtual void DoSetOffS
tag
e( Actor& actor );
+ virtual void DoSetOffS
cen
e( Actor& actor );
/**
* @brief Called by DoAction() allowing sub classes to do the given action.
/**
* @brief Called by DoAction() allowing sub classes to do the given action.
@@
-353,11
+360,11
@@
protected:
protected:
/**
protected:
/**
- * @brief Gets the on s
tag
e state for this Visual
+ * @brief Gets the on s
cen
e state for this Visual
*
*
- * @return Returns true if this Visual is on
stage, false if it is off the stag
e
+ * @return Returns true if this Visual is on
the scene, false if it is off the scen
e
*/
*/
- bool IsOnS
tag
e() const;
+ bool IsOnS
cen
e() const;
/**
* @brief Query whether the corners of the visual requires to be rounded.
/**
* @brief Query whether the corners of the visual requires to be rounded.