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
(Popup) Ensure popup gets key input focus when it is displayed
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
shader-effects
/
spot-effect.h
diff --git
a/dali-toolkit/devel-api/shader-effects/spot-effect.h
b/dali-toolkit/devel-api/shader-effects/spot-effect.h
index
c41e0f4
..
48cf305
100644
(file)
--- a/
dali-toolkit/devel-api/shader-effects/spot-effect.h
+++ b/
dali-toolkit/devel-api/shader-effects/spot-effect.h
@@
-2,7
+2,7
@@
#define __DALI_TOOLKIT_SHADER_EFFECT_SPOT_H__
/*
#define __DALI_TOOLKIT_SHADER_EFFECT_SPOT_H__
/*
- * Copyright (c) 201
5
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
6
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.
@@
-19,7
+19,7
@@
*/
// EXTERNAL INCLUDES
*/
// EXTERNAL INCLUDES
-#include <dali/
public
-api/shader-effects/shader-effect.h>
+#include <dali/
devel
-api/shader-effects/shader-effect.h>
namespace Dali
{
namespace Dali
{
@@
-57,7
+57,7
@@
inline ShaderEffect CreateSpotEffect()
" vRange = max(0.1, range);\n"
" \n"
" gl_Position = uMvpMatrix * world;\n"
" vRange = max(0.1, range);\n"
" \n"
" gl_Position = uMvpMatrix * world;\n"
- " vTexCoord =
aTexCoord
;\n"
+ " vTexCoord =
mix( sTextureRect.xy, sTextureRect.zw, aTexCoord )
;\n"
"}");
std::string fragmentShader(
"}");
std::string fragmentShader(
@@
-70,7
+70,6
@@
inline ShaderEffect CreateSpotEffect()
Dali::ShaderEffect shaderEffect = Dali::ShaderEffect::New(
vertexShader, fragmentShader,
Dali::ShaderEffect shaderEffect = Dali::ShaderEffect::New(
vertexShader, fragmentShader,
- Dali::GeometryType( GEOMETRY_TYPE_IMAGE ),
ShaderEffect::GeometryHints( ShaderEffect::HINT_GRID ));
shaderEffect.SetUniform( "uCenter", Vector2(0.0f, 0.0f) );
ShaderEffect::GeometryHints( ShaderEffect::HINT_GRID ));
shaderEffect.SetUniform( "uCenter", Vector2(0.0f, 0.0f) );