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 "Add null check for mTextureSet. For empty text, text-visual doesn't create...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
bubble-effect
/
color-adjuster.h
diff --git
a/dali-toolkit/internal/controls/bubble-effect/color-adjuster.h
b/dali-toolkit/internal/controls/bubble-effect/color-adjuster.h
index
8e24326
..
bbf81a9
100644
(file)
--- a/
dali-toolkit/internal/controls/bubble-effect/color-adjuster.h
+++ b/
dali-toolkit/internal/controls/bubble-effect/color-adjuster.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_INTERNAL_COLOR_ADJUSTER_H_
-#define
__DALI_TOOLKIT_INTERNAL_COLOR_ADJUSTER_H_
+#ifndef
DALI_TOOLKIT_INTERNAL_COLOR_ADJUSTER_H
+#define
DALI_TOOLKIT_INTERNAL_COLOR_ADJUSTER_H
/*
/*
- * Copyright (c) 201
5
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
7
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.
@@
-17,8
+17,15
@@
* limitations under the License.
*
*/
* limitations under the License.
*
*/
+
+// EXTERNAL INCLUDES
#include <dali/public-api/math/vector3.h>
#include <dali/public-api/math/vector3.h>
-#include <dali/public-api/shader-effects/shader-effect.h>
+#include <dali/public-api/object/property-map.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/visuals/visual-properties.h>
+
+#define DALI_COMPOSE_SHADER(STR) #STR
namespace Dali
{
namespace Dali
{
@@
-29,6
+36,12
@@
namespace Toolkit
namespace Internal
{
namespace Internal
{
+inline void SetColorAdjusterProperties( Actor& actor, const Vector3& hsvDelta, bool ignoreAlpha = false )
+{
+ actor.RegisterProperty( "uHSVDelta", hsvDelta );
+ actor.RegisterProperty( "uIgnoreAlpha", ignoreAlpha ? 1.f : 0.f );
+}
+
/**
* Creates a new ColorAdjuster effect.
* ColorAdjuster is a custom shader effect to adjust the image color in HSV space.
/**
* Creates a new ColorAdjuster effect.
* ColorAdjuster is a custom shader effect to adjust the image color in HSV space.
@@
-36,12
+49,14
@@
namespace Internal
* @param[in] ignoreAlpha If true, the result color will be opaque even though source has alpha value
* @return A handle to a newly allocated Dali resource.
*/
* @param[in] ignoreAlpha If true, the result color will be opaque even though source has alpha value
* @return A handle to a newly allocated Dali resource.
*/
-inline
ShaderEffect CreateColorAdjuster( const Vector3& hsvDelta, bool ignoreAlpha = false
)
+inline
Property::Map CreateColorAdjuster(
)
{
std::string fragmentShader = DALI_COMPOSE_SHADER(
precision highp float;\n
uniform vec3 uHSVDelta;\n
uniform float uIgnoreAlpha;\n
{
std::string fragmentShader = DALI_COMPOSE_SHADER(
precision highp float;\n
uniform vec3 uHSVDelta;\n
uniform float uIgnoreAlpha;\n
+ varying mediump vec2 vTexCoord;\n
+ uniform sampler2D sTexture;\n
float rand(vec2 co) \n
{\n
return fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453); \n}
float rand(vec2 co) \n
{\n
return fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453); \n}
@@
-78,11
+93,13
@@
inline ShaderEffect CreateColorAdjuster( const Vector3& hsvDelta, bool ignoreAlp
}\n
);
}\n
);
- ShaderEffect shaderEffect = ShaderEffect::New("", fragmentShader);
- shaderEffect.SetUniform( "uHSVDelta", hsvDelta );
- shaderEffect.SetUniform( "uIgnoreAlpha", ignoreAlpha?1.0f:0.0f );
+ Property::Map customShader;
+ customShader[ Toolkit::Visual::Shader::Property::FRAGMENT_SHADER ] = fragmentShader;
+
+ Property::Map map;
+ map[ Toolkit::Visual::Property::SHADER ] = customShader;
- return
shaderEffect
;
+ return
map
;
}
} // namespace Internal
}
} // namespace Internal
@@
-91,4
+108,4
@@
inline ShaderEffect CreateColorAdjuster( const Vector3& hsvDelta, bool ignoreAlp
} // namespace Dali
} // namespace Dali
-#endif /
* __DALI_TOOLKIT_INTERNAL_COLOR_ADJUSTER_H_ */
+#endif /
/ DALI_TOOLKIT_INTERNAL_COLOR_ADJUSTER_H