X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Fmesh-builder.cpp;h=2e8f7242e9def8747600e14c0fc9264b83de2995;hb=3928808cc2029cbfd59230f2edb8889a63a59cec;hp=5b127c7de560f7e0a11f67bff43d8144799ac2c5;hpb=ac03f72d0786ee02540106f1bc887a32f17fa786;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.cpp index 5b127c7..2e8f724 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 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. @@ -14,6 +14,8 @@ * limitations under the License. * */ + +// CLASS HEADER #include "mesh-builder.h" namespace Dali @@ -28,10 +30,11 @@ TextureSet CreateTextureSet() { return TextureSet::New(); } -TextureSet CreateTextureSet( Image image ) + +TextureSet CreateTextureSet( Texture texture ) { TextureSet textureSet = TextureSet::New(); - textureSet.SetImage( 0u, image ); + textureSet.SetTexture(0u, texture); return textureSet; } @@ -48,11 +51,6 @@ PropertyBuffer CreatePropertyBuffer() Geometry CreateQuadGeometry(void) { PropertyBuffer vertexData = CreatePropertyBuffer(); - return CreateQuadGeometryFromBuffer( vertexData ); -} - -Geometry CreateQuadGeometryFromBuffer( PropertyBuffer vertexData ) -{ const float halfQuadSize = .5f; struct TexturedQuadVertex { Vector2 position; Vector2 textureCoordinates; }; TexturedQuadVertex texturedQuadVertexData[4] = {