blender/blender
150
483
Fork 715
Code Issues 6.8k Pull Requests 883 Projects 17 Wiki Activity

Animation: blend to infinity slider #106517

Closed
AresDeveaux wants to merge 15 commits from AresDeveaux/blender:blend_to_infinity_slider into main
pull from: AresDeveaux/blender:blend_to_infinity_slider
merge into: blender:main

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

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

@ -508,7 +508,8 @@ void blend_to_infinity_fcurve_segment(FCurve *fcu, FCurveSegment *segment, const
const float beyond_left_y = beyond_left_key->vec[1][1]; const float beyond_left_y = beyond_left_key->vec[1][1];
/* One key on the outside right side of the neighboring keys is needed to use as reference. */ /* One key on the outside right side of the neighboring keys is needed to use as reference. */
const BezTriple *beyond_right_key = fcurve_segment_end_get(fcu, segment->start_index + segment->length + 1); const BezTriple *beyond_right_key = fcurve_segment_end_get(
fcu, segment->start_index + segment->length + 1);
const float beyond_right_x = beyond_right_key->vec[1][0]; const float beyond_right_x = beyond_right_key->vec[1][0];
const float beyond_right_y = beyond_right_key->vec[1][1]; const float beyond_right_y = beyond_right_key->vec[1][1];
@ -525,7 +526,8 @@ void blend_to_infinity_fcurve_segment(FCurve *fcu, FCurveSegment *segment, const
const bool slider_right_side = factor >= 0.5; const bool slider_right_side = factor >= 0.5;
const bool slider_left_side = factor < 0.5; const bool slider_left_side = factor < 0.5;
/* The factor goes from 0 to 1, but for this tool it needs to go from 0 to 1 on each side of the slider. */ /* The factor goes from 0 to 1, but for this tool it needs to go from 0 to 1 on each side of the
* slider. */
const float ping_pong_factor = fabs(factor * 2 - 1); const float ping_pong_factor = fabs(factor * 2 - 1);
float x_delta = 0; float x_delta = 0;
@ -533,18 +535,18 @@ void blend_to_infinity_fcurve_segment(FCurve *fcu, FCurveSegment *segment, const
/* This delta values are used to know the relationship between the bookend keys and the /* This delta values are used to know the relationship between the bookend keys and the
* reference keys beyong those. */ * reference keys beyong those. */
if(slider_right_side){ if (slider_right_side) {
/* Stop the fucntion if there is no key beyond the the right neighboring one. */ /* Stop the fucntion if there is no key beyond the the right neighboring one. */
if(segment->start_index + segment->length == fcu->totvert) { if (segment->start_index + segment->length == fcu->totvert) {
return; return;
} }
y_delta = beyond_right_y - right_y; y_delta = beyond_right_y - right_y;
x_delta = beyond_right_x - right_x; x_delta = beyond_right_x - right_x;
} }
else if(slider_left_side){ else if (slider_left_side) {
/* Stop the fucntion if there is no key beyond the left neighboring one. */ /* Stop the fucntion if there is no key beyond the left neighboring one. */
if(segment->start_index == 0) { if (segment->start_index == 0) {
return; return;
} }
y_delta = beyond_left_y - left_y; y_delta = beyond_left_y - left_y;
x_delta = beyond_left_x - left_x; x_delta = beyond_left_x - left_x;
@ -560,7 +562,8 @@ void blend_to_infinity_fcurve_segment(FCurve *fcu, FCurveSegment *segment, const
float new_y_delta = 0; float new_y_delta = 0;
float refe = 0; float refe = 0;
/* This new deltas are used to determin the relationship between the current key and the bookend ones. */ /* This new deltas are used to determin the relationship between the current key and the
* bookend ones. */
if (slider_right_side) { if (slider_right_side) {
new_x_delta = fcu->bezt[i].vec[1][0] - right_x; new_x_delta = fcu->bezt[i].vec[1][0] - right_x;
refe = right_y; refe = right_y;
@ -570,8 +573,9 @@ void blend_to_infinity_fcurve_segment(FCurve *fcu, FCurveSegment *segment, const
refe = left_key->vec[1][1]; refe = left_key->vec[1][1];
} }
/* we use compound rule of 3 to find the "Y" delta we are missing using the other deltas we know. */ /* we use compound rule of 3 to find the "Y" delta we are missing using the other deltas we
if(x_delta != 0){ * know. */
if (x_delta != 0) {
new_y_delta = new_x_delta * y_delta / x_delta; new_y_delta = new_x_delta * y_delta / x_delta;
} }

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

@ -437,7 +437,9 @@ 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 blend_to_infinity_fcurve_segment(struct FCurve *fcu, struct FCurveSegment *segment, float factor); void blend_to_infinity_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);
/** /**