Animation: shear right slider #106522
@ -330,6 +330,7 @@ class GRAPH_MT_slider(Menu):
|
|||||||
layout.operator("graph.blend_to_neighbor", text="Blend to Neighbor")
|
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_default", text="Blend to Default Value")
|
||||||
layout.operator("graph.ease", text="Ease")
|
layout.operator("graph.ease", text="Ease")
|
||||||
|
layout.operator("graph.shear_from_right", text="Shear from Right")
|
||||||
layout.operator("graph.gaussian_smooth", text="Smooth")
|
layout.operator("graph.gaussian_smooth", text="Smooth")
|
||||||
|
|
||||||
|
|
||||||
|
@ -491,6 +491,33 @@ void ease_fcurve_segment(FCurve *fcu, FCurveSegment *segment, const float factor
|
|||||||
|
|
||||||
/* ---------------- */
|
/* ---------------- */
|
||||||
|
|
||||||
|
void shear_from_right_fcurve_segment(FCurve *fcu, FCurveSegment *segment, const float factor)
|
||||||
|
{
|
||||||
|
const BezTriple *left_key = fcurve_segment_start_get(fcu, segment->start_index);
|
||||||
|
const BezTriple *right_key = fcurve_segment_end_get(fcu, segment->start_index + segment->length);
|
||||||
|
|
||||||
|
const float key_x_range = right_key->vec[1][0] - left_key->vec[1][0];
|
||||||
|
const float key_y_range = right_key->vec[1][1] - left_key->vec[1][1];
|
||||||
|
|
||||||
|
/* Happens if there is only 1 key on the FCurve. Needs to be skipped because it
|
||||||
|
* would be a divide by 0. */
|
||||||
|
if (IS_EQF(key_x_range, 0.0f)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int i = segment->start_index; i < segment->start_index + segment->length; i++) {
|
||||||
|
/* For easy calculation of the curve, the values are normalized. */
|
||||||
|
const float normalized_x = (right_key->vec[1][0] - fcu->bezt[i].vec[1][0]) / key_x_range;
|
||||||
|
|
||||||
|
const float lineal = key_y_range * normalized_x;
|
||||||
|
|
||||||
|
const float key_y_value = fcu->bezt[i].vec[1][1] + lineal * factor;
|
||||||
|
move_key(&fcu->bezt[i], key_y_value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ---------------- */
|
||||||
|
|
||||||
void breakdown_fcurve_segment(FCurve *fcu, FCurveSegment *segment, const float factor)
|
void breakdown_fcurve_segment(FCurve *fcu, FCurveSegment *segment, const float factor)
|
||||||
{
|
{
|
||||||
const BezTriple *left_bezt = fcurve_segment_start_get(fcu, segment->start_index);
|
const BezTriple *left_bezt = fcurve_segment_start_get(fcu, segment->start_index);
|
||||||
|
@ -437,6 +437,7 @@ void smooth_fcurve_segment(struct FCurve *fcu,
|
|||||||
int kernel_size,
|
int kernel_size,
|
||||||
double *kernel);
|
double *kernel);
|
||||||
void ease_fcurve_segment(struct FCurve *fcu, struct FCurveSegment *segment, float factor);
|
void ease_fcurve_segment(struct FCurve *fcu, struct FCurveSegment *segment, float factor);
|
||||||
|
void shear_from_right_fcurve_segment(struct FCurve *fcu, struct FCurveSegment *segment, float factor);
|
||||||
bool decimate_fcurve(struct bAnimListElem *ale, float remove_ratio, float error_sq_max);
|
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);
|
void blend_to_default_fcurve(struct PointerRNA *id_ptr, struct FCurve *fcu, float factor);
|
||||||
/**
|
/**
|
||||||
|
@ -114,6 +114,7 @@ void GRAPH_OT_clean(struct wmOperatorType *ot);
|
|||||||
void GRAPH_OT_blend_to_neighbor(struct wmOperatorType *ot);
|
void GRAPH_OT_blend_to_neighbor(struct wmOperatorType *ot);
|
||||||
void GRAPH_OT_breakdown(struct wmOperatorType *ot);
|
void GRAPH_OT_breakdown(struct wmOperatorType *ot);
|
||||||
void GRAPH_OT_ease(struct wmOperatorType *ot);
|
void GRAPH_OT_ease(struct wmOperatorType *ot);
|
||||||
|
void GRAPH_OT_shear_from_right(struct wmOperatorType *ot);
|
||||||
void GRAPH_OT_decimate(struct wmOperatorType *ot);
|
void GRAPH_OT_decimate(struct wmOperatorType *ot);
|
||||||
void GRAPH_OT_blend_to_default(struct wmOperatorType *ot);
|
void GRAPH_OT_blend_to_default(struct wmOperatorType *ot);
|
||||||
void GRAPH_OT_gaussian_smooth(struct wmOperatorType *ot);
|
void GRAPH_OT_gaussian_smooth(struct wmOperatorType *ot);
|
||||||
|
@ -463,6 +463,7 @@ void graphedit_operatortypes(void)
|
|||||||
WM_operatortype_append(GRAPH_OT_blend_to_neighbor);
|
WM_operatortype_append(GRAPH_OT_blend_to_neighbor);
|
||||||
WM_operatortype_append(GRAPH_OT_breakdown);
|
WM_operatortype_append(GRAPH_OT_breakdown);
|
||||||
WM_operatortype_append(GRAPH_OT_ease);
|
WM_operatortype_append(GRAPH_OT_ease);
|
||||||
|
WM_operatortype_append(GRAPH_OT_shear_from_right);
|
||||||
WM_operatortype_append(GRAPH_OT_blend_to_default);
|
WM_operatortype_append(GRAPH_OT_blend_to_default);
|
||||||
WM_operatortype_append(GRAPH_OT_gaussian_smooth);
|
WM_operatortype_append(GRAPH_OT_gaussian_smooth);
|
||||||
WM_operatortype_append(GRAPH_OT_euler_filter);
|
WM_operatortype_append(GRAPH_OT_euler_filter);
|
||||||
|
@ -1060,6 +1060,134 @@ void GRAPH_OT_ease(wmOperatorType *ot)
|
|||||||
1.0f);
|
1.0f);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* -------------------------------------------------------------------- */
|
||||||
|
/** \name Shear from Right Operator
|
||||||
|
* \{ */
|
||||||
|
|
||||||
|
static void shear_from_right_graph_keys(bAnimContext *ac, const float factor)
|
||||||
|
{
|
||||||
|
ListBase anim_data = {NULL, NULL};
|
||||||
|
|
||||||
|
ANIM_animdata_filter(ac, &anim_data, OPERATOR_DATA_FILTER, ac->data, ac->datatype);
|
||||||
|
LISTBASE_FOREACH (bAnimListElem *, ale, &anim_data) {
|
||||||
|
FCurve *fcu = (FCurve *)ale->key_data;
|
||||||
|
ListBase segments = find_fcurve_segments(fcu);
|
||||||
|
|
||||||
|
LISTBASE_FOREACH (FCurveSegment *, segment, &segments) {
|
||||||
|
shear_from_right_fcurve_segment(fcu, segment, factor);
|
||||||
|
}
|
||||||
|
|
||||||
|
ale->update |= ANIM_UPDATE_DEFAULT;
|
||||||
|
BLI_freelistN(&segments);
|
||||||
|
}
|
||||||
|
|
||||||
|
ANIM_animdata_update(ac, &anim_data);
|
||||||
|
ANIM_animdata_freelist(&anim_data);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void shear_from_right_draw_status_header(bContext *C, tGraphSliderOp *gso)
|
||||||
|
{
|
||||||
|
char status_str[UI_MAX_DRAW_STR];
|
||||||
|
char mode_str[32];
|
||||||
|
char slider_string[UI_MAX_DRAW_STR];
|
||||||
|
|
||||||
|
ED_slider_status_string_get(gso->slider, slider_string, UI_MAX_DRAW_STR);
|
||||||
|
|
||||||
|
strcpy(mode_str, TIP_("Shear from Right Keys"));
|
||||||
|
|
||||||
|
if (hasNumInput(&gso->num)) {
|
||||||
|
char str_ofs[NUM_STR_REP_LEN];
|
||||||
|
|
||||||
|
outputNumInput(&gso->num, str_ofs, &gso->scene->unit);
|
||||||
|
|
||||||
|
BLI_snprintf(status_str, sizeof(status_str), "%s: %s", mode_str, str_ofs);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
BLI_snprintf(status_str, sizeof(status_str), "%s: %s", mode_str, slider_string);
|
||||||
|
}
|
||||||
|
|
||||||
|
ED_workspace_status_text(C, status_str);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void shear_from_right_modal_update(bContext *C, wmOperator *op)
|
||||||
|
{
|
||||||
|
tGraphSliderOp *gso = op->customdata;
|
||||||
|
|
||||||
|
shear_from_right_draw_status_header(C, gso);
|
||||||
|
|
||||||
|
/* Reset keyframes to the state at invoke. */
|
||||||
|
reset_bezts(gso);
|
||||||
|
const float factor = slider_factor_get_and_remember(op);
|
||||||
|
shear_from_right_graph_keys(&gso->ac, factor);
|
||||||
|
WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int shear_from_right_invoke(bContext *C, wmOperator *op, const wmEvent *event)
|
||||||
|
{
|
||||||
|
const int invoke_result = graph_slider_invoke(C, op, event);
|
||||||
|
|
||||||
|
if (invoke_result == OPERATOR_CANCELLED) {
|
||||||
|
return invoke_result;
|
||||||
|
}
|
||||||
|
|
||||||
|
tGraphSliderOp *gso = op->customdata;
|
||||||
|
gso->modal_update = shear_from_right_modal_update;
|
||||||
|
gso->factor_prop = RNA_struct_find_property(op->ptr, "factor");
|
||||||
|
shear_from_right_draw_status_header(C, gso);
|
||||||
|
ED_slider_is_bidirectional_set(gso->slider, true);
|
||||||
|
ED_slider_factor_set(gso->slider, 0.0f);
|
||||||
|
|
||||||
|
return invoke_result;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int shear_from_right_exec(bContext *C, wmOperator *op)
|
||||||
|
{
|
||||||
|
bAnimContext ac;
|
||||||
|
|
||||||
|
/* Get editor data. */
|
||||||
|
if (ANIM_animdata_get_context(C, &ac) == 0) {
|
||||||
|
return OPERATOR_CANCELLED;
|
||||||
|
}
|
||||||
|
|
||||||
|
const float factor = RNA_float_get(op->ptr, "factor");
|
||||||
|
|
||||||
|
shear_from_right_graph_keys(&ac, factor);
|
||||||
|
|
||||||
|
/* Set notifier that keyframes have changed. */
|
||||||
|
WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL);
|
||||||
|
|
||||||
|
return OPERATOR_FINISHED;
|
||||||
|
}
|
||||||
|
|
||||||
|
void GRAPH_OT_shear_from_right(wmOperatorType *ot)
|
||||||
|
{
|
||||||
|
/* Identifiers. */
|
||||||
|
ot->name = "Shear from Right Keyframes";
|
||||||
|
ot->idname = "GRAPH_OT_shear_from_right";
|
||||||
|
ot->description =
|
||||||
|
"Affects the value of the keys linearly keeping the same \n\
|
||||||
|
relationship between them using the right key as reference";
|
||||||
|
|
||||||
|
/* API callbacks. */
|
||||||
|
ot->invoke = shear_from_right_invoke;
|
||||||
|
ot->modal = graph_slider_modal;
|
||||||
|
ot->exec = shear_from_right_exec;
|
||||||
|
ot->poll = graphop_editable_keyframes_poll;
|
||||||
|
|
||||||
|
/* Flags. */
|
||||||
|
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
|
||||||
|
|
||||||
|
RNA_def_float_factor(ot->srna,
|
||||||
|
"factor",
|
||||||
|
0.0f,
|
||||||
|
-FLT_MAX,
|
||||||
|
FLT_MAX,
|
||||||
|
"Curve Bend",
|
||||||
|
"Control the bend of the curve",
|
||||||
|
-1.0f,
|
||||||
|
1.0f);
|
||||||
|
}
|
||||||
|
|
||||||
/** \} */
|
/** \} */
|
||||||
/* -------------------------------------------------------------------- */
|
/* -------------------------------------------------------------------- */
|
||||||
/** \name Gauss Smooth Operator
|
/** \name Gauss Smooth Operator
|
||||||
|
Loading…
Reference in New Issue
Block a user