Skip to content

Commit 6a96741

Browse files
Break stuff
1 parent 972dac9 commit 6a96741

File tree

1 file changed

+27
-19
lines changed

1 file changed

+27
-19
lines changed

src/server/terrain/systems.rs

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ mod visualizer {
207207
.changed();
208208
}};
209209
}
210-
210+
211211
macro_rules! add_noise_sliders {
212212
($ui:expr, $changed:expr, $params:expr) => {
213213
add_slider!($ui, $changed, &mut $params.octaves, 1..=8, "octaves");
@@ -217,17 +217,25 @@ mod visualizer {
217217
};
218218
}
219219

220-
#[rustfmt::skip]
221-
fn add_sliders_for_noise_params(
222-
ui: &mut egui::Ui,
223-
changed: &mut bool,
224-
params: &mut NoiseFunctionParams,
225-
) {
226-
params.frequency = 1.0 / params.frequency;
227-
add_noise_sliders!(ui, *changed, params);
228-
params.frequency = 1.0 / params.frequency;
220+
macro_rules! add_sliders_for_noise_params {
221+
($ui:expr, $changed:expr, $params:expr) => {
222+
$params.frequency = 1.0 / $params.frequency;
223+
add_noise_sliders!($ui, *$changed, $params);
224+
$params.frequency = 1.0 / $params.frequency;
225+
};
229226
}
230227

228+
// #[rustfmt::skip]
229+
// fn add_sliders_for_noise_params(
230+
// ui: &mut egui::Ui,
231+
// changed: &mut bool,
232+
// params: &mut NoiseFunctionParams,
233+
// ) {
234+
// params.frequency = 1.0 / params.frequency;
235+
// add_noise_sliders!(ui, *changed, params);
236+
// params.frequency = 1.0 / params.frequency;
237+
// }
238+
231239
#[rustfmt::skip]
232240
pub fn render_visualizer_system(
233241
mut contexts: EguiContexts,
@@ -286,26 +294,26 @@ mod visualizer {
286294
TextureType::Cave => "Cave",
287295
};
288296

289-
let params: &mut NoiseFunctionParams = match texture_type {
290-
TextureType::Height => &mut generator.params.height.noise,
291-
TextureType::HeightAdjust => &mut generator.params.height_adjust.noise,
292-
TextureType::Density => &mut generator.params.density.noise,
293-
TextureType::Cave => &mut generator.params.cave.noise,
294-
};
295297

296298
egui::Window::new(window_name).show(contexts.ctx_mut(), |ui| {
297299
ui.label(window_name);
298300

299301
let mut changed = false;
300302

301-
add_sliders_for_noise_params(ui, &mut changed, params);
303+
let params: &mut NoiseFunctionParams = match texture_type {
304+
TextureType::Height => &mut generator.params.height.noise,
305+
TextureType::HeightAdjust => &mut generator.params.height_adjust.noise,
306+
TextureType::Density => &mut generator.params.density.noise,
307+
TextureType::Cave => &mut generator.params.cave.noise,
308+
};
309+
310+
add_slider!(ui, changed, &mut generator.params.cave.base_value, -1.0..=1.0, "base value");
311+
add_sliders_for_noise_params!(ui, &mut changed, params);
302312

303313
if changed {
304314
event_writer.send(terrain_events::RegenerateHeightMapEvent(texture_type.clone()));
305315
};
306316

307-
ui.label(format!("{:?}", params));
308-
309317
ui.add(egui::widgets::Image::new(egui::load::SizedTexture::new(
310318
texture_handle.id(),
311319
texture_handle.size_vec2(),

0 commit comments

Comments
 (0)