[dali_2.3.24] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-scene3d / public-api / controls / scene-view / scene-view.cpp

diff --git a/dali-scene3d/public-api/controls/scene-view/scene-view.cpp b/dali-scene3d/public-api/controls/scene-view/scene-view.cpp
index 68bb529..8a1efb9 100644 (file)
--- a/dali-scene3d/public-api/controls/scene-view/scene-view.cpp
+++ b/dali-scene3d/public-api/controls/scene-view/scene-view.cpp
@@ -31,11 +31,11 @@ SceneView::SceneView()
 
 SceneView::SceneView(const SceneView& sceneView) = default;
 
-SceneView::SceneView(SceneView&& rhs) = default;
+SceneView::SceneView(SceneView&& rhs) noexcept = default;
 
 SceneView& SceneView::operator=(const SceneView& sceneView) = default;
 
-SceneView& SceneView::operator=(SceneView&& rhs) = default;
+SceneView& SceneView::operator=(SceneView&& rhs) noexcept = default;
 
 SceneView::~SceneView()
 {
@@ -117,6 +117,11 @@ float SceneView::GetImageBasedLightScaleFactor() const
   return GetImpl(*this).GetImageBasedLightScaleFactor();
 }
 
+uint32_t SceneView::GetActivatedLightCount() const
+{
+  return GetImpl(*this).GetActivatedLightCount();
+}
+
 void SceneView::UseFramebuffer(bool useFramebuffer)
 {
   GetImpl(*this).UseFramebuffer(useFramebuffer);
@@ -127,6 +132,26 @@ bool SceneView::IsUsingFramebuffer() const
   return GetImpl(*this).IsUsingFramebuffer();
 }
 
+void SceneView::SetResolution(uint32_t width, uint32_t height)
+{
+  GetImpl(*this).SetResolution(width, height);
+}
+
+uint32_t SceneView::GetResolutionWidth()
+{
+  return GetImpl(*this).GetResolutionWidth();
+}
+
+uint32_t SceneView::GetResolutionHeight()
+{
+  return GetImpl(*this).GetResolutionHeight();
+}
+
+void SceneView::ResetResolution()
+{
+  GetImpl(*this).ResetResolution();
+}
+
 void SceneView::SetFramebufferMultiSamplingLevel(uint8_t multiSamplingLevel)
 {
   GetImpl(*this).SetFramebufferMultiSamplingLevel(multiSamplingLevel);