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

[platform/core/uifw/dali-toolkit.git] / dali-scene3d / internal / common / model-load-task.h

diff --git a/dali-scene3d/internal/common/model-load-task.h b/dali-scene3d/internal/common/model-load-task.h
index 0e68e06..c2baead 100644 (file)
--- a/dali-scene3d/internal/common/model-load-task.h
+++ b/dali-scene3d/internal/common/model-load-task.h
@@ -2,7 +2,7 @@
 #define DALI_SCENE3D_MODEL_LOAD_TASK_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,15 +18,18 @@
  */
 
 // EXTERNAL INCLUDES
+#include <dali/public-api/adaptor-framework/async-task-manager.h>
 #include <dali/public-api/common/intrusive-ptr.h>
 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/images/pixel-data.h>
 #include <memory>
 
 // INTERNAL INCLUDES
+#include <dali-scene3d/internal/common/model-cache-manager.h>
 #include <dali-scene3d/public-api/loader/load-result.h>
+#include <dali-scene3d/public-api/loader/model-loader.h>
 #include <dali-scene3d/public-api/loader/scene-definition.h>
-#include <dali/public-api/adaptor-framework/async-task-manager.h>
+#include <dali/devel-api/threading/conditional-wait.h>
 
 namespace Dali
 {
@@ -42,8 +45,8 @@ class ModelLoadTask : public AsyncTask
 public:
   /**
    * Constructor
-   * @param[in] modelUrl model file path.(e.g., glTF, and DLI).
-   * @param[in] resourceDirectoryUrl resource file path that includes binary, image etc.
+   * @param[in] modelUrl Model file path.(e.g., glTF, and DLI).
+   * @param[in] resourceDirectoryUrl Resource file path that includes binary, image etc.
    * @param[in] callback The callback that is called when the operation is completed.
    */
   ModelLoadTask(const std::string& modelUrl, const std::string& resourceDirectoryUrl, CallbackBase* callback);
@@ -54,21 +57,59 @@ public:
   ~ModelLoadTask();
 
   /**
-   * Process the task
+   * Whether the task has succeeded.
+   * @return True if the task has succeeded.
    */
-  void Process() override;
+  bool HasSucceeded() const;
 
   /**
-   * Whether the task is ready to process.
-   * @return True if the task is ready to process.
+   * @brief Retrieves loaded scene
+   * @return SceneDefinition that is loaded from file
    */
-  bool IsReady() override;
+  Dali::Scene3D::Loader::SceneDefinition& GetScene() const;
 
   /**
-   * Whether the task has succeeded.
-   * @return True if the task has succeeded.
+   * @brief Retrieves resource bunder that includes resource information
+   * @return ResourceBundle for model resources
    */
-  bool HasSucceeded() const;
+  Dali::Scene3D::Loader::ResourceBundle& GetResources() const;
+
+  /**
+   * @brief Retrieves loaded AnimationDefinition
+   * @return AnimationDefinition that is loaded from file
+   */
+  std::vector<Dali::Scene3D::Loader::AnimationDefinition>& GetAnimations() const;
+
+  /**
+   * @brief Retrieves loaded CameraParameters
+   * @return CameraParameters list that is loaded from file
+   */
+  std::vector<Dali::Scene3D::Loader::CameraParameters>& GetCameras() const;
+
+  /**
+   * @brief Retrieves ResourceChoices
+   * @return Choices for loaded Resources
+   */
+  Dali::Scene3D::Loader::Customization::Choices& GetResourceChoices();
+
+public: // Implementation of AsyncTask
+  /**
+   * @copydoc Dali::AsyncTask::Process()
+   */
+  void Process();
+
+  /**
+   * @copydoc Dali::AsyncTask::IsReady()
+   */
+  bool IsReady();
+
+  /**
+   * @copydoc Dali::AsyncTask::GetTaskName()
+   */
+  std::string_view GetTaskName() const override
+  {
+    return "ModelLoadTask";
+  }
 
 private:
   // Undefined
@@ -77,21 +118,12 @@ private:
   // Undefined
   ModelLoadTask& operator=(const ModelLoadTask& task) = delete;
 
-public:
-  std::string mModelUrl;
-  std::string mResourceDirectoryUrl;
-
-  Dali::Scene3D::Loader::ResourceBundle                        mResources;
-  Dali::Scene3D::Loader::SceneDefinition                       mScene;
-  Dali::Scene3D::Loader::SceneMetadata                         mMetaData;
-  std::vector<Dali::Scene3D::Loader::AnimationGroupDefinition> mAnimGroups;
-  std::vector<Dali::Scene3D::Loader::CameraParameters>         mCameraParameters;
-  std::vector<Dali::Scene3D::Loader::LightParameters>          mLights;
-  std::vector<Dali::Scene3D::Loader::AnimationDefinition>      mAnimations;
-
-  Dali::Scene3D::Loader::Customization::Choices         mResourceChoices;
-  std::vector<Dali::Scene3D::Loader::ResourceRefCounts> mResourceRefCounts;
-  bool                                                  mHasSucceeded;
+  std::string                                         mModelUrl;
+  std::string                                         mResourceDirectoryUrl;
+  std::shared_ptr<Dali::Scene3D::Loader::ModelLoader> mModelLoader;
+  ModelCacheManager                                   mModelCacheManager;
+  Dali::Scene3D::Loader::LoadResult                   mLoadResult;
+  bool                                                mHasSucceeded;
 };
 
 } // namespace Internal