Changes following dali-core patch "Renamed enum Geometry::GeometryType to Geometry...

Change-Id: I6deb28113e55870148a50eea68bb86b3cdc7c014

diff --git a/examples/line-mesh/line-mesh-example.cpp b/examples/line-mesh/line-mesh-example.cpp
index c61452a1750158931b7ae826517c1c602aaf91d0..53f0fe84655310de9cf7cbada2ff97453f01cb05 100644 (file)
--- 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 f470a47214d94f291c1bd93c013f30ae1ca69cdb..86e2d7172b0b21939a2237e009da72333c536533 100644 (file)
--- 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 71a2150fd3fcde4ba192833682caa3a51bf900e3..294e6f45f8217b836bc448e4afdddae0ebce3a8e 100644 (file)
--- 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;
 }