projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove uniform mappings.
[platform/core/uifw/dali-core.git]
/
automated-tests
/
src
/
dali
/
utc-Dali-Geometry.cpp
diff --git
a/automated-tests/src/dali/utc-Dali-Geometry.cpp
b/automated-tests/src/dali/utc-Dali-Geometry.cpp
index
11963d7
..
f5f289f
100644
(file)
--- a/
automated-tests/src/dali/utc-Dali-Geometry.cpp
+++ b/
automated-tests/src/dali/utc-Dali-Geometry.cpp
@@
-103,7
+103,7
@@
int UtcDaliGeometryConstraint01(void)
Stage::GetCurrent().Add(actor);
Vector4 initialColor = Color::WHITE;
Stage::GetCurrent().Add(actor);
Vector4 initialColor = Color::WHITE;
- Property::Index colorIndex = geometry.RegisterProperty( "
fade-c
olor", initialColor );
+ Property::Index colorIndex = geometry.RegisterProperty( "
uFadeC
olor", initialColor );
application.SendNotification();
application.Render(0);
application.SendNotification();
application.Render(0);
@@
-150,8
+150,7
@@
int UtcDaliGeometryConstraint02(void)
application.Render(0);
Vector4 initialColor = Color::WHITE;
application.Render(0);
Vector4 initialColor = Color::WHITE;
- Property::Index colorIndex = geometry.RegisterProperty( "fade-color", initialColor );
- geometry.AddUniformMapping( colorIndex, std::string("uFadeColor") );
+ Property::Index colorIndex = geometry.RegisterProperty( "uFadeColor", initialColor );
TestGlAbstraction& gl = application.GetGlAbstraction();
TestGlAbstraction& gl = application.GetGlAbstraction();
@@
-208,7
+207,7
@@
int UtcDaliGeometryAnimatedProperty01(void)
Stage::GetCurrent().Add(actor);
Vector4 initialColor = Color::WHITE;
Stage::GetCurrent().Add(actor);
Vector4 initialColor = Color::WHITE;
- Property::Index colorIndex = geometry.RegisterProperty( "
fade-c
olor", initialColor );
+ Property::Index colorIndex = geometry.RegisterProperty( "
uFadeC
olor", initialColor );
application.SendNotification();
application.Render(0);
application.SendNotification();
application.Render(0);
@@
-254,8
+253,7
@@
int UtcDaliGeometryAnimatedProperty02(void)
application.Render(0);
Vector4 initialColor = Color::WHITE;
application.Render(0);
Vector4 initialColor = Color::WHITE;
- Property::Index colorIndex = geometry.RegisterProperty( "fade-color", initialColor );
- geometry.AddUniformMapping( colorIndex, std::string("uFadeColor") );
+ Property::Index colorIndex = geometry.RegisterProperty( "uFadeColor", initialColor );
TestGlAbstraction& gl = application.GetGlAbstraction();
TestGlAbstraction& gl = application.GetGlAbstraction();