From 5d102408f8516c5d37d5217198b522834d6e564b Mon Sep 17 00:00:00 2001 From: Joshua Barretto Date: Sat, 22 Jun 2019 15:46:13 +0100 Subject: [PATCH] Stronger shadows, fewer cliffs in oceans --- assets/world/structures/human/town_hall.vox | Bin 0 -> 81932 bytes common/src/terrain/block.rs | 2 +- voxygen/shaders/postprocess.frag | 1 + world/src/sim/mod.rs | 2 +- 4 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 assets/world/structures/human/town_hall.vox diff --git a/assets/world/structures/human/town_hall.vox b/assets/world/structures/human/town_hall.vox new file mode 100644 index 0000000000000000000000000000000000000000..350d7ea7d3c00f196c8c922a8a0787142f12bca2 GIT binary patch literal 81932 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 l Option { match self.kind { 0 => None, - 1 => Some(0.6), + 1 => Some(0.85), _ => Some(1.0), } } diff --git a/voxygen/shaders/postprocess.frag b/voxygen/shaders/postprocess.frag index f1f644b4e6..4e1adf4040 100644 --- a/voxygen/shaders/postprocess.frag +++ b/voxygen/shaders/postprocess.frag @@ -164,6 +164,7 @@ void main() { vec2 uv = (f_pos + 1.0) * 0.5; vec4 fxaa_color = fxaa_apply(src_color, uv * screen_res.xy, screen_res.xy); + //vec4 fxaa_color = texture(src_color, uv); vec4 hsva_color = vec4(rgb2hsv(fxaa_color.rgb), fxaa_color.a); hsva_color.y *= 1.3; diff --git a/world/src/sim/mod.rs b/world/src/sim/mod.rs index 4fc237f460..0d47ae8e75 100644 --- a/world/src/sim/mod.rs +++ b/world/src/sim/mod.rs @@ -325,7 +325,7 @@ impl SimChunk { .sub(0.1) .mul(1.3) .max(0.0), - cliffs: cliff > 0.5 && dryness > 0.05, + cliffs: cliff > 0.5 && dryness > 0.05 && alt > CONFIG.sea_level + 5.0 && dryness.abs() > 0.075, near_cliffs: cliff > 0.4, tree_density: (gen_ctx.tree_nz.get((wposf.div(1024.0)).into_array()) as f32) .add(1.0)