#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.
* | %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 |
* @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 ) const;
+ 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::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 );
+ void DoCreateInstancePropertyMap( Property::Map& map ) const override;
protected:
virtual ~PrimitiveVisual();
/**
- * @copydoc Visual::Base::DoInitialize
+ * @copydoc Visual::Base::DoSetProperties
+ */
+ void DoSetProperties( const Property::Map& propertyMap ) override;
+
+ /**
+ * @copydoc Visual::Base::DoSetOnScene
*/
- virtual void DoInitialize( Actor& actor, const Property::Map& propertyMap );
+ void DoSetOnScene( Actor& actor ) override;
/**
- * @copydoc Visual::Base::DoSetOnStage
+ * @copydoc Visual::Base::OnSetTransform
*/
- virtual void DoSetOnStage( Actor& actor );
+ void OnSetTransform() override;
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;