From 9993a4c81aced4f0081874dfb9a6670089665665 Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Tue, 19 Nov 2019 19:22:56 +0000
Subject: [PATCH] Smoother water at distance, fixed warnings

---
 assets/voxygen/shaders/fluid-frag.glsl | 2 +-
 voxygen/src/render/texture.rs          | 1 -
 voxygen/src/ui/cache.rs                | 2 +-
 voxygen/src/ui/graphic/mod.rs          | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/assets/voxygen/shaders/fluid-frag.glsl b/assets/voxygen/shaders/fluid-frag.glsl
index 909c911c14..836b405907 100644
--- a/assets/voxygen/shaders/fluid-frag.glsl
+++ b/assets/voxygen/shaders/fluid-frag.glsl
@@ -99,7 +99,7 @@ void main() {
 		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;
 
diff --git a/voxygen/src/render/texture.rs b/voxygen/src/render/texture.rs
index 08fa7ac69b..8bd5c3b8a8 100644
--- a/voxygen/src/render/texture.rs
+++ b/voxygen/src/render/texture.rs
@@ -1,7 +1,6 @@
 use super::{gfx_backend, RenderError};
 use gfx::{self, traits::Factory};
 use image::{DynamicImage, GenericImageView};
-use std::marker::PhantomData;
 use vek::Vec2;
 
 type DefaultShaderFormat = (gfx::format::R8_G8_B8_A8, gfx::format::Srgb);
diff --git a/voxygen/src/ui/cache.rs b/voxygen/src/ui/cache.rs
index 36604f2bfb..b4bb7b61cb 100644
--- a/voxygen/src/ui/cache.rs
+++ b/voxygen/src/ui/cache.rs
@@ -1,6 +1,6 @@
 use super::graphic::{Graphic, GraphicCache, Id as GraphicId};
 use crate::{
-    render::{Renderer, Texture, UiPipeline},
+    render::{Renderer, Texture},
     Error,
 };
 use conrod_core::text::GlyphCache;
diff --git a/voxygen/src/ui/graphic/mod.rs b/voxygen/src/ui/graphic/mod.rs
index 8fba234e68..138a54d52e 100644
--- a/voxygen/src/ui/graphic/mod.rs
+++ b/voxygen/src/ui/graphic/mod.rs
@@ -1,6 +1,6 @@
 mod renderer;
 
-use crate::render::{Renderer, Texture, UiPipeline};
+use crate::render::{Renderer, Texture};
 use dot_vox::DotVoxData;
 use guillotiere::{size2, SimpleAtlasAllocator};
 use hashbrown::HashMap;