X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fprimitive%2Fprimitive-visual.h;h=e27239b7b9f7687a8a613f7fcdeea915a7b8ef5f;hp=6b210bda7ca6e0b62c0b27af5b61c2da14228734;hb=fedd5ae8da46cd798f730fd07c942df853e055dd;hpb=fb0339fee98523cbf3e527ddd8125660aa441c6c diff --git a/dali-toolkit/internal/visuals/primitive/primitive-visual.h b/dali-toolkit/internal/visuals/primitive/primitive-visual.h index 6b210bd..e27239b 100644 --- a/dali-toolkit/internal/visuals/primitive/primitive-visual.h +++ b/dali-toolkit/internal/visuals/primitive/primitive-visual.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_PRIMITIVE_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. @@ -79,11 +79,11 @@ typedef IntrusivePtr< PrimitiveVisual > PrimitiveVisualPtr; * | %Property Name | Type | Shapes Affected | * |-------------------|-------------|------------------------------------------| * | shapeColor | VECTOR4 | all | - * | slices | INTEGER | sphere, cone, conical frustrum, cylinder | + * | slices | INTEGER | sphere, cone, conical frustum, cylinder | * | stacks | INTEGER | sphere | - * | scaleTopRadius | FLOAT | conical frustrum | - * | scaleBottomRadius | FLOAT | cone, conical frustrum | - * | scaleHeight | FLOAT | cone, conical frustrum, cylinder | + * | scaleTopRadius | FLOAT | conical frustum | + * | scaleBottomRadius | FLOAT | cone, conical frustum | + * | scaleHeight | FLOAT | cone, conical frustum, cylinder | * | scaleRadius | FLOAT | cylinder | * | scaleDimensions | VECTOR3 | cube, octahedron, bevelled cube | * | bevelPercentage | FLOAT | bevelled cube | @@ -115,12 +115,17 @@ public: // from Visual /** * @copydoc Visual::Base::GetNaturalSize */ - virtual void GetNaturalSize( Vector2& naturalSize ); + void GetNaturalSize( Vector2& naturalSize ) override; /** * @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: @@ -139,17 +144,17 @@ protected: /** * @copydoc Visual::Base::DoSetProperties */ - virtual void DoSetProperties( const Property::Map& propertyMap ); + void DoSetProperties( const Property::Map& propertyMap ) override; /** * @copydoc Visual::Base::DoSetOnStage */ - virtual void DoSetOnStage( Actor& actor ); + void DoSetOnStage( Actor& actor ) override; /** * @copydoc Visual::Base::OnSetTransform */ - virtual void OnSetTransform(); + void OnSetTransform() override; private: