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
Merge "Add clockwise and counter clockwise direction type and movefocus" into devel...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
npatch
/
npatch-visual.cpp
diff --git
a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp
b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp
index
bca8d03
..
71d8cba
100644
(file)
--- a/
dali-toolkit/internal/visuals/npatch/npatch-visual.cpp
+++ b/
dali-toolkit/internal/visuals/npatch/npatch-visual.cpp
@@
-46,7
+46,7
@@
namespace Internal
{
namespace
{
{
namespace
{
-const int CUSTOM_PROPERTY_COUNT(
10); // 5 transform properties +
fixed(3),stretch,aux
+const int CUSTOM_PROPERTY_COUNT(
5); //
fixed(3),stretch,aux
}
/////////////////NPatchVisual////////////////
}
/////////////////NPatchVisual////////////////
@@
-236,7
+236,7
@@
void NPatchVisual::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);
}
}
}
}
@@
-300,11
+300,11
@@
void NPatchVisual::OnInitialize()
mFactoryCache,
ImageVisualShaderFeature::FeatureBuilder());
mFactoryCache,
ImageVisualShaderFeature::FeatureBuilder());
- 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);
}
Geometry NPatchVisual::CreateGeometry()
}
Geometry NPatchVisual::CreateGeometry()
@@
-493,7
+493,7
@@
void NPatchVisual::ApplyTextureAndUniforms()
mImpl->mRenderer.SetTextures(textureSet);
// Register transform properties
mImpl->mRenderer.SetTextures(textureSet);
// Register transform properties
- mImpl->mTransform.
Register
Uniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
+ mImpl->mTransform.
Set
Uniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT);
}
Geometry NPatchVisual::GetNinePatchGeometry(VisualFactoryCache::GeometryType subType)
}
Geometry NPatchVisual::GetNinePatchGeometry(VisualFactoryCache::GeometryType subType)