Merge "Use c-style string when webview loads contents." into 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 732c1d6..b6cc0ac 100644 (file)
--- a/dali-scene3d/public-api/controls/scene-view/scene-view.cpp
+++ b/dali-scene3d/public-api/controls/scene-view/scene-view.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 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.
@@ -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()
 {
@@ -127,9 +127,24 @@ bool SceneView::IsUsingFramebuffer() const
   return GetImpl(*this).IsUsingFramebuffer();
 }
 
-void SceneView::SetSkybox(const std::string& skyboxUrl, SkyboxType skyboxType)
+void SceneView::SetFramebufferMultiSamplingLevel(uint8_t multiSamplingLevel)
 {
-  GetImpl(*this).SetSkybox(skyboxUrl, skyboxType);
+  GetImpl(*this).SetFramebufferMultiSamplingLevel(multiSamplingLevel);
+}
+
+uint8_t SceneView::GetFramebufferMultiSamplingLevel() const
+{
+  return GetImpl(*this).GetFramebufferMultiSamplingLevel();
+}
+
+void SceneView::SetSkybox(const std::string& skyboxUrl)
+{
+  GetImpl(*this).SetSkybox(skyboxUrl);
+}
+
+void SceneView::SetSkyboxEnvironmentMapType(Scene3D::EnvironmentMapType skyboxEnvironmentMapType)
+{
+  GetImpl(*this).SetSkyboxEnvironmentMapType(skyboxEnvironmentMapType);
 }
 
 void SceneView::SetSkyboxIntensity(float intensity)