Renamed TouchSignal to TouchedSignal
[platform/core/uifw/dali-core.git] / dali / internal / event / common / stage-impl.cpp
index f1d7b01..f05b3f5 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
 #include <cstring> // for strcmp
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/system-overlay.h>
 #include <dali/internal/event/actors/layer-impl.h>
 #include <dali/internal/event/actors/layer-list.h>
 #include <dali/internal/event/actors/camera-actor-impl.h>
-#include <dali/internal/event/common/system-overlay-impl.h>
 #include <dali/internal/event/common/thread-local-storage.h>
 #include <dali/internal/event/common/property-notification-manager.h>
 #include <dali/internal/event/render-tasks/render-task-list-impl.h>
 #include <dali/internal/event/common/object-registry-impl.h>
 #include <dali/integration-api/platform-abstraction.h>
 #include <dali/public-api/common/constants.h>
-#include <dali/public-api/events/touch-data.h>
+#include <dali/public-api/events/touch-event.h>
 #include <dali/public-api/object/type-registry.h>
 #include <dali/public-api/render-tasks/render-task-list.h>
 #include <dali/public-api/rendering/frame-buffer.h>
+#include <dali/public-api/common/constants.h>
 
 using Dali::Internal::SceneGraph::Node;
 
@@ -61,15 +60,12 @@ namespace Internal
 namespace
 {
 
-const float DEFAULT_STEREO_BASE( 65.0f );
-
 // Signals
 
 const char* const SIGNAL_KEY_EVENT =                 "keyEvent";
 const char* const SIGNAL_KEY_EVENT_GENERATED =       "keyEventGenerated";
 const char* const SIGNAL_EVENT_PROCESSING_FINISHED = "eventProcessingFinished";
 const char* const SIGNAL_TOUCHED =                   "touched";
-const char* const SIGNAL_TOUCH =                     "touch";
 const char* const SIGNAL_WHEEL_EVENT =               "wheelEvent";
 const char* const SIGNAL_CONTEXT_LOST =              "contextLost";
 const char* const SIGNAL_CONTEXT_REGAINED =          "contextRegained";
@@ -79,75 +75,28 @@ TypeRegistration mType( typeid(Dali::Stage), typeid(Dali::BaseHandle), NULL );
 
 SignalConnectorType signalConnector1( mType, SIGNAL_KEY_EVENT,                 &Stage::DoConnectSignal );
 SignalConnectorType signalConnector2( mType, SIGNAL_EVENT_PROCESSING_FINISHED, &Stage::DoConnectSignal );
-SignalConnectorType signalConnector3( mType, SIGNAL_TOUCHED,                   &Stage::DoConnectSignal );
 SignalConnectorType signalConnector4( mType, SIGNAL_WHEEL_EVENT,               &Stage::DoConnectSignal );
 SignalConnectorType signalConnector5( mType, SIGNAL_CONTEXT_LOST,              &Stage::DoConnectSignal );
 SignalConnectorType signalConnector6( mType, SIGNAL_CONTEXT_REGAINED,          &Stage::DoConnectSignal );
 SignalConnectorType signalConnector7( mType, SIGNAL_SCENE_CREATED,             &Stage::DoConnectSignal );
 SignalConnectorType signalConnector8( mType, SIGNAL_KEY_EVENT_GENERATED,       &Stage::DoConnectSignal );
-SignalConnectorType signalConnector9( mType, SIGNAL_TOUCH,                     &Stage::DoConnectSignal );
+SignalConnectorType signalConnector9( mType, SIGNAL_TOUCHED,                   &Stage::DoConnectSignal );
 
 } // unnamed namespace
 
-StagePtr Stage::New( AnimationPlaylist& playlist,
-                     PropertyNotificationManager& propertyNotificationManager,
-                     SceneGraph::UpdateManager& updateManager,
-                     NotificationManager& notificationManager,
-                     Integration::RenderController& renderController )
+StagePtr Stage::New( SceneGraph::UpdateManager& updateManager )
 {
-  return StagePtr( new Stage( playlist, propertyNotificationManager, updateManager, notificationManager, renderController ) );
+  return StagePtr( new Stage( updateManager ) );
 }
 
-void Stage::Initialize( bool renderToFbo )
+void Stage::Initialize( Scene& scene )
 {
-  mRenderToFbo = renderToFbo;
-  mObjectRegistry = ObjectRegistry::New();
-
-  // Create the ordered list of layers
-  mLayerList = LayerList::New( mUpdateManager );
-
-  // The stage owns the default layer
-  mRootLayer = Layer::NewRoot( *mLayerList, mUpdateManager );
-  mRootLayer->SetName("RootLayer");
-  // The root layer needs to have a fixed resize policy (as opposed to the default USE_NATURAL_SIZE).
-  // This stops actors parented to the stage having their relayout requests propagating
-  // up to the root layer, and down through other children unnecessarily.
-  mRootLayer->SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
-
-  // Create the default camera actor first; this is needed by the RenderTaskList
-  CreateDefaultCameraActor();
-
-  // Create the list of render-tasks
-  mRenderTaskList = RenderTaskList::New();
-
-  // Create the default render-task
-  Dali::RenderTask defaultRenderTask = mRenderTaskList->CreateTask( mRootLayer.Get(), mDefaultCamera.Get() );
-}
-
-void Stage::Uninitialize()
-{
-  // Remove actors added to SystemOverlay
-  delete mSystemOverlay;
-  mSystemOverlay = NULL;
-
-  if( mDefaultCamera )
-  {
-    // its enough to release the handle so the object is released
-    // don't need to remove it from root actor as root actor will delete the object
-    mDefaultCamera.Reset();
-  }
-
-  if( mRootLayer )
-  {
-    // we are closing down so just delete the root, no point emit disconnect
-    // signals or send messages to update
-    mRootLayer.Reset();
-  }
-
-  if( mRenderTaskList )
-  {
-    mRenderTaskList.Reset();
-  }
+  mScene = &scene;
+  mScene->SetBackgroundColor( Dali::DEFAULT_BACKGROUND_COLOR );
+  mScene->EventProcessingFinishedSignal().Connect( this, &Stage::OnEventProcessingFinished );
+  mScene->KeyEventSignal().Connect( this, &Stage::OnKeyEvent );
+  mScene->TouchedSignal().Connect( this, &Stage::OnTouchEvent );
+  mScene->WheelEventSignal().Connect( this, &Stage::OnWheelEvent );
 }
 
 StagePtr Stage::GetCurrent()
@@ -169,379 +118,78 @@ bool Stage::IsInstalled()
 
 ObjectRegistry& Stage::GetObjectRegistry()
 {
-  return *mObjectRegistry;
-}
-
-void Stage::RegisterObject( Dali::BaseObject* object )
-{
-  mObjectRegistry->RegisterObject( object );
-}
-
-void Stage::UnregisterObject( Dali::BaseObject* object )
-{
-  mObjectRegistry->UnregisterObject( object );
+  return ThreadLocalStorage::Get().GetObjectRegistry();
 }
 
 Layer& Stage::GetRootActor()
 {
-  return *mRootLayer;
-}
-
-AnimationPlaylist& Stage::GetAnimationPlaylist()
-{
-  return mAnimationPlaylist;
-}
-
-PropertyNotificationManager& Stage::GetPropertyNotificationManager()
-{
-  return mPropertyNotificationManager;
+  Dali::Layer rootLayer = GetRootLayer();
+  return GetImplementation( rootLayer );
 }
 
 void Stage::Add( Actor& actor )
 {
-  mRootLayer->Add( actor );
+  mScene->Add( actor );
 }
 
 void Stage::Remove( Actor& actor )
 {
-  mRootLayer->Remove( actor );
-}
-
-void Stage::SurfaceResized( float width, float height )
-{
-  if( ( fabsf( width - mSurfaceSize.width ) > Math::MACHINE_EPSILON_1000 ) || ( fabsf( height - mSurfaceSize.height ) > Math::MACHINE_EPSILON_1000 ) )
-  {
-    mSurfaceSize.width = width;
-    mSurfaceSize.height = height;
-
-    // Internally we want to report the actual size of the stage.
-    mSize.width = width;
-    mSize.height = height - static_cast<float>( mTopMargin );
-
-    // Calculates the aspect ratio, near and far clipping planes, field of view and camera Z position.
-    mDefaultCamera->SetPerspectiveProjection( mSurfaceSize );
-
-    // Adjust the camera height to allow for top-margin
-    SetDefaultCameraPosition();
-
-    mRootLayer->SetSize( mSize.width, mSize.height );
-
-    // Repeat for SystemOverlay actors
-    if( mSystemOverlay )
-    {
-      // Note that the SystemOverlay has a separate camera, configured for the full surface-size.
-      // This will remain unaffected by changes in SetDefaultCameraPosition()
-      mSystemOverlay->GetImpl()->SetSize( width, height );
-    }
-
-    SetDefaultSurfaceRectMessage( mUpdateManager, Rect<int32_t>( 0, 0, static_cast<int32_t>( width ), static_cast<int32_t>( height ) ) ); // truncated
-
-    // if single render task to screen then set its viewport parameters
-    if( 1 == mRenderTaskList->GetTaskCount() )
-    {
-      Dali::RenderTask defaultRenderTask = mRenderTaskList->GetTask( 0u );
-
-      if(!defaultRenderTask.GetTargetFrameBuffer())
-      {
-        defaultRenderTask.SetViewport( Viewport( 0, 0, static_cast<int32_t>( width ), static_cast<int32_t>( height ) ) ); // truncated
-      }
-    }
-
-    if( mRenderToFbo )
-    {
-      Dali::FrameBuffer frameBuffer = Dali::FrameBuffer::New( static_cast<uint32_t>( width ), static_cast<uint32_t>( height ), Dali::FrameBuffer::Attachment::NONE );
-      Dali::Texture texture = Dali::Texture::New( Dali::TextureType::TEXTURE_2D, Dali::Pixel::RGB888, static_cast<uint32_t>( width ), static_cast<uint32_t>( height ) );
-      frameBuffer.AttachColorTexture( texture );
-
-      Dali::RenderTask defaultRenderTask = mRenderTaskList->GetTask( 0u );
-      defaultRenderTask.SetFrameBuffer( frameBuffer );
-    }
-  }
+  mScene->Remove( actor );
 }
 
 Vector2 Stage::GetSize() const
 {
-  return mSize;
-}
-
-void Stage::SetTopMargin( uint32_t margin )
-{
-  if (mTopMargin == margin)
-  {
-    return;
-  }
-  mTopMargin = margin;
-
-  mSize.width = mSurfaceSize.width;
-  mSize.height = mSurfaceSize.height - static_cast<float>( mTopMargin );
-
-  // Adjust the camera height to allow for top-margin
-  SetDefaultCameraPosition();
-
-  mRootLayer->SetSize( mSize.width, mSize.height );
+  return mScene->GetSize();
 }
 
 RenderTaskList& Stage::GetRenderTaskList() const
 {
-  return *mRenderTaskList;
-}
-
-void Stage::CreateDefaultCameraActor()
-{
-  // The default camera attributes and position is such that
-  // children of the default layer, can be positioned at (0,0) and
-  // be at the top-left of the viewport.
-  mDefaultCamera = CameraActor::New( Size::ZERO );
-  mDefaultCamera->SetParentOrigin(ParentOrigin::CENTER);
-  Add(*(mDefaultCamera.Get()));
-}
-
-void Stage::SetDefaultCameraPosition()
-{
-  mDefaultCamera->SetY( -(static_cast<float>(mTopMargin) * 0.5f) );
+  return mScene->GetRenderTaskList();
 }
 
 Actor& Stage::GetDefaultRootActor()
 {
-  return *mRootLayer;
+  return mScene->GetDefaultRootActor();
 }
 
 CameraActor& Stage::GetDefaultCameraActor()
 {
-  return *mDefaultCamera;
+  return mScene->GetDefaultCameraActor();
 }
 
 uint32_t Stage::GetLayerCount() const
 {
-  return mLayerList->GetLayerCount();
+  return mScene->GetLayerCount();
 }
 
 Dali::Layer Stage::GetLayer( uint32_t depth ) const
 {
-  return Dali::Layer(mLayerList->GetLayer( depth ));
+  return mScene->GetLayer( depth );
 }
 
 Dali::Layer Stage::GetRootLayer() const
 {
-  return Dali::Layer( mRootLayer.Get() );
+  return mScene->GetRootLayer();
 }
 
 LayerList& Stage::GetLayerList()
 {
-  return *mLayerList;
-}
-
-Integration::SystemOverlay& Stage::GetSystemOverlay()
-{
-  // Lazily create system-level if requested
-  if( !mSystemOverlay )
-  {
-    mSystemOverlay = new Integration::SystemOverlay( SystemOverlay::New( *this ) );
-    DALI_ASSERT_ALWAYS( NULL != mSystemOverlay && "Failed to create system overlay" );
-
-    mSystemOverlay->GetImpl()->SetSize( mSize.width, mSize.height );
-  }
-
-  return *mSystemOverlay;
-}
-
-SystemOverlay* Stage::GetSystemOverlayInternal()
-{
-  SystemOverlay* overlay( NULL );
-
-  if( mSystemOverlay )
-  {
-    overlay = mSystemOverlay->GetImpl();
-  }
-
-  return overlay;
-}
-
-void Stage::SetViewMode( ViewMode viewMode )
-{
-  if( mViewMode != viewMode )
-  {
-    DALI_LOG_INFO( Debug::Filter::gActor, Debug::Concise, "View mode changed from %d to %d\n", mViewMode, viewMode);
-
-    if( mViewMode == MONO )
-    {
-      mDefaultCamera->SetOrientation( Dali::ANGLE_180, Vector3::YAXIS );
-      mRenderTaskList->GetTask(0).SetSourceActor( Dali::Actor() );
-
-      //Create camera and RenderTask for left eye
-      mLeftCamera = CameraActor::New( Size::ZERO );
-      mLeftCamera->SetParentOrigin( ParentOrigin::CENTER );
-      mDefaultCamera->Add( *mLeftCamera.Get() );
-      mLeftRenderTask = mRenderTaskList->CreateTask();
-      mLeftRenderTask.SetCameraActor( Dali::CameraActor( mLeftCamera.Get() ) );
-      mLeftCamera->SetType( Dali::Camera::FREE_LOOK );
-
-      //Create camera and RenderTask for right eye
-      mRightCamera = CameraActor::New( Size::ZERO );
-      mRightCamera->SetParentOrigin( ParentOrigin::CENTER );
-      mDefaultCamera->Add( *mRightCamera.Get() );
-      mRightRenderTask = mRenderTaskList->CreateTask();
-      mRightRenderTask.SetClearColor( Vector4( 1.0f,0.0f,0.0f,1.0f));
-
-      mRightRenderTask.SetCameraActor( Dali::CameraActor( mRightCamera.Get() ) );
-      mRightCamera->SetType( Dali::Camera::FREE_LOOK );
-    }
-
-    // save new mode
-    mViewMode = viewMode;
-
-    switch( viewMode )
-    {
-      case MONO:
-      {
-        // delete extra stereoscopic render tasks and cameras
-        mRenderTaskList->RemoveTask( mLeftRenderTask );
-        mDefaultCamera->Remove( *mLeftCamera.Get() );
-        mLeftRenderTask.Reset();
-        mLeftCamera.Reset();
-        mRenderTaskList->RemoveTask( mRightRenderTask );
-        mDefaultCamera->Remove( *mRightCamera.Get() );
-        mRightRenderTask.Reset();
-        mRightCamera.Reset();
-        mDefaultCamera->SetOrientation( Dali::ANGLE_0, Vector3::YAXIS );
-        mDefaultCamera->SetType( Dali::Camera::LOOK_AT_TARGET );
-        mRenderTaskList->GetTask(0).SetSourceActor( Dali::Layer(mRootLayer.Get()) );
-
-        break;
-      }
-      case STEREO_HORIZONTAL:
-      {
-        //Stereo mode with horizontal split is for landscape mode. That's the reason for the cameras being rotated
-        //Top camera renders the scene as seen from the right eye and bottom camera as seen from left.
-
-        //Calculate separation in pixels along vertical axis ( mStereoBase is defined in millimetres )
-        const float stereoBase( ( (mStereoBase / 25.4f) * GetDpi().y ) * 0.5f );
-
-        //Calculate aspect ratio
-        float aspect = mSize.width / (mSize.height * 0.5f);
-
-        mLeftCamera->SetPerspectiveProjection( mSize, Vector2( 0.0f,stereoBase) );
-        mLeftCamera->SetAspectRatio( aspect );
-
-        mLeftCamera->SetOrientation( -Dali::ANGLE_90, Vector3::ZAXIS );
-        mLeftCamera->SetPosition( Vector3( stereoBase, 0.0f, 0.0f ) );
-        mLeftRenderTask.SetViewport( Viewport(0, static_cast<int32_t>( mSize.height * 0.5f ), static_cast<int32_t>( mSize.width ), static_cast<int32_t>( mSize.height * 0.5f ) ) ); // truncated
-
-        mRightCamera->SetPerspectiveProjection( mSize, Vector2( 0.0,  -stereoBase ) );
-        mRightCamera->SetAspectRatio( aspect );
-        mRightCamera->SetOrientation( -Dali::ANGLE_90, Vector3::ZAXIS );
-        mRightCamera->SetPosition( Vector3(-stereoBase, 0.0f, 0.0f ) );
-        mRightRenderTask.SetViewport( Viewport(0, 0, static_cast<int32_t>( mSize.width ), static_cast<int32_t>( mSize.height * 0.5f ) ) ); // truncated
-
-        break;
-      }
-      case STEREO_VERTICAL:
-      {
-        //Calculate separation in pixels along horizontal axis
-        const float stereoBase( ( (mStereoBase / 25.4f) * GetDpi().x ) * 0.5f );
-
-        //Recalculate fov based on viewport size
-        const float fov = 2.0f * std::atan(  mSize.y / (2.0f * std::max( mSize.x*0.5f, mSize.y )) );
-
-        mLeftCamera->SetPerspectiveProjection( Size( mSize.x * 0.5f, mSize.y ), Vector2(stereoBase,0.0f) );
-        mLeftCamera->SetFieldOfView( fov );
-        mLeftCamera->SetOrientation( Dali::ANGLE_0, Vector3::ZAXIS );
-        mLeftCamera->SetPosition( Vector3( stereoBase, 0.0f, 0.0f ) );
-        mLeftRenderTask.SetViewport( Viewport(0, 0, static_cast<int32_t>( mSize.width * 0.5f ), static_cast<int32_t>( mSize.height ) ) ); // truncated
-
-        mRightCamera->SetPerspectiveProjection( Size( mSize.x * 0.5f, mSize.y ), Vector2(-stereoBase,0.0f) );
-        mRightCamera->SetFieldOfView( fov );
-        mRightCamera->SetOrientation( Dali::ANGLE_0, Vector3::ZAXIS );
-        mRightCamera->SetPosition( Vector3( -stereoBase, 0.0f, 0.0f ) );
-        mRightRenderTask.SetViewport( Viewport( static_cast<int32_t>( mSize.width * 0.5f ), 0, static_cast<int32_t>( mSize.width * 0.5f ), static_cast<int32_t>( mSize.height ) ) ); // truncated
-
-        break;
-      }
-      case STEREO_INTERLACED:
-      {
-        break;
-      }
-    }
-  }
-}
-
-ViewMode Stage::GetViewMode() const
-{
-  return mViewMode;
-}
-
-void Stage::SetStereoBase( float stereoBase )
-{
-  if( ! Equals( mStereoBase, stereoBase ) )
-  {
-    DALI_LOG_INFO( Debug::Filter::gActor, Debug::Concise, "old( %.2f) new(%.2f)\n", mStereoBase, stereoBase );
-    mStereoBase = stereoBase;
-
-    switch( mViewMode  )
-    {
-      case STEREO_HORIZONTAL:
-      {
-        stereoBase = mStereoBase / 25.4f * GetDpi().y * 0.5f;
-        float aspect = mSize.width / (mSize.height * 0.5f);
-
-        mLeftCamera->SetPerspectiveProjection( mSize, Vector2( 0.0, stereoBase) );
-        mLeftCamera->SetAspectRatio( aspect );
-        mLeftCamera->SetPosition( Vector3( stereoBase, 0.0f, 0.0f ) );
-
-        mRightCamera->SetPerspectiveProjection( mSize, Vector2( 0.0, -stereoBase) );
-        mRightCamera->SetAspectRatio( aspect );
-        mRightCamera->SetPosition( Vector3(-stereoBase, 0.0f, 0.0f ) );
-
-        break;
-      }
-      case STEREO_VERTICAL:
-      {
-        stereoBase = mStereoBase / 25.4f * GetDpi().x * 0.5f;
-        const float fov = 2.0f * std::atan(  mSize.y / (2.0f * std::max( mSize.x*0.5f, mSize.y )) );
-
-        mLeftCamera->SetPerspectiveProjection( Size( mSize.x * 0.5f, mSize.y ), Vector2(stereoBase,0.0f) );
-        mLeftCamera->SetFieldOfView( fov );
-        mLeftCamera->SetPosition( Vector3( stereoBase, 0.0f, 0.0f ) );
-
-        mRightCamera->SetPerspectiveProjection( Size( mSize.x * 0.5f, mSize.y ), Vector2(-stereoBase,0.0f) );
-        mRightCamera->SetFieldOfView( fov );
-        mRightCamera->SetPosition( Vector3(-stereoBase, 0.0f, 0.0f ) );
-
-        break;
-      }
-      default:
-        break;
-    }
-  }
-}
-
-float Stage::GetStereoBase() const
-{
-  return mStereoBase;
+  return mScene->GetLayerList();
 }
 
 void Stage::SetBackgroundColor(Vector4 color)
 {
-  // Cache for public GetBackgroundColor()
-  mBackgroundColor = color;
-
-  // Send message to change color in next frame
-  SetBackgroundColorMessage( mUpdateManager, color );
+  mScene->SetBackgroundColor( color );
 }
 
 Vector4 Stage::GetBackgroundColor() const
 {
-  return mBackgroundColor;
+  return mScene->GetBackgroundColor();
 }
 
 Vector2 Stage::GetDpi() const
 {
-  return mDpi;
-}
-
-void Stage::SetDpi(Vector2 dpi)
-{
-  mDpi = dpi;
+  return mScene->GetDpi();
 }
 
 void Stage::KeepRendering( float durationSeconds )
@@ -587,10 +235,6 @@ bool Stage::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tra
   {
     stage->TouchedSignal().Connect( tracker, functor );
   }
-  else if( 0 == strcmp( signalName.c_str(), SIGNAL_TOUCH ) )
-  {
-    stage->TouchSignal().Connect( tracker, functor );
-  }
   else if( 0 == strcmp( signalName.c_str(), SIGNAL_WHEEL_EVENT ) )
   {
     stage->WheelEventSignal().Connect( tracker, functor );
@@ -616,6 +260,30 @@ bool Stage::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tra
   return connected;
 }
 
+void Stage::OnEventProcessingFinished()
+{
+  EmitEventProcessingFinishedSignal();
+}
+
+void Stage::OnKeyEvent( const Dali::KeyEvent& event )
+{
+  bool consumed = EmitKeyEventGeneratedSignal( event );
+  if( !consumed )
+  {
+    EmitKeyEventSignal( event );
+  }
+}
+
+void Stage::OnTouchEvent( const Dali::TouchEvent& touch )
+{
+  EmitTouchedSignal( touch );
+}
+
+void Stage::OnWheelEvent( const Dali::WheelEvent& event )
+{
+  EmitWheelEventSignal( event );
+}
+
 void Stage::EmitKeyEventSignal(const KeyEvent& event)
 {
   // Emit the key event signal when no actor in the stage has gained the key input focus
@@ -632,16 +300,15 @@ bool Stage::EmitKeyEventGeneratedSignal(const KeyEvent& event)
 
 void Stage::EmitEventProcessingFinishedSignal()
 {
-   mEventProcessingFinishedSignal.Emit();
+  mEventProcessingFinishedSignal.Emit();
 }
 
-void Stage::EmitTouchedSignal( const TouchEvent& touchEvent, const Dali::TouchData& touch )
+void Stage::EmitTouchedSignal( const Dali::TouchEvent& touch )
 {
-  mTouchedSignal.Emit( touchEvent );
-  mTouchSignal.Emit( touch );
+  mTouchedSignal.Emit( touch );
 }
 
-void Stage::EmitWheelEventSignal(const WheelEvent& event)
+void Stage::EmitWheelEventSignal( const WheelEvent& event )
 {
   // Emit the wheel event signal when no actor in the stage has gained the wheel input focus
 
@@ -684,17 +351,11 @@ Dali::Stage::EventProcessingFinishedSignalType& Stage::EventProcessingFinishedSi
   return mEventProcessingFinishedSignal;
 }
 
-Dali::Stage::TouchedSignalType& Stage::TouchedSignal()
+Dali::Stage::TouchEventSignalType& Stage::TouchedSignal()
 {
-  DALI_LOG_WARNING( "Deprecated. Use TouchSignal() instead.\n" );
   return mTouchedSignal;
 }
 
-Dali::Stage::TouchSignalType& Stage::TouchSignal()
-{
-  return mTouchSignal;
-}
-
 Dali::Stage::WheelEventSignalType& Stage::WheelEventSignal()
 {
   return mWheelEventSignal;
@@ -725,100 +386,22 @@ void Stage::NotifyContextRegained()
   mContextRegainedSignal.Emit();
 }
 
-
-void Stage::RequestRebuildDepthTree()
-{
-  DALI_LOG_INFO(gLogFilter, Debug::General, "RequestRebuildDepthTree()\n");
-  mDepthTreeDirty = true;
-}
-
-void Stage::RebuildDepthTree()
-{
-  // If the depth tree needs rebuilding, do it in this frame only.
-  if( mDepthTreeDirty )
-  {
-    DALI_LOG_INFO(gLogFilter, Debug::Concise, "RebuildDepthTree() dirty:T\n");
-
-    ActorPtr actor( mRootLayer.Get() );
-    actor->RebuildDepthTree();
-    mDepthTreeDirty = false;
-  }
-}
-
-
-Stage::Stage( AnimationPlaylist& playlist,
-              PropertyNotificationManager& propertyNotificationManager,
-              SceneGraph::UpdateManager& updateManager,
-              NotificationManager& notificationManager,
-              Integration::RenderController& renderController )
-: mAnimationPlaylist( playlist ),
-  mPropertyNotificationManager( propertyNotificationManager ),
-  mUpdateManager( updateManager ),
-  mNotificationManager( notificationManager ),
-  mRenderController( renderController ),
-  mSize( Vector2::ZERO ),
-  mSurfaceSize( Vector2::ZERO ),
-  mBackgroundColor( Dali::Stage::DEFAULT_BACKGROUND_COLOR ),
-  mViewMode( MONO ),
-  mStereoBase( DEFAULT_STEREO_BASE ),
-  mTopMargin( 0 ),
-  mDpi( Vector2::ZERO ),
-  mRightRenderTask(),
-  mLeftRenderTask(),
-  mSystemOverlay( NULL ),
+Stage::Stage( SceneGraph::UpdateManager& updateManager )
+: mUpdateManager( updateManager ),
   mKeyEventSignal(),
   mKeyEventGeneratedSignal(),
   mEventProcessingFinishedSignal(),
   mTouchedSignal(),
-  mTouchSignal(),
   mWheelEventSignal(),
   mContextLostSignal(),
   mContextRegainedSignal(),
   mSceneCreatedSignal(),
-  mRenderingBehavior( DevelStage::Rendering::IF_REQUIRED ),
-  mDepthTreeDirty( false ),
-  mForceNextUpdate( false ),
-  mRenderToFbo( false )
-{
-}
-
-SceneGraph::UpdateManager& Stage::GetUpdateManager()
+  mRenderingBehavior( DevelStage::Rendering::IF_REQUIRED )
 {
-  return mUpdateManager;
-}
-
-Integration::RenderController& Stage::GetRenderController()
-{
-  return mRenderController;
-}
-
-uint32_t* Stage::ReserveMessageSlot( uint32_t size, bool updateScene )
-{
-  return mUpdateManager.ReserveMessageSlot( size, updateScene );
-}
-
-BufferIndex Stage::GetEventBufferIndex() const
-{
-  return mUpdateManager.GetEventBufferIndex();
-}
-
-void Stage::ForceNextUpdate()
-{
-  mForceNextUpdate = true;
-}
-
-bool Stage::IsNextUpdateForced()
-{
-  bool nextUpdateForced = mForceNextUpdate;
-  mForceNextUpdate = false;
-  return nextUpdateForced;
 }
 
 Stage::~Stage()
 {
-  delete mSystemOverlay;
-
-  mObjectRegistry.Reset();
 }
 
 } // namespace Internal