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
Remove/Move experimental features
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
shader-effects
/
mirror-effect.h
diff --git
a/dali-toolkit/devel-api/shader-effects/mirror-effect.h
b/dali-toolkit/devel-api/shader-effects/mirror-effect.h
index
4e6b30f
..
7240743
100644
(file)
--- a/
dali-toolkit/devel-api/shader-effects/mirror-effect.h
+++ b/
dali-toolkit/devel-api/shader-effects/mirror-effect.h
@@
-2,7
+2,7
@@
#define __DALI_TOOLKIT_MIRROR_EFFECT_H__
/*
#define __DALI_TOOLKIT_MIRROR_EFFECT_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
{
@@
-47,7
+47,7
@@
inline ShaderEffect CreateMirrorEffect()
" pos.y = pos.y * 3.0; \n"
" mediump vec4 world = uModelView * vec4(pos,1.0); \n"
" gl_Position = uProjection * world; \n"
" pos.y = pos.y * 3.0; \n"
" mediump vec4 world = uModelView * vec4(pos,1.0); \n"
" gl_Position = uProjection * world; \n"
- " vTexCoord =
aTexCoord;
\n"
+ " vTexCoord =
mix( sTextureRect.xy, sTextureRect.zw, aTexCoord );
\n"
"} \n" );
std::string fragmentShader(
"} \n" );
std::string fragmentShader(
@@
-77,7
+77,6
@@
inline ShaderEffect CreateMirrorEffect()
Dali::ShaderEffect shaderEffect = Dali::ShaderEffect::New(
vertexShader,
fragmentShader,
Dali::ShaderEffect shaderEffect = Dali::ShaderEffect::New(
vertexShader,
fragmentShader,
- GeometryType( GEOMETRY_TYPE_IMAGE ),
ShaderEffect::GeometryHints( ShaderEffect::HINT_BLENDING ));
shaderEffect.SetUniform("uAlpha", 1.0f);
ShaderEffect::GeometryHints( ShaderEffect::HINT_BLENDING ));
shaderEffect.SetUniform("uAlpha", 1.0f);