From 803bd284a644366e315138fa3c80a98e51ec17ae Mon Sep 17 00:00:00 2001
From: Bradley Austin Davis <bdavis@saintandreas.org>
Date: Tue, 1 May 2018 14:41:23 -0700
Subject: [PATCH] Alternate shader

---
 interface/resources/shaders/splashSkybox.frag | 70 +++++++++++--------
 interface/src/Application.cpp                 |  5 +-
 2 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/interface/resources/shaders/splashSkybox.frag b/interface/resources/shaders/splashSkybox.frag
index 8088b745bc..38c89b4d26 100644
--- a/interface/resources/shaders/splashSkybox.frag
+++ b/interface/resources/shaders/splashSkybox.frag
@@ -1,37 +1,47 @@
+const vec3 COLOR = vec3(0x00, 0xD8, 0x02) / vec3(0xFF);
+const float CUTOFF = 0.65;
+const float NOISE_MULT = 8.0;
+const float NOISE_POWER = 1.0;
 
-float noise3D(vec3 p)
-{
-    return fract(sin(dot(p ,vec3(12.9898,78.233,126.7235))) * 43758.5453);
+float noise4D(vec4 p) {
+	return fract(sin(dot(p ,vec4(12.9898,78.233,126.7235, 593.2241))) * 43758.5453);
 }
 
-float worley3D(vec3 p)
-{                                        
-    float r = 3.0;
-    vec3 f = floor(p);
-    vec3 x = fract(p);
-    for(int i = -1; i<=1; i++)
-    {
-        for(int j = -1; j<=1; j++)
-        {
-            for(int k = -1; k<=1; k++)
-            {
-                vec3 q = vec3(float(i),float(j),float(k));
-                vec3 v = q + vec3(noise3D((q+f)*1.11), noise3D((q+f)*1.14), noise3D((q+f)*1.17)) - x;
-                float d = dot(v, v);
-                r = min(r, d);
-            }
-        }
-    }
+float worley4D(vec4 p) {
+	float r = 3.0;
+    vec4 f = floor(p);
+    vec4 x = fract(p);
+	for(int i = -1; i<=1; i++)
+	{
+		for(int j = -1; j<=1; j++)
+		{
+			for(int k = -1; k<=1; k++)
+			{
+                for (int l = -1; l <= 1; l++) {
+                	vec4 q = vec4(float(i),float(j),float(k), float(l));
+    				vec4 v = q + vec4(noise4D((q+f)*1.11), noise4D((q+f)*1.14), noise4D((q+f)*1.17), noise4D((q+f)*1.20)) - x;
+    				float d = dot(v, v);
+					r = min(r, d);
+                }
+			}
+		}
+	}
     return sqrt(r);
-}   
+}
 
 
+vec3 mainColor(vec3 direction) {
+    float n = worley4D(vec4(direction * NOISE_MULT, iGlobalTime / 3.0));
+    n = 1.0 - n;
+    n = pow(n, NOISE_POWER);
+    if (n < CUTOFF) {
+        return vec3(0.0);
+    }
+
+    n = (n - CUTOFF) / (1.0 - CUTOFF);
+	return COLOR * (1.0 - n);
+}
+
 vec3 getSkyboxColor() {
-    vec3 color = abs(normalize(_normal));
-//    vec2 uv;
-//    uv.x = 0.5 + atan(_normal.z, _normal.x);
-//    uv.y = 0.5 - asin(_normal.y);
-//    uv *= 20.0;
-//    color.r = worley3D(vec3(uv, iGlobalTime));
-    return color;
-}
\ No newline at end of file
+	return mainColor(normalize(_normal));
+}
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 4a59cf3549..e6830a04c8 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2671,6 +2671,9 @@ void Application::initializeDisplayPlugins() {
             batch.enableSkybox(true);
             batch.enableStereo(_appRenderArgs._isStereo);
             batch.setViewportTransform({ 0, 0, finalFramebuffer->getSize() });
+            batch.runLambda([] {
+                // update uniform values
+            });
             procedural->render(batch, _appRenderArgs._renderArgs.getViewFrustum());
         });
         auto frame = _gpuContext->endFrame();
@@ -3016,7 +3019,7 @@ void Application::updateCamera(RenderArgs& renderArgs, float deltaTime) {
             _thirdPersonHMDCameraBoomValid = false;
 
             _myCamera.setOrientation(myAvatar->getHead()->getOrientation());
-            if (Menu::getInstance()->isOptionChecked(MenuOption::CenterPlayerInView)) {
+            if (isOptionChecked(MenuOption::CenterPlayerInView)) {
                 _myCamera.setPosition(myAvatar->getDefaultEyePosition()
                     + _myCamera.getOrientation() * boomOffset);
             }