HDRenderLoop: Push a version with C# that compile

Author: sebastienlagarde

Assets/ScriptableRenderLoop/HDRenderLoop/Editor/HDRenderLoopInspector.cs

@@ -268,15 +268,15 @@ public override void OnInspectorGUI()
             EditorGUILayout.Space();
 
             // TODO: we should call a virtual method or something similar to setup the UI, inspector should not know about it
-            TilePass tilePass = renderLoop.lightLoop as TilePass;
+            TilePass.LightLoop tilePass = renderLoop.lightLoop as TilePass.LightLoop;
             if (tilePass != null)
             {
                 EditorGUILayout.LabelField(styles.tileLightLoopSettings);
                 EditorGUI.indentLevel++;
                 EditorGUI.BeginChangeCheck();
 
                 tilePass.debugViewTilesFlags = EditorGUILayout.MaskField("DebugView Tiles", tilePass.debugViewTilesFlags, styles.tileLightLoopDebugTileFlagStrings);
-                tilePass.enableSplitLightEvaluation = EditorGUILayout.Toggle(styles.directSplitLightEvaluation, tilePass.enableSplitLightEvaluation);
+                tilePass.enableSplitLightEvaluation = EditorGUILayout.Toggle(styles.splitLightEvaluation, tilePass.enableSplitLightEvaluation);
                 tilePass.enableBigTilePrepass = EditorGUILayout.Toggle(styles.bigTilePrepass, tilePass.enableBigTilePrepass);
                 tilePass.enableClustered = EditorGUILayout.Toggle(styles.clustered, tilePass.enableClustered);
                 tilePass.disableTileAndCluster = EditorGUILayout.Toggle(styles.disableTileAndCluster, tilePass.disableTileAndCluster);

Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.cs

@@ -159,9 +159,9 @@ public TextureSettings textureSettings
         int m_HeightOnRecord;
 
         // This must be allocate outside of Rebuild() else the option in the class can't be set in the inspector (as it will in this case recreate the class with default value)
-        LightLoop m_lightLoop = new TilePass();
+        BaseLightLoop m_lightLoop = new TilePass.LightLoop();
 
-        public LightLoop lightLoop
+        public BaseLightLoop lightLoop
         {
             get { return m_lightLoop; }
         }
@@ -445,6 +445,11 @@ void RenderSky(Camera camera, RenderLoop renderLoop)
 
         void RenderForward(CullResults cullResults, Camera camera, RenderLoop renderLoop, bool renderOpaque)
         {
+            // TODO: Currently we can't render opaque object forward when deferred is enabled
+            // miss option
+            if (!debugParameters.useForwardRenderingOnly && renderOpaque)
+                return;
+
             using (new Utilities.ProfilingSample("Forward Pass", renderLoop))
             {
                 // Bind material data
@@ -454,12 +459,14 @@ void RenderForward(CullResults cullResults, Camera camera, RenderLoop renderLoop
 
                 m_lightLoop.RenderForward(camera, renderLoop, renderOpaque);
 
-                if (debugParameters.useForwardRenderingOnly)
+                if (renderOpaque)
                 {
                     RenderOpaqueRenderList(cullResults, camera, renderLoop, "Forward");
                 }
-
-                RenderTransparentRenderList(cullResults, camera, renderLoop, "Forward", Utilities.kRendererConfigurationBakedLighting);
+                else
+                {
+                    RenderTransparentRenderList(cullResults, camera, renderLoop, "Forward", Utilities.kRendererConfigurationBakedLighting);
+                }
             }
         }
 

Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/LightDefinition.cs.hlsl

@@ -59,7 +59,7 @@ struct LightData
 // PackingRules = Exact
 struct DirectionalLightData
 {
-	float3 direction;
+	float3 forward;
 	float diffuseScale;
 	float3 up;
 	float invScaleY;
@@ -75,9 +75,9 @@ struct DirectionalLightData
 	int cookieIndex;
 };
 
-// Generated from UnityEngine.Experimental.ScriptableRenderLoop.PunctualShadowData
+// Generated from UnityEngine.Experimental.ScriptableRenderLoop.ShadowData
 // PackingRules = Exact
-struct PunctualShadowData
+struct ShadowData
 {
 	float4x4 worldToShadow;
 	int lightType;
@@ -86,16 +86,6 @@ struct PunctualShadowData
 	float unused;
 };
 
-// Generated from UnityEngine.Experimental.ScriptableRenderLoop.DirectionalShadowData
-// PackingRules = Exact
-struct DirectionalShadowData
-{
-	float4x4 worldToShadow;
-	float bias;
-	float quality;
-	float2 unused2;
-};
-
 // Generated from UnityEngine.Experimental.ScriptableRenderLoop.EnvLightData
 // PackingRules = Exact
 struct EnvLightData
@@ -189,9 +179,9 @@ bool GetTwoSided(LightData value)
 //
 // Accessors for UnityEngine.Experimental.ScriptableRenderLoop.DirectionalLightData
 //
-float3 GetDirection(DirectionalLightData value)
+float3 GetForward(DirectionalLightData value)
 {
-	return value.direction;
+	return value.forward;
 }
 float GetDiffuseScale(DirectionalLightData value)
 {
@@ -247,49 +237,29 @@ int GetCookieIndex(DirectionalLightData value)
 }
 
 //
-// Accessors for UnityEngine.Experimental.ScriptableRenderLoop.PunctualShadowData
+// Accessors for UnityEngine.Experimental.ScriptableRenderLoop.ShadowData
 //
-float4x4 GetWorldToShadow(PunctualShadowData value)
+float4x4 GetWorldToShadow(ShadowData value)
 {
 	return value.worldToShadow;
 }
-int GetLightType(PunctualShadowData value)
+int GetLightType(ShadowData value)
 {
 	return value.lightType;
 }
-float GetBias(PunctualShadowData value)
+float GetBias(ShadowData value)
 {
 	return value.bias;
 }
-float GetQuality(PunctualShadowData value)
+float GetQuality(ShadowData value)
 {
 	return value.quality;
 }
-float GetUnused(PunctualShadowData value)
+float GetUnused(ShadowData value)
 {
 	return value.unused;
 }
 
-//
-// Accessors for UnityEngine.Experimental.ScriptableRenderLoop.DirectionalShadowData
-//
-float4x4 GetWorldToShadow(DirectionalShadowData value)
-{
-	return value.worldToShadow;
-}
-float GetBias(DirectionalShadowData value)
-{
-	return value.bias;
-}
-float GetQuality(DirectionalShadowData value)
-{
-	return value.quality;
-}
-float2 GetUnused2(DirectionalShadowData value)
-{
-	return value.unused2;
-}
-
 //
 // Accessors for UnityEngine.Experimental.ScriptableRenderLoop.EnvLightData
 //

Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/LightLoop.cs

@@ -5,7 +5,7 @@
 
 namespace UnityEngine.Experimental.ScriptableRenderLoop
 {
-    public class LightLoop
+    public class BaseLightLoop
     {
         // TODO: We should rather put the texture settings in LightLoop, but how do we serialize it ?
         public virtual void Rebuild(TextureSettings textureSettings) {}