Skip to content

Commit b46f73d

Browse files
mbrea-cmbrea-c
committed
start asset migration, fix UI bug
1 parent d047f14 commit b46f73d

4 files changed

Lines changed: 213 additions & 8 deletions

File tree

‎assets/animation_graphs/blend_parameters.animgraph.ron‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
(
2+
nodes: [],
3+
edges_inverted: {},
4+
io_spec: (
5+
input_times: [],
6+
input_data: {},
7+
output_time: false,
8+
output_data: {},
9+
input_order: {},
10+
output_order: {},
11+
),
12+
default_data: {},
13+
editor_metadata: (
14+
node_positions: {},
15+
input_position: (0.0, 0.0),
16+
output_position: (0.0, 0.0),
17+
input_param_order: {},
18+
input_time_order: {},
19+
output_data_order: {},
20+
output_pose_order: {},
21+
),
22+
)

‎assets/animation_graphs/human.animgraph.ron‎

Lines changed: 182 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,182 @@
1+
(
2+
nodes: [
3+
(
4+
id: "d8636d07-9e62-4413-b3bb-761fc8461ae0",
5+
name: "run clip 2",
6+
inner: {
7+
"bevy_animation_graph::builtin_nodes::ClipNode": (
8+
clip: "animations/human_run.anim.ron",
9+
override_duration: None,
10+
override_interpolation: None,
11+
),
12+
},
13+
should_debug: false,
14+
),
15+
(
16+
id: "8a3262a8-d9b0-4c23-bb1f-a170b3bf4e6a",
17+
name: "blend",
18+
inner: {
19+
"bevy_animation_graph::builtin_nodes::BlendNode": (
20+
mode: LinearInterpolate,
21+
sync_mode: Absolute,
22+
),
23+
},
24+
should_debug: true,
25+
),
26+
(
27+
id: "3451ae58-0ff4-49d1-a67a-8249e1dd2d88",
28+
name: "walk clip 2",
29+
inner: {
30+
"bevy_animation_graph::builtin_nodes::ClipNode": (
31+
clip: "animations/human_walk.anim.ron",
32+
override_duration: None,
33+
override_interpolation: None,
34+
),
35+
},
36+
should_debug: false,
37+
),
38+
(
39+
id: "098be6e7-c3f5-4caf-b36d-3f9e069aee6e",
40+
name: "flip run",
41+
inner: {
42+
"bevy_animation_graph::builtin_nodes::FlipLRNode": (
43+
config: (
44+
name_mapper: Pattern((
45+
key_1: "L",
46+
key_2: "R",
47+
pattern_before: "^.*",
48+
pattern_after: "$",
49+
)),
50+
mode: MirrorX,
51+
),
52+
),
53+
},
54+
should_debug: false,
55+
),
56+
(
57+
id: "8064d95a-b8f5-4304-8534-31ead6304068",
58+
name: "run clip 1",
59+
inner: {
60+
"bevy_animation_graph::builtin_nodes::ClipNode": (
61+
clip: "animations/human_run.anim.ron",
62+
override_duration: None,
63+
override_interpolation: None,
64+
),
65+
},
66+
should_debug: false,
67+
),
68+
(
69+
id: "ae04ba83-7b08-4eaf-a552-09b7fa10e54d",
70+
name: "chain walk",
71+
inner: {
72+
"bevy_animation_graph::builtin_nodes::ChainNode": (
73+
interpolation_period: 0.5,
74+
),
75+
},
76+
should_debug: false,
77+
),
78+
(
79+
id: "0ddfb1a3-4248-4be3-ace3-98e20841ccf3",
80+
name: "walk clip 1",
81+
inner: {
82+
"bevy_animation_graph::builtin_nodes::ClipNode": (
83+
clip: "animations/human_walk.anim.ron",
84+
override_duration: None,
85+
override_interpolation: None,
86+
),
87+
},
88+
should_debug: false,
89+
),
90+
(
91+
id: "13af4c51-1ab5-4f1d-a9d3-fc53c50e4a38",
92+
name: "flip walk",
93+
inner: {
94+
"bevy_animation_graph::builtin_nodes::FlipLRNode": (
95+
config: (
96+
name_mapper: Pattern((
97+
key_1: "L",
98+
key_2: "R",
99+
pattern_before: "^.*",
100+
pattern_after: "$",
101+
)),
102+
mode: MirrorX,
103+
),
104+
),
105+
},
106+
should_debug: false,
107+
),
108+
(
109+
id: "b3d1c53f-1a14-4a75-b2c7-62bbe8eef87c",
110+
name: "chain run",
111+
inner: {
112+
"bevy_animation_graph::builtin_nodes::ChainNode": (
113+
interpolation_period: 0.5,
114+
),
115+
},
116+
should_debug: false,
117+
),
118+
],
119+
edges_inverted: {
120+
NodeTime("098be6e7-c3f5-4caf-b36d-3f9e069aee6e", "time"): NodeTime("d8636d07-9e62-4413-b3bb-761fc8461ae0"),
121+
NodeTime("b3d1c53f-1a14-4a75-b2c7-62bbe8eef87c", "time_a"): NodeTime("8064d95a-b8f5-4304-8534-31ead6304068"),
122+
NodeData("b3d1c53f-1a14-4a75-b2c7-62bbe8eef87c", "pose_b"): NodeData("098be6e7-c3f5-4caf-b36d-3f9e069aee6e", "pose"),
123+
NodeData("ae04ba83-7b08-4eaf-a552-09b7fa10e54d", "pose_b"): NodeData("13af4c51-1ab5-4f1d-a9d3-fc53c50e4a38", "pose"),
124+
NodeTime("ae04ba83-7b08-4eaf-a552-09b7fa10e54d", "time_b"): NodeTime("13af4c51-1ab5-4f1d-a9d3-fc53c50e4a38"),
125+
NodeTime("ae04ba83-7b08-4eaf-a552-09b7fa10e54d", "time_a"): NodeTime("0ddfb1a3-4248-4be3-ace3-98e20841ccf3"),
126+
NodeData("b3d1c53f-1a14-4a75-b2c7-62bbe8eef87c", "pose_a"): NodeData("8064d95a-b8f5-4304-8534-31ead6304068", "pose"),
127+
NodeData("ae04ba83-7b08-4eaf-a552-09b7fa10e54d", "pose_a"): NodeData("0ddfb1a3-4248-4be3-ace3-98e20841ccf3", "pose"),
128+
NodeData("8a3262a8-d9b0-4c23-bb1f-a170b3bf4e6a", "pose_a"): NodeData("ae04ba83-7b08-4eaf-a552-09b7fa10e54d", "pose"),
129+
NodeData("8a3262a8-d9b0-4c23-bb1f-a170b3bf4e6a", "pose_b"): NodeData("b3d1c53f-1a14-4a75-b2c7-62bbe8eef87c", "pose"),
130+
NodeTime("8a3262a8-d9b0-4c23-bb1f-a170b3bf4e6a", "time_b"): NodeTime("b3d1c53f-1a14-4a75-b2c7-62bbe8eef87c"),
131+
NodeData("098be6e7-c3f5-4caf-b36d-3f9e069aee6e", "pose"): NodeData("d8636d07-9e62-4413-b3bb-761fc8461ae0", "pose"),
132+
NodeTime("8a3262a8-d9b0-4c23-bb1f-a170b3bf4e6a", "time_a"): NodeTime("ae04ba83-7b08-4eaf-a552-09b7fa10e54d"),
133+
NodeTime("13af4c51-1ab5-4f1d-a9d3-fc53c50e4a38", "time"): NodeTime("3451ae58-0ff4-49d1-a67a-8249e1dd2d88"),
134+
NodeTime("b3d1c53f-1a14-4a75-b2c7-62bbe8eef87c", "time_b"): NodeTime("098be6e7-c3f5-4caf-b36d-3f9e069aee6e"),
135+
NodeData("13af4c51-1ab5-4f1d-a9d3-fc53c50e4a38", "pose"): NodeData("3451ae58-0ff4-49d1-a67a-8249e1dd2d88", "pose"),
136+
},
137+
io_spec: (
138+
input_times: [],
139+
input_data: {
140+
Passthrough("target_direction"): Vec3,
141+
Passthrough("Z"): Vec3,
142+
Passthrough("target_speed"): F32,
143+
Passthrough("1"): F32,
144+
Passthrough("rotation_bone"): EntityPath,
145+
},
146+
output_time: true,
147+
output_data: {
148+
"pose": Pose,
149+
},
150+
input_order: {
151+
Data(Passthrough("rotation_bone")): 2,
152+
Data(Passthrough("target_speed")): 3,
153+
Data(Passthrough("target_direction")): 0,
154+
Data(Passthrough("Z")): 1,
155+
Data(Passthrough("1")): 4,
156+
},
157+
output_order: {
158+
Time: 0,
159+
Data("pose"): 1,
160+
},
161+
),
162+
default_data: {},
163+
editor_metadata: (
164+
node_positions: {
165+
"d8636d07-9e62-4413-b3bb-761fc8461ae0": (-219.4336, 221.21094),
166+
"8a3262a8-d9b0-4c23-bb1f-a170b3bf4e6a": (253.11328, -26.597656),
167+
"3451ae58-0ff4-49d1-a67a-8249e1dd2d88": (-222.125, -128.01953),
168+
"098be6e7-c3f5-4caf-b36d-3f9e069aee6e": (-81.71484, 232.32422),
169+
"8064d95a-b8f5-4304-8534-31ead6304068": (-221.14453, 51.78125),
170+
"ae04ba83-7b08-4eaf-a552-09b7fa10e54d": (66.21484, -236.3125),
171+
"0ddfb1a3-4248-4be3-ace3-98e20841ccf3": (-224.76953, -292.48047),
172+
"13af4c51-1ab5-4f1d-a9d3-fc53c50e4a38": (-85.3125, -113.33594),
173+
"b3d1c53f-1a14-4a75-b2c7-62bbe8eef87c": (74.6875, 134.13672),
174+
},
175+
input_position: (-196.46875, 520.84766),
176+
output_position: (675.91016, 603.58594),
177+
input_param_order: {},
178+
input_time_order: {},
179+
output_data_order: {},
180+
output_pose_order: {},
181+
),
182+
)

‎crates/bevy_animation_graph_editor/src/ui/native_windows/graph_editor.rs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,12 @@ impl NativeEditorWindowExtension for GraphEditorWindow {
147147
.find(|id| **id > 1)
148148
&& *selected_node > 1
149149
{
150-
let node_name =
151-
graph_indices.node_indices.name(*selected_node).unwrap();
152-
graph.nodes.get_mut(&node_name).unwrap().should_debug = true;
150+
let node_id = graph_indices.node_indices.name(*selected_node).unwrap();
151+
graph.nodes.get_mut(&node_id).unwrap().should_debug = true;
153152
if let Some(active_node) = get_global_state::<ActiveGraphNode>(world)
154153
&& let Some(InspectorSelection::ActiveNode) =
155154
get_global_state::<InspectorSelection>(world)
156-
&& active_node.node == node_name
155+
&& active_node.node == node_id
157156
&& active_node.handle == active_graph.handle
158157
{
159158
// pass
@@ -162,7 +161,7 @@ impl NativeEditorWindowExtension for GraphEditorWindow {
162161
SetActiveGraphNode {
163162
new: ActiveGraphNode {
164163
handle: active_graph.handle.clone(),
165-
node: node_name.clone(),
164+
node: node_id,
166165
selected_pin: None,
167166
},
168167
},

‎crates/bevy_animation_graph_editor/src/ui/native_windows/inspector.rs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,11 @@ fn node_inspector(
9797

9898
let node_buffer_id = ui.id().with("graph node buffer");
9999

100-
let node_buffer = ctx
101-
.buffers
102-
.get_mut_or_insert_with(node_buffer_id, || node.clone());
100+
let node_buffer = ctx.buffers.get_mut_or_insert_with_condition(
101+
node_buffer_id,
102+
|n: &AnimationNode| n.id != active_node.node,
103+
|| node.clone(),
104+
);
103105

104106
let response = ui.text_edit_singleline(&mut node_buffer.name);
105107
let mut clear = false;

0 commit comments

Comments
 (0)