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
Added code for stylable transitions
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
shader-effects
/
quadratic-bezier.h
diff --git
a/dali-toolkit/devel-api/shader-effects/quadratic-bezier.h
b/dali-toolkit/devel-api/shader-effects/quadratic-bezier.h
index
e60f2d3
..
45667ac
100644
(file)
--- a/
dali-toolkit/devel-api/shader-effects/quadratic-bezier.h
+++ b/
dali-toolkit/devel-api/shader-effects/quadratic-bezier.h
@@
-2,7
+2,7
@@
#define __DALI_TOOLKIT_QUADRATIC_BEZIER_H__
/*
#define __DALI_TOOLKIT_QUADRATIC_BEZIER_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
{
@@
-110,8
+110,7
@@
inline ShaderEffect CreateQuadraticBezier(unsigned int pointCount, bool filled)
Dali::ShaderEffect shaderEffect = Dali::ShaderEffect::NewWithPrefix(
vertexShaderPrefix.str(),vertexShader,
Dali::ShaderEffect shaderEffect = Dali::ShaderEffect::NewWithPrefix(
vertexShaderPrefix.str(),vertexShader,
- "#extension GL_OES_standard_derivatives:enable\n", fragmentShader,
- GeometryType(GEOMETRY_TYPE_UNTEXTURED_MESH) );
+ "#extension GL_OES_standard_derivatives:enable\n", fragmentShader );
//Set default uniform values
shaderEffect.SetUniform( "uColor", Vector4(1.0f,1.0f,1.0f,1.0f) );
//Set default uniform values
shaderEffect.SetUniform( "uColor", Vector4(1.0f,1.0f,1.0f,1.0f) );