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
Revert "visual: Implements rive animation"
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
gradient
/
gradient-visual.h
diff --git
a/dali-toolkit/internal/visuals/gradient/gradient-visual.h
b/dali-toolkit/internal/visuals/gradient/gradient-visual.h
index
e4920d1
..
0dde8b4
100644
(file)
--- a/
dali-toolkit/internal/visuals/gradient/gradient-visual.h
+++ b/
dali-toolkit/internal/visuals/gradient/gradient-visual.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_INTERNAL_GRADIENT_VISUAL_H
/*
#define DALI_TOOLKIT_INTERNAL_GRADIENT_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.
@@
-22,8
+22,8
@@
#include <dali/public-api/common/intrusive-ptr.h>
// INTERNAL INCLUDES
#include <dali/public-api/common/intrusive-ptr.h>
// INTERNAL INCLUDES
-#include <dali-toolkit/internal/visuals/visual-base-impl.h>
#include <dali-toolkit/internal/visuals/gradient/gradient.h>
#include <dali-toolkit/internal/visuals/gradient/gradient.h>
+#include <dali-toolkit/internal/visuals/visual-base-impl.h>
namespace Dali
{
namespace Dali
{
@@
-31,13
+31,11
@@
class Vector2;
namespace Toolkit
{
namespace Toolkit
{
-
namespace Internal
{
namespace Internal
{
-
class Gradient;
class GradientVisual;
class Gradient;
class GradientVisual;
-typedef IntrusivePtr<
GradientVisual
> GradientVisualPtr;
+typedef IntrusivePtr<
GradientVisual
> GradientVisualPtr;
/**
* The visual which renders smooth transition of colors to the control's quad.
/**
* The visual which renders smooth transition of colors to the control's quad.
@@
-71,10
+69,9
@@
typedef IntrusivePtr< GradientVisual > GradientVisualPtr;
* Valid values for spreadMethod are 'pad', 'repeat' and 'reflect.'
* If not provided, 'objectBoundingBox' is used as default gradient units, and 'pad' is used as default spread method.
*/
* Valid values for spreadMethod are 'pad', 'repeat' and 'reflect.'
* If not provided, 'objectBoundingBox' is used as default gradient units, and 'pad' is used as default spread method.
*/
-class GradientVisual: public Visual::Base
+class GradientVisual
: public Visual::Base
{
public:
{
public:
-
/**
* Types of the gradient
*/
/**
* Types of the gradient
*/
@@
-88,40
+85,29
@@
public:
* @brief Create a new gradient visual.
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
* @brief Create a new gradient 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 GradientVisualPtr New( VisualFactoryCache& factoryCache );
-
-public: // from Visual
-
- /**
- * @copydoc Visual::Base::SetSize
- */
- virtual void SetSize( const Vector2& size );
+ static GradientVisualPtr New(VisualFactoryCache& factoryCache, const Property::Map& properties);
+public: // from Visual
/**
* @copydoc Visual::Base::CreatePropertyMap
*/
/**
* @copydoc Visual::Base::CreatePropertyMap
*/
- virtual void DoCreatePropertyMap( Property::Map& map ) const;
-
- /**
- * @copydoc Visual::Base::DoSetProperty
- */
- virtual void DoSetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue );
+ void DoCreatePropertyMap(Property::Map& map) const override;
/**
/**
- * @copydoc Visual::Base::
DoGetProperty
+ * @copydoc Visual::Base::
CreateInstancePropertyMap
*/
*/
- v
irtual Dali::Property::Value DoGetProperty( Dali::Property::Index index )
;
+ v
oid DoCreateInstancePropertyMap(Property::Map& map) const override
;
protected:
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
*/
- GradientVisual(
VisualFactoryCache& factoryCache
);
+ GradientVisual(
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().
@@
-129,27
+115,31
@@
protected:
virtual ~GradientVisual();
/**
virtual ~GradientVisual();
/**
+ * @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::OnSetTransform
*/
/**
* @copydoc Visual::Base::OnSetTransform
*/
- v
irtual void OnSetTransform()
;
+ v
oid OnSetTransform() override
;
/**
/**
- * @copydoc Visual::Base::DoSetOnS
tag
e
+ * @copydoc Visual::Base::DoSetOnS
cen
e
*/
*/
- virtual void DoSetOnStage( Actor& actor );
-
-private:
+ void DoSetOnScene(Actor& actor) override;
/**
/**
- * @
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::UpdateShader
*/
*/
- void
InitializeRenderer()
;
+ void
UpdateShader() override
;
+private:
/**
* New a gradient object with the given property map.
*
/**
* New a gradient object with the given property map.
*
@@
-158,6
+148,12
@@
private:
bool NewGradient(Type gradientType, const Property::Map& propertyMap);
/**
bool NewGradient(Type gradientType, const Property::Map& propertyMap);
/**
+ * @brief Get a shader for the current properties.
+ * @return The shader for the current properties.
+ */
+ Shader GetShader();
+
+ /**
* Get the stop-offsets from the property.
* The valid property type are ARRAY, VECTOR2, VECTOR3, VECTOR4.
*
* Get the stop-offsets from the property.
* The valid property type are ARRAY, VECTOR2, VECTOR3, VECTOR4.
*
@@
-167,16
+163,16
@@
private:
static void GetStopOffsets(const Property::Value* value, Vector<float>& stopOffsets);
// Undefined
static void GetStopOffsets(const Property::Value* value, Vector<float>& stopOffsets);
// Undefined
- GradientVisual(
const GradientVisual& gradientVisual
);
+ GradientVisual(
const GradientVisual& gradientVisual
);
// Undefined
// Undefined
- GradientVisual& operator=(
const GradientVisual& gradientVisual
);
+ GradientVisual& operator=(
const GradientVisual& gradientVisual
);
private:
private:
-
- Matrix3 mGradientTransform;
+ Matrix3 mGradientTransform;
IntrusivePtr<Gradient> mGradient;
IntrusivePtr<Gradient> mGradient;
- Type mGradientType;
+ Type mGradientType;
+ bool mIsOpaque; ///< Set to false if any of the stop colors are not opaque
};
} // namespace Internal
};
} // namespace Internal