@@ -207,7 +207,7 @@ mod visualizer {
207
207
. changed( ) ;
208
208
} } ;
209
209
}
210
-
210
+
211
211
macro_rules! add_noise_sliders {
212
212
( $ui: expr, $changed: expr, $params: expr) => {
213
213
add_slider!( $ui, $changed, & mut $params. octaves, 1 ..=8 , "octaves" ) ;
@@ -217,17 +217,25 @@ mod visualizer {
217
217
} ;
218
218
}
219
219
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
+ } ;
229
226
}
230
227
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
+
231
239
#[ rustfmt:: skip]
232
240
pub fn render_visualizer_system (
233
241
mut contexts : EguiContexts ,
@@ -286,26 +294,26 @@ mod visualizer {
286
294
TextureType :: Cave => "Cave" ,
287
295
} ;
288
296
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
- } ;
295
297
296
298
egui:: Window :: new ( window_name) . show ( contexts. ctx_mut ( ) , |ui| {
297
299
ui. label ( window_name) ;
298
300
299
301
let mut changed = false ;
300
302
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) ;
302
312
303
313
if changed {
304
314
event_writer. send ( terrain_events:: RegenerateHeightMapEvent ( texture_type. clone ( ) ) ) ;
305
315
} ;
306
316
307
- ui. label ( format ! ( "{:?}" , params) ) ;
308
-
309
317
ui. add ( egui:: widgets:: Image :: new ( egui:: load:: SizedTexture :: new (
310
318
texture_handle. id ( ) ,
311
319
texture_handle. size_vec2 ( ) ,
0 commit comments