X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fprimitive%2Fprimitive-visual.h;h=677df9d9fabc36313605a68ccc1cd28d90ee01a0;hb=refs%2Fchanges%2F36%2F116336%2F7;hp=5239d3f14f9a9aca8e6642b406f5b2ebd7ab99cf;hpb=83066ea18044c04fbbf0378aa6863416c532e10b;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/visuals/primitive/primitive-visual.h b/dali-toolkit/internal/visuals/primitive/primitive-visual.h index 5239d3f..677df9d 100644 --- a/dali-toolkit/internal/visuals/primitive/primitive-visual.h +++ b/dali-toolkit/internal/visuals/primitive/primitive-visual.h @@ -105,18 +105,14 @@ public: * @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. */ - static PrimitiveVisualPtr New( VisualFactoryCache& factoryCache ); + static PrimitiveVisualPtr New( VisualFactoryCache& factoryCache, const Property::Map& properties ); public: // from Visual /** - * @copydoc Visual::Base::SetSize - */ - virtual void SetSize( const Vector2& size ); - - /** * @copydoc Visual::Base::GetNaturalSize */ virtual void GetNaturalSize( Vector2& naturalSize ); @@ -127,14 +123,9 @@ public: // from Visual virtual void DoCreatePropertyMap( Property::Map& map ) const; /** - * @copydoc Visual::Base::DoSetProperty - */ - virtual void DoSetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue ); - - /** - * @copydoc Visual::Base::DoGetProperty + * @copydoc Visual::Base::CreateInstancePropertyMap */ - virtual Dali::Property::Value DoGetProperty( Dali::Property::Index index ); + virtual void DoCreateInstancePropertyMap( Property::Map& map ) const; protected: @@ -334,7 +325,6 @@ private: 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;