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 "Fixed an issue where the multi-tap did not work properly. (https://review...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
color
/
color-visual.h
diff --git
a/dali-toolkit/internal/visuals/color/color-visual.h
b/dali-toolkit/internal/visuals/color/color-visual.h
index
6552ac6
..
6fe1f43
100644
(file)
--- a/
dali-toolkit/internal/visuals/color/color-visual.h
+++ b/
dali-toolkit/internal/visuals/color/color-visual.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_INTERNAL_COLOR_VISUAL_H
/*
#define DALI_TOOLKIT_INTERNAL_COLOR_VISUAL_H
/*
- * Copyright (c) 20
16
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
21
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.
@@
-26,15
+26,12
@@
namespace Dali
{
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
namespace Internal
{
namespace Internal
{
-
class ColorVisual;
class ColorVisual;
-typedef IntrusivePtr<
ColorVisual
> ColorVisualPtr;
+typedef IntrusivePtr<
ColorVisual
> ColorVisualPtr;
/**
* The visual which renders a solid color to the control's quad
/**
* The visual which renders a solid color to the control's quad
@@
-45,91
+42,100
@@
typedef IntrusivePtr< ColorVisual > ColorVisualPtr;
* |-----------------|-------------|
* | mixColor | VECTOR4 |
*/
* |-----------------|-------------|
* | mixColor | VECTOR4 |
*/
-class ColorVisual: public Visual::Base
+class ColorVisual
: public Visual::Base
{
public:
{
public:
-
/**
* @brief Create a new color visual.
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
/**
* @brief Create a new color 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 ColorVisualPtr New(
VisualFactoryCache& factoryCache
);
+ static ColorVisualPtr New(
VisualFactoryCache& factoryCache, const Property::Map& properties
);
-public: // from Visual
+public: // from Visual
+ /**
+ * @copydoc Visual::Base::CreatePropertyMap
+ */
+ void DoCreatePropertyMap(Property::Map& map) const override;
/**
/**
- * @copydoc Visual::Base::
SetSize
+ * @copydoc Visual::Base::
CreateInstancePropertyMap
*/
*/
- v
irtual void SetSize( const Vector2& size )
;
+ v
oid DoCreateInstancePropertyMap(Property::Map& map) const override
;
+protected:
/**
/**
- * @copydoc Visual::Base::CreatePropertyMap
+ * @brief Constructor.
+ *
+ * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
*/
*/
-
virtual void DoCreatePropertyMap( Property::Map& map ) const
;
+
ColorVisual(VisualFactoryCache& factoryCache)
;
/**
/**
- * @
copydoc Visual::Base::DoSetProperty
+ * @
brief A reference counted object may only be deleted by calling Unreference().
*/
*/
- virtual
void DoSetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue
);
+ virtual
~ColorVisual(
);
/**
/**
- * @copydoc Visual::Base::
DoGetProperty
+ * @copydoc Visual::Base::
OnInitialize
*/
*/
- v
irtual Dali::Property::Value DoGetProperty( Dali::Property::Index index )
;
+ v
oid OnInitialize() override
;
-protected:
+ /**
+ * @copydoc Visual::Base::DoSetProperties
+ */
+ void DoSetProperties(const Property::Map& propertyMap) override;
/**
/**
- * @brief Constructor.
- *
- * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
+ * @copydoc Visual::Base::DoSetOnScene
*/
*/
-
ColorVisual( VisualFactoryCache& factoryCache )
;
+
void DoSetOnScene(Actor& actor) override
;
/**
/**
- * @
brief A reference counted object may only be deleted by calling Unreference().
+ * @
copydoc Visual::Base::DoSetOffScene
*/
*/
- v
irtual ~ColorVisual()
;
+ v
oid DoSetOffScene(Actor& actor) override
;
/**
/**
- * @copydoc Visual::Base::
DoInitialize
+ * @copydoc Visual::Base::
OnSetTransform
*/
*/
- v
irtual void DoInitialize( Actor& actor, const Property::Map& propertyMap )
;
+ v
oid OnSetTransform() override
;
/**
/**
- * @copydoc Visual::Base::
DoSetOnStage
+ * @copydoc Visual::Base::
OnDoAction
*/
*/
- v
irtual void DoSetOnStage( Actor& actor )
;
+ v
oid OnDoAction(const Property::Index actionId, const Property::Value& attributes) override
;
-public:
+ /**
+ * @copydoc Visual::Base::UpdateShader
+ */
+ void UpdateShader() override;
/**
/**
- * Set the color for rendering.
- * @param[in] color The color to be rendered.
+ * @copydoc Visual::Base::OnGetPropertyObject
*/
*/
-
void SetColor( const Vector4& color )
;
+
Dali::Property OnGetPropertyObject(Dali::Property::Key key) override
;
private:
/**
private:
/**
- * @brief Initialize the renderer with the geometry and shader from the cache, if not available, create and save to the cache for sharing.
+ * @brief Get a shader for the current properties.
+ * @return The shader for the current properties.
*/
*/
-
void InitializeRender
er();
+
Shader GetShad
er();
private:
private:
-
// Undefined
// Undefined
- ColorVisual(
const ColorVisual& colorRenderer
);
+ ColorVisual(
const ColorVisual& colorRenderer
);
// Undefined
// Undefined
- ColorVisual& operator=(
const ColorVisual& colorRenderer
);
+ ColorVisual& operator=(
const ColorVisual& colorRenderer
);
private:
private:
-
- Vector4 mMixColor;
- Property::Index mMixColorIndex;
-
+ float mBlurRadius; ///< The blur radius
+ Property::Index mBlurRadiusIndex; ///< The blur radius property index
+ bool mNeedBlurRadius; ///< Whether we need the blur radius in shader.
};
} // namespace Internal
};
} // namespace Internal