Skip to content

Commit 238e227

Browse files
Fix linter
1 parent 3d95b7f commit 238e227

File tree

2 files changed

+52
-12
lines changed

2 files changed

+52
-12
lines changed

src/client/collider/systems.rs

Lines changed: 44 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ pub fn setup_coliders_system(mut commands: Commands) {
1313
commands
1414
.spawn(Collider::cuboid(0.5, 0.5, 0.5))
1515
.insert(TransformBundle::from(Transform::from_xyz(
16-
x as f32, y as f32, z as f32,
16+
x as f32, y as f32, z as f32,
1717
)))
1818
.insert(collider_components::MyCollider { key });
19-
}
19+
}
2020
}
2121
}
2222
}
@@ -94,24 +94,58 @@ mod tests {
9494
app.add_systems(Update, handle_collider_update_events_system);
9595
app.insert_resource(terrain_resources::ChunkManager::new());
9696

97-
app
98-
.world
99-
.spawn((Transform { translation: Vec3 {x: 0.0, y: 0.0, z: 0.0}, ..Default::default()}, collider_components::MyCollider { key: 0 } ));
97+
app.world.spawn((
98+
Transform {
99+
translation: Vec3 {
100+
x: 0.0,
101+
y: 0.0,
102+
z: 0.0,
103+
},
104+
..Default::default()
105+
},
106+
collider_components::MyCollider { key: 0 },
107+
));
100108

101109
let block = BlockId::Dirt;
102-
let mut resource = app.world.get_resource_mut::<terrain_resources::ChunkManager>().unwrap();
103-
let chunks = terrain_resources::ChunkManager::instantiate_chunks(Vec3 {x: 0.0, y: 0.0, z: 0.0}, 1);
110+
let mut resource = app
111+
.world
112+
.get_resource_mut::<terrain_resources::ChunkManager>()
113+
.unwrap();
114+
let chunks = terrain_resources::ChunkManager::instantiate_chunks(
115+
Vec3 {
116+
x: 0.0,
117+
y: 0.0,
118+
z: 0.0,
119+
},
120+
1,
121+
);
104122
resource.insert_chunks(chunks);
105-
resource.set_block(Vec3 {x: 9.0, y: 9.0, z: 9.0}, block);
123+
resource.set_block(
124+
Vec3 {
125+
x: 9.0,
126+
y: 9.0,
127+
z: 9.0,
128+
},
129+
block,
130+
);
106131

107132
app.world.send_event(ColliderUpdateEvent {
108133
position: [10.0, 10.0, 10.0],
109134
});
110135

111136
app.update();
112137

113-
let mut collider_query = app.world.query::<(&Transform, &collider_components::MyCollider)>();
138+
let mut collider_query = app
139+
.world
140+
.query::<(&Transform, &collider_components::MyCollider)>();
114141
let (collider_transform, _) = collider_query.single(&app.world);
115-
assert_eq!(Vec3 {x: 9.5, y: 9.5, z: 9.5}, collider_transform.translation);
142+
assert_eq!(
143+
Vec3 {
144+
x: 9.5,
145+
y: 9.5,
146+
z: 9.5
147+
},
148+
collider_transform.translation
149+
);
116150
}
117151
}

src/client/terrain/systems.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,15 @@ fn add_chunk_objects(
7777
texture_manager: &terrain_util::TextureManager,
7878
) {
7979
if let Some(mesh) = create_chunk_mesh(chunk, texture_manager) {
80-
let texture_handle = obtain_texture_handle(&asset_server).clone();
80+
let texture_handle = obtain_texture_handle(asset_server).clone();
8181
let material = create_chunk_material(texture_handle, &mut ResMut::reborrow(materials));
82-
spawn_chunk(commands, &mut ResMut::reborrow(meshes), material, mesh, chunk);
82+
spawn_chunk(
83+
commands,
84+
&mut ResMut::reborrow(meshes),
85+
material,
86+
mesh,
87+
chunk,
88+
);
8389
}
8490
}
8591

0 commit comments

Comments
 (0)