blender
/
blender
137
411
Fork 594
Code Issues 6.3k Pull Requests 770 Projects 19 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 +18 -7
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 74e78bfef6 - Show all commits

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

@ -500,13 +500,16 @@ void blend_to_infinity_fcurve_segment(FCurve *fcu, FCurveSegment *segment, const
const BezTriple *right_key = fcurve_segment_end_get(fcu, segment->start_index + segment->length);
const float right_x = right_key->vec[1][0];
const float right_y = right_key->vec[1][1];
/* We need the one key on the outside side of the neighboring keys to use as reference. */
/* One key on the outside left side of the neighboring keys is needed to use as reference. */
const BezTriple *beyond_left_key = fcurve_segment_start_get(fcu, segment->start_index - 1);
const float beyond_left_x = beyond_left_key->vec[1][0];
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. */
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_y = beyond_right_key->vec[1][1];
@ -525,16 +528,24 @@ void blend_to_infinity_fcurve_segment(FCurve *fcu, FCurveSegment *segment, const
/* 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);
float x_delta;
float y_delta;
float x_delta = 0;
float y_delta = 0;
/* This delta values are used to know the relationship between the bookend keys and the
* reference keys beyong those. */
if(slider_right_side){
/* Stop the fucntion if there is no key beyond the the right neighboring one. */
if(segment->start_index + segment->length == fcu->totvert) {
return;
}
y_delta = beyond_right_y - right_y;
x_delta = beyond_right_x - right_x;
}
else if(slider_left_side){
/* Stop the fucntion if there is no key beyond the left neighboring one. */
if(segment->start_index == 0) {
return;
}
y_delta = beyond_left_y - left_y;
x_delta = beyond_left_x - left_x;
}
@ -545,9 +556,9 @@ void blend_to_infinity_fcurve_segment(FCurve *fcu, FCurveSegment *segment, const
for (int i = segment->start_index; i < segment->start_index + segment->length; i++) {
float new_x_delta;
float new_y_delta;
float refe;
float new_x_delta = 0;
float new_y_delta = 0;
float refe = 0;
/* This new deltas are used to determin the relationship between the current key and the bookend ones. */
if (slider_right_side) {