Updated ozz-animation to version 0.14.1 @35b2efd4

2023-03-26 13:28:12 +02:00
parent bf3189ff49
commit 15871f349c
194 changed files with 3495 additions and 1957 deletions
@@ -23,6 +23,7 @@ add_executable(sample_partial_blend
  "${CMAKE_CURRENT_BINARY_DIR}/media/animation_partial.ozz")
 target_link_libraries(sample_partial_blend
  sample_framework)
+target_copy_shared_libraries(sample_partial_blend)

 set_target_properties(sample_partial_blend
  PROPERTIES FOLDER "samples")
@@ -24,6 +24,6 @@ The GUI also proposes to select the "root" joint of the upper body hierarchy, wh
 4. Uses ozz::animation::IterateJointsDF helper function to iterate all children of the upper body root joint, and set up per-joint weight masks as follows (note that weight coefficients are stored as SoA floats):
   - Upper body weight mask: Affects upper body weight coefficient to all the joints that are part of the upper body, all others are set to zero.
   - Lower body weight mask: Affects lower body weight coefficient to all the joints that are part of the lower body (ie: all the ones that are not part of the upper body), all others are set to one.
-5. Sets ozz::animation::BlendingJob object with the two layers for the lower and upper body. Per-joint weight masks are provided as an input to each layer. All other arguments (bind-pose, input local-space transforms, weights, output) are the same as those used by the full skeleton hierarchy blending. See "blend" sample for more details.
+5. Sets ozz::animation::BlendingJob object with the two layers for the lower and upper body. Per-joint weight masks are provided as an input to each layer. All other arguments (rest-pose, input local-space transforms, weights, output) are the same as those used by the full skeleton hierarchy blending. See "blend" sample for more details.
 6. Converts local-space transformations, outputted from the blending stage, to model-space matrices using ozz::animation::LocalToModelJob. It also takes as input the skeleton (to know about joint's hierarchy). Output is model-space matrices array.
 7. Model-space matrices array can then be used for rendering (to skin a mesh) or updating the scene graph.
@@ -25,30 +25,25 @@
 //                                                                            //
 //----------------------------------------------------------------------------//

+#include <cstring>
+
+#include "framework/application.h"
+#include "framework/imgui.h"
+#include "framework/renderer.h"
+#include "framework/utils.h"
 #include "ozz/animation/runtime/animation.h"
 #include "ozz/animation/runtime/blending_job.h"
 #include "ozz/animation/runtime/local_to_model_job.h"
 #include "ozz/animation/runtime/sampling_job.h"
 #include "ozz/animation/runtime/skeleton.h"
 #include "ozz/animation/runtime/skeleton_utils.h"
-
-#include "ozz/base/log.h"
-
 #include "ozz/base/containers/vector.h"
-
+#include "ozz/base/log.h"
 #include "ozz/base/maths/simd_math.h"
 #include "ozz/base/maths/soa_transform.h"
 #include "ozz/base/maths/vec_float.h"
-
 #include "ozz/options/options.h"

-#include "framework/application.h"
-#include "framework/imgui.h"
-#include "framework/renderer.h"
-#include "framework/utils.h"
-
-#include <cstring>
-
 // Skeleton archive can be specified as an option.
 OZZ_OPTIONS_DECLARE_STRING(skeleton,
                           "Path to the skeleton (ozz archive format).",
@@ -86,7 +81,7 @@ class PartialBlendSampleApplication : public ozz::sample::Application {
      // Setup sampling job.
      ozz::animation::SamplingJob sampling_job;
      sampling_job.animation = &sampler.animation;
-      sampling_job.cache = &sampler.cache;
+      sampling_job.context = &sampler.context;
      sampling_job.ratio = sampler.controller.time_ratio();
      sampling_job.output = make_span(sampler.locals);

@@ -115,7 +110,7 @@ class PartialBlendSampleApplication : public ozz::sample::Application {
    ozz::animation::BlendingJob blend_job;
    blend_job.threshold = threshold_;
    blend_job.layers = layers;
-    blend_job.bind_pose = skeleton_.joint_bind_poses();
+    blend_job.rest_pose = skeleton_.joint_rest_poses();
    blend_job.output = make_span(blended_locals_);

    // Blends.
@@ -171,8 +166,8 @@ class PartialBlendSampleApplication : public ozz::sample::Application {
      // this is a Soa structure.
      sampler.joint_weights.resize(num_soa_joints);

-      // Allocates a cache that matches animation requirements.
-      sampler.cache.Resize(num_joints);
+      // Allocates a context that matches animation requirements.
+      sampler.context.Resize(num_joints);
    }

    // Default weight settings.
@@ -191,11 +186,9 @@ class PartialBlendSampleApplication : public ozz::sample::Application {
    models_.resize(num_joints);

    // Finds the "Spine1" joint in the joint hierarchy.
-    for (int i = 0; i < num_joints; ++i) {
-      if (std::strstr(skeleton_.joint_names()[i], "Spine1")) {
-        upper_body_root_ = i;
-        break;
-      }
+    upper_body_root_ = FindJoint(skeleton_, "Spine1");
+    if (upper_body_root_ < 0) {
+      return false;
    }
    SetupPerJointWeights();

@@ -373,8 +366,8 @@ class PartialBlendSampleApplication : public ozz::sample::Application {
    // Runtime animation.
    ozz::animation::Animation animation;

-    // Sampling cache.
-    ozz::animation::SamplingCache cache;
+    // Sampling context.
+    ozz::animation::SamplingJob::Context context;

    // Buffer of local transforms as sampled from animation_.
    ozz::vector<ozz::math::SoaTransform> locals;
@@ -388,7 +381,7 @@ class PartialBlendSampleApplication : public ozz::sample::Application {
  // Index of the joint at the base of the upper body hierarchy.
  int upper_body_root_;

-  // Blending job bind pose threshold.
+  // Blending job rest pose threshold.
  float threshold_;

  // Buffer of local transforms which stores the blending result.