Skip to content

Commit d6714b1

Browse files
mbrea-cmbrea-c
committed
cleaned up import paths
1 parent af98983 commit d6714b1

119 files changed

Lines changed: 994 additions & 875 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎crates/bevy_animation_graph/src/builtin_nodes/blend_node.rs‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
use crate::core::animation_graph::{PinMap, TimeUpdate};
2-
use crate::core::animation_node::{NodeLike, ReflectNodeLike};
3-
use crate::core::context::SpecContext;
4-
use crate::core::context::new_context::NodeContext;
5-
use crate::core::edge_data::DataSpec;
6-
use crate::core::errors::GraphError;
7-
use crate::core::pose::Pose;
8-
use crate::interpolation::linear::InterpolateLinear;
91
use bevy::prelude::*;
102
use serde::{Deserialize, Serialize};
113

4+
use crate::core::{
5+
animation_graph::{PinMap, TimeUpdate},
6+
animation_node::{NodeLike, ReflectNodeLike},
7+
context::{new_context::NodeContext, spec_context::SpecContext},
8+
edge_data::DataSpec,
9+
errors::GraphError,
10+
interpolation::linear::InterpolateLinear,
11+
pose::Pose,
12+
};
13+
1214
#[derive(Reflect, Clone, Copy, Debug, Default, Serialize, Deserialize)]
1315
#[reflect(Default, Serialize)]
1416
pub enum BlendMode {

‎crates/bevy_animation_graph/src/builtin_nodes/blend_space_node.rs‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
1-
use crate::core::animation_graph::{PinMap, TimeUpdate};
2-
use crate::core::animation_node::{EditProxy, NodeLike, ReflectEditProxy, ReflectNodeLike};
3-
use crate::core::context::SpecContext;
4-
use crate::core::context::new_context::NodeContext;
5-
use crate::core::edge_data::DataSpec;
6-
use crate::core::errors::GraphError;
7-
use crate::builtin_nodes::blend_node::BlendSyncMode;
8-
use crate::utils::delaunay::Triangulation;
91
use bevy::prelude::*;
102
use serde::{Deserialize, Serialize};
113

4+
use crate::{
5+
builtin_nodes::blend_node::BlendSyncMode,
6+
core::{
7+
animation_graph::{PinMap, TimeUpdate},
8+
animation_node::{EditProxy, NodeLike, ReflectEditProxy, ReflectNodeLike},
9+
context::{new_context::NodeContext, spec_context::SpecContext},
10+
edge_data::DataSpec,
11+
errors::GraphError,
12+
utils::delaunay::Triangulation,
13+
},
14+
};
15+
1216
#[derive(Reflect, Clone, Copy, Debug, Default, Serialize, Deserialize)]
1317
#[reflect(Default, Serialize)]
1418
pub enum BlendMode {

‎crates/bevy_animation_graph/src/builtin_nodes/bool/const_bool.rs‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
use crate::core::animation_graph::PinMap;
2-
use crate::core::animation_node::{NodeLike, ReflectNodeLike};
3-
use crate::core::context::SpecContext;
4-
use crate::core::context::new_context::NodeContext;
5-
use crate::core::edge_data::DataSpec;
6-
use crate::core::errors::GraphError;
71
use bevy::prelude::*;
82

3+
use crate::core::{
4+
animation_graph::PinMap,
5+
animation_node::{NodeLike, ReflectNodeLike},
6+
context::{new_context::NodeContext, spec_context::SpecContext},
7+
edge_data::DataSpec,
8+
errors::GraphError,
9+
};
10+
911
#[derive(Reflect, Clone, Debug, Default)]
1012
#[reflect(Default, NodeLike)]
1113
#[type_path = "bevy_animation_graph::builtin_nodes"]

‎crates/bevy_animation_graph/src/builtin_nodes/chain_node.rs‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
use crate::core::animation_graph::{PinMap, TimeUpdate};
2-
use crate::core::animation_node::{NodeLike, ReflectNodeLike};
3-
use crate::core::context::SpecContext;
4-
use crate::core::context::new_context::NodeContext;
5-
use crate::core::edge_data::DataSpec;
6-
use crate::core::errors::GraphError;
7-
use crate::interpolation::linear::InterpolateLinear;
81
use bevy::prelude::*;
92

3+
use crate::core::{
4+
animation_graph::{PinMap, TimeUpdate},
5+
animation_node::{NodeLike, ReflectNodeLike},
6+
context::{new_context::NodeContext, spec_context::SpecContext},
7+
edge_data::DataSpec,
8+
errors::GraphError,
9+
interpolation::linear::InterpolateLinear,
10+
};
11+
1012
#[derive(Reflect, Clone, Debug, Default)]
1113
#[reflect(Default, NodeLike)]
1214
#[type_path = "bevy_animation_graph::builtin_nodes"]

‎crates/bevy_animation_graph/src/builtin_nodes/clip_node.rs‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,26 @@
11
use std::any::TypeId;
22

3-
use crate::core::animation_clip::{GraphClip, Interpolation};
4-
use crate::core::animation_graph::{PinMap, TimeUpdate};
5-
use crate::core::animation_node::{NodeLike, ReflectNodeLike};
6-
use crate::core::context::SpecContext;
7-
use crate::core::context::new_context::NodeContext;
8-
use crate::core::edge_data::{DataSpec, DataValue, EventQueue};
9-
use crate::core::errors::GraphError;
10-
use crate::core::event_track::sample_tracks;
11-
use crate::core::id::BoneId;
12-
use crate::core::pose::{BonePose, Pose};
13-
use bevy::asset::Handle;
14-
use bevy::math::{Quat, Vec3};
15-
use bevy::platform::hash::Hashed;
16-
use bevy::prelude::{
17-
Animatable, AnimatableProperty, AnimationNodeIndex, EvaluatorId, Transform, VariableCurve,
3+
use bevy::{
4+
asset::Handle,
5+
math::{Quat, Vec3},
6+
platform::hash::Hashed,
7+
prelude::{
8+
Animatable, AnimatableProperty, AnimationNodeIndex, EvaluatorId, Transform, VariableCurve,
9+
},
10+
reflect::prelude::*,
11+
};
12+
13+
use crate::core::{
14+
animation_clip::{GraphClip, Interpolation},
15+
animation_graph::{PinMap, TimeUpdate},
16+
animation_node::{NodeLike, ReflectNodeLike},
17+
context::{new_context::NodeContext, spec_context::SpecContext},
18+
edge_data::{DataSpec, DataValue, events::EventQueue},
19+
errors::GraphError,
20+
event_track::sample_tracks,
21+
id::BoneId,
22+
pose::{BonePose, Pose},
1823
};
19-
use bevy::reflect::prelude::*;
2024

2125
#[derive(Reflect, Clone, Debug, Default)]
2226
#[reflect(Default, NodeLike)]

‎crates/bevy_animation_graph/src/builtin_nodes/const_entity_path.rs‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
use crate::core::animation_clip::EntityPath;
2-
use crate::core::animation_graph::PinMap;
3-
use crate::core::animation_node::NodeLike;
4-
use crate::core::context::SpecContext;
5-
use crate::core::context::new_context::NodeContext;
6-
use crate::core::edge_data::{DataSpec, DataValue};
7-
use crate::core::errors::GraphError;
8-
use bevy::reflect::Reflect;
9-
use bevy::reflect::prelude::ReflectDefault;
1+
use bevy::reflect::{Reflect, prelude::ReflectDefault};
2+
3+
use crate::core::{
4+
animation_clip::EntityPath,
5+
animation_graph::PinMap,
6+
animation_node::NodeLike,
7+
context::{new_context::NodeContext, spec_context::SpecContext},
8+
edge_data::{DataSpec, DataValue},
9+
errors::GraphError,
10+
};
1011

1112
#[derive(Reflect, Clone, Debug, Default)]
1213
#[reflect(Default)]

‎crates/bevy_animation_graph/src/builtin_nodes/dummy_node.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
use crate::core::animation_node::{NodeLike, ReflectNodeLike};
21
use bevy::prelude::*;
32

3+
use crate::core::animation_node::{NodeLike, ReflectNodeLike};
4+
45
#[derive(Reflect, Clone, Debug, Default)]
56
#[reflect(Default, NodeLike)]
67
#[type_path = "bevy_animation_graph::builtin_nodes"]

‎crates/bevy_animation_graph/src/builtin_nodes/event_markup_node.rs‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
use crate::core::animation_graph::{PinMap, TimeUpdate};
2-
use crate::core::animation_node::{NodeLike, ReflectNodeLike};
3-
use crate::core::context::SpecContext;
4-
use crate::core::context::new_context::NodeContext;
5-
use crate::core::edge_data::{DataSpec, EventQueue};
6-
use crate::core::errors::GraphError;
7-
use crate::core::event_track::EventTrack;
8-
use bevy::platform::collections::HashMap;
9-
use bevy::prelude::*;
1+
use bevy::{platform::collections::HashMap, prelude::*};
102
use serde::{Deserialize, Serialize};
113

4+
use crate::core::{
5+
animation_graph::{PinMap, TimeUpdate},
6+
animation_node::{NodeLike, ReflectNodeLike},
7+
context::{new_context::NodeContext, spec_context::SpecContext},
8+
edge_data::{DataSpec, events::EventQueue},
9+
errors::GraphError,
10+
event_track::EventTrack,
11+
};
12+
1213
/// This node enables "decorating" arbitrary animations with event tracks.
1314
///
1415
/// The timestamp of upstream animation data will be used for sampling the event tracks.

‎crates/bevy_animation_graph/src/builtin_nodes/event_queue/fire_event.rs‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1+
use bevy::prelude::*;
2+
13
use crate::core::{
24
animation_graph::PinMap,
35
animation_node::{NodeLike, ReflectNodeLike},
4-
context::{SpecContext, new_context::NodeContext},
5-
edge_data::{AnimationEvent, DataSpec, EventQueue, SampledEvent},
6+
context::{new_context::NodeContext, spec_context::SpecContext},
7+
edge_data::{
8+
DataSpec,
9+
events::{AnimationEvent, EventQueue, SampledEvent},
10+
},
611
errors::GraphError,
712
};
8-
use bevy::prelude::*;
913

1014
#[derive(Reflect, Clone, Debug, Default)]
1115
#[reflect(Default, NodeLike)]

‎crates/bevy_animation_graph/src/builtin_nodes/f32/abs_f32.rs‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
use crate::core::animation_graph::PinMap;
2-
use crate::core::animation_node::{NodeLike, ReflectNodeLike};
3-
use crate::core::context::SpecContext;
4-
use crate::core::context::new_context::NodeContext;
5-
use crate::core::edge_data::DataSpec;
6-
use crate::core::errors::GraphError;
71
use bevy::prelude::*;
82

3+
use crate::core::{
4+
animation_graph::PinMap,
5+
animation_node::{NodeLike, ReflectNodeLike},
6+
context::{new_context::NodeContext, spec_context::SpecContext},
7+
edge_data::DataSpec,
8+
errors::GraphError,
9+
};
10+
911
#[derive(Reflect, Clone, Debug, Default)]
1012
#[reflect(Default, NodeLike)]
1113
#[type_path = "bevy_animation_graph::builtin_nodes"]

0 commit comments

Comments
 (0)