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%2Fmesh-builder.cpp;h=361fbf3cca152e4ac4e182e402963390735109f4;hp=5b127c7de560f7e0a11f67bff43d8144799ac2c5;hb=54fbf47db890d0479d19d780de5ea5d860924632;hpb=941eb8eab76fca967bb8e21456179fc9b4eafea6 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..361fbf3 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) 2016 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,8 +14,13 @@ * limitations under the License. * */ + +// CLASS HEADER #include "mesh-builder.h" +// EXTERNAL INCLUDES +#include + namespace Dali { @@ -28,10 +33,11 @@ TextureSet CreateTextureSet() { return TextureSet::New(); } + TextureSet CreateTextureSet( Image image ) { TextureSet textureSet = TextureSet::New(); - textureSet.SetImage( 0u, image ); + TextureSetImage( textureSet, 0u, image ); return textureSet; } @@ -48,11 +54,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] = { @@ -71,6 +72,4 @@ Geometry CreateQuadGeometryFromBuffer( PropertyBuffer vertexData ) return geometry; } - - } // namespace Dali