Better savannah colours

This commit is contained in:
Joshua Barretto 2019-07-09 00:09:04 +01:00
parent bb50bb8c81
commit cfdb0209bd
4 changed files with 9 additions and 6 deletions

View File

@ -321,8 +321,8 @@ impl<'a> BlockGen<'a> {
StructureBlock::Acacia => Block::new(
1,
Lerp::lerp(
Rgb::new(25.0, 80.0, 20.0),
Rgb::new(100.0, 200.0, 5.0),
Rgb::new(40.0, 80.0, 20.0),
Rgb::new(125.0, 200.0, 5.0),
lerp,
)
.map(|e| e as u8),

View File

@ -44,7 +44,7 @@ pub fn structure_gen<'a>(
let st_pos3d = Vec3::new(st_pos.x, st_pos.y, wheight as i32);
let volumes: &'static [_] = if QUIRKY_RAND.get(st_seed) % 64 == 17 {
if st_sample.temp > CONFIG.tropical_temp {
if st_sample.temp > CONFIG.desert_temp {
&QUIRKY_DRY
} else {
&QUIRKY

View File

@ -118,8 +118,8 @@ impl<'a> Sampler for ColumnGen<'a> {
let tropical = Rgb::lerp(
grass,
Rgb::new(1.0, 0.75, 0.1),
marble_small.sub(0.5).mul(0.05).add(0.3),
Rgb::new(0.85, 0.4, 0.2),
marble_small.sub(0.5).mul(0.2).add(0.75),
);
let ground = Rgb::lerp(

View File

@ -421,7 +421,10 @@ impl SimChunk {
&& dryness > 0.05
&& alt > CONFIG.sea_level + 5.0
&& dryness.abs() > 0.075,
near_cliffs: cliff > 0.3,
near_cliffs: cliff > 0.275
&& dryness > 0.05
&& alt > CONFIG.sea_level + 5.0
&& dryness.abs() > 0.075,
tree_density: (gen_ctx.tree_nz.get((wposf.div(1024.0)).into_array()) as f32)
.mul(1.5)
.add(1.0)