griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

USD: import skeletal animation as slotted Actions

Browse Source 
The USD importer was still creating legacy Actions, which are no longer
supported in Blender 4.4. This commit updates the code to produce
slotted Actions instead.

This also avoids the need to create F-Curves "from scratch", but rather
uses the available functionality. This makes the code somewhat easier to
maintain.

Pull Request: https://projects.blender.org/blender/blender/pulls/134866
This commit is contained in:
Sybren A. Stüvel
2025-02-24 12:39:52 +01:00
parent 981246ef4a
commit 857743db9d
1 changed files with 26 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
source/blender/io/usd/intern/usd_skel_convert.cc
View File

@@ -42,6 +42,7 @@
#include "ED_armature.hh" #include "ED_armature.hh"
#include "ED_object_vgroup.hh" #include "ED_object_vgroup.hh"
#include "ANIM_action.hh"
#include "ANIM_animdata.hh" #include "ANIM_animdata.hh"
#include <algorithm> #include <algorithm>
@@ -60,19 +61,6 @@ inline float max_mag_component(const pxr::GfVec3d &vec)
return pxr::GfMax(pxr::GfAbs(vec[0]), pxr::GfAbs(vec[1]), pxr::GfAbs(vec[2])); return pxr::GfMax(pxr::GfAbs(vec[0]), pxr::GfAbs(vec[1]), pxr::GfAbs(vec[2]));
} }
/* Utility: create curve at the given array index. */
FCurve *create_fcurve(const int array_index, const std::string &rna_path, const int totvert)
{
FCurve *fcu = BKE_fcurve_create();
fcu->flag = (FCURVE_VISIBLE | FCURVE_SELECTED);
fcu->rna_path = BLI_strdup(rna_path.c_str());
fcu->array_index = array_index;
fcu->bezt = MEM_cnew_array<BezTriple>(totvert, "beztriple");
fcu->totvert = totvert;
return fcu;
}
void resize_fcurve(FCurve *fcu, uint bezt_count) void resize_fcurve(FCurve *fcu, uint bezt_count)
{ {
/* There is no need to resize if the counts match. */ /* There is no need to resize if the counts match. */
@@ -92,17 +80,15 @@ void resize_fcurve(FCurve *fcu, uint bezt_count)
fcu->totvert = bezt_count; fcu->totvert = bezt_count;
} }
/* Utility: create curve at the given array index and /* Utility: create curve at the given array index and add it as a channel to a group. */
* add it as a channel to a group. */ FCurve *create_fcurve(blender::animrig::Channelbag &channelbag,
FCurve *create_chan_fcurve(bAction *act, const blender::animrig::FCurveDescriptor &fcurve_descriptor,
bActionGroup *grp, const int totvert)
const int array_index,
const std::string &rna_path,
const int totvert)
{ {
FCurve *fcu = create_fcurve(array_index, rna_path, totvert); FCurve *fcurve = channelbag.fcurve_create_unique(nullptr, fcurve_descriptor);
action_groups_add_channel(act, grp, fcu); BLI_assert_msg(fcurve, "The same F-Curve is being created twice, this is unexpected.");
return fcu; BKE_fcurve_bezt_resize(fcurve, totvert);
return fcurve;
} }
/* Utility: add curve sample. */ /* Utility: add curve sample. */
@@ -166,6 +152,9 @@ void import_skeleton_curves(Main *bmain,
bAction *act = blender::animrig::id_action_ensure(bmain, &arm_obj->id); bAction *act = blender::animrig::id_action_ensure(bmain, &arm_obj->id);
BKE_id_rename(*bmain, act->id, anim_query.GetPrim().GetName().GetText()); BKE_id_rename(*bmain, act->id, anim_query.GetPrim().GetName().GetText());
blender::animrig::Channelbag &channelbag = blender::animrig::action_channelbag_ensure(
*act, arm_obj->id);
/* Create the curves. */ /* Create the curves. */
/* Get the joint paths. */ /* Get the joint paths. */
@@ -190,26 +179,24 @@ void import_skeleton_curves(Main *bmain,
continue; continue;
} }
bActionGroup *grp = action_groups_add_new(act, name->c_str());
/* Add translation curves. */ /* Add translation curves. */
std::string rna_path = "pose.bones[\"" + *name + "\"].location"; std::string rna_path = "pose.bones[\"" + *name + "\"].location";
loc_curves.append(create_chan_fcurve(act, grp, 0, rna_path, num_samples)); loc_curves.append(create_fcurve(channelbag, {rna_path, 0, {}, *name}, num_samples));
loc_curves.append(create_chan_fcurve(act, grp, 1, rna_path, num_samples)); loc_curves.append(create_fcurve(channelbag, {rna_path, 1, {}, *name}, num_samples));
loc_curves.append(create_chan_fcurve(act, grp, 2, rna_path, num_samples)); loc_curves.append(create_fcurve(channelbag, {rna_path, 2, {}, *name}, num_samples));
/* Add rotation curves. */ /* Add rotation curves. */
rna_path = "pose.bones[\"" + *name + "\"].rotation_quaternion"; rna_path = "pose.bones[\"" + *name + "\"].rotation_quaternion";
rot_curves.append(create_chan_fcurve(act, grp, 0, rna_path, num_samples)); rot_curves.append(create_fcurve(channelbag, {rna_path, 0, {}, *name}, num_samples));
rot_curves.append(create_chan_fcurve(act, grp, 1, rna_path, num_samples)); rot_curves.append(create_fcurve(channelbag, {rna_path, 1, {}, *name}, num_samples));
rot_curves.append(create_chan_fcurve(act, grp, 2, rna_path, num_samples)); rot_curves.append(create_fcurve(channelbag, {rna_path, 2, {}, *name}, num_samples));
rot_curves.append(create_chan_fcurve(act, grp, 3, rna_path, num_samples)); rot_curves.append(create_fcurve(channelbag, {rna_path, 3, {}, *name}, num_samples));
/* Add scale curves. */ /* Add scale curves. */
rna_path = "pose.bones[\"" + *name + "\"].scale"; rna_path = "pose.bones[\"" + *name + "\"].scale";
scale_curves.append(create_chan_fcurve(act, grp, 0, rna_path, num_samples)); scale_curves.append(create_fcurve(channelbag, {rna_path, 0, {}, *name}, num_samples));
scale_curves.append(create_chan_fcurve(act, grp, 1, rna_path, num_samples)); scale_curves.append(create_fcurve(channelbag, {rna_path, 1, {}, *name}, num_samples));
scale_curves.append(create_chan_fcurve(act, grp, 2, rna_path, num_samples)); scale_curves.append(create_fcurve(channelbag, {rna_path, 2, {}, *name}, num_samples));
} }
/* Sanity checks: make sure we have a curve entry for each joint. */ /* Sanity checks: make sure we have a curve entry for each joint. */
@@ -647,6 +634,9 @@ void import_blendshapes(Main *bmain,
/* Create the animation and curves. */ /* Create the animation and curves. */
bAction *act = blender::animrig::id_action_ensure(bmain, &key->id); bAction *act = blender::animrig::id_action_ensure(bmain, &key->id);
blender::animrig::Channelbag &channelbag = blender::animrig::action_channelbag_ensure(*act,
key->id);
blender::Vector<FCurve *> curves; blender::Vector<FCurve *> curves;
curves.reserve(blendshapes.size()); curves.reserve(blendshapes.size());
@@ -660,9 +650,8 @@ void import_blendshapes(Main *bmain,
/* Create the curve for this shape key. */ /* Create the curve for this shape key. */
std::string rna_path = "key_blocks[\"" + blendshape_name.GetString() + "\"].value"; std::string rna_path = "key_blocks[\"" + blendshape_name.GetString() + "\"].value";
FCurve *fcu = create_fcurve(0, rna_path, times.size()); FCurve *fcu = create_fcurve(channelbag, {rna_path, 0}, times.size());
curves.append(fcu); curves.append(fcu);
BLI_addtail(&act->curves, fcu);
} }
/* Add the weight time samples to the curves. */ /* Add the weight time samples to the curves. */