From 81b72192f44183ce84ff2233b84e9d2783d90aab Mon Sep 17 00:00:00 2001 From: seungho baek Date: Tue, 21 Nov 2023 16:28:13 +0900 Subject: [PATCH] Support RootTranslationOnly option for motion capture data Change-Id: I457ae5783dfbb05e7f9b976040194f051d578365 Signed-off-by: seungho baek --- dali-csharp-binder/dali-scene3d/model-wrap.cpp | 4 ++-- dali-csharp-binder/dali-scene3d/motion-data-wrap.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dali-csharp-binder/dali-scene3d/model-wrap.cpp b/dali-csharp-binder/dali-scene3d/model-wrap.cpp index 2f8a449..cfa56ea 100644 --- a/dali-csharp-binder/dali-scene3d/model-wrap.cpp +++ b/dali-csharp-binder/dali-scene3d/model-wrap.cpp @@ -561,7 +561,7 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Model_LoadBvhAnimation_1(void* csModel, { try { - Dali::Scene3D::Loader::AnimationDefinition animationDefinition = Dali::Scene3D::Loader::LoadBvh(filename, "LoadedBvhAnimation", scale); + Dali::Scene3D::Loader::AnimationDefinition animationDefinition = Dali::Scene3D::Loader::LoadBvh(filename, "LoadedBvhAnimation", false, scale); if(csUseRootNodeTranslate && animationDefinition.GetPropertyCount() > 0u) { @@ -634,7 +634,7 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Model_LoadBvhAnimation_2(void* csModel, { try { - Dali::Scene3D::Loader::AnimationDefinition animationDefinition = Dali::Scene3D::Loader::LoadBvhFromBuffer(rawBuffer, csBufferLength, "LoadedBvhAnimation", scale); + Dali::Scene3D::Loader::AnimationDefinition animationDefinition = Dali::Scene3D::Loader::LoadBvhFromBuffer(rawBuffer, csBufferLength, "LoadedBvhAnimation", false, scale); if(csUseRootNodeTranslate && animationDefinition.GetPropertyCount() > 0u) { diff --git a/dali-csharp-binder/dali-scene3d/motion-data-wrap.cpp b/dali-csharp-binder/dali-scene3d/motion-data-wrap.cpp index 708e03e..50a9ff6 100644 --- a/dali-csharp-binder/dali-scene3d/motion-data-wrap.cpp +++ b/dali-csharp-binder/dali-scene3d/motion-data-wrap.cpp @@ -302,7 +302,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_Dali_MotionData_GetDuration(void* csMotionDa return result; } -SWIGEXPORT void SWIGSTDCALL CSharp_Dali_MotionData_LoadBvh(void* csMotionData, char* csFileName, void* csScale, bool csSynchronousLoad) +SWIGEXPORT void SWIGSTDCALL CSharp_Dali_MotionData_LoadBvh(void* csMotionData, char* csFileName, bool csUseRootTranslationOnly, void* csScale, bool csSynchronousLoad) { Dali::Scene3D::MotionData* motionData = (Dali::Scene3D::MotionData*)csMotionData; @@ -328,13 +328,13 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_MotionData_LoadBvh(void* csMotionData, c { try { - motionData->LoadBvh(filename, scale, csSynchronousLoad); + motionData->LoadBvh(filename, csUseRootTranslationOnly, scale, csSynchronousLoad); } CALL_CATCH_EXCEPTION(); } } -SWIGEXPORT void SWIGSTDCALL CSharp_Dali_MotionData_LoadBvhFromBuffer(void* csMotionData, char* csBuffer, int csBufferLength, void* csScale, bool csSynchronousLoad) +SWIGEXPORT void SWIGSTDCALL CSharp_Dali_MotionData_LoadBvhFromBuffer(void* csMotionData, char* csBuffer, int csBufferLength, bool csUseRootTranslationOnly, void* csScale, bool csSynchronousLoad) { Dali::Scene3D::MotionData* motionData = (Dali::Scene3D::MotionData*)csMotionData; @@ -360,7 +360,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_MotionData_LoadBvhFromBuffer(void* csMot { try { - motionData->LoadBvhFromBuffer(rawBuffer, csBufferLength, scale, csSynchronousLoad); + motionData->LoadBvhFromBuffer(rawBuffer, csBufferLength, csUseRootTranslationOnly, scale, csSynchronousLoad); } CALL_CATCH_EXCEPTION(); } -- 2.7.4