Fix the sky, tweak HDR setting, made deferred rendering and prost-pro…

…cessing settings properly apply on load
RosaryMala · Oct 13, 2016 · 2749c7e · 2749c7e
1 parent 186897d
commit 2749c7e
Show file tree

Hide file tree

Showing 14 changed files with 377 additions and 31 deletions.
diff --git a/Assets/CelestialScripts/TurnOffBelowHorizon.cs b/Assets/CelestialScripts/TurnOffBelowHorizon.cs
@@ -9,6 +9,12 @@ public class TurnOffBelowHorizon : MonoBehaviour {
     float originalIntensity;
     Light lightComponent;
 
+    public bool setFog = false;
+
+    public Color dayFog;
+
+    public Color nightFog;
+
     void Awake()
     {
         lightComponent = GetComponent<Light>();
@@ -19,7 +25,9 @@ void Start ()
     {
         originalIntensity = lightComponent.intensity;
     }
-
+
+    float prevIntensity = float.NaN;
+
     // Update is called once per frame
     void Update () {
 
@@ -31,7 +39,16 @@ void Start ()
         x += (angleRange / 2);
         x /= angleRange;
         x = Mathf.Clamp(x, 0, 1);
-        //Debug.Log(this.name + " light=" + x + ", xrot=" + transform.rotation.eulerAngles.x);
-        lightComponent.intensity = x * originalIntensity;
+
+        if (x != prevIntensity)
+        {
+            //Debug.Log(this.name + " light=" + x + ", xrot=" + transform.rotation.eulerAngles.x);
+            lightComponent.intensity = x * originalIntensity;
+            if(setFog)
+            {
+                RenderSettings.fogColor = Color.Lerp(nightFog, dayFog, x);
+            }
+            prevIntensity = x;
+        }
     }
 }
diff --git a/Assets/Effects Presets/Default Camera Effects.asset b/Assets/Effects Presets/Default Camera Effects.asset
@@ -79,7 +79,7 @@ MonoBehaviour:
     m_Settings:
       lowPercent: 65
       highPercent: 95
-      minLuminance: 0.03
+      minLuminance: 0.2
       maxLuminance: 2
       exposureCompensation: 0.5
       adaptationType: 0

diff --git a/Assets/ExtraEvents.cs b/Assets/ExtraEvents.cs
@@ -0,0 +1,20 @@
+using System;
+using UnityEngine;
+using UnityEngine.Events;
+
+public class ExtraEvents : MonoBehaviour
+{
+    public OnStartEvent OnStart;
+
+    // Use this for initialization
+    void Start()
+    {
+        OnStart.Invoke(gameObject);
+    }
+
+    [Serializable]
+    public class OnStartEvent : UnityEvent<GameObject>
+    {
+
+    }
+}
diff --git a/Assets/ExtraEvents.cs.meta b/Assets/ExtraEvents.cs.meta
diff --git a/Assets/IniFileParser/GameSettings.cs b/Assets/IniFileParser/GameSettings.cs
@@ -3,6 +3,8 @@
 using System.Collections.Generic;
 using System.IO;
 using UnityEngine;
+using UnityEngine.PostProcessing;
+using UnityEngine.UI;
 
 public class GameSettings : MonoBehaviour
 {
@@ -118,6 +120,8 @@ public void Awake()
         SetShadows(Instance.rendering.drawShadows);
         Application.targetFrameRate = Instance.rendering.targetFrameRate;
         QualitySettings.vSyncCount = Instance.rendering.vSyncCount;
+
+        UpdatePostProcessing();
     }
 
     void SetShadows(bool input)
@@ -135,4 +139,80 @@ void SetShadows(bool input)
             }
         }
     }
+
+    void SetSlider(GameObject go, float value)
+    {
+        Slider slider = go.GetComponent<Slider>();
+        if (slider == null) return;
+        slider.value = value;
+    }
+    void SetSlider(Slider slider, float value)
+    {
+        if (slider == null) return;
+        slider.value = value;
+    }
+
+    #region Variable change events
+
+    #region Deferred
+    Slider deferredSlider;
+    public void InitDeferredRendering(GameObject go)
+    {
+        UnityEngine.Debug.Log("Invoked from " + go);
+        deferredSlider = go.GetComponent<Slider>();
+        SetSlider(deferredSlider, Convert.ToInt32(Instance.camera.deferredRendering));
+    }
+    public void SetDeferredRendering(float value)
+    {
+        Instance.camera.deferredRendering = Convert.ToBoolean(value);
+        UpdateDeferredRendering();
+        UpdatePostProcessing();
+        SetSlider(deferredSlider, Convert.ToInt32(Instance.camera.deferredRendering));
+    }
+    public void UpdateDeferredRendering()
+    {
+        foreach (Camera camera in mainCameras)
+        {
+                if (Instance.camera.deferredRendering)
+                    camera.renderingPath = RenderingPath.DeferredShading;
+                else
+                    camera.renderingPath = RenderingPath.Forward;
+        }
+        if (postprocessSlider != null)
+            postprocessSlider.gameObject.SetActive(Instance.camera.deferredRendering);
+    }
+    #endregion
+
+    #region PostProcessing
+    Slider postprocessSlider;
+    public void InitPostProcessing(GameObject go)
+    {
+        UnityEngine.Debug.Log("Invoked from " + go);
+        postprocessSlider = go.GetComponent<Slider>();
+        SetSlider(postprocessSlider, Convert.ToInt32(Instance.camera.postProcessing));
+    }
+    public void SetPostProcessing(float value)
+    {
+        Instance.camera.postProcessing = Convert.ToBoolean(value);
+        UpdatePostProcessing();
+        SetSlider(postprocessSlider, Convert.ToInt32(Instance.camera.postProcessing));
+    }
+    public void UpdatePostProcessing()
+    {
+        foreach (Camera camera in mainCameras)
+        {
+            PostProcessingBehaviour ppb = camera.GetComponent<PostProcessingBehaviour>();
+            if (ppb != null)
+            {
+                if (Instance.camera.deferredRendering)
+                    ppb.enabled = Instance.camera.postProcessing;
+                else
+                    ppb.enabled = false;
+            }
+        }
+    }
+    #endregion
+
+    #endregion
+
 }
diff --git a/Assets/MapGen/UserSettings/DeferredRendering.cs b/Assets/MapGen/UserSettings/DeferredRendering.cs
@@ -26,5 +26,11 @@ protected override void OnValueChanged(float value)
                     break;
             }
         }
+
+        void Update()
+        {
+            if(!GameSettings.Instance.camera.deferredRendering)
+                GameSettings.Instance.camera.postProcessing = false;
+        }
     }
 }
diff --git a/Assets/MapGen/UserSettings/EnablePostProcessing.cs b/Assets/MapGen/UserSettings/EnablePostProcessing.cs
@@ -13,7 +13,7 @@ public class EnablePostProcessing : SliderBase
 
         protected override void InitValue()
         {
-            skyCam = GameObject.Find("Sky Camera").GetComponent<Camera>();
+            skyCam = GameObject.FindGameObjectWithTag("SkyCam").GetComponent<Camera>();
             slider.value = Convert.ToInt32(GameSettings.Instance.camera.postProcessing);
             valueLabel.text = GameSettings.Instance.camera.postProcessing.ToString();
             post = cam.GetComponent<PostProcessingBehaviour>();
@@ -32,7 +32,7 @@ protected override void OnValueChanged(float value)
             skyCam.hdr = GameSettings.Instance.camera.postProcessing; ;
         }
 
-        bool oldValue = false;
+        bool oldValue = true;
 
         void Update()
         {

diff --git a/Assets/Materials/TerrainMats/StandardMaterialArray.mat b/Assets/Materials/TerrainMats/StandardMaterialArray.mat
@@ -190,4 +190,4 @@ Material:
       second: {r: 30, g: 40, b: 7, a: 0}
     - first:
         name: _WorldBounds
-      second: {r: -1, g: 1, b: 383, a: -287}
+      second: {r: -1, g: 1, b: 383, a: -383}
diff --git a/Assets/Materials/TerrainMats/StencilMaterialArray.mat b/Assets/Materials/TerrainMats/StencilMaterialArray.mat
@@ -187,4 +187,4 @@ Material:
       second: {r: 30, g: 40, b: 7, a: 0}
     - first:
         name: _WorldBounds
-      second: {r: -1, g: 1, b: 383, a: -287}
+      second: {r: -1, g: 1, b: 383, a: -383}
diff --git a/Assets/Materials/TerrainMats/TransparentMaterialArray.mat b/Assets/Materials/TerrainMats/TransparentMaterialArray.mat
@@ -142,4 +142,4 @@ Material:
       second: {r: 30, g: 40, b: 7, a: 0}
     - first:
         name: _WorldBounds
-      second: {r: -1, g: 1, b: 383, a: -287}
+      second: {r: -1, g: 1, b: 383, a: -383}