SkyRenderer now renders into a 256 cubemap RT and updates GI with it.

Author: JulienIgnace-Unity

Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.cs

@@ -276,38 +276,23 @@ void InitAndClearBuffer(Camera camera, RenderLoop renderLoop)
                 {
                     m_gbufferManager.InitGBuffers(w, h, cmd);
                 }
-
-                cmd.SetRenderTarget(new RenderTargetIdentifier(s_CameraColorBuffer), new RenderTargetIdentifier(s_CameraDepthBuffer));
-                cmd.ClearRenderTarget(true, false, new Color(0, 0, 0, 0));
                 renderLoop.ExecuteCommandBuffer(cmd);
                 cmd.Dispose();
-            }
 
+                Utilities.SetRenderTarget(renderLoop, s_CameraColorBufferRT, s_CameraDepthBufferRT, ClearFlag.ClearDepth);
+            }
 
             // TEMP: As we are in development and have not all the setup pass we still clear the color in emissive buffer and gbuffer, but this will be removed later.
 
             // Clear HDR target
             {
-                var cmd = new CommandBuffer();
-                cmd.name = "Clear HDR target";
-                cmd.SetRenderTarget(new RenderTargetIdentifier(s_CameraColorBuffer), new RenderTargetIdentifier(s_CameraDepthBuffer));
-                cmd.ClearRenderTarget(false, true, new Color(0, 0, 0, 0));
-                renderLoop.ExecuteCommandBuffer(cmd);
-                cmd.Dispose();
+                Utilities.SetRenderTarget(renderLoop, s_CameraColorBufferRT, s_CameraDepthBufferRT, ClearFlag.ClearColor, Color.black, "Clear HDR target");
             }
 
 
             // Clear GBuffers
             {
-                var cmd = new CommandBuffer();
-                cmd.name = "Clear GBuffer";
-                // Write into the Camera Depth buffer
-                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));
-                renderLoop.ExecuteCommandBuffer(cmd);
-                cmd.Dispose();
+                Utilities.SetRenderTarget(renderLoop, m_gbufferManager.GetGBuffers(), s_CameraDepthBufferRT, ClearFlag.ClearColor, Color.black, "Clear GBuffer");
             }
 
             // END TEMP
@@ -348,13 +333,9 @@ void RenderDepthPrepass(CullResults cull, Camera camera, RenderLoop renderLoop)
             if (!debugParameters.useDepthPrepass)
                 return;
 
-              // TODO: Must do opaque then alpha masked for performance! 
+            // TODO: Must do opaque then alpha masked for performance! 
             // TODO: front to back for opaque and by materal for opaque tested when we split in two
-            var cmd = new CommandBuffer { name = "Depth Prepass" };
-            cmd.SetRenderTarget(new RenderTargetIdentifier(s_CameraDepthBuffer));
-            renderLoop.ExecuteCommandBuffer(cmd);
-            cmd.Dispose();
-
+            Utilities.SetRenderTarget(renderLoop, s_CameraDepthBufferRT, "Depth Prepass");
 			RenderOpaqueRenderList(cull, camera, renderLoop, "DepthOnly");
         }
 
@@ -366,11 +347,7 @@ void RenderGBuffer(CullResults cull, Camera camera, RenderLoop renderLoop)
             }
 
             // setup GBuffer for rendering
-            var cmd = new CommandBuffer { name = "GBuffer Pass" };
-            cmd.SetRenderTarget(m_gbufferManager.GetGBuffers(), new RenderTargetIdentifier(s_CameraDepthBuffer));
-            renderLoop.ExecuteCommandBuffer(cmd);
-            cmd.Dispose();
-
+            Utilities.SetRenderTarget(renderLoop, m_gbufferManager.GetGBuffers(), s_CameraDepthBufferRT, "GBuffer Pass");
             // render opaque objects into GBuffer
             RenderOpaqueRenderList(cull, camera, renderLoop, "GBuffer", Utilities.kRendererConfigurationBakedLighting);
         }
@@ -383,23 +360,15 @@ 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" };
-            cmd.SetRenderTarget(new RenderTargetIdentifier(s_CameraDepthBuffer));
-            renderLoop.ExecuteCommandBuffer(cmd);
-            cmd.Dispose();
-
+            Utilities.SetRenderTarget(renderLoop, s_CameraDepthBufferRT, "Clear HDR target");
 			RenderOpaqueRenderList(cull, camera, renderLoop, "DepthOnly");
         }
 
         void RenderDebugViewMaterial(CullResults cull, Camera camera, RenderLoop renderLoop)
         {
             // Render Opaque forward
             {
-                var cmd = new CommandBuffer { name = "DebugView Material Mode Pass" };
-                cmd.SetRenderTarget(new RenderTargetIdentifier(s_CameraColorBuffer), new RenderTargetIdentifier(s_CameraDepthBuffer));
-                cmd.ClearRenderTarget(true, true, new Color(0, 0, 0, 0));
-                renderLoop.ExecuteCommandBuffer(cmd);
-                cmd.Dispose();
+                Utilities.SetRenderTarget(renderLoop, s_CameraColorBufferRT, s_CameraDepthBufferRT, Utilities.kClearAll, Color.black, "DebugView Material Mode Pass");
 
                 Shader.SetGlobalInt("_DebugViewMaterial", (int)debugParameters.debugViewMaterial);
 
@@ -416,7 +385,7 @@ void RenderDebugViewMaterial(CullResults cull, Camera camera, RenderLoop renderL
                 // m_gbufferManager.BindBuffers(m_DeferredMaterial);
                 // TODO: Bind depth textures
                 var cmd = new CommandBuffer { name = "GBuffer Debug Pass" };
-                cmd.Blit(null, new RenderTargetIdentifier(s_CameraColorBuffer), m_DebugViewMaterialGBuffer, 0);
+                cmd.Blit(null, s_CameraColorBufferRT, m_DebugViewMaterialGBuffer, 0);
                 renderLoop.ExecuteCommandBuffer(cmd);
                 cmd.Dispose();
             }
@@ -429,7 +398,7 @@ void RenderDebugViewMaterial(CullResults cull, Camera camera, RenderLoop renderL
             // Last blit
             {
                 var cmd = new CommandBuffer { name = "Blit DebugView Material Debug" };
-                cmd.Blit(new RenderTargetIdentifier(s_CameraColorBuffer), BuiltinRenderTextureType.CameraTarget);
+                cmd.Blit(s_CameraColorBufferRT, BuiltinRenderTextureType.CameraTarget);
                 renderLoop.ExecuteCommandBuffer(cmd);
                 cmd.Dispose();
             }
@@ -469,7 +438,7 @@ void RenderDeferredLighting(Camera camera, RenderLoop renderLoop)
             // m_gbufferManager.BindBuffers(m_DeferredMaterial);
             // TODO: Bind depth textures
             var cmd = new CommandBuffer { name = "Deferred Ligthing Pass" };
-            cmd.Blit(null, new RenderTargetIdentifier(s_CameraColorBuffer), m_DeferredMaterial, 0);
+            cmd.Blit(null, s_CameraColorBufferRT, m_DeferredMaterial, 0);
             renderLoop.ExecuteCommandBuffer(cmd);
             cmd.Dispose();
         }
@@ -484,10 +453,7 @@ void RenderForward(CullResults cullResults, Camera camera, RenderLoop renderLoop
             // Bind material data
             m_LitRenderLoop.Bind();
 
-            var cmd = new CommandBuffer { name = "Forward Pass" };
-            cmd.SetRenderTarget(new RenderTargetIdentifier(s_CameraColorBuffer), new RenderTargetIdentifier(s_CameraDepthBuffer));
-            renderLoop.ExecuteCommandBuffer(cmd);
-            cmd.Dispose();
+            Utilities.SetRenderTarget(renderLoop, s_CameraColorBufferRT, s_CameraDepthBufferRT, "Forward Pass");
 
             if (debugParameters.useForwardRenderingOnly)
             {
@@ -502,11 +468,7 @@ void RenderForwardUnlit(CullResults cullResults, Camera camera, RenderLoop rende
             // Bind material data
             m_LitRenderLoop.Bind();
 
-            var cmd = new CommandBuffer { name = "Forward Unlit Pass" };
-            cmd.SetRenderTarget(new RenderTargetIdentifier(s_CameraColorBuffer), new RenderTargetIdentifier(s_CameraDepthBuffer));
-            renderLoop.ExecuteCommandBuffer(cmd);
-            cmd.Dispose();
-
+            Utilities.SetRenderTarget(renderLoop, s_CameraColorBufferRT, s_CameraDepthBufferRT, "Forward Unlit Pass");
             RenderOpaqueRenderList(cullResults, camera, renderLoop, "ForwardUnlit");
             RenderTransparentRenderList(cullResults, camera, renderLoop, "ForwardUnlit");
         }
@@ -524,7 +486,7 @@ void RenderVelocity(CullResults cullResults, Camera camera, RenderLoop renderLoo
 
             var cmd = new CommandBuffer { name = "Velocity Pass" };
             cmd.GetTemporaryRT(s_VelocityBuffer, w, h, 0, FilterMode.Point, Builtin.RenderLoop.GetVelocityBufferFormat(), Builtin.RenderLoop.GetVelocityBufferReadWrite());
-            cmd.SetRenderTarget(new RenderTargetIdentifier(s_VelocityBuffer), new RenderTargetIdentifier(s_CameraDepthBuffer));
+            cmd.SetRenderTarget(s_VelocityBufferRT, s_CameraDepthBufferRT);
             renderLoop.ExecuteCommandBuffer(cmd);
             cmd.Dispose();
 
@@ -539,7 +501,7 @@ void RenderDistortion(CullResults cullResults, Camera camera, RenderLoop renderL
 
             var cmd = new CommandBuffer { name = "Distortion Pass" };
             cmd.GetTemporaryRT(s_DistortionBuffer, w, h, 0, FilterMode.Point, Builtin.RenderLoop.GetDistortionBufferFormat(), Builtin.RenderLoop.GetDistortionBufferReadWrite());
-            cmd.SetRenderTarget(new RenderTargetIdentifier(s_DistortionBuffer), new RenderTargetIdentifier(s_CameraDepthBuffer));
+            cmd.SetRenderTarget(s_DistortionBufferRT, s_CameraDepthBufferRT);
             renderLoop.ExecuteCommandBuffer(cmd);
             cmd.Dispose();
 
@@ -573,7 +535,7 @@ void FinalPass(RenderLoop renderLoop)
             var cmd = new CommandBuffer { name = "FinalPass" };
 
             // Resolve our HDR texture to CameraTarget.
-            cmd.Blit(new RenderTargetIdentifier(s_CameraColorBuffer), BuiltinRenderTextureType.CameraTarget, m_FinalPassMaterial, 0);
+            cmd.Blit(s_CameraColorBufferRT, BuiltinRenderTextureType.CameraTarget, m_FinalPassMaterial, 0);
             renderLoop.ExecuteCommandBuffer(cmd);
             cmd.Dispose();
         }

Assets/ScriptableRenderLoop/HDRenderLoop/Sky/SkyRenderer.cs

@@ -16,14 +16,16 @@ public class SkyParameters
 
     public class SkyRenderer
     {
-        const int kSkyCubemapSize = 128;
+        const int kSkyCubemapSize = 256;
 
-        RenderTexture m_SkyboxCubemap = null;
+        RenderTexture m_SkyboxCubemapRT = null;
 
-        Material m_SkyboxMaterial = null;
-        Material m_SkyHDRIMaterial = null;
+        Material m_StandardSkyboxMaterial = null; // This is the Unity standard skybox material. Used to pass the correct cubemap to Enlighten.
+        Material m_SkyHDRIMaterial = null; // Renders a cubemap into a render texture (can be cube or 2D)
 
-        Mesh BuildSkyMesh(Camera camera)
+        GameObject[] m_CubemapFaceCamera = new GameObject[6];
+
+        Mesh BuildSkyMesh(Camera camera, bool forceUVBottom)
         {
             Vector4 vertData0 = new Vector4(-1.0f, -1.0f, 1.0f, 1.0f);
             Vector4 vertData1 = new Vector4(1.0f, -1.0f, 1.0f, 1.0f);
@@ -54,7 +56,7 @@ Mesh BuildSkyMesh(Camera camera)
             Vector4 direction2 = (posWorldSpace2 / posWorldSpace2.w - cameraPosition);
             Vector4 direction3 = (posWorldSpace3 / posWorldSpace3.w - cameraPosition);
 
-            if (SystemInfo.graphicsUVStartsAtTop)
+            if (SystemInfo.graphicsUVStartsAtTop && !forceUVBottom)
             {
                 eyeVectorData[3] = new Vector3(direction0.x, direction0.y, direction0.z).normalized;
                 eyeVectorData[2] = new Vector3(direction1.x, direction1.y, direction1.z).normalized;
@@ -83,32 +85,90 @@ Mesh BuildSkyMesh(Camera camera)
         public void Rebuild()
         {
             // 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 = Utilities.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;
+            m_StandardSkyboxMaterial = Utilities.CreateEngineMaterial("Skybox/Cubemap");
 
             m_SkyHDRIMaterial = Utilities.CreateEngineMaterial("Hidden/HDRenderLoop/SkyHDRI");
 
-            m_SkyboxCubemap = new RenderTexture(kSkyCubemapSize, kSkyCubemapSize, 1, RenderTextureFormat.ARGBHalf);
-            m_SkyboxCubemap.dimension = TextureDimension.Cube;
-            m_SkyboxCubemap.Create();
+            m_SkyboxCubemapRT = new RenderTexture(kSkyCubemapSize, kSkyCubemapSize, 1, RenderTextureFormat.ARGBHalf);
+            m_SkyboxCubemapRT.dimension = TextureDimension.Cube;
+            m_SkyboxCubemapRT.useMipMap = true;
+            m_SkyboxCubemapRT.autoGenerateMips = true;
+            m_SkyboxCubemapRT.Create();
+
+            Matrix4x4 cubeProj = Matrix4x4.Perspective(90.0f, 1.0f, 0.1f, 1.0f);
+
+            Vector3[] lookAtList = {
+                            new Vector3(1.0f, 0.0f, 0.0f),
+                            new Vector3(-1.0f, 0.0f, 0.0f),
+                            new Vector3(0.0f, 1.0f, 0.0f),
+                            new Vector3(0.0f, -1.0f, 0.0f),
+                            new Vector3(0.0f, 0.0f, 1.0f),
+                            new Vector3(0.0f, 0.0f, -1.0f),
+                        };
+            
+            Vector3[] UpVectorList = {
+                            new Vector3(0.0f, 1.0f, 0.0f),
+                            new Vector3(0.0f, 1.0f, 0.0f),
+                            new Vector3(0.0f, 0.0f, -1.0f),
+                            new Vector3(0.0f, 0.0f, 1.0f),
+                            new Vector3(0.0f, 1.0f, 0.0f),
+                            new Vector3(0.0f, 1.0f, 0.0f),
+                        };
+
+            for (int i = 0; i < 6; ++i)
+            {
+                m_CubemapFaceCamera[i] = new GameObject();
+                m_CubemapFaceCamera[i].hideFlags = HideFlags.HideAndDontSave;
+
+                Camera camera = m_CubemapFaceCamera[i].AddComponent<Camera>();
+                camera.projectionMatrix = cubeProj;
+                Transform transform = camera.GetComponent<Transform>();
+                transform.LookAt(lookAtList[i], UpVectorList[i]);
+            }
         }
 
         public void OnDisable()
         {
-            Utilities.Destroy(m_SkyboxMaterial);
+            Utilities.Destroy(m_StandardSkyboxMaterial);
             Utilities.Destroy(m_SkyHDRIMaterial);
+            Utilities.Destroy(m_SkyboxCubemapRT);
 
-            //m_SkyboxCubemap.Release();
-            Utilities.Destroy(m_SkyboxCubemap);
+            for(int i = 0 ; i < 6 ; ++i)
+            {
+                Utilities.Destroy(m_CubemapFaceCamera[i]);
+            }
 
         }
 
+        private void RenderSky(Camera camera, SkyParameters skyParameters, bool forceUVBottom, RenderLoop renderLoop)
+        {
+            Mesh skyMesh = BuildSkyMesh(camera, forceUVBottom);
+
+            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(skyMesh, Matrix4x4.identity, m_SkyHDRIMaterial);
+            renderLoop.ExecuteCommandBuffer(cmd);
+            cmd.Dispose();
+        }
+
         public void RenderSky(Camera camera, SkyParameters skyParameters, RenderTargetIdentifier colorBuffer, RenderTargetIdentifier depthBuffer, RenderLoop renderLoop)
         {
             // Render sky into a cubemap - doesn't happen every frame, can be control
+            for (int i = 0; i < 6; ++i)
+            {
+                Utilities.SetRenderTarget(renderLoop, m_SkyboxCubemapRT, "", 0, (CubemapFace)i);
+                Camera faceCamera = m_CubemapFaceCamera[i].GetComponent<Camera>();
+                RenderSky(faceCamera, skyParameters, true, renderLoop);
+            }
+
+            m_StandardSkyboxMaterial.SetTexture("_Tex", m_SkyboxCubemapRT);
+            RenderSettings.skybox = m_StandardSkyboxMaterial; // 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;
+            DynamicGI.UpdateEnvironment();
 
             // TODO: do a render to texture here
 
@@ -118,18 +178,8 @@ public void RenderSky(Camera camera, SkyParameters skyParameters, RenderTargetId
             //m_SkyboxMaterial.SetTexture(cubemap);
 
             // Render the sky itself
-
             Utilities.SetRenderTarget(renderLoop, colorBuffer, depthBuffer, "Sky Pass");
-
-            Mesh skyMesh = BuildSkyMesh(camera);
-            
-            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(skyMesh, Matrix4x4.identity, m_SkyHDRIMaterial);
-            renderLoop.ExecuteCommandBuffer(cmd);
-            cmd.Dispose();
+            RenderSky(camera, skyParameters, false, renderLoop);
         }
     }
 }