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

Smoother water at distance, fixed warnings

Browse Source
This commit is contained in:
Joshua Barretto 2019-11-19 19:22:56 +00:00
parent 7ad22c647d
commit 9993a4c81a
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,7 +99,7 @@ void main() {
0.1 / slope 0.1 / slope
); );
nmap = mix(vec3(0, 0, 1), normalize(nmap), clamp(2.0 / pow(frag_dist, 0.5), 0, 1)); nmap = mix(vec3(0, 0, 1), normalize(nmap), min(1.0 / pow(frag_dist, 0.75), 1));
vec3 norm = f_norm * nmap.z + b_norm * nmap.x + c_norm * nmap.y; vec3 norm = f_norm * nmap.z + b_norm * nmap.x + c_norm * nmap.y;

1
voxygen/src/render/texture.rs
View File

@ -1,7 +1,6 @@
use super::{gfx_backend, RenderError}; use super::{gfx_backend, RenderError};
use gfx::{self, traits::Factory}; use gfx::{self, traits::Factory};
use image::{DynamicImage, GenericImageView}; use image::{DynamicImage, GenericImageView};
use std::marker::PhantomData;
use vek::Vec2; use vek::Vec2;
type DefaultShaderFormat = (gfx::format::R8_G8_B8_A8, gfx::format::Srgb); type DefaultShaderFormat = (gfx::format::R8_G8_B8_A8, gfx::format::Srgb);

2
voxygen/src/ui/cache.rs
View File

@ -1,6 +1,6 @@
use super::graphic::{Graphic, GraphicCache, Id as GraphicId}; use super::graphic::{Graphic, GraphicCache, Id as GraphicId};
use crate::{ use crate::{
render::{Renderer, Texture, UiPipeline}, render::{Renderer, Texture},
Error, Error,
}; };
use conrod_core::text::GlyphCache; use conrod_core::text::GlyphCache;

2
voxygen/src/ui/graphic/mod.rs
View File

@ -1,6 +1,6 @@
mod renderer; mod renderer;
use crate::render::{Renderer, Texture, UiPipeline}; use crate::render::{Renderer, Texture};
use dot_vox::DotVoxData; use dot_vox::DotVoxData;
use guillotiere::{size2, SimpleAtlasAllocator}; use guillotiere::{size2, SimpleAtlasAllocator};
use hashbrown::HashMap; use hashbrown::HashMap;