Merge "Changed buttons example to use ImageView." into devel/master

[platform/core/uifw/dali-demo.git] / examples / radial-menu / radial-sweep-view-impl.cpp

diff --git a/examples/radial-menu/radial-sweep-view-impl.cpp b/examples/radial-menu/radial-sweep-view-impl.cpp
index f13d58a..9c791c7 100644 (file)
--- a/examples/radial-menu/radial-sweep-view-impl.cpp
+++ b/examples/radial-menu/radial-sweep-view-impl.cpp
@@ -17,6 +17,7 @@
 
 #include "radial-sweep-view-impl.h"
 
+#include <dali/devel-api/rendering/renderer.h>
 #include <sstream>
 
 using namespace Dali;
@@ -330,13 +331,13 @@ void RadialSweepViewImpl::CreateStencil( Radian initialSector )
   vertexFormat["aAngleIndex"] = Property::FLOAT;
   vertexFormat["aPosition1"] = Property::VECTOR2;
   vertexFormat["aPosition2"] = Property::VECTOR2;
-  PropertyBuffer vertices = PropertyBuffer::New( PropertyBuffer::STATIC, vertexFormat, 7u );
+  PropertyBuffer vertices = PropertyBuffer::New( vertexFormat, 7u );
   vertices.SetData( vertexData );
 
   unsigned int indexData[15] = { 0,1,2,0,2,3,0,3,4,0,4,5,0,5,6 };
   Property::Map indexFormat;
-  indexFormat["indices"] = Property::UNSIGNED_INTEGER;
-  PropertyBuffer indices = PropertyBuffer::New( PropertyBuffer::STATIC, indexFormat, 15u );
+  indexFormat["indices"] = Property::INTEGER;
+  PropertyBuffer indices = PropertyBuffer::New( indexFormat, 15u );
   indices.SetData( indexData );
 
   Geometry meshGeometry = Geometry::New();
@@ -357,10 +358,8 @@ void RadialSweepViewImpl::CreateStencil( Radian initialSector )
   mStencilActor.SetSize(1.f, 1.f);
 
   // register properties
-  mStartAngleIndex = mStencilActor.RegisterProperty("start-angle", 0.f);
-  mStencilActor.AddUniformMapping( mStartAngleIndex, "uStartAngle " );
-  mRotationAngleIndex = mStencilActor.RegisterProperty("rotation-angle", initialSector.radian);
-  mStencilActor.AddUniformMapping( mRotationAngleIndex, "uRotationAngle" );
+  mStartAngleIndex = mStencilActor.RegisterProperty("uStartAngle", 0.f);
+  mRotationAngleIndex = mStencilActor.RegisterProperty("uRotationAngle", initialSector.radian);
 
   mStencilActor.SetDrawMode( DrawMode::STENCIL );
   mStencilActor.SetPositionInheritanceMode(USE_PARENT_POSITION);