X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftest-actor-utils.cpp;h=5a8a5d1fb10e4a0f6671de8f03cb26273755e944;hp=9be97bc7fdbe7e777530db44085c9fbff22eebb6;hb=54fbf47db890d0479d19d780de5ea5d860924632;hpb=124b37e4664e47f0fc5fd2f16427b25b66d6ebaf diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp index 9be97bc..5a8a5d1 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp @@ -15,14 +15,17 @@ * */ -// HEADER +// CLASS HEADER #include "test-actor-utils.h" -#include "mesh-builder.h" // EXTERNAL INCLUDES #include +#include #include +// INTERNAL INCLUDES +#include "mesh-builder.h" + namespace Dali { @@ -65,7 +68,7 @@ Actor CreateRenderableActor( Image texture ) Actor CreateRenderableActor( Image texture, const std::string& vertexShader, const std::string& fragmentShader ) { // Create the geometry - Geometry geometry = Geometry::QUAD(); + Geometry geometry = CreateQuadGeometry(); // Create Shader Shader shader = Shader::New( vertexShader, fragmentShader ); @@ -81,7 +84,7 @@ Actor CreateRenderableActor( Image texture, const std::string& vertexShader, con if( texture ) { TextureSet textureSet = TextureSet::New(); - textureSet.SetImage( 0u, texture ); + TextureSetImage( textureSet, 0u, texture ); renderer.SetTextures( textureSet ); // Set actor to the size of the texture if set @@ -102,7 +105,7 @@ Image GetTexture( Actor actor ) TextureSet textureSet = renderer.GetTextures(); if( textureSet && textureSet.GetTextureCount() ) { - image = textureSet.GetImage( 0u ); + image = TextureGetImage( textureSet, 0u ); } } }