X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fmesh%2Fmesh-visual.h;h=852d7efbad0805a860d13f9c42f743ff141c882b;hb=6e79b1b333af799839c8e7b11a077f754132dc24;hp=2c227a3c350268b091051c4d54fe3de248faf39f;hpb=8e7cfd0c114bf778287cc6e67d0f42f3c866e205;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 2c227a3..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. @@ -73,7 +73,12 @@ public: // from Visual /** * @copydoc Visual::Base::CreatePropertyMap */ - virtual void DoCreatePropertyMap( Property::Map& map ) const; + void DoCreatePropertyMap( Property::Map& map ) const override; + + /** + * @copydoc Visual::Base::CreateInstancePropertyMap + */ + void DoCreateInstancePropertyMap( Property::Map& map ) const override; protected: @@ -92,31 +97,17 @@ protected: /** * @copydoc Visual::Base::DoSetProperties */ - virtual void DoSetProperties( const Property::Map& propertyMap ); + void DoSetProperties( const Property::Map& propertyMap ) override; /** * @copydoc Visual::Base::OnSetTransform */ - virtual void OnSetTransform(); - - /** - * @copydoc Visual::Base::DoSetOnStage - */ - virtual void DoSetOnStage( Actor& actor ); - -public: - - /** - * Declare whether a texture map should be used for the object, if it's present. Defaults to true. - * @param[in] useTexture boolean declaration. - */ - 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: