X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fmesh%2Fmesh-visual.h;h=852d7efbad0805a860d13f9c42f743ff141c882b;hb=1e363b70b59dafe0900fbcd1ff4f85e15f355a37;hp=4c0441acc80bd90aa900431b14dcf95bf7fc1977;hpb=f7ca0a1c753ea498df357add70b5c7a9bad4ea91;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/visuals/mesh/mesh-visual.h b/dali-toolkit/internal/visuals/mesh/mesh-visual.h
index 4c0441a..852d7ef 100644
--- a/dali-toolkit/internal/visuals/mesh/mesh-visual.h
+++ b/dali-toolkit/internal/visuals/mesh/mesh-visual.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_MESH_VISUAL_H
 
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
@@ -63,31 +63,22 @@ public:
    * @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.
    */
-  static MeshVisualPtr New( VisualFactoryCache& factoryCache );
+  static MeshVisualPtr New( VisualFactoryCache& factoryCache, const Property::Map& properties );
 
 public:  // from Visual
 
   /**
-   * @copydoc Visual::Base::SetSize
-   */
-  virtual void SetSize( const Vector2& size );
-
-  /**
    * @copydoc Visual::Base::CreatePropertyMap
    */
-  virtual void DoCreatePropertyMap( Property::Map& map ) const;
+  void DoCreatePropertyMap( Property::Map& map ) const override;
 
   /**
-   * @copydoc Visual::Base::DoSetProperty
+   * @copydoc Visual::Base::CreateInstancePropertyMap
    */
-  virtual void DoSetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue );
-
-  /**
-   * @copydoc Visual::Base::DoGetProperty
-   */
-  virtual Dali::Property::Value DoGetProperty( Dali::Property::Index index );
+  void DoCreateInstancePropertyMap( Property::Map& map ) const override;
 
 protected:
 
@@ -106,26 +97,17 @@ protected:
   /**
    * @copydoc Visual::Base::DoSetProperties
    */
-  virtual void DoSetProperties( const Property::Map& propertyMap );
-
-  /**
-   * @copydoc Visual::Base::DoSetOnStage
-   */
-  virtual void DoSetOnStage( Actor& actor );
-
-public:
+  void DoSetProperties( const Property::Map& propertyMap ) override;
 
   /**
-   * Declare whether a texture map should be used for the object, if it's present. Defaults to true.
-   * @param[in] useTexture boolean declaration.
+   * @copydoc Visual::Base::OnSetTransform
    */
-  void SetUseTexture( bool useTexture );
+  void OnSetTransform() override;
 
   /**
-   * Declare whether a normal map should be used for the object, if it's present. Defaults to true.
-   * @param[in] useNormalMap boolean declaration.
+   * @copydoc Visual::Base::DoSetOnScene
    */
-  void SetUseNormalMap( bool useNormalMap );
+  void DoSetOnScene( Actor& actor ) override;
 
 private:
 
@@ -174,6 +156,13 @@ private:
    */
   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