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.9.17] 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
4c0441a
..
15099bd
100644
(file)
--- 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
/*
#define DALI_TOOLKIT_INTERNAL_MESH_VISUAL_H
/*
- * Copyright (c) 201
6
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
9
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.
*
* 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
* @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
/**
- * @copydoc Visual::Base::SetSize
- */
- virtual void SetSize( const Vector2& size );
-
- /**
* @copydoc Visual::Base::CreatePropertyMap
*/
* @copydoc Visual::Base::CreatePropertyMap
*/
- virtual void DoCreatePropertyMap( Property::Map& map ) const;
-
- /**
- * @copydoc Visual::Base::DoSetProperty
- */
- virtual void DoSetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue );
+ void DoCreatePropertyMap( Property::Map& map ) const override;
/**
/**
- * @copydoc Visual::Base::
DoGetProperty
+ * @copydoc Visual::Base::
CreateInstancePropertyMap
*/
*/
- v
irtual Dali::Property::Value DoGetProperty( Dali::Property::Index index )
;
+ v
oid DoCreateInstancePropertyMap( Property::Map& map ) const override
;
protected:
protected:
@@
-106,26
+97,17
@@
protected:
/**
* @copydoc Visual::Base::DoSetProperties
*/
/**
* @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::DoSetOnStage
*/
*/
- void
SetUseNormalMap( bool useNormalMap )
;
+ void
DoSetOnStage( Actor& actor ) override
;
private:
private:
@@
-174,6
+156,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