From e9c2b31a85945f21886bc3c73f62984bcdce05a0 Mon Sep 17 00:00:00 2001 From: Ferran Sole Date: Wed, 27 Jul 2016 17:16:44 +0100 Subject: [PATCH 1/1] Changes following dali-core patch "Renamed enum Geometry::GeometryType to Geometry::Type" Change-Id: I6deb28113e55870148a50eea68bb86b3cdc7c014 --- examples/line-mesh/line-mesh-example.cpp | 6 +++--- examples/point-mesh/point-mesh-example.cpp | 2 +- shared/utility.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/line-mesh/line-mesh-example.cpp b/examples/line-mesh/line-mesh-example.cpp index c61452a..53f0fe8 100644 --- a/examples/line-mesh/line-mesh-example.cpp +++ b/examples/line-mesh/line-mesh-example.cpp @@ -102,7 +102,7 @@ Geometry CreateGeometry() Geometry pentagonGeometry = Geometry::New(); pentagonGeometry.AddVertexBuffer( pentagonVertices ); pentagonGeometry.SetIndexBuffer( INDICES[0], INDICES_SIZE[0] ); - pentagonGeometry.SetGeometryType( Geometry::LINES ); + pentagonGeometry.SetType( Geometry::LINES ); return pentagonGeometry; } @@ -334,7 +334,7 @@ public: std::stringstream str; str << mCurrentIndexCount; mIndicesCountLabel.SetProperty( Toolkit::TextLabel::Property::TEXT, str.str() ); - mGeometry.SetGeometryType( mPrimitiveType ); + mGeometry.SetType( mPrimitiveType ); mGeometry.SetIndexBuffer( INDICES[ indicesArray ], INDICES_SIZE[ indicesArray ] ); mRenderer.SetIndexRange( 0, mCurrentIndexCount ); return true; @@ -373,7 +373,7 @@ private: Toolkit::PushButton mMinusButton; Toolkit::PushButton mPlusButton; Toolkit::TextLabel mIndicesCountLabel; - Geometry::GeometryType mPrimitiveType; + Geometry::Type mPrimitiveType; int mCurrentIndexCount; int mMaxIndexCount; }; diff --git a/examples/point-mesh/point-mesh-example.cpp b/examples/point-mesh/point-mesh-example.cpp index f470a47..86e2d71 100644 --- a/examples/point-mesh/point-mesh-example.cpp +++ b/examples/point-mesh/point-mesh-example.cpp @@ -105,7 +105,7 @@ Geometry CreateGeometry() // Create the geometry object Geometry polyhedraGeometry = Geometry::New(); polyhedraGeometry.AddVertexBuffer( polyhedraVertices ); - polyhedraGeometry.SetGeometryType( Geometry::POINTS ); + polyhedraGeometry.SetType( Geometry::POINTS ); return polyhedraGeometry; } diff --git a/shared/utility.h b/shared/utility.h index 71a2150..294e6f4 100644 --- a/shared/utility.h +++ b/shared/utility.h @@ -112,7 +112,7 @@ Dali::Geometry CreateTexturedQuad() //Create the geometry Dali::Geometry geometry = Dali::Geometry::New(); geometry.AddVertexBuffer( vertexBuffer ); - geometry.SetGeometryType(Dali::Geometry::TRIANGLE_STRIP ); + geometry.SetType(Dali::Geometry::TRIANGLE_STRIP ); return geometry; } -- 2.7.4