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=2f833c6821ddeb6d7635349bf0e8d72a1951048a;hb=54fbf47db890d0479d19d780de5ea5d860924632;hpb=c4a92ccf72121cbe2a015711e4253e8d16f28fef 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 2f833c6..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,21 +15,22 @@ * */ -// 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 { namespace { -const char * const TEXTURE_UNIFORM_NAME( "sTexture" ); - const char* VERTEX_SHADER = DALI_COMPOSE_SHADER( attribute mediump vec2 aPosition;\n uniform mediump mat4 uMvpMatrix;\n @@ -83,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 @@ -104,7 +105,7 @@ Image GetTexture( Actor actor ) TextureSet textureSet = renderer.GetTextures(); if( textureSet && textureSet.GetTextureCount() ) { - image = textureSet.GetImage( 0u ); + image = TextureGetImage( textureSet, 0u ); } } }