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
Merge "SVACE issue resolved" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
primitive
/
primitive-visual.h
diff --git
a/dali-toolkit/internal/visuals/primitive/primitive-visual.h
b/dali-toolkit/internal/visuals/primitive/primitive-visual.h
index
59979f8
..
677df9d
100644
(file)
--- a/
dali-toolkit/internal/visuals/primitive/primitive-visual.h
+++ b/
dali-toolkit/internal/visuals/primitive/primitive-visual.h
@@
-105,21
+105,17
@@
public:
* @brief Create a new primitive visual.
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
* @brief Create a new primitive 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 PrimitiveVisualPtr New( VisualFactoryCache& factoryCache );
+ static PrimitiveVisualPtr 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::GetNaturalSize
*/
* @copydoc Visual::Base::GetNaturalSize
*/
- virtual void GetNaturalSize( Vector2& naturalSize )
const
;
+ virtual void GetNaturalSize( Vector2& naturalSize );
/**
* @copydoc Visual::Base::CreatePropertyMap
/**
* @copydoc Visual::Base::CreatePropertyMap
@@
-127,14
+123,9
@@
public: // from Visual
virtual void DoCreatePropertyMap( Property::Map& map ) const;
/**
virtual void DoCreatePropertyMap( Property::Map& map ) const;
/**
- * @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 );
+ virtual void DoCreateInstancePropertyMap( Property::Map& map ) const;
protected:
protected:
@@
-151,15
+142,20
@@
protected:
virtual ~PrimitiveVisual();
/**
virtual ~PrimitiveVisual();
/**
- * @copydoc Visual::Base::Do
Initialize
+ * @copydoc Visual::Base::Do
SetProperties
*/
*/
- virtual void Do
Initialize( Actor& actor,
const Property::Map& propertyMap );
+ virtual void Do
SetProperties(
const Property::Map& propertyMap );
/**
* @copydoc Visual::Base::DoSetOnStage
*/
virtual void DoSetOnStage( Actor& actor );
/**
* @copydoc Visual::Base::DoSetOnStage
*/
virtual void DoSetOnStage( Actor& actor );
+ /**
+ * @copydoc Visual::Base::OnSetTransform
+ */
+ virtual void OnSetTransform();
+
private:
//Simple struct to store the position and normal of a single vertex.
private:
//Simple struct to store the position and normal of a single vertex.
@@
-329,7
+325,6
@@
private:
Shader mShader;
Geometry mGeometry;
Shader mShader;
Geometry mGeometry;
- Vector4 mColor; //Color of shape.
Vector3 mObjectDimensions; //Dimensions of shape, scaled to be between 0.0 and 1.0.
Vector3 mSceneCenter;
Vector3 mObjectDimensions; //Dimensions of shape, scaled to be between 0.0 and 1.0.
Vector3 mSceneCenter;