blender/blender
142
451
Fork 651
Code Issues 6.5k Pull Requests 824 Projects 18 Wiki Activity

Animation: blend offset slider #106518

Closed
AresDeveaux wants to merge 12 commits from AresDeveaux/blender:blend_offset_slider into main
pull from: AresDeveaux/blender:blend_offset_slider
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 3 Commits 12 Files Changed 6 +23 -23
6 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6c90f32d7e - Show all commits

2
scripts/startup/bl_ui/space_graph.py
View File

@ -329,7 +329,7 @@ class GRAPH_MT_slider(Menu):
layout.operator("graph.breakdown", text="Breakdown")
layout.operator("graph.blend_to_neighbor", text="Blend to Neighbor")
layout.operator("graph.blend_to_default", text="Blend to Default Value")
layout.operator("graph.blend_to_offset", text="Blend to Offset")
layout.operator("graph.blend_offset", text="Blend Offset")
layout.operator("graph.ease", text="Ease")
layout.operator("graph.gaussian_smooth", text="Smooth")

2
source/blender/editors/animation/keyframes_general.c
View File

@ -491,7 +491,7 @@ void ease_fcurve_segment(FCurve *fcu, FCurveSegment *segment, const float factor
/* ---------------- */
void blend_to_offset_fcurve_segment(FCurve *fcu, FCurveSegment *segment, const float factor)
void blend_offset_fcurve_segment(FCurve *fcu, FCurveSegment *segment, const float factor)
{
const BezTriple *left_key = fcurve_segment_start_get(fcu, segment->start_index);
const float left_x = left_key->vec[1][0];

2
source/blender/editors/include/ED_keyframes_edit.h
View File

@ -437,7 +437,7 @@ void smooth_fcurve_segment(struct FCurve *fcu,
int kernel_size,
double *kernel);
void ease_fcurve_segment(struct FCurve *fcu, struct FCurveSegment *segment, float factor);
void blend_to_offset_fcurve_segment(struct FCurve *fcu, struct FCurveSegment *segment, float factor);
void blend_offset_fcurve_segment(struct FCurve *fcu, struct FCurveSegment *segment, float factor);
bool decimate_fcurve(struct bAnimListElem *ale, float remove_ratio, float error_sq_max);
void blend_to_default_fcurve(struct PointerRNA *id_ptr, struct FCurve *fcu, float factor);
Sybren A. Stüvel commented 2023-05-09 16:44:27 +02:00
Review
Copy Link

The more functions we add here, the more important it becomes that they are documented. Could you write a doxygen-style comment for it, that explains what it does? Something like this:

/**
 * Shift the FCurve segment up/down so that it aligns with the key before/after
 * the segment.
 *
 * \param factor blend factor from -1.0 to 1.0. The sign determines whether the
 * segment is aligned with the key before or after the segment.
 */
The more functions we add here, the more important it becomes that they are documented. Could you write a doxygen-style comment for it, that explains what it does? Something like this: ```c /** * Shift the FCurve segment up/down so that it aligns with the key before/after * the segment. * * \param factor blend factor from -1.0 to 1.0. The sign determines whether the * segment is aligned with the key before or after the segment. */ ```
/**

2
source/blender/editors/space_graph/graph_intern.h
View File

@ -114,7 +114,7 @@ void GRAPH_OT_clean(struct wmOperatorType *ot);
void GRAPH_OT_blend_to_neighbor(struct wmOperatorType *ot);
void GRAPH_OT_breakdown(struct wmOperatorType *ot);
void GRAPH_OT_ease(struct wmOperatorType *ot);
void GRAPH_OT_blend_to_offset(struct wmOperatorType *ot);
void GRAPH_OT_blend_offset(struct wmOperatorType *ot);
void GRAPH_OT_decimate(struct wmOperatorType *ot);
void GRAPH_OT_blend_to_default(struct wmOperatorType *ot);
void GRAPH_OT_gaussian_smooth(struct wmOperatorType *ot);

2
source/blender/editors/space_graph/graph_ops.c
View File

@ -463,7 +463,7 @@ void graphedit_operatortypes(void)
WM_operatortype_append(GRAPH_OT_blend_to_neighbor);
WM_operatortype_append(GRAPH_OT_breakdown);
WM_operatortype_append(GRAPH_OT_ease);
WM_operatortype_append(GRAPH_OT_blend_to_offset);
WM_operatortype_append(GRAPH_OT_blend_offset);
WM_operatortype_append(GRAPH_OT_blend_to_default);
WM_operatortype_append(GRAPH_OT_gaussian_smooth);
WM_operatortype_append(GRAPH_OT_euler_filter);

36
source/blender/editors/space_graph/graph_slider_ops.c
View File

@ -1061,10 +1061,10 @@ void GRAPH_OT_ease(wmOperatorType *ot)
}
/* -------------------------------------------------------------------- */
/** \name Blend to Offset Operator
/** \name Blend Offset Operator
* \{ */
static void blend_to_offset_graph_keys(bAnimContext *ac, const float factor)
static void blend_offset_graph_keys(bAnimContext *ac, const float factor)
{
ListBase anim_data = {NULL, NULL};
@ -1074,7 +1074,7 @@ static void blend_to_offset_graph_keys(bAnimContext *ac, const float factor)
ListBase segments = find_fcurve_segments(fcu);
LISTBASE_FOREACH (FCurveSegment *, segment, &segments) {
blend_to_offset_fcurve_segment(fcu, segment, factor);
blend_offset_fcurve_segment(fcu, segment, factor);
}
ale->update |= ANIM_UPDATE_DEFAULT;
@ -1085,7 +1085,7 @@ static void blend_to_offset_graph_keys(bAnimContext *ac, const float factor)
ANIM_animdata_freelist(&anim_data);
}
static void blend_to_offset_draw_status_header(bContext *C, tGraphSliderOp *gso)
static void blend_offset_draw_status_header(bContext *C, tGraphSliderOp *gso)
{
char status_str[UI_MAX_DRAW_STR];
char mode_str[32];
@ -1093,7 +1093,7 @@ static void blend_to_offset_draw_status_header(bContext *C, tGraphSliderOp *gso)
ED_slider_status_string_get(gso->slider, slider_string, UI_MAX_DRAW_STR);
strcpy(mode_str, TIP_("Blend to Offset Keys"));
strcpy(mode_str, TIP_("Blend Offset Keys"));
if (hasNumInput(&gso->num)) {
char str_ofs[NUM_STR_REP_LEN];
@ -1109,20 +1109,20 @@ static void blend_to_offset_draw_status_header(bContext *C, tGraphSliderOp *gso)
ED_workspace_status_text(C, status_str);
}
static void blend_to_offset_modal_update(bContext *C, wmOperator *op)
static void blend_offset_modal_update(bContext *C, wmOperator *op)
{
tGraphSliderOp *gso = op->customdata;
blend_to_offset_draw_status_header(C, gso);
blend_offset_draw_status_header(C, gso);
/* Reset keyframes to the state at invoke. */
reset_bezts(gso);
const float factor = slider_factor_get_and_remember(op);
blend_to_offset_graph_keys(&gso->ac, factor);
blend_offset_graph_keys(&gso->ac, factor);
WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL);
}
static int blend_to_offset_invoke(bContext *C, wmOperator *op, const wmEvent *event)
static int blend_offset_invoke(bContext *C, wmOperator *op, const wmEvent *event)
{
const int invoke_result = graph_slider_invoke(C, op, event);
@ -1131,14 +1131,14 @@ static int blend_to_offset_invoke(bContext *C, wmOperator *op, const wmEvent *ev
}
tGraphSliderOp *gso = op->customdata;
gso->modal_update = blend_to_offset_modal_update;
gso->modal_update = blend_offset_modal_update;
gso->factor_prop = RNA_struct_find_property(op->ptr, "factor");
blend_to_offset_draw_status_header(C, gso);
blend_offset_draw_status_header(C, gso);
return invoke_result;
}
static int blend_to_offset_exec(bContext *C, wmOperator *op)
static int blend_offset_exec(bContext *C, wmOperator *op)
{
bAnimContext ac;
@ -1149,7 +1149,7 @@ static int blend_to_offset_exec(bContext *C, wmOperator *op)
const float factor = RNA_float_get(op->ptr, "factor");
blend_to_offset_graph_keys(&ac, factor);
blend_offset_graph_keys(&ac, factor);
/* Set notifier that keyframes have changed. */
WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL);
@ -1157,17 +1157,17 @@ static int blend_to_offset_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED;
}
void GRAPH_OT_blend_to_offset(wmOperatorType *ot)
void GRAPH_OT_blend_offset(wmOperatorType *ot)
{
/* Identifiers. */
ot->name = "Blend to Offset Keyframes";
ot->idname = "GRAPH_OT_blend_to_offset";
ot->name = "Blend Offset Keyframes";
ot->idname = "GRAPH_OT_blend_offset";
ot->description = "Shift selected keys to the value of the neighboring keys as a block";
/* API callbacks. */
ot->invoke = blend_to_offset_invoke;
ot->invoke = blend_offset_invoke;
ot->modal = graph_slider_modal;
ot->exec = blend_to_offset_exec;
ot->exec = blend_offset_exec;
ot->poll = graphop_editable_keyframes_poll;
/* Flags. */