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 seams

Browse Source
This commit is contained in:
Joshua Barretto 2022-09-23 16:26:18 +01:00
parent 3f2efea4f2
commit db4cc21ec3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/voxygen/shaders/fluid-frag/shiny.glsl
View File

@ -103,7 +103,7 @@ float wave_height2(vec2 pos){
vec2 vel = vec2(sin(pos.x * 0.2), cos(pos.y * 0.2)) * 2.0;
vel = cross(vec3(vel, 0), vec3(0, 0, 1)).xy;
vel = lod_norm(f_pos.xy - 16).xy * 10.0;
vel = f_vel * 3.5;
vel = f_vel * 2.5;
float hx = mix(
wave_height(pos - vec2(1, 0) * tick.x * floor(vel.x) - vec2(0, 1) * tick.x * floor(vel.y)),
wave_height(pos - vec2(1, 0) * tick.x * floor(vel.x + 1.0) - vec2(0, 1) * tick.x * floor(vel.y)),

4
voxygen/src/mesh/terrain.rs
View File

@ -391,12 +391,12 @@ pub fn generate_mesh<'a>(
let create_opaque =
|atlas_pos, pos, norm, meta| TerrainVertex::new(atlas_pos, pos + mesh_delta, norm, meta);
let create_transparent = |_atlas_pos, pos: Vec3<f32>, norm| {
let key = vol.pos_key(pos.map(|e| e.floor() as i32) + range.min);
let key = vol.pos_key(range.min + pos.as_());
let v00 = vol.get_key(key + Vec2::new(0, 0)).map_or(Vec3::zero(), |c| c.meta().river_velocity());
let v10 = vol.get_key(key + Vec2::new(1, 0)).map_or(Vec3::zero(), |c| c.meta().river_velocity());
let v01 = vol.get_key(key + Vec2::new(0, 1)).map_or(Vec3::zero(), |c| c.meta().river_velocity());
let v11 = vol.get_key(key + Vec2::new(1, 1)).map_or(Vec3::zero(), |c| c.meta().river_velocity());
let factor = pos / TerrainChunk::RECT_SIZE.map(|e| e as f32);
let factor = (range.min + pos.as_()).map(|e| e as f32) / TerrainChunk::RECT_SIZE.map(|e| e as f32);
let vel = Lerp::lerp(
Lerp::lerp(v00, v10, factor.x.rem_euclid(1.0)),
Lerp::lerp(v01, v11, factor.x.rem_euclid(1.0)),