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

[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 ea98aa6..34bbe7c 100644 (file)
--- a/examples/radial-menu/radial-sweep-view-impl.cpp
+++ b/examples/radial-menu/radial-sweep-view-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 
 #include "radial-sweep-view-impl.h"
 
-#include <dali/devel-api/rendering/renderer.h>
+#include <dali/public-api/rendering/renderer.h>
 #include <sstream>
 
 using namespace Dali;
@@ -302,10 +302,6 @@ void RadialSweepViewImpl::Deactivate()
   {
     mAnim.Stop();
   }
-  // mLayer.Remove( mStencilActor );
-  // mStencilActor.Reset();
-  // mMesh.Reset();
-  // mMaterial.Reset();
 }
 
 void RadialSweepViewImpl::CreateStencil( Radian initialSector )
@@ -334,24 +330,19 @@ void RadialSweepViewImpl::CreateStencil( Radian initialSector )
   PropertyBuffer vertices = PropertyBuffer::New( vertexFormat );
   vertices.SetData( vertexData, 7u );
 
-  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::INTEGER;
-  PropertyBuffer indices = PropertyBuffer::New( indexFormat );
-  indices.SetData( indexData, 15u );
+  unsigned short indexData[15] = { 0,1,2,0,2,3,0,3,4,0,4,5,0,5,6 };
 
   Geometry meshGeometry = Geometry::New();
   meshGeometry.AddVertexBuffer( vertices );
-  meshGeometry.SetIndexBuffer( indices );
+  meshGeometry.SetIndexBuffer( &indexData[0], sizeof( indexData )/sizeof(indexData[0]) );
 
-  // Create material
+  // Create shader
   std::ostringstream vertexShaderStringStream;
   vertexShaderStringStream<<VERTEX_SHADER_PREFIX<<VERTEX_SHADER;
   Shader shader = Shader::New( vertexShaderStringStream.str(), FRAGMENT_SHADER );
-  Material material = Material::New( shader );
 
   // Create renderer
-  Renderer renderer = Renderer::New( meshGeometry, material );
+  Renderer renderer = Renderer::New( meshGeometry, shader );
 
   mStencilActor = Actor::New();
   mStencilActor.AddRenderer( renderer );