Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added procedural LoD detail shader

Browse Source
This commit is contained in:
Joshua Barretto 2022-01-18 23:06:02 +00:00 committed by Imbris
parent dea540222f
commit 7506dc2a41
2 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
assets/voxygen/shaders/include/lod.glsl
View File

@ -313,7 +313,16 @@ vec3 lod_norm(vec2 f_pos/*vec3 pos*/, vec4 square) {
vec3 lod_norm(vec2 f_pos/*vec3 pos*/) { vec3 lod_norm(vec2 f_pos/*vec3 pos*/) {
const float SAMPLE_W = 32; const float SAMPLE_W = 32;
return lod_norm(f_pos, vec4(f_pos - vec2(SAMPLE_W), f_pos + vec2(SAMPLE_W))); vec3 norm = lod_norm(f_pos, vec4(f_pos - vec2(SAMPLE_W), f_pos + vec2(SAMPLE_W)));
#ifdef EXPERIMENTAL_PROCEDURALLODDETAIL
norm.xy += vec2(
textureLod(sampler2D(t_noise, s_noise), f_pos / 400, 0).x - 0.5,
textureLod(sampler2D(t_noise, s_noise), f_pos / 400 + 0.5, 0).x - 0.5
) * 0.35;
#endif
return normalize(norm);
} }
@ -340,11 +349,24 @@ layout(set = 0, binding = 11)
uniform sampler s_map; uniform sampler s_map;
vec3 lod_col(vec2 pos) { vec3 lod_col(vec2 pos) {
//return vec3(0, 0.5, 0); #ifdef EXPERIMENTAL_PROCEDURALLODDETAIL
// return /*linear_to_srgb*/vec3(alt_at(pos), textureBicubic(t_map, pos_to_tex(pos)).gb); pos += vec2(
return /*linear_to_srgb*/(textureBicubic(t_map, s_map, pos_to_tex(pos)).rgb) textureLod(sampler2D(t_noise, s_noise), pos / 200, 0).x - 0.5,
;//+ (texture(t_noise, pos * 0.04 + texture(t_noise, pos * 0.005).xy * 2.0 + texture(t_noise, pos * 0.06).xy * 0.6).x - 0.5) * 0.1; textureLod(sampler2D(t_noise, s_noise), pos / 200 + 0.5, 0).x - 0.5
//+ (texture(t_noise, pos * 0.04 + texture(t_noise, pos * 0.005).xy * 2.0 + texture(t_noise, pos * 0.06).xy * 0.6).x - 0.5) * 0.1; ) * 64;
#endif
vec3 col = textureBicubic(t_map, s_map, pos_to_tex(pos)).rgb;
#ifdef EXPERIMENTAL_PROCEDURALLODDETAIL
col *= pow(vec3(
textureLod(sampler2D(t_noise, s_noise), pos / 50, 0).x,
textureLod(sampler2D(t_noise, s_noise), pos / 50 + 0.5, 0).x,
textureLod(sampler2D(t_noise, s_noise), pos / 50 + 0.5, 0).x
), vec3(0.5));
#endif
return col;
} }
#endif #endif

6
voxygen/src/render/mod.rs
View File

@ -391,6 +391,10 @@ struct OtherModes {
profiler_enabled: bool, profiler_enabled: bool,
} }
/// Experimental shader modes.
///
/// You can enable these using Voxygen's `settings.ron`. See
/// [here](https://book.veloren.net/players/voxygen.html#experimental-shaders) for more information.
#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] #[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
pub enum ExperimentalShader { pub enum ExperimentalShader {
/// Add brick-like normal mapping to the world. /// Add brick-like normal mapping to the world.
@ -402,4 +406,6 @@ pub enum ExperimentalShader {
/// Remove the glow effect around point lights (this is *not* the same thing /// Remove the glow effect around point lights (this is *not* the same thing
/// as bloom). /// as bloom).
NoPointGlow, NoPointGlow,
/// Adds extra detail to distant LoD (Level of Detail) terrain procedurally.
ProceduralLodDetail,
} }