Peter M. Groen / dali-demo

Commit e9c2b31a85945f21886bc3c73f62984bcdce05a0

Authored by Ferran Sole
1 parent ecf9d68e

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

Change-Id: I6deb28113e55870148a50eea68bb86b3cdc7c014
Inline Side-by-side
Showing 3 changed files with 5 additions and 5 deletions
examples/line-mesh/line-mesh-example.cpp
  View file @e9c2b31
... ... @@ -102,7 +102,7 @@ Geometry CreateGeometry()
102 102 Geometry pentagonGeometry = Geometry::New();
103 103 pentagonGeometry.AddVertexBuffer( pentagonVertices );
104 104 pentagonGeometry.SetIndexBuffer( INDICES[0], INDICES_SIZE[0] );
105   - pentagonGeometry.SetGeometryType( Geometry::LINES );
  105 + pentagonGeometry.SetType( Geometry::LINES );
106 106 return pentagonGeometry;
107 107 }
108 108  
... ... @@ -334,7 +334,7 @@ public:
334 334 std::stringstream str;
335 335 str << mCurrentIndexCount;
336 336 mIndicesCountLabel.SetProperty( Toolkit::TextLabel::Property::TEXT, str.str() );
337   - mGeometry.SetGeometryType( mPrimitiveType );
  337 + mGeometry.SetType( mPrimitiveType );
338 338 mGeometry.SetIndexBuffer( INDICES[ indicesArray ], INDICES_SIZE[ indicesArray ] );
339 339 mRenderer.SetIndexRange( 0, mCurrentIndexCount );
340 340 return true;
... ... @@ -373,7 +373,7 @@ private:
373 373 Toolkit::PushButton mMinusButton;
374 374 Toolkit::PushButton mPlusButton;
375 375 Toolkit::TextLabel mIndicesCountLabel;
376   - Geometry::GeometryType mPrimitiveType;
  376 + Geometry::Type mPrimitiveType;
377 377 int mCurrentIndexCount;
378 378 int mMaxIndexCount;
379 379 };
... ...
examples/point-mesh/point-mesh-example.cpp
  View file @e9c2b31
... ... @@ -105,7 +105,7 @@ Geometry CreateGeometry()
105 105 // Create the geometry object
106 106 Geometry polyhedraGeometry = Geometry::New();
107 107 polyhedraGeometry.AddVertexBuffer( polyhedraVertices );
108   - polyhedraGeometry.SetGeometryType( Geometry::POINTS );
  108 + polyhedraGeometry.SetType( Geometry::POINTS );
109 109  
110 110 return polyhedraGeometry;
111 111 }
... ...
shared/utility.h
  View file @e9c2b31
... ... @@ -112,7 +112,7 @@ Dali::Geometry CreateTexturedQuad()
112 112 //Create the geometry
113 113 Dali::Geometry geometry = Dali::Geometry::New();
114 114 geometry.AddVertexBuffer( vertexBuffer );
115   - geometry.SetGeometryType(Dali::Geometry::TRIANGLE_STRIP );
  115 + geometry.SetType(Dali::Geometry::TRIANGLE_STRIP );
116 116  
117 117 return geometry;
118 118 }
... ...