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

Refactor: Anim, improve Action assignment functions

Browse Source 
The `animrig::assign_action(action, id)` function now takes a `bAction`
pointer (instead of its C++ wrapper `animrig::Action`). This makes it
easier to call from code that just deals with the DNA/C struct.

Also an override was added that takes an `OwnedAnimData` struct instead
of just the ID. This saves the lookup of the AnimData, to be used in cases
where the caller already has it.

Pull Request: https://projects.blender.org/blender/blender/pulls/128030
This commit is contained in:
Sybren A. Stüvel
2024-09-20 17:47:36 +02:00
parent ee2d8ec8db
commit 99d4c3c44d
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/animrig/ANIM_action.hh
View File

@@ -1112,12 +1112,19 @@ static_assert(sizeof(ChannelGroup) == sizeof(::bActionGroup),
* be animated). If the above fall-through case of "no slot found" is reached, this function
* will still return `true` as the Action was successfully assigned.
*/
bool assign_action(Action *action, ID &animated_id);
bool assign_action(bAction *action, ID &animated_id);
/**
* Same as assign_action(action, id) above.
*
* Use this function when you already have the AnimData struct of this ID.
*/
void assign_action(bAction *action, OwnedAnimData owned_adt);
/**
* Same as assign_action, except it assigns to AnimData::tmpact and tmp_slot_handle.
*/
void assign_tmpaction(Action *action, OwnedAnimData owned_adt);
void assign_tmpaction(bAction *action, OwnedAnimData owned_adt);
/**
* Un-assign the Action assigned to this ID.
@@ -1155,7 +1162,7 @@ Slot *assign_action_ensure_slot_for_keying(Action &action, ID &animated_id);
* This function always succeeds, and thus it doesn't have any return value.
*/
void generic_assign_action(ID &animated_id,
Action *action_to_assign,
bAction *action_to_assign,
bAction *&action_ptr_ref,
slot_handle_t &slot_handle_ref,
char *slot_name);

20
source/blender/animrig/intern/action.cc
View File

@@ -1142,18 +1142,26 @@ void Slot::name_ensure_prefix()
/* ----- Functions ----------- */
bool assign_action(Action *action, ID &animated_id)
bool assign_action(bAction *action, ID &animated_id)
{
AnimData *adt = BKE_animdata_ensure_id(&animated_id);
if (!adt) {
return false;
}
generic_assign_action(animated_id, action, adt->action, adt->slot_handle, adt->slot_name);
assign_action(action, {animated_id, *adt});
return true;
}
void assign_tmpaction(Action *action, OwnedAnimData owned_adt)
void assign_action(bAction *action, const OwnedAnimData owned_adt)
{
generic_assign_action(owned_adt.owner_id,
action,
owned_adt.adt.action,
owned_adt.adt.slot_handle,
owned_adt.adt.slot_name);
}
void assign_tmpaction(bAction *action, const OwnedAnimData owned_adt)
{
generic_assign_action(owned_adt.owner_id,
action,
@@ -1222,7 +1230,7 @@ static bool is_id_using_action_slot(const ID &animated_id,
}
void generic_assign_action(ID &animated_id,
Action *action_to_assign,
bAction *action_to_assign,
bAction *&action_ptr_ref,
slot_handle_t &slot_handle_ref,
char *slot_name)
@@ -1255,7 +1263,7 @@ void generic_assign_action(ID &animated_id,
/* Assign the slot. Since the slot is guaranteed to be usable (or nullptr) and from the assigned
* Action, this call is guaranteed to succeed. */
Slot *slot = action_to_assign->find_suitable_slot_for(animated_id);
Slot *slot = action_to_assign->wrap().find_suitable_slot_for(animated_id);
const ActionSlotAssignmentResult result = generic_assign_action_slot(
slot, animated_id, action_ptr_ref, slot_handle_ref, slot_name);
BLI_assert(result == ActionSlotAssignmentResult::OK);