Copy animation name to output in ozz::animation::offline::AdditiveAni…

…mationBuilder.
ugocupcic · Sep 30, 2021 · ccff2b1 · ccff2b1
1 parent 2541d20
commit ccff2b1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/animation/offline/additive_animation_builder.cc b/src/animation/offline/additive_animation_builder.cc
@@ -89,6 +89,7 @@ bool AdditiveAnimationBuilder::operator()(const RawAnimation& _input,
   }
 
   // Rebuilds output animation.
+  _output->name = _input.name;
   _output->duration = _input.duration;
   _output->tracks.resize(_input.tracks.size());
 
@@ -143,6 +144,7 @@ bool AdditiveAnimationBuilder::operator()(
   }
 
   // Rebuilds output animation.
+  _output->name = _input.name;
   _output->duration = _input.duration;
   _output->tracks.resize(_input.tracks.size());
 

diff --git a/test/animation/offline/additive_animation_builder_tests.cc b/test/animation/offline/additive_animation_builder_tests.cc
@@ -25,16 +25,13 @@
 //                                                                            //
 //----------------------------------------------------------------------------//
 
-#include "ozz/animation/offline/additive_animation_builder.h"
-
 #include "gtest/gtest.h"
-
+#include "ozz/animation/offline/additive_animation_builder.h"
+#include "ozz/animation/offline/raw_animation.h"
 #include "ozz/base/maths/gtest_math_helper.h"
 #include "ozz/base/maths/math_constant.h"
 #include "ozz/base/maths/transform.h"
 
-#include "ozz/animation/offline/raw_animation.h"
-
 using ozz::animation::offline::AdditiveAnimationBuilder;
 using ozz::animation::offline::RawAnimation;
 
@@ -85,6 +82,7 @@ TEST(Build, AdditiveAnimationBuilder) {
   AdditiveAnimationBuilder builder;
 
   RawAnimation input;
+  input.name = "test";
   input.duration = 1.f;
   input.tracks.resize(3);
 
@@ -140,6 +138,7 @@ TEST(Build, AdditiveAnimationBuilder) {
   {
     RawAnimation output;
     ASSERT_TRUE(builder(input, &output));
+    EXPECT_STREQ(output.name.c_str(), input.name.c_str());
     EXPECT_EQ(output.num_tracks(), 3);
 
     // 1st track.
@@ -199,6 +198,7 @@ TEST(BuildRefPose, AdditiveAnimationBuilder) {
   RawAnimation input;
   input.duration = 1.f;
   input.tracks.resize(3);
+  input.name = "test";
 
   // First track is empty
   {
@@ -263,6 +263,7 @@ TEST(BuildRefPose, AdditiveAnimationBuilder) {
     RawAnimation output;
     ASSERT_TRUE(
         builder(input, ozz::span<ozz::math::Transform>(ref_pose), &output));
+    EXPECT_STREQ(output.name.c_str(), input.name.c_str());
     EXPECT_EQ(output.num_tracks(), 3);
 
     // 1st track.