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
[dali_1.2.46] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
mesh
/
mesh-visual.h
diff --git
a/dali-toolkit/internal/visuals/mesh/mesh-visual.h
b/dali-toolkit/internal/visuals/mesh/mesh-visual.h
index
8a9010c
..
511ce49
100644
(file)
--- a/
dali-toolkit/internal/visuals/mesh/mesh-visual.h
+++ b/
dali-toolkit/internal/visuals/mesh/mesh-visual.h
@@
-63,9
+63,10
@@
public:
* @brief Create a new mesh visual.
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
* @brief Create a new mesh visual.
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
+ * @param[in] properties A Property::Map containing settings for this visual
* @return A smart-pointer to the newly allocated visual.
*/
* @return A smart-pointer to the newly allocated visual.
*/
- static MeshVisualPtr New( VisualFactoryCache& factoryCache );
+ static MeshVisualPtr New( VisualFactoryCache& factoryCache
, const Property::Map& properties
);
public: // from Visual
public: // from Visual
@@
-74,6
+75,11
@@
public: // from Visual
*/
virtual void DoCreatePropertyMap( Property::Map& map ) const;
*/
virtual void DoCreatePropertyMap( Property::Map& map ) const;
+ /**
+ * @copydoc Visual::Base::CreateInstancePropertyMap
+ */
+ virtual void DoCreateInstancePropertyMap( Property::Map& map ) const;
+
protected:
/**
protected:
/**
@@
-164,6
+170,13
@@
private:
*/
bool LoadTextures();
*/
bool LoadTextures();
+ /**
+ * Helper method to set individual values by index key.
+ * @param[in] index The index key of the value
+ * @param[in] value The value
+ */
+ void DoSetProperty( Property::Index index, const Property::Value& value );
+
private:
// Undefined
private:
// Undefined