Skip to content

Commit

Permalink
Cache data noise for each point when generating & add SAMPLES counter.
Browse files Browse the repository at this point in the history 
Also update many_tiles to have some nicer mountains.
  • Loading branch information
@TheGrimsey
TheGrimsey committed Dec 3, 2024
1 parent 895339b commit de6bb68
Show file tree
Hide file tree
Showing 3 changed files with 239 additions and 85 deletions.
1 change: 1 addition & 0 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ license = "MIT OR Apache-2.0"
readme = "README.md"

[features]
count_samples = []
debug_draw = ["rendering", "bevy/bevy_gizmos", "dep:bevy_color"]
rendering = ["dep:bevy_render", "dep:bevy_pbr"]
serialize = ["dep:serde"]
Expand Down
172 changes: 126 additions & 46 deletions examples/many_tiles.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,38 +60,46 @@ fn main() {
NoiseLayer {
operation: LayerOperation::Noise {
noise: LayerNoiseSettings {
amplitude: 16.0,
frequency: 0.005,
seed: 3,
amplitude: 128.0,
frequency: 0.002,
seed: 281139797,
domain_warp: vec![DomainWarping {
amplitude: 25.0,
frequency: 0.01,
z_offset: 100.0
},
DomainWarping {
amplitude: 50.0,
frequency: 0.006,
z_offset: 50.0
},
DomainWarping {
amplitude: 60.0,
frequency: 0.004,
z_offset: 10.0
amplitude: 30.0,
frequency: 0.001,
z_offset: 3.55
}],
scaling: NoiseScaling::Normalized
scaling: NoiseScaling::Ridged
}
},
filters: vec![NoiseFilter {
condition: NoiseFilterCondition::Above(0.9),
falloff: 0.3,
falloff_easing_function: EasingFunction::SmoothStep,
compare_to: FilterComparingTo::Spline { index: 0 },
}],
filter_combinator: FilterCombinator::Max
},
NoiseLayer {
operation: LayerOperation::Noise {
noise: LayerNoiseSettings {
amplitude: 64.0,
frequency: 0.002,
seed: 3,
domain_warp: vec![],
scaling: NoiseScaling::Ridged
},
},
filters: vec![],
filter_combinator: FilterCombinator::Max
},
NoiseLayer {
operation: LayerOperation::Noise {
noise: LayerNoiseSettings {
amplitude: 8.0,
frequency: 0.01,
seed: 1,
amplitude: 32.0,
frequency: 0.002,
seed: 891670187,
domain_warp: vec![],
scaling: NoiseScaling::Normalized
scaling: NoiseScaling::Ridged
}
},
filters: vec![],
Expand All @@ -100,11 +108,11 @@ fn main() {
NoiseLayer {
operation: LayerOperation::Noise {
noise: LayerNoiseSettings {
amplitude: 4.0,
frequency: 0.02,
amplitude: 8.0,
frequency: 0.006,
seed: 2,
domain_warp: vec![],
scaling: NoiseScaling::Normalized
scaling: NoiseScaling::Ridged
}
},
filters: vec![],
Expand All @@ -113,26 +121,80 @@ fn main() {
NoiseLayer {
operation: LayerOperation::Noise {
noise: LayerNoiseSettings {
amplitude: 2.0,
frequency: 0.04,
amplitude: 16.0,
frequency: 0.004,
seed: 3,
domain_warp: vec![],
scaling: NoiseScaling::Normalized
scaling: NoiseScaling::Ridged
},
},
filters: vec![],
filter_combinator: FilterCombinator::Max
},
NoiseLayer {
operation: LayerOperation::Noise {
noise: LayerNoiseSettings {
amplitude: 128.0,
frequency: 0.0005,
seed: 3,
domain_warp: vec![],
scaling: NoiseScaling::Ridged
},
},
filters: vec![NoiseFilter {
condition: NoiseFilterCondition::Above(0.8),
falloff: 0.25,
falloff_easing_function: EasingFunction::SmoothStep,
compare_to: FilterComparingTo::Spline { index: 0 },
}],
filter_combinator: FilterCombinator::Max
},
NoiseLayer {
operation: LayerOperation::Noise {
noise: LayerNoiseSettings {
amplitude: 64.0,
frequency: 0.002,
seed: 3,
domain_warp: vec![],
scaling: NoiseScaling::Ridged
},
},
filters: vec![],
filter_combinator: FilterCombinator::Max
},
],
filters: vec![NoiseFilter {
condition: NoiseFilterCondition::Above(0.4),
falloff: 0.1,
falloff_easing_function: EasingFunction::CubicInOut,
condition: NoiseFilterCondition::Above(0.6),
falloff: 0.15,
falloff_easing_function: EasingFunction::SmoothStep,
compare_to: FilterComparingTo::Spline { index: 0 },
}],
filter_combinator: FilterCombinator::Min
}
],
data: vec![
LayerNoiseSettings {
amplitude: 1.0,
frequency: 0.0003,
seed: 3110758200,
domain_warp: vec![],
scaling: NoiseScaling::Unitized
},
LayerNoiseSettings {
amplitude: 1.0,
frequency: 0.0001,
seed: 2400218420,
domain_warp: vec![],
scaling: NoiseScaling::Unitized
},
LayerNoiseSettings {
amplitude: 1.0,
frequency: 0.0001,
seed: 1228950654,
domain_warp: vec![],
scaling: NoiseScaling::Unitized
},
],
..default()
}),
terrain_settings: TerrainSettings {
Expand Down Expand Up @@ -172,23 +234,37 @@ fn insert_rules(
terrain_noise_settings.splines.extend([
TerrainNoiseSplineLayer {
amplitude_curve: continentallness.clone(),
frequency: 0.001,
frequency: 0.0005,
seed: 5,
domain_warp: vec![],
filters: vec![],
filter_combinator: FilterCombinator::Min
},
TerrainNoiseSplineLayer {
amplitude_curve: peaks_and_valleys.clone(),
frequency: 0.005,
seed: 6,
domain_warp: vec![],
filters: vec![NoiseFilter {
condition: NoiseFilterCondition::Above(0.3),
falloff: 0.2,
falloff_easing_function: EasingFunction::SmoothStep,
compare_to: FilterComparingTo::Spline { index: 0 }
}],
frequency: 0.002,
seed: 14085,
domain_warp: vec![
DomainWarping {
amplitude: 40.0,
frequency: 0.009,
z_offset: 93.0
}
],
filters: vec![
NoiseFilter {
condition: NoiseFilterCondition::Above(0.3),
falloff: 0.2,
falloff_easing_function: EasingFunction::SmoothStep,
compare_to: FilterComparingTo::Spline { index: 0 }
},
NoiseFilter {
condition: NoiseFilterCondition::Above(1.0),
falloff: 1.0,
falloff_easing_function: EasingFunction::SmoothStep,
compare_to: FilterComparingTo::Data { index: 0 }
}
],
filter_combinator: FilterCombinator::Min
},
]);
Expand Down Expand Up @@ -327,7 +403,7 @@ fn spawn_terrain(mut commands: Commands, terrain_settings: Res<TerrainSettings>)
..default()
});

let terrain_range = 5;
let terrain_range = 15;

for x in -terrain_range..terrain_range {
for z in -terrain_range..terrain_range {
Expand Down Expand Up @@ -394,11 +470,15 @@ impl EditorWindow for NoiseDebugWindow {

let translation = transform.translation();

let mut data = Vec::with_capacity(noise_settings.data.len());
noise_settings.sample_data(noise_cache, noise_index_cache, translation.xz(), &mut data);

let height = noise_settings.sample_position(
noise_cache,
noise_index_cache,
translation.xz(),
lookup_curves,
&data
);
ui.heading(format!("Height: {height}"));

Expand All @@ -423,13 +503,13 @@ impl EditorWindow for NoiseDebugWindow {
translation.z,
noise_settings,
noise_cache,
&noise_index_cache.data_index_cache,
&data,
&noise_index_cache.spline_index_cache,
cached_noise,
lookup_curves,
);

let strength = calc_filter_strength(translation.xz(), &spline.filters, spline.filter_combinator, noise_settings, noise_cache, &noise_index_cache.data_index_cache, &noise_index_cache.spline_index_cache);
let strength = calc_filter_strength(translation.xz(), &spline.filters, spline.filter_combinator, noise_settings, noise_cache, &data, &noise_index_cache.spline_index_cache);

if let Some(lookup_curve) = lookup_curves.get(&spline.amplitude_curve) {
ui.label(format!(
Expand All @@ -447,18 +527,18 @@ impl EditorWindow for NoiseDebugWindow {
let noise = group.sample(
noise_settings,
noise_cache,
&noise_index_cache.data_index_cache,
&data,
&noise_index_cache.spline_index_cache,
group_noises,
translation.xz()
);

let strength = calc_filter_strength(translation.xz(), &group.filters, group.filter_combinator, noise_settings, noise_cache, &noise_index_cache.data_index_cache, &noise_index_cache.spline_index_cache);
let strength = calc_filter_strength(translation.xz(), &group.filters, group.filter_combinator, noise_settings, noise_cache, &data, &noise_index_cache.spline_index_cache);

egui::CollapsingHeader::new(format!("GROUP {i}: {noise:.3} ({strength:.3})")).id_source(format!("group_{i}")).show(ui, |ui| {
unsafe {
for (i,layer) in group.layers.iter().enumerate() {
let strength = calc_filter_strength(translation.xz(), &layer.filters, layer.filter_combinator, noise_settings, noise_cache, &noise_index_cache.data_index_cache, &noise_index_cache.spline_index_cache);
let strength = calc_filter_strength(translation.xz(), &layer.filters, layer.filter_combinator, noise_settings, noise_cache, &data, &noise_index_cache.spline_index_cache);

match &layer.operation {
LayerOperation::Noise { noise } => {
Expand Down
Loading

0 comments on commit de6bb68

Please sign in to comment.