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
Updated visuals to use VisualRenderer
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
border
/
border-visual.cpp
diff --git
a/dali-toolkit/internal/visuals/border/border-visual.cpp
b/dali-toolkit/internal/visuals/border/border-visual.cpp
index
b60cc27
..
b715cca
100644
(file)
--- a/
dali-toolkit/internal/visuals/border/border-visual.cpp
+++ b/
dali-toolkit/internal/visuals/border/border-visual.cpp
@@
-39,7
+39,7
@@
namespace Internal
{
namespace
{
{
namespace
{
-const int CUSTOM_PROPERTY_COUNT(
7); // 5 transform properties +
color,size
+const int CUSTOM_PROPERTY_COUNT(
2); //
color,size
const char* const POSITION_ATTRIBUTE_NAME("aPosition");
const char* const DRIFT_ATTRIBUTE_NAME("aDrift");
const char* const POSITION_ATTRIBUTE_NAME("aPosition");
const char* const DRIFT_ATTRIBUTE_NAME("aDrift");
@@
-166,7
+166,7
@@
void BorderVisual::OnSetTransform()
{
if(mImpl->mRenderer)
{
{
if(mImpl->mRenderer)
{
- mImpl->mTransform.
Register
Uniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
+ mImpl->mTransform.
Set
Uniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
}
}
}
}
@@
-180,11
+180,11
@@
void BorderVisual::OnInitialize()
}
Shader shader = GetBorderShader();
}
Shader shader = GetBorderShader();
- mImpl->mRenderer = Renderer::New(geometry, shader);
+ mImpl->mRenderer =
Visual
Renderer::New(geometry, shader);
mImpl->mRenderer.ReserveCustomProperties(CUSTOM_PROPERTY_COUNT);
//Register transform properties
mImpl->mRenderer.ReserveCustomProperties(CUSTOM_PROPERTY_COUNT);
//Register transform properties
- mImpl->mTransform.
Register
Uniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
+ mImpl->mTransform.
Set
Uniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
}
Shader BorderVisual::GetBorderShader()
}
Shader BorderVisual::GetBorderShader()