diff options
author | Ferran Sole <ferran.sole@samsung.com> | 2016-07-27 17:16:44 +0100 |
---|---|---|
committer | Ferran Sole <ferran.sole@samsung.com> | 2016-07-28 10:32:08 +0100 |
commit | e9c2b31a85945f21886bc3c73f62984bcdce05a0 (patch) | |
tree | 17c7119371df9216e58960387525fa4374b34d71 | |
parent | ecf9d68e56cbd7fa65df11aa6ff9427f9121a523 (diff) | |
download | dali-demo-e9c2b31a85945f21886bc3c73f62984bcdce05a0.tar.gz dali-demo-e9c2b31a85945f21886bc3c73f62984bcdce05a0.tar.bz2 dali-demo-e9c2b31a85945f21886bc3c73f62984bcdce05a0.zip |
Changes following dali-core patch "Renamed enum Geometry::GeometryType to Geometry::Type"
Change-Id: I6deb28113e55870148a50eea68bb86b3cdc7c014
-rw-r--r-- | examples/line-mesh/line-mesh-example.cpp | 6 | ||||
-rw-r--r-- | examples/point-mesh/point-mesh-example.cpp | 2 | ||||
-rw-r--r-- | 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 c61452a1..53f0fe84 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 f470a472..86e2d717 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 71a2150f..294e6f45 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; } |