X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Fray-marching%2Fray-marching-example.cpp;h=39caa42b116a69bb485b766a274396cedb31d502;hb=1a473d5189ca7e7d55aca3a64a8a4ff2dc3b6c67;hp=7ea54869ff765e878588bbf8931f862ca44d6d84;hpb=694dced621016315f10a5bdbd3f4552f5e29e380;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/examples/ray-marching/ray-marching-example.cpp b/examples/ray-marching/ray-marching-example.cpp index 7ea5486..39caa42 100644 --- a/examples/ray-marching/ray-marching-example.cpp +++ b/examples/ray-marching/ray-marching-example.cpp @@ -116,7 +116,7 @@ public: // Get a handle to the window Window window = application.GetWindow(); - window.GetRootLayer().TouchSignal().Connect( this, &RayMarchingExample::OnTouch ); + window.GetRootLayer().TouchedSignal().Connect( this, &RayMarchingExample::OnTouch ); window.KeyEventSignal().Connect(this, &RayMarchingExample::OnKeyEvent); @@ -132,12 +132,12 @@ public: APPLICATION_TITLE ); // Add an extra space on the right to center the title text. - mToolBar.AddControl( Actor::New(), DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight ); + mToolBar.AddControl( Actor::New(), DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HORIZONTAL_RIGHT ); AddContentLayer(); } - bool OnTouch( Actor actor, const TouchData& touch ) + bool OnTouch( Actor actor, const TouchEvent& touch ) { // quit the application mApplication.Quit(); @@ -149,7 +149,7 @@ public: */ void 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) ) { @@ -168,7 +168,7 @@ public: Property::Map vertexFormat; vertexFormat["aPosition"] = Property::VECTOR2; - PropertyBuffer vertexBuffer = PropertyBuffer::New( vertexFormat ); + VertexBuffer vertexBuffer = VertexBuffer::New( vertexFormat ); const float P( 0.5f ); const Vector2 vertices[] = {