X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Fmesh-sorting%2Fmesh-sorting-example.cpp;h=81f4ca34e8e93d8eb2df5c5d29c6752b8c3d168d;hb=bb40e8f928d340b380f1eab14f76575b83472794;hp=a11e2e5ee2042be229b8974acc6f650f45c3e1c3;hpb=8d2e32de905116f05b4cf62572f3a016c128e408;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/examples/mesh-sorting/mesh-sorting-example.cpp b/examples/mesh-sorting/mesh-sorting-example.cpp index a11e2e5..81f4ca3 100644 --- a/examples/mesh-sorting/mesh-sorting-example.cpp +++ b/examples/mesh-sorting/mesh-sorting-example.cpp @@ -85,34 +85,6 @@ void main() } ); -Geometry CreateGeometry() -{ - // Create vertices - 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) } }; - - Property::Map texturedQuadVertexFormat; - texturedQuadVertexFormat["aPosition"] = Property::VECTOR2; - texturedQuadVertexFormat["aTexCoord"] = Property::VECTOR2; - PropertyBuffer texturedQuadVertices = PropertyBuffer::New( texturedQuadVertexFormat ); - texturedQuadVertices.SetData( texturedQuadVertexData, 4 ); - - // Create indices - unsigned short indexData[6] = { 0, 3, 1, 0, 2, 3 }; - - // Create the geometry object - Geometry texturedQuadGeometry = Geometry::New(); - texturedQuadGeometry.AddVertexBuffer( texturedQuadVertices ); - texturedQuadGeometry.SetIndexBuffer( &indexData[0], sizeof(indexData)/sizeof(unsigned short) ); - - return texturedQuadGeometry; -} - } // anonymous namespace // This example shows how to use a simple mesh @@ -159,7 +131,7 @@ public: application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE ); mShader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER ); - mGeometry = CreateGeometry(); + mGeometry = DemoHelper::CreateTexturedQuad(); TextureSet firstTextureSet;