martin/AnimTestbed
1
0
Fork 0
Code Issues 11 Pull Requests Projects 1 Releases Wiki Activity

Updated ozz-animation to version 0.14.1 @35b2efd4

Browse Source
This commit is contained in:
Martin Felis
2023-03-26 13:28:12 +02:00
parent bf3189ff49
commit 15871f349c
194 changed files with 3495 additions and 1957 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/AnimGraph/AnimGraphNodes.cc
+3 -3
View File
@@ -27,7 +27,7 @@ void Blend2Node::Evaluate(AnimGraphContext& context) {
ozz::animation::BlendingJob blend_job;
blend_job.threshold = ozz::animation::BlendingJob().threshold;
blend_job.layers = layers;
blend_job.bind_pose = context.m_skeleton->joint_bind_poses();
blend_job.rest_pose = context.m_skeleton->joint_rest_poses();
blend_job.output = make_span(o_output->m_local_matrices);
if (!blend_job.Run()) {
@@ -69,7 +69,7 @@ bool AnimSamplerNode::Init(AnimGraphContext& context) {
}
assert (context.m_skeleton != nullptr);
m_sampling_cache.Resize(context.m_skeleton->num_joints());
m_sampling_context.Resize(context.m_skeleton->num_joints());
return true;
}
@@ -79,7 +79,7 @@ void AnimSamplerNode::Evaluate(AnimGraphContext& context) {
ozz::animation::SamplingJob sampling_job;
sampling_job.animation = m_animation;
sampling_job.cache = &m_sampling_cache;
sampling_job.context = &m_sampling_context;
sampling_job.ratio = m_time_now;
sampling_job.output = make_span(o_output->m_local_matrices);
src/AnimGraph/AnimGraphNodes.h
+1 -1
View File
@@ -192,7 +192,7 @@ struct NodeSocketAccessor<SpeedScaleNode> : public NodeSocketAccessorBase {
struct AnimSamplerNode : public AnimNode {
AnimData* o_output = nullptr;
std::string m_filename;
ozz::animation::SamplingCache m_sampling_cache;
ozz::animation::SamplingJob::Context m_sampling_context;
ozz::animation::Animation* m_animation = nullptr;
virtual ~AnimSamplerNode();