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

Fixed maths, improved LoD resolution

Browse Source
This commit is contained in:
Joshua Barretto 2020-02-24 12:38:53 +00:00
parent 5481df38fe
commit 9fea150473
2 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,16 +16,12 @@ float alt_at(vec2 pos) {
+ texture(t_noise, pos * 0.003).x * 30.0; + texture(t_noise, pos * 0.003).x * 30.0;
} }
vec2 splay(vec2 pos, float e) { vec2 splay(vec2 pos) {
return pos * pow(length(pos), e); return pos * pow(length(pos) * 0.5, 3.0);
}
float splay_scale(vec2 pos, float e) {
return distance(splay(pos, e), splay(pos + 0.001, e)) * 1000000.0;
} }
vec3 lod_norm(vec2 pos) { vec3 lod_norm(vec2 pos) {
const float SAMPLE_W = 16; const float SAMPLE_W = 32;
float altx0 = alt_at(pos + vec2(-1, 0) * SAMPLE_W); float altx0 = alt_at(pos + vec2(-1, 0) * SAMPLE_W);
float altx1 = alt_at(pos + vec2(1, 0) * SAMPLE_W); float altx1 = alt_at(pos + vec2(1, 0) * SAMPLE_W);
@ -41,34 +37,20 @@ vec3 lod_norm(vec2 pos) {
} }
vec3 lod_pos(vec2 v_pos, vec2 focus_pos) { vec3 lod_pos(vec2 v_pos, vec2 focus_pos) {
vec2 hpos = focus_pos.xy + splay(v_pos, 4.0) * 1000000.0; vec2 hpos = focus_pos.xy + splay(v_pos) * 1000000.0;
// Remove spiking by "pushing" vertices towards local optima // Remove spiking by "pushing" vertices towards local optima
vec2 nhpos = hpos; vec2 nhpos = hpos;
for (int i = 0; i < 5; i ++) { for (int i = 0; i < 5; i ++) {
nhpos -= lod_norm(hpos).xy * 5.0; nhpos -= lod_norm(hpos).xy * 10.0;
} }
hpos = nhpos; hpos = hpos + normalize(nhpos - hpos + 0.001) * min(length(nhpos - hpos), 32);
return vec3(hpos, alt_at(hpos)); return vec3(hpos, alt_at(hpos));
} }
vec3 lod_col(vec2 pos) { vec3 lod_col(vec2 pos) {
//return vec3(0, 1, 0); //return vec3(0, 0.5, 0);
return texture(t_map, pos_to_uv(pos)).rgb; return texture(t_map, pos_to_uv(pos)).rgb;
//+ (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; //+ (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;
vec3 warmth = mix(
vec3(0.05, 0.4, 0.1),
vec3(0.5, 0.4, 0.0),
(texture(t_noise, pos * 0.0002).x - 0.5) * 2.0 + 0.5
);
vec3 color = mix(
warmth,
vec3(0.3, 0.3, 0.4),
alt_at(pos) / 1200.0
);
return color;
} }

4
voxygen/src/scene/lod.rs
View File

@ -16,11 +16,11 @@ impl Lod {
pub fn new(renderer: &mut Renderer, client: &Client) -> Self { pub fn new(renderer: &mut Renderer, client: &Client) -> Self {
Self { Self {
model: renderer model: renderer
.create_model(&create_lod_terrain_mesh(300)) //175 .create_model(&create_lod_terrain_mesh(500))
.unwrap(), .unwrap(),
locals: renderer.create_consts(&[Locals::default()]).unwrap(), locals: renderer.create_consts(&[Locals::default()]).unwrap(),
map: renderer map: renderer
.create_texture(&client.world_map.0, Some(FilterMethod::Bilinear), None) .create_texture(&client.world_map.0, Some(FilterMethod::Trilinear), None)
.expect("Failed to generate map texture"), .expect("Failed to generate map texture"),
} }
} }