X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftest-actor-utils.cpp;h=f8d7bf87f72c91f1bd93c490f265db1b9450c889;hb=d00a250741411c386d988e7ac34525cf94a1918e;hp=9be97bc7fdbe7e777530db44085c9fbff22eebb6;hpb=471657912f53a37f832a6b4f5f8513cbc62a32e1;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git 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..f8d7bf8 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,13 +15,15 @@ * */ -// 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 +67,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 +83,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 +104,7 @@ Image GetTexture( Actor actor ) TextureSet textureSet = renderer.GetTextures(); if( textureSet && textureSet.GetTextureCount() ) { - image = textureSet.GetImage( 0u ); + image = TextureGetImage( textureSet, 0u ); } } }