collision fixes

generator changes
This commit is contained in:
2024-09-02 20:53:11 -04:00
parent 9613e3ae0d
commit 2d1fb78ab8
10 changed files with 33 additions and 30 deletions

View File

@@ -217,7 +217,6 @@ fn sample_point(
let z_s = z / cfg.scale;
let mut elevation: f64 = 0.;
let mut first_layer: f64 = 0.;
for i in 0..cfg.layers.len() {
let value: f64;
let layer = &cfg.layers[i];
@@ -226,15 +225,8 @@ fn sample_point(
} else {
value = sample_simple(x_s, z_s, layer, noise);
}
if i == 0 {
first_layer = value;
}
if layer.first_layer_mask {
elevation += mask(first_layer, value);
} else {
elevation += value;
}
}
elevation += value;
}
if border_size == 0.0 {
return elevation as f32;
@@ -251,10 +243,6 @@ fn sample_point(
return border_value.lerp(elevation as f32, d);
}
fn mask(mask: f64, value: f64) -> f64 {
return value * mask;
}
fn sample_simple(x: f64, z: f64, cfg: &GeneratorLayer, noise: &impl NoiseFn<f64, 2>) -> f64 {
let mut freq: f64 = cfg.base_roughness;
let mut amp: f64 = 1.;