blender/blender
148
469
Fork 680
Code Issues 6.7k Pull Requests 884 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 +4 -7
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c038ce005f - Show all commits

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

@ -498,14 +498,9 @@ void blend_offset_fcurve_segment(FCurve *fcu, FCurveSegment *segment, const floa
const BezTriple segment_first_key = fcu->bezt[segment->start_index];
Christoph Lendenfeld commented 2023-04-13 12:25:25 +02:00
Outdated
Review
Copy Link

this can be simplified to fcu->bezt[segment->start_index]
same for getting the segment end

this can be simplified to `fcu->bezt[segment->start_index]` same for getting the segment end
Sybren A. Stüvel commented 2023-05-09 16:40:42 +02:00
Review
Copy Link

Since ``y_delta * fabs(factor)` doesnt' change over the course of this loop, take it out of the loop:

const float weighted_delta = y_delta * fabs(factor);
Since ``y_delta * fabs(factor)` doesnt' change over the course of this loop, take it out of the loop: ```c const float weighted_delta = y_delta * fabs(factor); ```
const BezTriple segment_last_key = fcu->bezt[segment->start_index + segment->length - 1];
/* For this tool the calculations are made easier if each side of the slider goes from 0 to
* positive 1. */
const float bidirectional_factor = fabs(factor * 2 - 1);
float y_delta;
if (factor > 0.5) {
if (factor > 0) {
y_delta = right_key->vec[1][1] - segment_last_key.vec[1][1];
}
else {
@ -513,7 +508,7 @@ void blend_offset_fcurve_segment(FCurve *fcu, FCurveSegment *segment, const floa
}
for (int i = segment->start_index; i < segment->start_index + segment->length; i++) {
const float key_y_value = fcu->bezt[i].vec[1][1] + y_delta * bidirectional_factor;
const float key_y_value = fcu->bezt[i].vec[1][1] + y_delta * fabs(factor);
move_key(&fcu->bezt[i], key_y_value);
Christoph Lendenfeld commented 2023-04-13 12:33:00 +02:00
Outdated
Review
Copy Link

if you use ED_slider_is_bidirectional_set you can just say factor > 0 and remove the boolean
That way this function doesn't even need to have an implicit notion of where the value came from

if you use `ED_slider_is_bidirectional_set` you can just say `factor > 0` and remove the boolean That way this function doesn't even need to have an implicit notion of where the value came from
AresDeveaux commented 2023-04-14 10:02:45 +02:00
Outdated
Review
Copy Link

I just tried this. One problem with a bidirectional slider is that the factor is always going to be more than zero, so the else part of the if statement is never executed. I still need to know what side of the slider the value is coming from. If the factor is from 0 to 1 I can, and by using ping_pong_factor = fabs(factor * 2 - 1) I have been simulating what now I should call "bidirectional_factor" instead of "ping_pong_factor"

If there is a way to know what side of the slider the value is coming from I could use ED_slider_is_bidirectional_set

I just tried this. One problem with a bidirectional slider is that the factor is always going to be more than zero, so the `else` part of the if statement is never executed. I still need to know what side of the slider the value is coming from. If the factor is from 0 to 1 I can, and by using `ping_pong_factor = fabs(factor * 2 - 1)` I have been simulating what now I should call "bidirectional_factor" instead of "ping_pong_factor" If there is a way to know what side of the slider the value is coming from I could use `ED_slider_is_bidirectional_set`
Christoph Lendenfeld commented 2023-04-14 15:29:15 +02:00
Outdated
Review
Copy Link

hm sorry I think that was my bad. I thought this would set the slider to a -1/1 range but it does not. It just allows negative values.
In that case your implementation is correct until we add that feature to the slider :)

hm sorry I think that was my bad. I thought this would set the slider to a -1/1 range but it does not. It just allows negative values. In that case your implementation is correct until we add that feature to the slider :)
}
}

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

@ -1134,6 +1134,8 @@ static int blend_offset_invoke(bContext *C, wmOperator *op, const wmEvent *event
gso->modal_update = blend_offset_modal_update;
gso->factor_prop = RNA_struct_find_property(op->ptr, "factor");
blend_offset_draw_status_header(C, gso);
ED_slider_is_bidirectional_set(gso->slider, true);
ED_slider_factor_set(gso->slider, 0.0f);
return invoke_result;
}