Changes after TouchedSignal changes

[platform/core/uifw/dali-demo.git] / examples / metaball-explosion / metaball-explosion-example.cpp

diff --git a/examples/metaball-explosion/metaball-explosion-example.cpp b/examples/metaball-explosion/metaball-explosion-example.cpp
index 5601a00..92209c3 100644 (file)
--- a/examples/metaball-explosion/metaball-explosion-example.cpp
+++ b/examples/metaball-explosion/metaball-explosion-example.cpp
@@ -204,7 +204,7 @@ public:
    * Touch event handler to center metaballs at touch position
    * and start explosion animation on release
    */
-  bool OnTouch( Actor actor, const TouchData& touch );
+  bool OnTouch( Actor actor, const TouchEvent& touch );
 
   /**
    * Key event handler to quit application on escape or back key
@@ -364,7 +364,7 @@ void MetaballExplosionController::Create( Application& app )
   mTimerDispersion.TickSignal().Connect( this, &MetaballExplosionController::OnTimerDispersionTick );
 
   // Connect the callback to the touch signal on the mesh actor
-  window.GetRootLayer().TouchSignal().Connect( this, &MetaballExplosionController::OnTouch );
+  window.GetRootLayer().TouchedSignal().Connect( this, &MetaballExplosionController::OnTouch );
 }
 
 Geometry MetaballExplosionController::CreateGeometry( bool aspectMappedTexture )
@@ -400,13 +400,13 @@ Geometry MetaballExplosionController::CreateGeometry( bool aspectMappedTexture )
   // Vertices
   Property::Map positionVertexFormat;
   positionVertexFormat["aPosition"] = Property::VECTOR2;
-  PropertyBuffer positionVertices = PropertyBuffer::New( positionVertexFormat );
+  VertexBuffer positionVertices = VertexBuffer::New( positionVertexFormat );
   positionVertices.SetData( vertices, numberOfVertices );
 
   // Textures
   Property::Map textureVertexFormat;
   textureVertexFormat["aTexture"] = Property::VECTOR2;
-  PropertyBuffer textureVertices = PropertyBuffer::New( textureVertexFormat );
+  VertexBuffer textureVertices = VertexBuffer::New( textureVertexFormat );
   textureVertices.SetData( textures, numberOfVertices );
 
   // Indices
@@ -629,7 +629,7 @@ void MetaballExplosionController::SetPositionToMetaballs( const Vector2& metabal
   mCompositionActor.SetProperty( mPositionIndex, metaballCenter );
 }
 
-bool MetaballExplosionController::OnTouch( Actor actor, const TouchData& touch )
+bool MetaballExplosionController::OnTouch( Actor actor, const TouchEvent& touch )
 {
   float aspectR = mScreenSize.y / mScreenSize.x;
 
@@ -667,7 +667,7 @@ bool MetaballExplosionController::OnTouch( Actor actor, const TouchData& touch )
 
 void MetaballExplosionController::OnKeyEvent(const KeyEvent& event)
 {
-  if(event.state == KeyEvent::Down)
+  if(event.GetState() == KeyEvent::DOWN)
   {
     if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
     {