Skip to content

Commit 18c6b08

Browse files
mbrea-cmbrea-c
committed
started work on editor
1 parent 59d5f0b commit 18c6b08

32 files changed

Lines changed: 1523 additions & 618 deletions

File tree

‎Cargo.lock‎

Lines changed: 370 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/animation_graphs/human_new.animgraph.ron‎

Lines changed: 129 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,46 @@
11
(
22
nodes: [
33
(
4-
name: "speed",
4+
name: "wave additive",
55
inner: {
6-
"bevy_animation_graph::nodes::speed_node::SpeedNode": (),
6+
"bevy_animation_graph::nodes::blend_node::BlendNode": (
7+
mode: Additive,
8+
sync_mode: NoSync,
9+
),
710
},
811
),
912
(
10-
name: "walk clip 1",
13+
name: "stand",
1114
inner: {
1215
"bevy_animation_graph::nodes::clip_node::ClipNode": (
13-
clip: "animations/human_walk.anim.ron",
16+
clip: "animations/human_stand.anim.ron",
17+
override_duration: None,
18+
override_interpolation: None,
1419
),
1520
},
1621
),
1722
(
18-
name: "Rotate",
23+
name: "walk clip 2",
1924
inner: {
20-
"bevy_animation_graph::nodes::rotation_node::RotationNode": (
21-
application_mode: Compose,
22-
rotation_space: Character,
23-
chain_decay: Linear,
24-
chain_length: 1,
25-
base_weight: 1.0,
25+
"bevy_animation_graph::nodes::clip_node::ClipNode": (
26+
clip: "animations/human_walk.anim.ron",
27+
override_duration: None,
28+
override_interpolation: None,
2629
),
2730
},
2831
),
2932
(
30-
name: "flip walk",
33+
name: "Parameters",
3134
inner: {
32-
"bevy_animation_graph::nodes::flip_lr_node::FlipLRNode": (
33-
config: (
34-
name_mapper: Pattern((
35-
key_1: "L",
36-
key_2: "R",
37-
pattern_before: "^.*",
38-
pattern_after: "$",
39-
)),
40-
),
35+
"bevy_animation_graph::nodes::graph_node::GraphNode": (
36+
graph: "animation_graphs/velocity_to_params.animgraph.ron",
4137
),
4238
},
4339
),
4440
(
45-
name: "wave additive",
41+
name: "Make Rotation",
4642
inner: {
47-
"bevy_animation_graph::nodes::blend_node::BlendNode": (
48-
mode: Additive,
49-
),
43+
"bevy_animation_graph::nodes::arithmetic::vec3::rotation_arc::RotationArcNode": (),
5044
},
5145
),
5246
(
@@ -60,39 +54,50 @@
6054
pattern_before: "^.*",
6155
pattern_after: "$",
6256
)),
57+
mode: MirrorX,
6358
),
6459
),
6560
},
6661
),
6762
(
68-
name: "run clip 2",
63+
name: "Rotate",
6964
inner: {
70-
"bevy_animation_graph::nodes::clip_node::ClipNode": (
71-
clip: "animations/human_run.anim.ron",
65+
"bevy_animation_graph::nodes::rotation_node::RotationNode": (
66+
application_mode: Compose,
67+
rotation_space: Character,
68+
chain_decay: Linear,
69+
chain_length: 1,
70+
base_weight: 1.0,
7271
),
7372
},
7473
),
7574
(
76-
name: "blend",
75+
name: "run clip 1",
7776
inner: {
78-
"bevy_animation_graph::nodes::blend_node::BlendNode": (
79-
mode: LinearInterpolate,
77+
"bevy_animation_graph::nodes::clip_node::ClipNode": (
78+
clip: "animations/human_run.anim.ron",
79+
override_duration: None,
80+
override_interpolation: None,
8081
),
8182
},
8283
),
8384
(
84-
name: "loop",
85+
name: "wave",
8586
inner: {
86-
"bevy_animation_graph::nodes::loop_node::LoopNode": (
87-
interpolation_period: 0.5,
87+
"bevy_animation_graph::nodes::clip_node::ClipNode": (
88+
clip: "animations/human_wave.anim.ron",
89+
override_duration: None,
90+
override_interpolation: None,
8891
),
8992
},
9093
),
9194
(
92-
name: "stand",
95+
name: "run clip 2",
9396
inner: {
9497
"bevy_animation_graph::nodes::clip_node::ClipNode": (
95-
clip: "animations/human_stand.anim.ron",
98+
clip: "animations/human_run.anim.ron",
99+
override_duration: None,
100+
override_interpolation: None,
96101
),
97102
},
98103
),
@@ -105,110 +110,122 @@
105110
},
106111
),
107112
(
108-
name: "Parameters",
113+
name: "blend",
109114
inner: {
110-
"bevy_animation_graph::nodes::graph_node::GraphNode": (
111-
graph: "animation_graphs/velocity_to_params.animgraph.ron",
115+
"bevy_animation_graph::nodes::blend_node::BlendNode": (
116+
mode: LinearInterpolate,
117+
sync_mode: Absolute,
112118
),
113119
},
114120
),
115121
(
116-
name: "chain run",
122+
name: "wave diff",
117123
inner: {
118-
"bevy_animation_graph::nodes::chain_node::ChainNode": (
119-
interpolation_period: 0.5,
124+
"bevy_animation_graph::nodes::blend_node::BlendNode": (
125+
mode: Difference,
126+
sync_mode: Absolute,
120127
),
121128
},
122129
),
123130
(
124-
name: "run clip 1",
131+
name: "loop",
125132
inner: {
126-
"bevy_animation_graph::nodes::clip_node::ClipNode": (
127-
clip: "animations/human_run.anim.ron",
133+
"bevy_animation_graph::nodes::loop_node::LoopNode": (
134+
interpolation_period: 0.5,
128135
),
129136
},
130137
),
131138
(
132-
name: "wave diff",
139+
name: "walk clip 1",
133140
inner: {
134-
"bevy_animation_graph::nodes::blend_node::BlendNode": (
135-
mode: Difference,
141+
"bevy_animation_graph::nodes::clip_node::ClipNode": (
142+
clip: "animations/human_walk.anim.ron",
143+
override_duration: None,
144+
override_interpolation: None,
136145
),
137146
},
138147
),
139148
(
140-
name: "wave",
149+
name: "chain run",
141150
inner: {
142-
"bevy_animation_graph::nodes::clip_node::ClipNode": (
143-
clip: "animations/human_wave.anim.ron",
151+
"bevy_animation_graph::nodes::chain_node::ChainNode": (
152+
interpolation_period: 0.5,
144153
),
145154
},
146155
),
147156
(
148-
name: "walk clip 2",
157+
name: "speed",
149158
inner: {
150-
"bevy_animation_graph::nodes::clip_node::ClipNode": (
151-
clip: "animations/human_walk.anim.ron",
152-
),
159+
"bevy_animation_graph::nodes::speed_node::SpeedNode": (),
153160
},
154161
),
155162
(
156-
name: "Make Rotation",
163+
name: "flip walk",
157164
inner: {
158-
"bevy_animation_graph::nodes::arithmetic::vec3::rotation_arc::RotationArcNode": (),
165+
"bevy_animation_graph::nodes::flip_lr_node::FlipLRNode": (
166+
config: (
167+
name_mapper: Pattern((
168+
key_1: "L",
169+
key_2: "R",
170+
pattern_before: "^.*",
171+
pattern_after: "$",
172+
)),
173+
mode: MirrorX,
174+
),
175+
),
159176
},
160177
),
161178
],
162179
edges_inverted: {
163-
NodeData("Rotate", "bone_mask"): InputData("rotation_bone"),
164-
NodeTime("speed", "time"): NodeTime("loop"),
165-
NodeData("Make Rotation", "in_b"): InputData("target_direction"),
180+
NodeData("Parameters", "speed"): InputData("target_speed"),
181+
NodeData("chain run", "pose_b"): NodeData("flip run", "pose"),
182+
NodeTime("flip walk", "time"): NodeTime("walk clip 2"),
183+
NodeTime("chain walk", "time_a"): NodeTime("walk clip 1"),
184+
NodeData("Make Rotation", "in_a"): InputData("Z"),
185+
NodeData("wave additive", "pose_b"): NodeData("wave diff", "pose"),
186+
NodeData("wave additive", "pose_a"): NodeData("speed", "pose"),
166187
OutputData("pose"): NodeData("Rotate", "pose"),
167-
NodeTime("chain run", "time_b"): NodeTime("flip run"),
168188
NodeData("chain walk", "pose_b"): NodeData("flip walk", "pose"),
169-
NodeTime("blend", "time_a"): NodeTime("chain walk"),
170-
NodeData("chain walk", "pose_a"): NodeData("walk clip 1", "pose"),
171189
NodeData("blend", "factor"): NodeData("Parameters", "blend_fac"),
172-
NodeData("Parameters", "speed"): InputData("target_speed"),
173-
NodeData("blend", "pose_a"): NodeData("chain walk", "pose"),
174-
NodeTime("wave additive", "time_a"): NodeTime("speed"),
175-
OutputTime: NodeTime("Rotate"),
176-
NodeData("wave additive", "pose_a"): NodeData("speed", "pose"),
177-
NodeData("wave diff", "pose_b"): NodeData("wave", "pose"),
178-
NodeData("flip run", "pose"): NodeData("run clip 2", "pose"),
190+
NodeData("chain walk", "pose_a"): NodeData("walk clip 1", "pose"),
191+
NodeTime("blend", "time_b"): NodeTime("chain run"),
179192
NodeData("blend", "pose_b"): NodeData("chain run", "pose"),
180-
NodeData("speed", "speed"): NodeData("Parameters", "speed_fac"),
181-
NodeData("wave additive", "pose_b"): NodeData("wave diff", "pose"),
182-
NodeTime("wave diff", "time_a"): NodeTime("stand"),
193+
NodeData("Rotate", "bone_mask"): InputData("rotation_bone"),
183194
NodeTime("wave diff", "time_b"): NodeTime("wave"),
184-
NodeTime("chain walk", "time_b"): NodeTime("flip walk"),
195+
NodeData("speed", "pose"): NodeData("loop", "pose"),
196+
NodeData("speed", "speed"): NodeData("Parameters", "speed_fac"),
197+
NodeData("chain run", "pose_a"): NodeData("run clip 1", "pose"),
198+
NodeTime("chain run", "time_a"): NodeTime("run clip 1"),
185199
NodeData("wave diff", "pose_a"): NodeData("stand", "pose"),
186-
NodeTime("wave additive", "time_b"): NodeTime("wave diff"),
187-
NodeTime("chain walk", "time_a"): NodeTime("walk clip 1"),
188-
NodeData("Rotate", "rotation"): NodeData("Make Rotation", "out"),
200+
NodeData("flip run", "pose"): NodeData("run clip 2", "pose"),
189201
NodeTime("loop", "time"): NodeTime("blend"),
190-
NodeData("chain run", "pose_b"): NodeData("flip run", "pose"),
191-
NodeTime("blend", "time_b"): NodeTime("chain run"),
202+
NodeTime("wave additive", "time_a"): NodeTime("speed"),
192203
NodeData("loop", "pose"): NodeData("blend", "pose"),
204+
NodeData("wave diff", "pose_b"): NodeData("wave", "pose"),
205+
NodeTime("blend", "time_a"): NodeTime("chain walk"),
193206
NodeTime("Rotate", "time"): NodeTime("wave additive"),
194-
NodeData("wave additive", "factor"): InputData("1"),
195-
NodeTime("chain run", "time_a"): NodeTime("run clip 1"),
207+
NodeData("Rotate", "rotation"): NodeData("Make Rotation", "out"),
208+
NodeTime("flip run", "time"): NodeTime("run clip 2"),
209+
NodeTime("chain run", "time_b"): NodeTime("flip run"),
196210
NodeData("flip walk", "pose"): NodeData("walk clip 2", "pose"),
197-
NodeTime("flip walk", "time"): NodeTime("walk clip 2"),
211+
NodeData("blend", "pose_a"): NodeData("chain walk", "pose"),
212+
NodeTime("chain walk", "time_b"): NodeTime("flip walk"),
213+
NodeTime("wave diff", "time_a"): NodeTime("stand"),
198214
NodeData("Rotate", "pose"): NodeData("wave additive", "pose"),
199-
NodeData("speed", "pose"): NodeData("loop", "pose"),
200-
NodeData("Make Rotation", "in_a"): InputData("Z"),
201-
NodeTime("flip run", "time"): NodeTime("run clip 2"),
202-
NodeData("chain run", "pose_a"): NodeData("run clip 1", "pose"),
215+
NodeTime("wave additive", "time_b"): NodeTime("wave diff"),
216+
OutputTime: NodeTime("Rotate"),
217+
NodeData("Make Rotation", "in_b"): InputData("target_direction"),
218+
NodeTime("speed", "time"): NodeTime("loop"),
219+
NodeData("wave additive", "factor"): InputData("1"),
203220
},
204221
default_parameters: {
205-
"target_speed": F32(1.6),
206-
"target_direction": Vec3((1.0, 0.0, 0.0)),
207222
"rotation_bone": EntityPath([
208223
"metarig",
209224
"spine",
210225
]),
211226
"Z": Vec3((0.0, 0.0, 1.0)),
227+
"target_direction": Vec3((1.0, 0.0, 0.0)),
228+
"target_speed": F32(0.0),
212229
"1": F32(1.0),
213230
},
214231
input_times: {},
@@ -218,26 +235,36 @@
218235
output_time: Some(()),
219236
extra: (
220237
node_positions: {
221-
"speed": (787.15393, 429.8462),
222-
"walk clip 1": (169.0, 247.0),
223-
"Rotate": (1185.231, 292.6154),
224-
"flip walk": (167.0, 401.0),
225-
"wave additive": (1004.3075, 513.2307),
238+
"wave additive": (1001.2411, 506.39087),
239+
"stand": (408.9231, 818.7693),
240+
"walk clip 2": (21.0, 401.0),
241+
"Parameters": (472.01984, -81.55797),
242+
"Make Rotation": (1071.902, 104.07933),
226243
"flip run": (170.0, 713.0),
244+
"Rotate": (1178.9731, 288.77945),
245+
"run clip 1": (172.0, 558.0),
246+
"wave": (411.69232, 978.4614),
227247
"run clip 2": (20.538483, 715.6923),
248+
"chain walk": (335.0, 320.0),
228249
"blend": (501.0, 441.0),
250+
"wave diff": (596.3078, 868.61536),
229251
"loop": (640.0, 443.0),
230-
"stand": (408.9231, 818.7693),
231-
"chain walk": (335.0, 320.0),
232-
"Parameters": (453.23077, -5.538437),
252+
"walk clip 1": (169.0, 247.0),
233253
"chain run": (328.0, 600.0),
234-
"run clip 1": (172.0, 558.0),
235-
"wave diff": (596.3078, 868.61536),
236-
"wave": (411.69232, 978.4614),
237-
"walk clip 2": (21.0, 401.0),
238-
"Make Rotation": (1130.7692, 96.92308),
254+
"speed": (802.23206, 427.99463),
255+
"flip walk": (167.0, 401.0),
239256
},
240257
input_position: (130.61536, -34.07692),
241258
output_position: (1354.3077, 305.46152),
259+
input_param_order: {
260+
"rotation_bone": 2,
261+
"Z": 1,
262+
"target_direction": 0,
263+
"target_speed": 3,
264+
"1": 4,
265+
},
266+
input_time_order: {},
267+
output_data_order: {},
268+
output_pose_order: {},
242269
),
243-
)
270+
)

0 commit comments

Comments
 (0)