- First version of sky renderer

- Added an Utilities class for re-usable methods in the renderloop (SetRenderTarget, Material creation, etc...)

Author: JulienIgnace-Unity

Assets/ScriptableRenderLoop/HDRenderLoop/Editor/HDRenderLoopInspector.cs

@@ -181,7 +181,7 @@ public override void OnInspectorGUI()
             skyParameters.skyHDRI = (Cubemap)EditorGUILayout.ObjectField("Cubemap", skyParameters.skyHDRI, typeof(Cubemap), false);
             skyParameters.exposure = Mathf.Max(Mathf.Min(EditorGUILayout.FloatField(styles.skyExposure, skyParameters.exposure), 32), -32);
             skyParameters.multiplier = Mathf.Max(EditorGUILayout.FloatField(styles.skyMultiplier, skyParameters.multiplier), 0);
-            skyParameters.rotation = Mathf.Max(Mathf.Min(EditorGUILayout.FloatField(styles.skyRotation, skyParameters.rotation), 360), 0);
+            skyParameters.rotation = Mathf.Max(Mathf.Min(EditorGUILayout.FloatField(styles.skyRotation, skyParameters.rotation), 360), -360);
 
             if (EditorGUI.EndChangeCheck())
             {

Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.cs

@@ -24,14 +24,7 @@ static void CreateHDRenderLoop()
 
 #endif
 
-        public class SkyParameters
-        {
-            public Cubemap skyHDRI;
-            public float rotation;
-            public float exposure;
-            public float multiplier;
-        }
-
+        SkyRenderer m_SkyRenderer = null;
         [SerializeField]
         SkyParameters m_SkyParameters = new SkyParameters();
 
@@ -82,7 +75,7 @@ public void InitGBuffers(int width, int height, CommandBuffer cmd)
                 }
             }
 
-            public RenderTargetIdentifier[] GetGBuffers(CommandBuffer cmd)
+            public RenderTargetIdentifier[] GetGBuffers()
             {
                 var colorMRTs = new RenderTargetIdentifier[gbufferCount];
                 for (int index = 0; index < gbufferCount; index++)
@@ -128,8 +121,6 @@ public void BindBuffers(Material mat)
         TextureSettings m_TextureSettings = TextureSettings.Default;
 
         // Various set of material use in render loop
-        Material m_SkyboxMaterial;
-        Material m_SkyHDRIMaterial;
         Material m_DeferredMaterial;
         Material m_FinalPassMaterial;
         Material m_DebugViewMaterialGBuffer;
@@ -140,6 +131,12 @@ public void BindBuffers(Material mat)
         int s_VelocityBuffer;
         int s_DistortionBuffer;
 
+        RenderTargetIdentifier s_CameraColorBufferRT;
+        RenderTargetIdentifier s_CameraDepthBufferRT;
+        RenderTargetIdentifier s_VelocityBufferRT;
+        RenderTargetIdentifier s_DistortionBufferRT;
+
+
         public class LightList
         {
             public List<DirectionalLightData> directionalLights;
@@ -174,31 +171,20 @@ void OnValidate()
             Rebuild();
         }
 
-        Material CreateEngineMaterial(string shaderPath)
-        {
-            var mat = new Material(Shader.Find(shaderPath) as Shader)
-            {
-                hideFlags = HideFlags.HideAndDontSave
-            };
-            return mat;
-        }
-
         public override void Rebuild()
         {
             s_CameraColorBuffer  = Shader.PropertyToID("_CameraColorTexture");
             s_CameraDepthBuffer  = Shader.PropertyToID("_CameraDepthTexture");
 
-            // TODO: We need to have an API to send our sky information to Enlighten. For now use a workaround through skybox/cubemap material...
-            m_SkyboxMaterial = CreateEngineMaterial("Skybox/Cubemap");
-            RenderSettings.skybox = m_SkyboxMaterial; // Setup this material as the default to be use in RenderSettings
-            RenderSettings.ambientIntensity = 1.0f; // fix this to 1, this parameter should not exist!
-            RenderSettings.ambientMode = UnityEngine.Rendering.AmbientMode.Skybox; // Force skybox for our HDRI
-            RenderSettings.reflectionIntensity = 1.0f;
+            s_CameraColorBufferRT = new RenderTargetIdentifier(s_CameraColorBuffer);
+            s_CameraDepthBufferRT = new RenderTargetIdentifier(s_CameraDepthBuffer);
+
+            m_SkyRenderer = new SkyRenderer();
+            m_SkyRenderer.Rebuild();
 
-            m_SkyHDRIMaterial = CreateEngineMaterial("Hidden/HDRenderLoop/SkyHDRI");
-            m_DeferredMaterial   = CreateEngineMaterial("Hidden/HDRenderLoop/Deferred");
-            m_FinalPassMaterial  = CreateEngineMaterial("Hidden/HDRenderLoop/FinalPass");
-            m_DebugViewMaterialGBuffer = CreateEngineMaterial("Hidden/HDRenderLoop/DebugViewMaterialGBuffer");
+            m_DeferredMaterial   = Utilities.CreateEngineMaterial("Hidden/HDRenderLoop/Deferred");
+            m_FinalPassMaterial  = Utilities.CreateEngineMaterial("Hidden/HDRenderLoop/FinalPass");
+            m_DebugViewMaterialGBuffer = Utilities.CreateEngineMaterial("Hidden/HDRenderLoop/DebugViewMaterialGBuffer");
 
             m_ShadowPass = new ShadowRenderPass(m_ShadowSettings);
 
@@ -222,9 +208,11 @@ public override void Rebuild()
                 m_gbufferManager.SetBufferDescription(m_gbufferManager.gbufferCount, "_VelocityTexture", Builtin.RenderLoop.GetVelocityBufferFormat(), Builtin.RenderLoop.GetVelocityBufferReadWrite());
                 m_gbufferManager.gbufferCount++;
             }
+            s_VelocityBufferRT = new RenderTargetIdentifier(s_VelocityBuffer);
 #pragma warning restore 162
 
             s_DistortionBuffer = Shader.PropertyToID("_DistortionTexture");
+            s_DistortionBufferRT = new RenderTargetIdentifier(s_DistortionBuffer);
 
             m_LitRenderLoop.Rebuild();
 
@@ -247,16 +235,16 @@ void OnDisable()
             m_LitRenderLoop.OnDisable();
             m_SinglePassLightLoop.OnDisable();
             //m_TilePassLightLoop.OnDisable();
-
-            if (m_SkyboxMaterial) DestroyImmediate(m_SkyboxMaterial);
-            if (m_SkyHDRIMaterial) DestroyImmediate(m_SkyHDRIMaterial);
-            if (m_DeferredMaterial)  DestroyImmediate(m_DeferredMaterial);
-            if (m_FinalPassMaterial) DestroyImmediate(m_FinalPassMaterial);
-            if (m_DebugViewMaterialGBuffer) DestroyImmediate(m_DebugViewMaterialGBuffer);
+     
+            Utilities.Destroy(m_DeferredMaterial);
+            Utilities.Destroy(m_FinalPassMaterial);
+            Utilities.Destroy(m_DebugViewMaterialGBuffer);
 
             m_CubeReflTexArray.Release();
             m_CookieTexArray.Release();
             m_CubeCookieTexArray.Release();
+
+            m_SkyRenderer.OnDisable();
         }
 
         void NewFrame()
@@ -314,7 +302,7 @@ void InitAndClearBuffer(Camera camera, RenderLoop renderLoop)
                 var cmd = new CommandBuffer();
                 cmd.name = "Clear GBuffer";
                 // Write into the Camera Depth buffer
-                cmd.SetRenderTarget(m_gbufferManager.GetGBuffers(cmd), new RenderTargetIdentifier(s_CameraDepthBuffer));
+                cmd.SetRenderTarget(m_gbufferManager.GetGBuffers(), new RenderTargetIdentifier(s_CameraDepthBuffer));
                 // Clear everything
                 // TODO: Clear is not required for color as we rewrite everything, will save performance.
                 cmd.ClearRenderTarget(false, true, new Color(0, 0, 0, 0));
@@ -325,56 +313,28 @@ void InitAndClearBuffer(Camera camera, RenderLoop renderLoop)
             // END TEMP
         }
 
-        void RenderOpaqueNoLightingRenderList(CullResults cull, Camera camera, RenderLoop renderLoop, string passName)
+        void RenderOpaqueRenderList(CullResults cull, Camera camera, RenderLoop renderLoop, string passName, RendererConfiguration rendererConfiguration = 0)
         {
             if (!debugParameters.displayOpaqueObjects)
                 return;
 
             var settings = new DrawRendererSettings(cull, camera, new ShaderPassName(passName))
             {
-                rendererConfiguration = 0,
-                sorting = { sortOptions = SortOptions.SortByMaterialThenMesh }
-            };        
-            settings.inputFilter.SetQueuesOpaque();
-            renderLoop.DrawRenderers(ref settings);
-        }
-
-        void RenderOpaqueRenderList(CullResults cull, Camera camera, RenderLoop renderLoop, string passName)
-        {
-            if (!debugParameters.displayOpaqueObjects)
-                return;
-
-            var settings = new DrawRendererSettings(cull, camera, new ShaderPassName(passName))
-            {
-                rendererConfiguration = RendererConfiguration.PerObjectLightProbe | RendererConfiguration.PerObjectReflectionProbes | RendererConfiguration.PerObjectLightmaps | RendererConfiguration.PerObjectLightProbeProxyVolume,
+                rendererConfiguration = rendererConfiguration,
                 sorting = { sortOptions = SortOptions.SortByMaterialThenMesh }
             };
             settings.inputFilter.SetQueuesOpaque();
             renderLoop.DrawRenderers(ref settings);
         }
 
-        void RenderTransparentNoLightingRenderList(CullResults cull, Camera camera, RenderLoop renderLoop, string passName)
-        {
-            if (!debugParameters.displayTransparentObjects)
-                return;
-
-            var settings = new DrawRendererSettings(cull, camera, new ShaderPassName(passName))
-            {
-                rendererConfiguration = 0,
-                sorting = { sortOptions = SortOptions.BackToFront }
-            };
-            settings.inputFilter.SetQueuesTransparent();
-            renderLoop.DrawRenderers(ref settings);
-        }
-
-        void RenderTransparentRenderList(CullResults cull, Camera camera, RenderLoop renderLoop, string passName)        
+        void RenderTransparentRenderList(CullResults cull, Camera camera, RenderLoop renderLoop, string passName, RendererConfiguration rendererConfiguration = 0)
         {
             if (!debugParameters.displayTransparentObjects)
                 return;
 
             var settings = new DrawRendererSettings(cull, camera, new ShaderPassName(passName))
             {
-                rendererConfiguration = RendererConfiguration.PerObjectLightProbe | RendererConfiguration.PerObjectReflectionProbes | RendererConfiguration.PerObjectLightmaps | RendererConfiguration.PerObjectLightProbeProxyVolume,
+                rendererConfiguration = rendererConfiguration,
                 sorting = { sortOptions = SortOptions.BackToFront }
             };
             settings.inputFilter.SetQueuesTransparent();
@@ -395,7 +355,7 @@ void RenderDepthPrepass(CullResults cull, Camera camera, RenderLoop renderLoop)
             renderLoop.ExecuteCommandBuffer(cmd);
             cmd.Dispose();
 
-            RenderOpaqueNoLightingRenderList(cull, camera, renderLoop, "DepthOnly");
+			RenderOpaqueRenderList(cull, camera, renderLoop, "DepthOnly");
         }
 
         void RenderGBuffer(CullResults cull, Camera camera, RenderLoop renderLoop)
@@ -407,12 +367,12 @@ void RenderGBuffer(CullResults cull, Camera camera, RenderLoop renderLoop)
 
             // setup GBuffer for rendering
             var cmd = new CommandBuffer { name = "GBuffer Pass" };
-            cmd.SetRenderTarget(m_gbufferManager.GetGBuffers(cmd), new RenderTargetIdentifier(s_CameraDepthBuffer));
+            cmd.SetRenderTarget(m_gbufferManager.GetGBuffers(), new RenderTargetIdentifier(s_CameraDepthBuffer));
             renderLoop.ExecuteCommandBuffer(cmd);
             cmd.Dispose();
 
             // render opaque objects into GBuffer
-            RenderOpaqueRenderList(cull, camera, renderLoop, "GBuffer");
+            RenderOpaqueRenderList(cull, camera, renderLoop, "GBuffer", Utilities.kRendererConfigurationBakedLighting);
         }
 
         // This pass is use in case of forward opaque and deferred rendering. We need to render forward objects before tile lighting pass
@@ -423,12 +383,12 @@ void RenderForwardOpaqueDepth(CullResults cull, Camera camera, RenderLoop render
                 return;
 
             // TODO: Use the render queue index to only send the forward opaque!
-            var cmd = new CommandBuffer { name = "Depth Prepass" };
+                        var cmd = new CommandBuffer { name = "Depth Prepass" };
             cmd.SetRenderTarget(new RenderTargetIdentifier(s_CameraDepthBuffer));
             renderLoop.ExecuteCommandBuffer(cmd);
             cmd.Dispose();
 
-            RenderOpaqueNoLightingRenderList(cull, camera, renderLoop, "DepthOnly");
+			RenderOpaqueRenderList(cull, camera, renderLoop, "DepthOnly");
         }
 
         void RenderDebugViewMaterial(CullResults cull, Camera camera, RenderLoop renderLoop)
@@ -516,54 +476,7 @@ void RenderDeferredLighting(Camera camera, RenderLoop renderLoop)
 
         void RenderSky(Camera camera, RenderLoop renderLoop)
         {
-            /*
-            // Render sky into a cubemap - doesn't happen every frame, can be control
-
-            // TODO: do a render to texture here
-
-            // Downsample the cubemap and provide it to Enlighten
-
-            // TODO: currently workaround is to set the cubemap in a Skybox/cubemap material
-            //m_SkyboxMaterial.SetTexture(cubemap);
-
-            // Render the sky itself
-
-            Vector3[] vertData = new Vector3[4];
-            vertData[0] = new Vector3(-1.0f, -1.0f, 0.0f);
-            vertData[1] = new Vector3(1.0f, -1.0f, 0.0f);
-            vertData[2] = new Vector3(1.0f, 1.0f, 0.0f);
-            vertData[3] = new Vector3(-1.0f, 1.0f, 0.0f);            
-
-            Vector3[] eyeVectorData = new Vector3[4];
-            // camera.worldToCameraMatrix, camera.projectionMatrix
-            // Get view vector vased on the frustrum, i.e (invert transform frustrum get position etc...)
-            eyeVectorData[0] = 
-            eyeVectorData[1] = 
-            eyeVectorData[2] = 
-            eyeVectorData[3] = 
-
-            // Write out the mesh
-            var triangles = new int[4];
-            for (int i = 0; i < 4; i++)
-            {
-                triangles[i] = i;
-            }
-
-            Mesh mesh = new Mesh
-            {
-                vertices = vertData,
-                normals = eyeVectorData,
-                triangles = triangles
-            };
-
-            m_SkyHDRIMaterial.SetTexture("_Cubemap", skyParameters.skyHDRI);
-            m_SkyHDRIMaterial.SetVector("_SkyParam", new Vector4(skyParameters.exposure, skyParameters.multiplier, skyParameters.rotation, 0.0f));
-
-            var cmd = new CommandBuffer { name = "Skybox" };
-            cmd.DrawMesh(mesh, Matrix4x4.identity, m_SkyHDRIMaterial);
-            renderloop.ExecuteCommandBuffer(cmd);
-            cmd.Dispose();
-            */
+            m_SkyRenderer.RenderSky(camera, m_SkyParameters, s_CameraColorBufferRT, s_CameraDepthBufferRT, renderLoop);
         }
 
         void RenderForward(CullResults cullResults, Camera camera, RenderLoop renderLoop)
@@ -581,7 +494,7 @@ void RenderForward(CullResults cullResults, Camera camera, RenderLoop renderLoop
                 RenderOpaqueRenderList(cullResults, camera, renderLoop, "Forward");
             }
 
-            RenderTransparentRenderList(cullResults, camera, renderLoop, "Forward");
+            RenderTransparentRenderList(cullResults, camera, renderLoop, "Forward", Utilities.kRendererConfigurationBakedLighting);
         }
 
         void RenderForwardUnlit(CullResults cullResults, Camera camera, RenderLoop renderLoop)
@@ -594,8 +507,8 @@ void RenderForwardUnlit(CullResults cullResults, Camera camera, RenderLoop rende
             renderLoop.ExecuteCommandBuffer(cmd);
             cmd.Dispose();
 
-            RenderOpaqueNoLightingRenderList(cullResults, camera, renderLoop, "ForwardUnlit");
-            RenderTransparentNoLightingRenderList(cullResults, camera, renderLoop, "ForwardUnlit");
+            RenderOpaqueRenderList(cullResults, camera, renderLoop, "ForwardUnlit");
+            RenderTransparentRenderList(cullResults, camera, renderLoop, "ForwardUnlit");
         }
 
         void RenderVelocity(CullResults cullResults, Camera camera, RenderLoop renderLoop)
@@ -615,7 +528,7 @@ void RenderVelocity(CullResults cullResults, Camera camera, RenderLoop renderLoo
             renderLoop.ExecuteCommandBuffer(cmd);
             cmd.Dispose();
 
-            RenderOpaqueNoLightingRenderList(cullResults, camera, renderLoop, "MotionVectors");
+            RenderOpaqueRenderList(cullResults, camera, renderLoop, "MotionVectors");
 #pragma warning restore 162, 429
         }
 
@@ -631,7 +544,7 @@ void RenderDistortion(CullResults cullResults, Camera camera, RenderLoop renderL
             cmd.Dispose();
 
             // Only transparent object can render distortion vectors
-            RenderTransparentNoLightingRenderList(cullResults, camera, renderLoop, "DistortionVectors");
+            RenderTransparentRenderList(cullResults, camera, renderLoop, "DistortionVectors");
         }
 
 

Assets/ScriptableRenderLoop/HDRenderLoop/Sky/Resources/SkyHDRI.shader

@@ -5,7 +5,8 @@ Shader "Hidden/HDRenderLoop/SkyHDRI"
         Pass
         {
             ZWrite Off
-            Blend SrcAlpha OneMinusSrcAlpha // We will lerp only the values that are valid
+            ZTest LEqual
+            Blend One Zero
 
             HLSLPROGRAM
             #pragma target 5.0
@@ -38,11 +39,6 @@ Shader "Hidden/HDRenderLoop/SkyHDRI"
                 // TODO: implement SV_vertexID full screen quad
                 Varyings output;
                 output.positionCS = float4(input.positionCS.xy, UNITY_RAW_FAR_CLIP_VALUE
-                    #if UNITY_REVERSED_Z
-                    + 0.000001
-                    #else
-                    - 0.000001
-                    #endif
                     , 1.0);
                 output.eyeVector = input.eyeVector;
 
@@ -54,11 +50,11 @@ Shader "Hidden/HDRenderLoop/SkyHDRI"
                 float3 dir = normalize(input.eyeVector);
 
                 // Rotate direction
-                float phi = _SkyParam.z * PI / 180.0; // Convert to radiant
+                float phi = DegToRad(_SkyParam.z);
                 float cosPhi, sinPhi;
-                sincos(phi, cosPhi, sinPhi);
-                float3 rotDirX = float3(cosPhi, 0, sinPhi);
-                float3 rotDirY = float3(sinPhi, 0, -cosPhi);                
+                sincos(phi, sinPhi, cosPhi);
+                float3 rotDirX = float3(cosPhi, 0, -sinPhi);
+                float3 rotDirY = float3(sinPhi, 0, cosPhi);
                 dir = float3(dot(rotDirX, dir), dir.y, dot(rotDirY, dir));
 
                 return ClampToFloat16Max(SAMPLE_TEXTURECUBE_LOD(_Cubemap, sampler_Cubemap, dir, 0) * exp2(_SkyParam.x) * _SkyParam.y);