dr.sybren/rignodes
11
14
Fork 2
Code Issues Pull Requests 5 Projects Releases Wiki Activity

Motion transfer setup #1

Manually merged
Sybren A. Stüvel merged 18 commits from cgtinker/powership:motion_transfer into main 2023-06-05 12:06:15 +02:00
Conversation 6 Commits 18 Files Changed 4 +21 -30
1 changed files with 21 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b4b939c280 - Show all commits

51
execute.py
View File

@ -1,14 +1,14 @@
# SPDX-License-Identifier: GPL-2.0-or-later # SPDX-License-Identifier: GPL-2.0-or-later
import bpy
from . import nodes
is_first_load = "nodes" not in locals() is_first_load = "nodes" not in locals()
from . import nodes
cgtinker marked this conversation as resolved Outdated
Sybren A. Stüvel commented 2023-05-26 17:19:11 +02:00
Outdated
Review
Copy Link

Please keep this block as-is. These changes will break the reloading mechanism.

Please keep this block as-is. These changes will break the reloading mechanism.
Sybren A. Stüvel commented 2023-05-26 17:19:11 +02:00
Outdated
Review
Copy Link

Please keep this block as-is. These changes will break the reloading mechanism.

Please keep this block as-is. These changes will break the reloading mechanism.
Denys Hsu commented 2023-05-26 19:39:25 +02:00
Outdated
Review
Copy Link

That's why it hasn't been updating!
My lsp destroyed the formatting a bit, doing my best to fix it – pylance has been fighting against mypy and no-one has been the winner I guess. Pep8 came to the rescue and yea well, here we are :)

What kind of formatter are you using? (probably will add a few more nodes in the future if you don't mind)

That's why it hasn't been updating! My lsp destroyed the formatting a bit, doing my best to fix it – pylance has been fighting against mypy and no-one has been the winner I guess. Pep8 came to the rescue and yea well, here we are :) What kind of formatter are you using? (probably will add a few more nodes in the future if you don't mind)
if not is_first_load: if not is_first_load:
import sys import sys
nodes = sys.modules[nodes.__name__] nodes = sys.modules[nodes.__name__]
import bpy
_skip_next_autorun = False _skip_next_autorun = False
@ -50,6 +50,7 @@ def execute_tree(
# The running of this tree will trigger another depsgraph update, which # The running of this tree will trigger another depsgraph update, which
# should not trigger yet another execution. # should not trigger yet another execution.
global _skip_next_autorun global _skip_next_autorun
try: try:
cgtinker marked this conversation as resolved Outdated
Sybren A. Stüvel commented 2023-05-26 17:20:28 +02:00
Outdated
Review
Copy Link

Please don’t include formatting changes like this. Formatting changes shouldn’t be in the same PR as functional changes.

Please don’t include formatting changes like this. Formatting changes shouldn’t be in the same PR as functional changes.
tree.run_event(depsgraph, mode) tree.run_event(depsgraph, mode)
except Exception: except Exception:
@ -66,10 +67,28 @@ def _on_depsgraph_update_post(
scene: bpy.types.Scene, depsgraph: bpy.types.Depsgraph scene: bpy.types.Scene, depsgraph: bpy.types.Depsgraph
) -> None: ) -> None:
global _skip_next_autorun global _skip_next_autorun
if _skip_next_autorun: if _skip_next_autorun:
_skip_next_autorun = False _skip_next_autorun = False
return return
run_node_tree(scene, depsgraph)
@bpy.app.handlers.persistent # type: ignore
def _on_frame_changed_post(
scene: bpy.types.Scene, depsgraph: bpy.types.Depsgraph
) -> None:
global _skip_next_autorun
if not _skip_next_autorun:
_skip_next_autorun = True
cgtinker marked this conversation as resolved
Sybren A. Stüvel commented 2023-06-01 11:05:15 +02:00
Review
Copy Link

Since _skip_next_autorun is a boolean, the if condition can be removed.

Since `_skip_next_autorun` is a boolean, the `if` condition can be removed.
run_node_tree(scene, depsgraph)
def run_node_tree(
scene: bpy.types.Scene, depsgraph: bpy.types.Depsgraph
) -> None:
for tree in bpy.data.node_groups: for tree in bpy.data.node_groups:
if tree.bl_idname != "PowerShipNodeTree": if tree.bl_idname != "PowerShipNodeTree":
continue continue
@ -97,34 +116,6 @@ def _choose_auto_mode(context: bpy.types.Context) -> str:
return "FORWARD" return "FORWARD"
@bpy.app.handlers.persistent # type: ignore
def _on_frame_changed_post(
scene: bpy.types.Scene, depsgraph: bpy.types.Depsgraph
) -> None:
global _skip_next_autorun
if _skip_next_autorun:
_skip_next_autorun = True
# updating on frame change to allow
# keyframed animation influencing the rig
for tree in bpy.data.node_groups:
if tree.bl_idname != "PowerShipNodeTree":
continue
if not tree.autorun:
return
powership_mode = scene.powership_mode
if powership_mode == "AUTO":
if bpy.context.object and bpy.context.object.mode == "POSE":
powership_mode = "BACKWARD"
else:
powership_mode = "FORWARD"
execute_tree(tree, depsgraph, powership_mode)
classes = ( classes = (
# Operators: # Operators:
PowerShip_OT_execute_tree, PowerShip_OT_execute_tree,