Fix #111593: Auto-offset when inserting nodes on links inside frames #111637

Leon Schittek · 2023-08-28T23:00:08+02:00

Leon Schittek commented

2023-08-28 23:00:08 +02:00

Apply auto-offset animation in relative steps, to avoid issues, when
the parent space of the currently offset node changes.

Issue

The auto-offset was calculated by adding the offset to the inital node
location. Since the node location is always in "parent space", this
broke, when the node was attached to (or detached from) a frame during
the offset animation.

Previously this couldn't happen, because the insert_offset operator
was only called in macros after handling the attachement to frames.
This changed with commit cc9c720aae, which made it so the link insertion
operatior is called from inside the node transform operator, which
runs before handling the parenting to frames.

Here's a .blend-file to reproduce the issue: 111593.blend
Just insert a node a new node on the links insde the frames.

Proposed Solution

Rather than calculating the absolute node location based on the inital
location, this PR makes it so that with each call of
node_insert_offset_modal the node is offset a bit based on the
current duration and the delta (time) since the last call.

This makes the animation independent of the origin of the parent space
the node is currently in.
It also means anim_init_locx can be removed from the node runtime
since it's not used anymore.

Alternative

A small alternative fix is to also handle anim_init_locx, when
attaching (and detaching) nodes (see diff below.)
This change looks a bit safer, but I didn't like how the inner workings
of the auto-offset were leaking into unrelated code, so I prefer the
solution above.

diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index 0acb9760b58..3280a9c1545 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -2764,23 +2764,34 @@ void nodeAttachNode(bNodeTree *ntree, bNode *node, bNode *parent)
   BKE_ntree_update_tag_parent_change(ntree, node);
   /* transform to parent space */
   const blender::float2 new_loc = blender::bke::nodeFromView(parent, loc);
   node->locx = new_loc.x;
   node->locy = new_loc.y;
+
+  if (node->runtime->anim_ofsx) {
+    const float offset = new_loc.x - loc.x;
+    node->runtime->anim_init_locx += offset;
+  }
 }
 
 void nodeDetachNode(bNodeTree *ntree, bNode *node)
 {
   if (node->parent) {
     BLI_assert(node->parent->type == NODE_FRAME);
+    const blender::float2 old_loc{node->locx, node->locy};
 
     /* transform to view space */
     const blender::float2 loc = blender::bke::nodeToView(node, {});
     node->locx = loc.x;
     node->locy = loc.y;
     node->parent = nullptr;
     BKE_ntree_update_tag_parent_change(ntree, node);
+
+    if (node->runtime->anim_ofsx) {
+      const float offset = loc.x - old_loc.x;
+      node->runtime->anim_init_locx += offset;
+    }
   }
 }
 
 namespace blender::bke {

Apply auto-offset animation in relative steps, to avoid issues, when the parent space of the currently offset node changes. --- #### Issue The auto-offset was calculated by adding the offset to the inital node location. Since the node location is always in "parent space", this broke, when the node was attached to (or detached from) a frame during the offset animation. Previously this couldn't happen, because the `insert_offset` operator was only called in macros *after* handling the attachement to frames. This changed with commit cc9c720aae, which made it so the link insertion operatior is called from inside the node transform operator, which runs *before* handling the parenting to frames. Here's a .blend-file to reproduce the issue: [111593.blend](https://projects.blender.org/attachments/efeabc25-fc66-4a28-8339-641fc837bfda) Just insert a node a new node on the links insde the frames. #### Proposed Solution Rather than calculating the absolute node location based on the inital location, this PR makes it so that with each call of `node_insert_offset_modal` the node is offset a bit based on the current `duration` and the `delta` (time) since the last call. This makes the animation independent of the origin of the parent space the node is currently in. It also means `anim_init_locx` can be removed from the node runtime since it's not used anymore. #### Alternative A small alternative fix is to also handle `anim_init_locx`, when attaching (and detaching) nodes (see diff below.) This change looks a bit safer, but I didn't like how the inner workings of the auto-offset were leaking into unrelated code, so I prefer the solution above. ```Diff diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc index 0acb9760b58..3280a9c1545 100644 --- a/source/blender/blenkernel/intern/node.cc +++ b/source/blender/blenkernel/intern/node.cc @@ -2764,23 +2764,34 @@ void nodeAttachNode(bNodeTree *ntree, bNode *node, bNode *parent) BKE_ntree_update_tag_parent_change(ntree, node); /* transform to parent space */ const blender::float2 new_loc = blender::bke::nodeFromView(parent, loc); node->locx = new_loc.x; node->locy = new_loc.y; + + if (node->runtime->anim_ofsx) { + const float offset = new_loc.x - loc.x; + node->runtime->anim_init_locx += offset; + } } void nodeDetachNode(bNodeTree *ntree, bNode *node) { if (node->parent) { BLI_assert(node->parent->type == NODE_FRAME); + const blender::float2 old_loc{node->locx, node->locy}; /* transform to view space */ const blender::float2 loc = blender::bke::nodeToView(node, {}); node->locx = loc.x; node->locy = loc.y; node->parent = nullptr; BKE_ntree_update_tag_parent_change(ntree, node); + + if (node->runtime->anim_ofsx) { + const float offset = loc.x - old_loc.x; + node->runtime->anim_init_locx += offset; + } } } namespace blender::bke { ```

111593.blend

860 KiB

Leon Schittek added 1 commit 2023-08-28 23:00:23 +02:00

Fix #111593 : Auto-offset when inserting nodes on links inside frames 00c6d38242

Apply auto-offset animation in relative steps, to avoid issues, when
the parent space of the currently offset node changes.

Leon Schittek added this to the Nodes & Physics project 2023-08-28 23:01:01 +02:00

Leon Schittek added the

Download

What's New

Blender Studio

Manual

Developers Blog

Documentation

Benchmark

Blender Conference

Development Fund

One-time Donations

Fix #111593: Auto-offset when inserting nodes on links inside frames #111637

Issue

Proposed Solution

Alternative