From 86b4dd6ba301e50c23b246d420d00952cc44ef10 Mon Sep 17 00:00:00 2001
From: jiminycrick <jemelkonian@gmail.com>
Date: Sun, 23 Aug 2020 22:50:07 -0700
Subject: [PATCH] set shiny water to default

---
 assets/voxygen/shaders/fluid-frag/shiny.glsl | 13 +++++--------
 voxygen/src/hud/settings_window.rs           |  5 +----
 voxygen/src/render/mod.rs                    |  2 +-
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/assets/voxygen/shaders/fluid-frag/shiny.glsl b/assets/voxygen/shaders/fluid-frag/shiny.glsl
index 4141dbc4a8..8b9e8681ce 100644
--- a/assets/voxygen/shaders/fluid-frag/shiny.glsl
+++ b/assets/voxygen/shaders/fluid-frag/shiny.glsl
@@ -132,13 +132,10 @@ void main() {
 	float wave10 = wave_height(wave_pos + vec3(0.1, 0, 0));
 	float wave01 = wave_height(wave_pos + vec3(0, 0.1, 0));
 
-    float slope;
-    // Prevent slope from being zero so no div by zero
-    if ((abs(wave00 - wave10) > 0.0001) && (abs(wave00 - wave01) > 0.0001)) {
-	    slope = abs(wave00 - wave10) * abs(wave00 - wave01);
-    } else {
-        slope = 0.0001;
-    }
+    // Possibility of div by zero when slope = 0,
+    // however this only results in no water surface appearing
+    // and is not likely to occur (could not find any occurrences)
+    float slope = abs(wave00 - wave10) * abs(wave00 - wave01);
 
 	vec3 nmap = vec3(
 		-(wave10 - wave00) / 0.1,
@@ -158,7 +155,7 @@ void main() {
     float f_alt = f_pos.z;
 #endif
 
-    float fluid_alt = f_norm.z == 0 ? f_alt : f_pos.z;
+    float fluid_alt = mix(f_pos.z, f_alt, f_norm.z == 0);
     const float alpha = 0.255/*/ / 4.0*//* / 4.0 / sqrt(2.0)*/;
     const float n2 = 1.3325;
     const float R_s2s0 = pow((1.0 - n2) / (1.0 + n2), 2);
diff --git a/voxygen/src/hud/settings_window.rs b/voxygen/src/hud/settings_window.rs
index f1a58e474b..03738ab9b2 100644
--- a/voxygen/src/hud/settings_window.rs
+++ b/voxygen/src/hud/settings_window.rs
@@ -2064,10 +2064,7 @@ impl<'a> Widget for SettingsWindow<'a> {
             .color(TEXT_COLOR)
             .set(state.ids.fluid_mode_text, ui);
 
-            let mode_list = [
-                FluidMode::Cheap,
-                FluidMode::Shiny
-            ];
+            let mode_list = [FluidMode::Cheap, FluidMode::Shiny];
             let mode_label_list = [
                 &self
                     .localized_strings
diff --git a/voxygen/src/render/mod.rs b/voxygen/src/render/mod.rs
index fce129283f..9aadf43031 100644
--- a/voxygen/src/render/mod.rs
+++ b/voxygen/src/render/mod.rs
@@ -171,7 +171,7 @@ pub enum FluidMode {
 }
 
 impl Default for FluidMode {
-    fn default() -> Self { FluidMode::Cheap }
+    fn default() -> Self { FluidMode::Shiny }
 }
 
 /// Lighting modes