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
Rendering API clean-up
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
renderers
/
color
/
color-renderer.cpp
diff --git
a/dali-toolkit/internal/controls/renderers/color/color-renderer.cpp
b/dali-toolkit/internal/controls/renderers/color/color-renderer.cpp
index
b6074eb
..
abdee4e
100644
(file)
--- a/
dali-toolkit/internal/controls/renderers/color/color-renderer.cpp
+++ b/
dali-toolkit/internal/controls/renderers/color/color-renderer.cpp
@@
-38,10
+38,8
@@
namespace Internal
namespace
{
const char * const RENDERER_TYPE("rendererType");
namespace
{
const char * const RENDERER_TYPE("rendererType");
-const char * const RENDERER_TYPE_VALUE("color
Renderer
");
+const char * const RENDERER_TYPE_VALUE("color");
const char * const COLOR_NAME("blendColor");
const char * const COLOR_NAME("blendColor");
-const char * const COLOR_UNIFORM_NAME("uBlendColor");
-
const char* VERTEX_SHADER = DALI_COMPOSE_SHADER(
attribute mediump vec2 aPosition;\n
const char* VERTEX_SHADER = DALI_COMPOSE_SHADER(
attribute mediump vec2 aPosition;\n
@@
-58,11
+56,11
@@
const char* VERTEX_SHADER = DALI_COMPOSE_SHADER(
const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER(
uniform lowp vec4 uColor;\n
const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER(
uniform lowp vec4 uColor;\n
- uniform lowp vec4
uB
lendColor;\n
+ uniform lowp vec4
b
lendColor;\n
\n
void main()\n
{\n
\n
void main()\n
{\n
- gl_FragColor =
uB
lendColor*uColor;\n
+ gl_FragColor =
b
lendColor*uColor;\n
}\n
);
}
}\n
);
}
@@
-133,13
+131,12
@@
void ColorRenderer::InitializeRenderer()
mFactoryCache.SaveShader( RendererFactoryCache::COLOR_SHADER, shader );
}
mFactoryCache.SaveShader( RendererFactoryCache::COLOR_SHADER, shader );
}
- Material material = Material::New( shader );
- mImpl->mRenderer = Renderer::New( geometry, material );
+ mImpl->mRenderer = Renderer::New( geometry, shader );
- mBlendColorIndex = mImpl->mRenderer.RegisterProperty( COLOR_
UNIFORM_
NAME, mBlendColor );
+ mBlendColorIndex = mImpl->mRenderer.RegisterProperty( COLOR_NAME, mBlendColor );
if( mBlendColor.a < 1.f )
{
if( mBlendColor.a < 1.f )
{
- mImpl->mRenderer.
GetMaterial().SetBlendMode(
BlendingMode::ON );
+ mImpl->mRenderer.
SetProperty( Renderer::Property::BLENDING_MODE,
BlendingMode::ON );
}
}
}
}
@@
-150,9
+147,9
@@
void ColorRenderer::SetColor(const Vector4& color)
if( mImpl->mRenderer )
{
(mImpl->mRenderer).SetProperty( mBlendColorIndex, color );
if( mImpl->mRenderer )
{
(mImpl->mRenderer).SetProperty( mBlendColorIndex, color );
- if( color.a < 1.f
&& (mImpl->mRenderer).GetMaterial().GetBlendMode() != BlendingMode::ON
)
+ if( color.a < 1.f )
{
{
-
(mImpl->mRenderer).GetMaterial().SetBlendMode(
BlendingMode::ON );
+
mImpl->mRenderer.SetProperty( Renderer::Property::BLENDING_MODE,
BlendingMode::ON );
}
}
}
}
}
}