X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-scene3d%2Fpublic-api%2Floader%2Fbvh-loader.cpp;h=70cb297099b67064b983623cbbcd25c814eff888;hb=679f02413b55445b39148f4b102c153b1b5fae83;hp=fc6815dde549d1edc248f7c2ddce80d5c2237922;hpb=ef75e3b7a26f7beafc6376c04a72119d27a57df9;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-scene3d/public-api/loader/bvh-loader.cpp b/dali-scene3d/public-api/loader/bvh-loader.cpp
index fc6815d..70cb297 100644
--- a/dali-scene3d/public-api/loader/bvh-loader.cpp
+++ b/dali-scene3d/public-api/loader/bvh-loader.cpp
@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -25,11 +25,7 @@
 #include <sstream>
 #include <string_view>
 
-namespace Dali
-{
-namespace Scene3D
-{
-namespace Loader
+namespace Dali::Scene3D::Loader
 {
 namespace
 {
@@ -291,8 +287,8 @@ AnimationDefinition GenerateAnimation(const std::string& animationName, std::sha
 {
   AnimationDefinition animationDefinition;
 
-  animationDefinition.mName     = animationName;
-  animationDefinition.mDuration = frameTime * (frameCount - 1);
+  animationDefinition.SetName(animationName);
+  animationDefinition.SetDuration(frameTime * (frameCount - 1));
   float keyFrameInterval        = (frameCount > 1u) ? 1.0f / static_cast<float>(frameCount - 1u) : Dali::Math::MACHINE_EPSILON_10;
 
   std::vector<std::shared_ptr<Joint>> jointList;
@@ -300,16 +296,16 @@ AnimationDefinition GenerateAnimation(const std::string& animationName, std::sha
 
   if(!jointList.empty())
   {
-    animationDefinition.mProperties.resize(jointList.size() * 2u); // translation and rotation
+    animationDefinition.ReserveSize(jointList.size() * 2u); // translation and rotation
     for(uint32_t i = 0; i < jointList.size(); ++i)
     {
-      AnimatedProperty& translationProperty = animationDefinition.mProperties[i * 2u];
-      translationProperty.mTimePeriod       = Dali::TimePeriod(animationDefinition.mDuration);
+      AnimatedProperty translationProperty;
+      translationProperty.mTimePeriod       = Dali::TimePeriod(animationDefinition.GetDuration());
       translationProperty.mNodeName         = jointList[i]->name;
       translationProperty.mPropertyName     = PROPERTY_NAME_POSITION.data();
 
-      AnimatedProperty& rotationProperty = animationDefinition.mProperties[i * 2u + 1];
-      rotationProperty.mTimePeriod       = Dali::TimePeriod(animationDefinition.mDuration);
+      AnimatedProperty rotationProperty;
+      rotationProperty.mTimePeriod       = Dali::TimePeriod(animationDefinition.GetDuration());
       rotationProperty.mNodeName         = jointList[i]->name;
       rotationProperty.mPropertyName     = PROPERTY_NAME_ORIENTATION.data();
 
@@ -317,9 +313,11 @@ AnimationDefinition GenerateAnimation(const std::string& animationName, std::sha
       rotationProperty.mKeyFrames    = Dali::KeyFrames::New();
       for(uint32_t j = 0; j < frameCount; ++j)
       {
-        translationProperty.mKeyFrames.Add(static_cast<float>(j) * keyFrameInterval, (jointList[i]->translations[j] / scale));
+        translationProperty.mKeyFrames.Add(static_cast<float>(j) * keyFrameInterval, (jointList[i]->translations[j] * scale));
         rotationProperty.mKeyFrames.Add(static_cast<float>(j) * keyFrameInterval, jointList[i]->rotations[j]);
       }
+      animationDefinition.SetProperty(i * 2u, std::move(translationProperty));
+      animationDefinition.SetProperty(i * 2u + 1, std::move(rotationProperty));
     }
   }
 
@@ -340,6 +338,4 @@ AnimationDefinition LoadBvh(const std::string& path, const std::string& animatio
 
   return GenerateAnimation(animationName, rootJoint, frameCount, frameTime, scale);
 }
-} // namespace Loader
-} // namespace Scene3D
-} // namespace Dali
\ No newline at end of file
+} // namespace Dali::Scene3D::Loader
\ No newline at end of file