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

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

diff --git a/dali-scene3d/public-api/loader/bvh-loader.h b/dali-scene3d/public-api/loader/bvh-loader.h
index 2c3dbc7..58cab5b 100644 (file)
--- a/dali-scene3d/public-api/loader/bvh-loader.h
+++ b/dali-scene3d/public-api/loader/bvh-loader.h
@@ -2,7 +2,7 @@
 #define DALI_SCENE3D_LOADER_BVH_LOADER_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.
@@ -21,25 +21,33 @@
 // INTERNAL INCLUDES
 #include <dali-scene3d/public-api/loader/animation-definition.h>
 
-namespace Dali
+namespace Dali::Scene3D::Loader
 {
-namespace Scene3D
-{
-namespace Loader
-{
-
 /**
  * @brief Loads motion capture data from bvh file format.
  *
+ * @SINCE_2_1.32
  * @param[in] path The file path.
  * @param[in] animationName Name of the motion capture animation
+ * @param[in] useRootTranslationOnly True to use only root translation with rotation animation.
+ * @param[in] scale The scale factor to set on the position property manually.
+ * @return AnimationDefinition that includes joint animation information.
+ */
+DALI_SCENE3D_API AnimationDefinition LoadBvh(const std::string& path, const std::string& animationName, bool useRootTranslationOnly, const Vector3& scale = Vector3::ONE);
+
+/**
+ * @brief Loads motion capture data from bvh data stream.
+ *
+ * @SINCE_2_2.23
+ * @param[in] rawBuffer The bvh buffer.
+ * @param[in] rawBufferLength The length of buffer.
+ * @param[in] animationName Name of the motion capture animation
+ * @param[in] useRootTranslationOnly True to use only root translation with rotation animation.
  * @param[in] scale The scale factor to set on the position property manually.
  * @return AnimationDefinition that includes joint animation information.
  */
-DALI_SCENE3D_API AnimationDefinition LoadBvh(const std::string& path, const std::string& animationName, const Vector3& scale = Vector3::ONE);
+DALI_SCENE3D_API AnimationDefinition LoadBvhFromBuffer(const uint8_t* rawBuffer, int rawBufferLength, const std::string& animationName, bool useRootTranslationOnly, const Vector3& scale = Vector3::ONE);
 
-} // namespace Loader
-} // namespace Scene3D
-} // namespace Dali
+} // namespace Dali::Scene3D::Loader
 
 #endif // DALI_SCENE3D_LOADER_BVH_LOADER_H
\ No newline at end of file