Merge branch 'devel/master' into tizen

[platform/core/uifw/dali-core.git] / dali / integration-api / scene.cpp

diff --git a/dali/integration-api/scene.cpp b/dali/integration-api/scene.cpp
index 8fef6db..6d69db8 100644 (file)
--- a/dali/integration-api/scene.cpp
+++ b/dali/integration-api/scene.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 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.
@@ -19,59 +19,52 @@
 #include <dali/integration-api/scene.h>
 
 // INTERNAL INCLUDES
+#include <dali/internal/event/common/scene-impl.h>
 #include <dali/public-api/actors/layer.h>
 #include <dali/public-api/render-tasks/render-task-list.h>
-#include <dali/internal/event/common/scene-impl.h>
 
 namespace Dali
 {
-
 namespace Integration
 {
-
-Scene Scene::New( Integration::RenderSurface& surface )
+Scene Scene::New(Size size)
 {
-  Internal::ScenePtr internal = Internal::Scene::New( surface );
-  return Scene( internal.Get() );
+  Internal::ScenePtr internal = Internal::Scene::New(size);
+  return Scene(internal.Get());
 }
 
-Scene Scene::DownCast( BaseHandle handle )
+Scene Scene::New(Size size, int orientation)
 {
-  return Scene( dynamic_cast<Dali::Internal::Scene*>( handle.GetObjectPtr()) );
+  Internal::ScenePtr internal = Internal::Scene::New(size, orientation);
+  return Scene(internal.Get());
 }
 
-Scene::Scene()
+Scene Scene::DownCast(BaseHandle handle)
 {
+  return Scene(dynamic_cast<Dali::Internal::Scene*>(handle.GetObjectPtr()));
 }
 
-Scene::~Scene()
-{
-}
+Scene::Scene() = default;
 
-Scene::Scene( const Scene& handle )
-:BaseHandle(handle)
-{
-}
+Scene::~Scene() = default;
+
+Scene::Scene(const Scene& handle) = default;
 
-Scene::Scene( Internal::Scene* internal )
+Scene::Scene(Internal::Scene* internal)
 : BaseHandle(internal)
 {
 }
 
-Scene& Scene::operator=( const Scene& rhs )
-{
-  BaseHandle::operator=(rhs);
-  return *this;
-}
+Scene& Scene::operator=(const Scene& rhs) = default;
 
-void Scene::Add( Actor actor )
+void Scene::Add(Actor actor)
 {
-  GetImplementation(*this).Add( GetImplementation(actor) );
+  GetImplementation(*this).Add(GetImplementation(actor));
 }
 
-void Scene::Remove( Actor actor )
+void Scene::Remove(Actor actor)
 {
-  GetImplementation(*this).Remove( GetImplementation(actor) );
+  GetImplementation(*this).Remove(GetImplementation(actor));
 }
 
 Size Scene::GetSize() const
@@ -79,9 +72,9 @@ Size Scene::GetSize() const
   return GetImplementation(*this).GetSize();
 }
 
-void Scene::SetDpi( Vector2 dpi )
+void Scene::SetDpi(Vector2 dpi)
 {
-  GetImplementation(*this).SetDpi( dpi );
+  GetImplementation(*this).SetDpi(dpi);
 }
 
 Vector2 Scene::GetDpi() const
@@ -89,9 +82,9 @@ Vector2 Scene::GetDpi() const
   return GetImplementation(*this).GetDpi();
 }
 
-void Scene::SetBackgroundColor( const Vector4& color )
+void Scene::SetBackgroundColor(const Vector4& color)
 {
-  GetImplementation(*this).SetBackgroundColor( color );
+  GetImplementation(*this).SetBackgroundColor(color);
 }
 
 Vector4 Scene::GetBackgroundColor() const
@@ -101,7 +94,7 @@ Vector4 Scene::GetBackgroundColor() const
 
 RenderTaskList Scene::GetRenderTaskList() const
 {
-  return RenderTaskList( &GetImplementation(*this).GetRenderTaskList() );
+  return RenderTaskList(&GetImplementation(*this).GetRenderTaskList());
 }
 
 Layer Scene::GetRootLayer() const
@@ -114,24 +107,19 @@ uint32_t Scene::GetLayerCount() const
   return GetImplementation(*this).GetLayerCount();
 }
 
-Layer Scene::GetLayer( uint32_t depth ) const
-{
-  return GetImplementation(*this).GetLayer( depth );
-}
-
-void Scene::SetSurface( Integration::RenderSurface& surface )
+Layer Scene::GetLayer(uint32_t depth) const
 {
-  GetImplementation(*this).SetSurface( surface );
+  return GetImplementation(*this).GetLayer(depth);
 }
 
-void Scene::SurfaceResized()
+void Scene::SurfaceResized(float width, float height)
 {
-  GetImplementation( *this ).SurfaceResized();
+  GetImplementation(*this).SurfaceResized(width, height);
 }
 
-Integration::RenderSurface* Scene::GetSurface() const
+void Scene::SurfaceReplaced()
 {
-  return GetImplementation(*this).GetSurface();
+  GetImplementation(*this).SurfaceReplaced();
 }
 
 void Scene::Discard()
@@ -139,14 +127,14 @@ void Scene::Discard()
   GetImplementation(*this).Discard();
 }
 
-Integration::Scene Scene::Get( Actor actor )
+Integration::Scene Scene::Get(Actor actor)
 {
-  return Dali::Integration::Scene( &GetImplementation( actor ).GetScene() );
+  return Dali::Integration::Scene(&GetImplementation(actor).GetScene());
 }
 
-void Scene::QueueEvent( const Integration::Event& event )
+void Scene::QueueEvent(const Integration::Event& event)
 {
-  GetImplementation(*this).QueueEvent( event );
+  GetImplementation(*this).QueueEvent(event);
 }
 
 void Scene::ProcessEvents()
@@ -154,6 +142,26 @@ void Scene::ProcessEvents()
   GetImplementation(*this).ProcessEvents();
 }
 
+void Scene::AddFrameRenderedCallback(std::unique_ptr<CallbackBase> callback, int32_t frameId)
+{
+  GetImplementation(*this).AddFrameRenderedCallback(std::move(callback), frameId);
+}
+
+void Scene::AddFramePresentedCallback(std::unique_ptr<CallbackBase> callback, int32_t frameId)
+{
+  GetImplementation(*this).AddFramePresentedCallback(std::move(callback), frameId);
+}
+
+void Scene::GetFrameRenderedCallback(FrameCallbackContainer& callbacks)
+{
+  GetImplementation(*this).GetFrameRenderedCallback(callbacks);
+}
+
+void Scene::GetFramePresentedCallback(FrameCallbackContainer& callbacks)
+{
+  GetImplementation(*this).GetFramePresentedCallback(callbacks);
+}
+
 Scene::EventProcessingFinishedSignalType& Scene::EventProcessingFinishedSignal()
 {
   return GetImplementation(*this).EventProcessingFinishedSignal();
@@ -169,9 +177,9 @@ Scene::KeyEventGeneratedSignalType& Scene::KeyEventGeneratedSignal()
   return GetImplementation(*this).KeyEventGeneratedSignal();
 }
 
-Scene::TouchSignalType& Scene::TouchSignal()
+Scene::TouchEventSignalType& Scene::TouchedSignal()
 {
-  return GetImplementation(*this).TouchSignal();
+  return GetImplementation(*this).TouchedSignal();
 }
 
 Scene::WheelEventSignalType& Scene::WheelEventSignal()
@@ -179,6 +187,6 @@ Scene::WheelEventSignalType& Scene::WheelEventSignal()
   return GetImplementation(*this).WheelEventSignal();
 }
 
-} // Integration
+} // namespace Integration
 
-} // Dali
+} // namespace Dali