Anim: Graph Editor Scale From Neighbor #112387

Christoph Lendenfeld · 2023-09-14T17:32:09+02:00

2023-09-14 17:32:09 +02:00

Combination of two operators by Ares Deveaux
#106524: Animation: scale left slider
and
#106523: Animation: scale right slider

Introduces a new operator "Scale from Neighbor" that scales selected keyframe segments from either the left or right keyframe neighbor.

Pressing "D" during modal operation will switch from which end of the segment the scaling happens.

This is useful to make a section of animation closer to a pose on either side.

Combination of two operators by Ares Deveaux [#106524: Animation: scale left slider](https://projects.blender.org/blender/blender/pulls/106524) and [#106523: Animation: scale right slider](https://projects.blender.org/blender/blender/pulls/106523) Introduces a new operator "Scale from Neighbor" that scales selected keyframe segments from either the left or right keyframe neighbor. Pressing "D" during modal operation will switch from which end of the segment the scaling happens. ![image](/attachments/2be353d8-2922-4c5c-b477-a40905dfc08a) This is useful to make a section of animation closer to a pose on either side. <video src=/attachments/503888e7-9706-49d1-a17a-7daa224fed86 controls></video>

image.png

5.1 KiB

scale_from_neighbor.mp4

612 KiB

Christoph Lendenfeld added the

Module

Animation & Rigging

label 2023-09-14 17:32:09 +02:00

Christoph Lendenfeld added 10 commits 2023-09-14 17:32:23 +02:00

744436b0c9 Added functions

325ac01aea changed names to include "to"

06015f5c55 took away the "to" in the names

250231fcf6 fixed some formating

97d688695b Took away unnecesary lines of code

2a5736eb63 Converted the slider to bidirectional

fe0255c6ab Changed name to "Scale From Left"

fdeb69a897 Merge branch 'main' into ge_scale_from_neighbor

63af573ddd resolve merge issues

de28350e40 add hotkey to switch target

Christoph Lendenfeld added this to the Animation & Rigging project 2023-09-14 17:32:49 +02:00

Christoph Lendenfeld added 1 commit 2023-12-15 12:08:26 +01:00

173fa26140 Merge branch 'main' into ge_scale_from_neighbor

Christoph Lendenfeld changed title from ~~WIP: Animation: Graph Editor Scale From Neighbor~~ to Animation: Graph Editor Scale From Neighbor

2023-12-15 12:16:19 +01:00

Christoph Lendenfeld added 1 commit 2023-12-15 12:27:34 +01:00

493506fc54 add D key to workspace status text

Christoph Lendenfeld changed title from ~~Animation: Graph Editor Scale From Neighbor~~ to Anim: Graph Editor Scale From Neighbor

2023-12-15 12:40:32 +01:00

Sybren A. Stüvel requested changes 2023-12-19 12:29:44 +01:00

Sybren A. Stüvel left a comment

Would it be possible to change the status bar text from [D] Toggle Anchor Key to be more context-aware? Then it could be [D] Anchor to Left Key (or Right Key), making it more specific to what's going to happen.

Would it be possible to change the status bar text from `[D] Toggle Anchor Key` to be more context-aware? Then it could be `[D] Anchor to Left Key` (or `Right Key`), making it more specific to what's going to happen.

source/blender/editors/animation/keyframes_general.cc Outdated

						
				@ -954,0 +957,4 @@

				                                        const FCurveSegmentAnchor anchor)

				{

				  const BezTriple *reference_key;

				  if (anchor == FCurveSegmentAnchor::LEFT) {

Sybren A. Stüvel commented

2023-12-19 12:25:33 +01:00

I'd make this a switch because it's going over the items of an enum. Without a default, it makes it clear that these are indeed the only two values in the enum.

I'd make this a `switch` because it's going over the items of an enum. Without a `default`, it makes it clear that these are indeed the only two values in the enum.

Christoph Lendenfeld commented

2023-12-19 13:09:18 +01:00

made this and other occurrences a switch

made this and other occurrences a `switch`

dr.sybren marked this conversation as resolved

source/blender/editors/space_graph/graph_slider_ops.cc Outdated

						
				@ -2283,0 +2366,4 @@

				  switch (event->type) {

				    case EVT_DKEY: {

				      FCurveSegmentAnchor anchor = FCurveSegmentAnchor(RNA_enum_get(op->ptr, "anchor"));

				      if (anchor == FCurveSegmentAnchor::LEFT) {

Sybren A. Stüvel commented

2023-12-19 12:26:55 +01:00

This might actually be implementable as an FCurveSegmentAnchor FCurveSegmentAnchor::opposite() const function?

This might actually be implementable as an `FCurveSegmentAnchor FCurveSegmentAnchor::opposite() const` function?

Christoph Lendenfeld commented

2023-12-19 13:08:42 +01:00

I had a quick google search and apparently you cannot add methods to an enum class.
Did I miss something?

I had a quick google search and apparently you cannot add methods to an enum class. Did I miss something?

Sybren A. Stüvel commented

2023-12-19 18:00:57 +01:00

C++ is stupid. I think I've done too much Python & Go and got used to a more sane type system ;-)

https://stackoverflow.com/a/53284026/875379 could work, but I think it's overkill for the one use case.

C++ is stupid. I think I've done too much Python & Go and got used to a more sane type system ;-) https://stackoverflow.com/a/53284026/875379 could work, but I think it's overkill for the one use case.

dr.sybren marked this conversation as resolved

source/blender/editors/space_graph/graph_slider_ops.cc Outdated

						
				@ -2283,0 +2379,4 @@

				    default:

				      return graph_slider_modal(C, op, event);

				      break;

Sybren A. Stüvel commented

2023-12-19 12:28:06 +01:00

No break after return.

No `break` after `return`.

dr.sybren marked this conversation as resolved

source/blender/editors/space_graph/graph_slider_ops.cc Outdated

						
				@ -2283,0 +2389,4 @@

				  const int invoke_result = graph_slider_invoke(C, op, event);

				  if (invoke_result == OPERATOR_CANCELLED) {

				    return invoke_result;

Sybren A. Stüvel commented

2023-12-19 12:29:18 +01:00

When you know the value that's being returned, because of the surrounding logic, I usually prefer simply returning that value. That way it's instantly clear from the return statement itself what it returns, without having to actually mentally parse the preceeding code. So in this case just return OPERATOR_CANCELLED;

When you know the value that's being returned, because of the surrounding logic, I usually prefer simply returning that value. That way it's instantly clear from the `return` statement itself what it returns, without having to actually mentally parse the preceeding code. So in this case just `return OPERATOR_CANCELLED;`

👍 1

dr.sybren marked this conversation as resolved

Christoph Lendenfeld added 2 commits 2023-12-19 13:08:06 +01:00

3d05222f57 Merge branch 'main' into ge_scale_from_neighbor

57a4d67d80 implement review comments

Christoph Lendenfeld requested review from Sybren A. Stüvel 2023-12-19 13:09:34 +01:00

Sybren A. Stüvel approved these changes 2023-12-19 18:01:51 +01:00

Sybren A. Stüvel left a comment

👍

:+1:

Christoph Lendenfeld merged commit b27718a9e7 into main

2023-12-21 10:46:52 +01:00