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

[platform/core/uifw/dali-toolkit.git] / dali-scene3d / public-api / loader / load-result.h

diff --git a/dali-scene3d/public-api/loader/load-result.h b/dali-scene3d/public-api/loader/load-result.h
index a9428eb..b849279 100644 (file)
--- a/dali-scene3d/public-api/loader/load-result.h
+++ b/dali-scene3d/public-api/loader/load-result.h
@@ -1,7 +1,7 @@
 #ifndef DALI_SCENE3D_LOADER_OUTPUT_H
 #define DALI_SCENE3D_LOADER_OUTPUT_H
 /*
- * 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.
@@ -18,58 +18,66 @@
  */
 
 // INTERNAL INCLUDES
-#include "dali-scene3d/public-api/api.h"
-#include "dali-scene3d/public-api/loader/animation-definition.h"
-#include "dali-scene3d/public-api/loader/camera-parameters.h"
-#include "dali-scene3d/public-api/loader/light-parameters.h"
+#include <dali-scene3d/public-api/api.h>
+#include <dali-scene3d/public-api/loader/animation-definition.h>
+#include <dali-scene3d/public-api/loader/camera-parameters.h>
+#include <dali-scene3d/public-api/loader/light-parameters.h>
+#include <dali-scene3d/public-api/loader/load-scene-metadata.h>
 
-namespace Dali
-{
-namespace Scene3D
-{
-namespace Loader
+namespace Dali::Scene3D::Loader
 {
 class ResourceBundle;
 class SceneDefinition;
 
 /**
  * @brief The outputs from loading and processing a scene.
+ * @SINCE_2_0.7
  */
 struct DALI_SCENE3D_API LoadResult
 {
   /**
    * @brief The bundle to store resources in.
+   * @SINCE_2_0.7
    */
   ResourceBundle& mResources;
 
   /**
    * @brief The scene definition to populate.
+   * @SINCE_2_0.7
    */
   SceneDefinition& mScene;
 
   /**
+   * @brief The metadata of the scene.
+   * @SINCE_2_2.5
+   */
+  SceneMetadata& mSceneMetadata;
+
+  /**
    * @brief The list of animation definitions, in lexicographical order of their names.
+   * @SINCE_2_0.7
    */
   std::vector<AnimationDefinition>& mAnimationDefinitions;
 
   /**
    * @brief The list of animation group definitions, in lexicographical order of their names.
+   * @SINCE_2_0.7
    */
   std::vector<AnimationGroupDefinition>& mAnimationGroupDefinitions;
 
   /**
    * @brief The camera parameters that were loaded from the scene.
+   * @SINCE_2_0.7
    */
   std::vector<CameraParameters>& mCameraParameters;
 
   /**
    * @brief The light parameters that were loaded from the scene.
+   * @SINCE_2_0.7
    */
   std::vector<LightParameters>& mLightParameters;
 };
 
-} // namespace Loader
-} // namespace Scene3D
-} // namespace Dali
+} // namespace Dali::Scene3D::Loader
 
 #endif //DALI_SCENE3D_LOADER_OUTPUT_H