Merge "Use Renderer::BlendMode::USE_ACTOR_OPACITY instead to use depth write mode...

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / controls / scene3d-view / scene3d-view.h

diff --git a/dali-toolkit/devel-api/controls/scene3d-view/scene3d-view.h b/dali-toolkit/devel-api/controls/scene3d-view/scene3d-view.h
index 1f0effb..573c221 100644 (file)
--- a/dali-toolkit/devel-api/controls/scene3d-view/scene3d-view.h
+++ b/dali-toolkit/devel-api/controls/scene3d-view/scene3d-view.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_SCENE3D_VIEW_H\r
 \r
 /*\r
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.\r
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.\r
  *\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
@@ -80,15 +80,9 @@ public:
     // Scene doesn't use both of point and directional light\r
     NONE = 0,\r
     // Scene use point light\r
-    POINT_LIGHT,\r
+    POINT_LIGHT = 1,\r
     // Scene use directional light\r
-    DIRECTIONAL_LIGHT,\r
-    // Scene use Image Based Lighting\r
-    IMAGE_BASED_LIGHT,\r
-    // Scene use Image Based Lighting and point light\r
-    IMAGE_BASED_LIGHT_AND_POINT_LIGHT,\r
-    // Scene use Image Based Lighting and directional light\r
-    IMAGE_BASED_LIGHT_AND_DIRECTIONAL_LIGHT\r
+    DIRECTIONAL_LIGHT = 2\r
   };\r
 \r
   /**\r
@@ -99,15 +93,31 @@ public:
 \r
   /**\r
    * @brief Copy constructor. Creates another handle that points to the same real object\r
+   * @param[in] handle to copy from\r
    */\r
   Scene3dView(const Scene3dView& handle);\r
 \r
   /**\r
    * @brief Assignment operator. Changes this handle to point to another real object\r
+   * @param[in] handle to copy from\r
+   * @return reference to this\r
    */\r
   Scene3dView& operator=(const Scene3dView& handle);\r
 \r
   /**\r
+   * @brief Move constructor. Creates another handle that points to the same real object\r
+   * @param[in] rhs to move from\r
+   */\r
+  Scene3dView(Scene3dView&& rhs);\r
+\r
+  /**\r
+   * @brief Move assignment operator. Changes this handle to point to another real object\r
+   * @param[in] rhs to move from\r
+   * @return reference to this\r
+   */\r
+  Scene3dView& operator=(Scene3dView&& rhs);\r
+\r
+  /**\r
    * @brief Destructor\r
    * This is non-virtual since derived Handle types must not contain data or virtual methods.\r
    */\r