From 9ddc0bcc16d39f0e5076268d5059a958673ef5de Mon Sep 17 00:00:00 2001 From: Xiangyin Ma Date: Mon, 16 May 2016 17:12:46 +0100 Subject: [PATCH] Use Geometry::QUAD() in UTC Change-Id: I1c3931f987cabec0cdb5dede53baf4eee29c9b30 --- .../dali-test-suite-utils/mesh-builder.cpp | 28 ---------------------- .../dali-test-suite-utils/mesh-builder.h | 2 -- .../dali-test-suite-utils/test-actor-utils.cpp | 2 +- 3 files changed, 1 insertion(+), 31 deletions(-) diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/mesh-builder.cpp b/automated-tests/src/dali-adaptor/dali-test-suite-utils/mesh-builder.cpp index 5b127c7..978dc74 100644 --- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/mesh-builder.cpp +++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/mesh-builder.cpp @@ -45,32 +45,4 @@ PropertyBuffer CreatePropertyBuffer() return vertexData; } -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] = { - { Vector2(-halfQuadSize, -halfQuadSize), Vector2(0.f, 0.f) }, - { Vector2( halfQuadSize, -halfQuadSize), Vector2(1.f, 0.f) }, - { Vector2(-halfQuadSize, halfQuadSize), Vector2(0.f, 1.f) }, - { Vector2( halfQuadSize, halfQuadSize), Vector2(1.f, 1.f) } }; - vertexData.SetData(texturedQuadVertexData, 4); - - unsigned short indexData[6] = { 0, 3, 1, 0, 2, 3 }; - - Geometry geometry = Geometry::New(); - geometry.AddVertexBuffer( vertexData ); - geometry.SetIndexBuffer( indexData, sizeof(indexData)/sizeof(indexData[0]) ); - - return geometry; -} - - - } // namespace Dali diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/mesh-builder.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/mesh-builder.h index bf5f6a6..391bcc4 100644 --- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/mesh-builder.h +++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/mesh-builder.h @@ -30,8 +30,6 @@ namespace Dali Shader CreateShader(); TextureSet CreateTextureSet(); TextureSet CreateTextureSet( Image image ); -Geometry CreateQuadGeometry(); -Geometry CreateQuadGeometryFromBuffer( PropertyBuffer vertexData ); PropertyBuffer CreatePropertyBuffer(); } diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-actor-utils.cpp b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-actor-utils.cpp index 2f833c6..fb50bf5 100644 --- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-actor-utils.cpp +++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-actor-utils.cpp @@ -67,7 +67,7 @@ Actor CreateRenderableActor( Image texture ) Actor CreateRenderableActor( Image texture, const std::string& vertexShader, const std::string& fragmentShader ) { // Create the geometry - Geometry geometry = CreateQuadGeometry(); + Geometry geometry = Geometry::QUAD(); // Create Shader Shader shader = Shader::New( vertexShader, fragmentShader ); -- 2.7.4