Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop

Author: EvgeniiG

Assets/ScriptableRenderLoop/AdditionalLightData.cs

@@ -26,7 +26,7 @@ public float GetInnerSpotPercent01()
         }
 
         [RangeAttribute(0.0F, 1.0F)]
-        public float shadowDimmer = 1.0F;
+        public float shadowDimmer = 1.0f;
 
         public bool affectDiffuse = true;
         public bool affectSpecular = true;

Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.asset.meta

@@ -6,67 +6,85 @@ namespace UnityEngine.Experimental.ScriptableRenderLoop
     // structure definition
     //-----------------------------------------------------------------------------
 
+    [GenerateHLSL]
+    public enum GPULightType
+    {
+        Directional,
+        Spot, 
+        Point,
+        ProjectorOrtho,
+        ProjectorPyramid,
+
+        // AreaLight
+        Rectangle,
+        Line,
+        // Currently not supported in real time (just use for reference)
+        Sphere,
+        Disk,
+        Hemisphere,
+        Cylinder
+    };
+
     // These structures share between C# and hlsl need to be align on float4, so we pad them.
     [GenerateHLSL]
-    public struct PunctualLightData
+    public struct LightData
     {
         public Vector3 positionWS;
         public float invSqrAttenuationRadius;
 
         public Vector3 color;
-        public float useDistanceAttenuation;
+        public float angleScale; // Spot light
 
         public Vector3 forward;
-        public float angleScale;
+        public float angleOffset;
 
         public Vector3 up;
-        public float angleOffset;
+        public float diffuseScale; // Spot light
 
         public Vector3 right;
-        public float diffuseScale;
-
         public float specularScale;
+        
         public float shadowDimmer;
         // index are -1 if not used
         public int shadowIndex;
         public int IESIndex;
-
         public int cookieIndex;
-        public Vector3 unused;
-    };
 
-    [GenerateHLSL]
-    public enum AreaShapeType
-    {
-        Rectangle,
-        Line,
-        // Currently not supported in real time (just use for reference)
-        Sphere,
-        Disk,
-        Hemisphere,
-        Cylinder
+        public GPULightType lightType;        
+        // Area Light specific
+        public Vector2 size;
+        public bool twoSided;
     };
 
     [GenerateHLSL]
-    public struct AreaLightData
+    public struct DirectionalLightData
     {
-        public Vector3 positionWS;
-        public float invSqrAttenuationRadius;
+        public Vector3 direction;
+        public float diffuseScale;
 
         public Vector3 color;
-        public AreaShapeType shapeType;
+        public float specularScale;        
 
-        public Vector3 forward;
-        public float diffuseScale;
+        // Sun disc size 
+        public float cosAngle; // Distance to disk
+        public float sinAngle; // Disk radius
+        public int shadowIndex;
+        public float unsued;
+    };
 
-        public Vector3 up;
-        public float specularScale;
 
-        public Vector3 right;
-        public float shadowDimmer;
+    // TODO: we may have to add various parameters here for shadow - was suppose to be coupled with a light loop
+    // A point light is 6x PunctualShadowData
+    [GenerateHLSL]
+    public struct PunctualShadowData
+    {
+        // World to ShadowMap matrix
+        // Include scale and bias for shadow atlas if any
+        public Matrix4x4 worldToShadow;
 
-        public Vector2 size;
-        public bool twoSided;
+        public GPULightType lightType;
+        public float bias;
+        public float quality;
         public float unused;
     };
 
@@ -99,5 +117,4 @@ public struct EnvLightData
         public Vector3 offsetLS;
         public float unused2;
     };
-
 } // namespace UnityEngine.Experimental.ScriptableRenderLoop