Skip to content

Commit c9166eb

Browse files
Fix linter
1 parent 5c08326 commit c9166eb

File tree

2 files changed

+47
-58
lines changed

2 files changed

+47
-58
lines changed

src/server/terrain/resources.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
use std::sync::Arc;
2-
31
use crate::prelude::*;
42

5-
use bevy::{asset::Handle, image::Image};
6-
use bevy_inspector_egui::egui::{epaint::TextureManager, mutex::RwLock, TextureHandle};
3+
use bevy_inspector_egui::egui::TextureHandle;
74
use terrain_events::BlockUpdateEvent;
85

96
#[derive(Resource)]

src/server/terrain/systems.rs

Lines changed: 46 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::prelude::*;
22

33
pub fn setup_world_system(
4-
mut chunk_manager: ResMut<ChunkManager>,
4+
chunk_manager: ResMut<ChunkManager>,
55
generator: Res<terrain_resources::Generator>,
66
) {
77
let render_distance = Vec3::new(12.0, 2.0, 12.0);
@@ -25,19 +25,15 @@ pub use visualizer::*;
2525
mod visualizer {
2626

2727
use bevy::{
28-
asset::RenderAssetUsages,
29-
image::Image,
30-
log::info,
3128
math::{Vec2, Vec3},
32-
prelude::{EventReader, EventWriter, Res, ResMut},
33-
render::render_resource::{Extent3d, TextureDimension, TextureFormat},
29+
prelude::{EventReader, EventWriter, ResMut},
3430
};
3531
use bevy_inspector_egui::{
3632
bevy_egui::EguiContexts,
37-
egui::{self, load::SizedTexture, Color32, ColorImage, ImageData, TextureOptions},
33+
egui::{self, Color32, ColorImage, ImageData, TextureOptions},
3834
};
3935

40-
use super::{chat_resources, player_resources, terrain_events, terrain_resources};
36+
use super::{terrain_events, terrain_resources};
4137

4238
fn generate_terrain_heightmap(
4339
generator: &terrain_resources::Generator,
@@ -59,7 +55,7 @@ mod visualizer {
5955
);
6056
let value = value * size.y as f64;
6157
let value = value as u8;
62-
data[(x + z * width) as usize] = value;
58+
data[x + z * width] = value;
6359
}
6460
}
6561

@@ -82,7 +78,6 @@ mod visualizer {
8278
mut noise_texture: ResMut<terrain_resources::NoiseTexture>,
8379
mut contexts: EguiContexts,
8480
) {
85-
8681
for _ in events.read() {
8782
let width = 1024;
8883
let height = 1024;
@@ -95,9 +90,9 @@ mod visualizer {
9590
);
9691

9792
noise_texture.texture = Some(contexts.ctx_mut().load_texture(
98-
"terrain-texture",
99-
image_data,
100-
TextureOptions::default(),
93+
"terrain-texture",
94+
image_data,
95+
TextureOptions::default(),
10196
));
10297
noise_texture.size = Vec2::new(width as f32, height as f32);
10398
}
@@ -115,47 +110,44 @@ mod visualizer {
115110
mut generator: ResMut<terrain_resources::Generator>,
116111
mut event_writer: EventWriter<terrain_events::RegenerateHeightMapEvent>,
117112
) {
118-
match &noise_texture.texture {
119-
Some(texture_handle) => {
120-
egui::Window::new("Hello").show(contexts.ctx_mut(), |ui| {
121-
ui.label("world");
122-
123-
ui.add(egui::widgets::Slider::new(
124-
&mut generator.params.height_params.octaves,
125-
1..=8,
126-
));
127-
ui.add(egui::widgets::Slider::new(
128-
&mut generator.params.height_params.height,
129-
0.0..=10.0,
130-
));
131-
ui.add(egui::widgets::Slider::new(
132-
&mut generator.params.height_params.lacuranity,
133-
0.0..=4.0,
134-
));
135-
ui.add(egui::widgets::Slider::new(
136-
&mut generator.params.height_params.frequency,
137-
0.0..=1.0,
138-
));
139-
ui.add(egui::widgets::Slider::new(
140-
&mut generator.params.height_params.amplitude,
141-
0.0..=20.0,
142-
));
143-
ui.add(egui::widgets::Slider::new(
144-
&mut generator.params.height_params.persistence,
145-
0.0..=1.0,
146-
));
147-
148-
if ui.button("Regenerate").clicked() {
149-
event_writer.send(terrain_events::RegenerateHeightMapEvent);
150-
};
151-
152-
ui.add(egui::widgets::Image::new(egui::load::SizedTexture::new(
153-
texture_handle.id(),
154-
texture_handle.size_vec2(),
155-
)));
156-
});
157-
}
158-
None => {}
113+
if let Some(texture_handle) = &noise_texture.texture {
114+
egui::Window::new("Hello").show(contexts.ctx_mut(), |ui| {
115+
ui.label("world");
116+
117+
ui.add(egui::widgets::Slider::new(
118+
&mut generator.params.height_params.octaves,
119+
1..=8,
120+
));
121+
ui.add(egui::widgets::Slider::new(
122+
&mut generator.params.height_params.height,
123+
0.0..=10.0,
124+
));
125+
ui.add(egui::widgets::Slider::new(
126+
&mut generator.params.height_params.lacuranity,
127+
0.0..=4.0,
128+
));
129+
ui.add(egui::widgets::Slider::new(
130+
&mut generator.params.height_params.frequency,
131+
0.0..=1.0,
132+
));
133+
ui.add(egui::widgets::Slider::new(
134+
&mut generator.params.height_params.amplitude,
135+
0.0..=20.0,
136+
));
137+
ui.add(egui::widgets::Slider::new(
138+
&mut generator.params.height_params.persistence,
139+
0.0..=1.0,
140+
));
141+
142+
if ui.button("Regenerate").clicked() {
143+
event_writer.send(terrain_events::RegenerateHeightMapEvent);
144+
};
145+
146+
ui.add(egui::widgets::Image::new(egui::load::SizedTexture::new(
147+
texture_handle.id(),
148+
texture_handle.size_vec2(),
149+
)));
150+
});
159151
}
160152
}
161153
}

0 commit comments

Comments
 (0)