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 "DALi Version 2.0.43" into devel/master
[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
99758d1
..
1f2af5c
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,10
+42,9
@@
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.
*
/**
* @brief Create a new color visual.
*
@@
-56,23
+52,26
@@
public:
* @param[in] properties A Property::Map containing settings for this visual
* @return A smart-pointer to the newly allocated visual.
*/
* @param[in] properties A Property::Map containing settings for this visual
* @return A smart-pointer to the newly allocated visual.
*/
- static ColorVisualPtr New( VisualFactoryCache& factoryCache, const Property::Map& properties );
-
-public: // from Visual
+ static ColorVisualPtr New(VisualFactoryCache& factoryCache, const Property::Map& properties);
+public: // from Visual
/**
* @copydoc Visual::Base::CreatePropertyMap
*/
/**
* @copydoc Visual::Base::CreatePropertyMap
*/
- v
irtual void DoCreatePropertyMap( Property::Map& map ) const
;
+ v
oid DoCreatePropertyMap(Property::Map& map) const override
;
-protected:
+ /**
+ * @copydoc Visual::Base::CreateInstancePropertyMap
+ */
+ void DoCreateInstancePropertyMap(Property::Map& map) const override;
+protected:
/**
* @brief Constructor.
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
*/
/**
* @brief Constructor.
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
*/
- ColorVisual(
VisualFactoryCache& factoryCache
);
+ ColorVisual(
VisualFactoryCache& factoryCache
);
/**
* @brief A reference counted object may only be deleted by calling Unreference().
/**
* @brief A reference counted object may only be deleted by calling Unreference().
@@
-80,47
+79,61
@@
protected:
virtual ~ColorVisual();
/**
virtual ~ColorVisual();
/**
+ * @copydoc Visual::Base::OnInitialize
+ */
+ void OnInitialize() override;
+
+ /**
* @copydoc Visual::Base::DoSetProperties
*/
* @copydoc Visual::Base::DoSetProperties
*/
- v
irtual void DoSetProperties( const Property::Map& propertyMap )
;
+ v
oid DoSetProperties(const Property::Map& propertyMap) override
;
/**
/**
- * @copydoc Visual::Base::DoSetOnS
tag
e
+ * @copydoc Visual::Base::DoSetOnS
cen
e
*/
*/
- virtual void DoSetOnStage( Actor& actor );
+ void DoSetOnScene(Actor& actor) override;
+
+ /**
+ * @copydoc Visual::Base::DoSetOffScene
+ */
+ void DoSetOffScene(Actor& actor) override;
/**
* @copydoc Visual::Base::OnSetTransform
*/
/**
* @copydoc Visual::Base::OnSetTransform
*/
- v
irtual void OnSetTransform()
;
+ v
oid OnSetTransform() override
;
-public:
+ /**
+ * @copydoc Visual::Base::OnDoAction
+ */
+ void OnDoAction(const Property::Index actionId, const Property::Value& attributes) override;
/**
/**
- * Set the color for rendering.
- * @param[in] color The color to be rendered.
+ * @copydoc Visual::Base::UpdateShader
*/
*/
- void
SetColor( const Vector4& color )
;
+ void
UpdateShader() override
;
-private:
/**
/**
- * @
brief Initialize the renderer with the geometry and shader from the cache, if not available, create and save to the cache for sharing.
+ * @
copydoc Visual::Base::GenerateShader
*/
*/
-
void InitializeRenderer()
;
+
Shader GenerateShader() const override
;
-private:
+ /**
+ * @copydoc Visual::Base::OnGetPropertyObject
+ */
+ Dali::Property OnGetPropertyObject(Dali::Property::Key key) override;
+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