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=3d7c359c09af267d374c9a49bac77127cc26dc47;hb=37809ae7570411971d415a9060b38f64bba81744;hp=f8e3917c88ed92d8d57fa22f68ea612db22fb6b4;hpb=c86d2363fffcaf1d6804b4fd7347128b779dbe19;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 f8e3917..3d7c359 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 @@ -18,9 +18,6 @@ // CLASS HEADER #include "mesh-builder.h" -// EXTERNAL INCLUDES -#include - namespace Dali { @@ -34,13 +31,6 @@ TextureSet CreateTextureSet() return TextureSet::New(); } -TextureSet CreateTextureSet( Image image ) -{ - TextureSet textureSet = TextureSet::New(); - TextureSetImage( textureSet, 0u, image ); - return textureSet; -} - TextureSet CreateTextureSet( Texture texture ) { TextureSet textureSet = TextureSet::New(); @@ -48,19 +38,19 @@ TextureSet CreateTextureSet( Texture texture ) return textureSet; } -PropertyBuffer CreatePropertyBuffer() +VertexBuffer CreateVertexBuffer() { Property::Map texturedQuadVertexFormat; texturedQuadVertexFormat["aPosition"] = Property::VECTOR2; texturedQuadVertexFormat["aVertexCoord"] = Property::VECTOR2; - PropertyBuffer vertexData = PropertyBuffer::New( texturedQuadVertexFormat ); + VertexBuffer vertexData = VertexBuffer::New( texturedQuadVertexFormat ); return vertexData; } Geometry CreateQuadGeometry(void) { - PropertyBuffer vertexData = CreatePropertyBuffer(); + VertexBuffer vertexData = CreateVertexBuffer(); const float halfQuadSize = .5f; struct TexturedQuadVertex { Vector2 position; Vector2 textureCoordinates; }; TexturedQuadVertex texturedQuadVertexData[4] = {