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.h;h=0dbe07e878a7a20943a8374a4c6b5fa493d448d5;hp=8b8859fb2ad9684a1be68b5293e29a0681d8568a;hb=4c4f959f023cf5541feeef5c834cfe7e43fa05b2;hpb=33f29d762e4410026a85521f05b7b66aa2d087d1 diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.h index 8b8859f..0dbe07e 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.h @@ -2,7 +2,7 @@ #define DALI_TEST_ACTOR_UTILS_H /* - * Copyright (c) 2020 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 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. @@ -19,11 +19,12 @@ */ // EXTERNAL INCLUDES +#include +#include #include namespace Dali { - class Actor; class Image; class Texture; @@ -39,7 +40,7 @@ Actor CreateRenderableActor(); * @param[in] texture Texture to set. * @return An actor with a renderer. */ -Actor CreateRenderableActor( Image texture ); +Actor CreateRenderableActor(Texture texture); /** * @brief Creates a renderable-actor with a texture and custom shaders. @@ -48,23 +49,18 @@ Actor CreateRenderableActor( Image texture ); * @param[in] fragmentShader The fragment-shader. * @return An actor with a renderer. */ -Actor CreateRenderableActor( Image texture, const std::string& vertexShader, const std::string& fragmentShader ); - -/** - * @brief Creates a renderable-actor with a texture. - * @param[in] texture Texture to set. - * @return An actor with a renderer. - */ -Actor CreateRenderableActor( Texture texture ); +Actor CreateRenderableActor(Texture texture, const std::string& vertexShader, const std::string& fragmentShader); /** * @brief Creates a renderable-actor with a texture and custom shaders. - * @param[in] texture Texture to set. + * @param[in] textures TextureSet to set. * @param[in] vertexShader The vertex-shader. * @param[in] fragmentShader The fragment-shader. * @return An actor with a renderer. */ -Actor CreateRenderableActor( Texture texture, const std::string& vertexShader, const std::string& fragmentShader ); +Actor CreateRenderableActor2(TextureSet textures, const std::string& vertexShader, const std::string& fragmentShader); + +Texture CreateTexture(TextureType::Type type, Pixel::Format format, int width, int height); } // namespace Dali