X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftest-actor-utils.cpp;h=5d45a121bdde6a7fe867a1d9dde63f0dae641864;hb=3928808cc2029cbfd59230f2edb8889a63a59cec;hp=4387ba77ffdd7ddad3071f1de89a05ac4f0c5a11;hpb=ad110f27c01af7e617df158891eef5cf60bf22e6;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 4387ba7..5d45a12 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,6 @@ // EXTERNAL INCLUDES #include -#include // INTERNAL INCLUDES #include "mesh-builder.h" @@ -57,15 +56,15 @@ const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER( Actor CreateRenderableActor() { - return CreateRenderableActor( Image(), VERTEX_SHADER, FRAGMENT_SHADER ); + return CreateRenderableActor( Texture(), VERTEX_SHADER, FRAGMENT_SHADER ); } -Actor CreateRenderableActor( Image texture ) +Actor CreateRenderableActor( Texture texture ) { return CreateRenderableActor( texture, VERTEX_SHADER, FRAGMENT_SHADER ); } -Actor CreateRenderableActor( Image texture, const std::string& vertexShader, const std::string& fragmentShader ) +Actor CreateRenderableActor( Texture texture, const std::string& vertexShader, const std::string& fragmentShader ) { // Create the geometry Geometry geometry = CreateQuadGeometry(); @@ -84,7 +83,7 @@ Actor CreateRenderableActor( Image texture, const std::string& vertexShader, con if( texture ) { TextureSet textureSet = TextureSet::New(); - TextureSetImage( textureSet, 0u, texture ); + textureSet.SetTexture( 0u, texture ); renderer.SetTextures( textureSet ); // Set actor to the size of the texture if set