Merge remote-tracking branch 'refs/remotes/origin/master' into Merge-FPTL

8 年前 · ed862ed6
--- a/Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.cs
+++ b/Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.cs
                    // TODO: add AreaShapeType.Line support for small widths.
                    lightData.shapeType = AreaShapeType.Rectangle;
                    lightData.size = new Vector2(additionalData.areaLightLength, additionalData.areaLightWidth);
-                    lightData.twoSided = additionalData.isDoubleSided ? 1.0f : 0.0f;
+                    lightData.twoSided = additionalData.isDoubleSided;

                    lightData.positionWS = light.light.transform.position;
                    lightData.forward = light.light.transform.forward; // Note: Light direction is oriented backward (-Z)
--- a/Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/LightDefinition.cs
+++ b/Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/LightDefinition.cs
        public float shadowDimmer;

        public Vector2 size;
-        public float twoSided;
+        public bool twoSided;
        public float unused;
    };

--- a/Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/LightDefinition.cs.hlsl
+++ b/Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/LightDefinition.cs.hlsl
 	float3 right;
 	float shadowDimmer;
 	float2 size;
-	float twoSided;
+	bool twoSided;
 	float unused;
 };

 {
 	return value.size;
 }
-float GetTwoSided(AreaLightData value)
+bool GetTwoSided(AreaLightData value)
 {
 	return value.twoSided;
 }
--- a/Assets/ScriptableRenderLoop/HDRenderLoop/Material/Lit/Lit.hlsl
+++ b/Assets/ScriptableRenderLoop/HDRenderLoop/Material/Lit/Lit.hlsl
    diffuseLighting  = float3(0.0, 0.0, 0.0);
    specularLighting = float3(0.0, 0.0, 0.0);

+    // Pick the correct axis along which to expand the fade-out sphere into an ellipsoid.
+    float3 axisLS;
+    float  minDim, maxDim;
+
+    // The compiler should generate conditional MOVs.
+    if (halfWidth >= halfHeight)
+    {
+        axisLS = lightData.right;
+        minDim = halfHeight;
+        maxDim = halfWidth;
+    }
+    else
+    {
+        axisLS = lightData.up;
+        minDim = halfWidth;
+        maxDim = halfHeight;
+    }
+
+    float3 dirLS          = positionWS - lightData.positionWS;
+    float  lightSpaceProj = dot(dirLS, axisLS);
+    float  invAspectRatio = minDim / maxDim;
+
+    // We want 'dirLS' to shrink along 'axisLS' by the aspect ratio. Therefore,
+    // we compute the difference between the original length and the shrunk one.
+    // This is equivalent to the expansion of the fade-out sphere into an ellipsoid.
+    float scaleLS = lightSpaceProj - lightSpaceProj * invAspectRatio;
+    dirLS -= scaleLS * axisLS;
+
+    // Compute the light attenuation.
+    float sqDist    = dot(dirLS, dirLS);
+    float intensity = SmoothDistanceAttenuation(sqDist, lightData.invSqrAttenuationRadius);
+
+    // Return the black color if the shaded point is too far away.
+    if (intensity == 0.0) return;
+
+    lightData.diffuseScale  *= intensity;
+    lightData.specularScale *= intensity;
+
    float ltcValue;

    // Evaluate the diffuse part.
--- a/Assets/ScriptableRenderLoop/ShaderLibrary/AreaLighting.hlsl
+++ b/Assets/ScriptableRenderLoop/ShaderLibrary/AreaLighting.hlsl
            L[3] = normalize(L[3]);
            L4   = L[0];
            break;
-        default: // 1, 2, 5
+        case 5:
            L[3] = normalize(L[3]);
            L4   = normalize(L4);
            break;
    if (n == 5)
        sum += IntegrateEdge(L4, L[0]);

-    sum *= INV_TWO_PI; // Normalization of the integral of cosine over the sphere
+    sum *= INV_TWO_PI; // Normalization

    return twoSided ? abs(sum) : max(sum, 0.0);
 }
--- a/Assets/ScriptableRenderLoop/ShaderLibrary/Common.hlsl
+++ b/Assets/ScriptableRenderLoop/ShaderLibrary/Common.hlsl
    return 1.0 / (zBufferParam.z * depth + zBufferParam.w);
 }

-// NdotV should not be negative for visible pixels, but it can happen due to perspective projection and normal mapping + decal
-// In this case this may cause weird artifact.
-// GetNdotV return a 'valid' data
-float GetNdotV(float3 N, float3 V)
-{
-    return abs(dot(N, V)); // This abs allow to limit artifact
-}
-
-// NdotV should not be negative for visible pixels, but it can happen due to perspective projection and normal mapping + decal
-// In this case normal should be modified to become valid (i.e facing camera) and not cause weird artifacts.
-// but this operation adds few ALU and users may not want it. Alternative is to simply take the abs of NdotV (less correct but works too).
-// Note: This code is not compatible with two sided lighting used in SpeedTree (TODO: investigate).
-float GetShiftedNdotV(float3 N, float3 V)
-{
-    // The amount we shift the normal toward the view vector is defined by the dot product.
-    float shiftAmount = dot(N, V);
-    N = shiftAmount < 0.0 ? N + V * (-shiftAmount + 1e-5f) : N;
-    N = normalize(N);
-
-    return saturate(dot(N, V)); // TODO: this saturate should not be necessary here
-}
-
 #endif // UNITY_COMMON_INCLUDED
--- a/Assets/ScriptableRenderLoop/ShaderLibrary/CommonLighting.hlsl
+++ b/Assets/ScriptableRenderLoop/ShaderLibrary/CommonLighting.hlsl
 }
 */

+//-----------------------------------------------------------------------------
+// various helper
+//-----------------------------------------------------------------------------
+
+// NdotV should not be negative for visible pixels, but it can happen due to perspective projection and normal mapping + decal
+// In this case this may cause weird artifact.
+// GetNdotV return a 'valid' data
+float GetNdotV(float3 N, float3 V)
+{
+    return abs(dot(N, V)); // This abs allow to limit artifact
+}
+
+// NdotV should not be negative for visible pixels, but it can happen due to perspective projection and normal mapping + decal
+// In this case normal should be modified to become valid (i.e facing camera) and not cause weird artifacts.
+// but this operation adds few ALU and users may not want it. Alternative is to simply take the abs of NdotV (less correct but works too).
+// Note: This code is not compatible with two sided lighting used in SpeedTree (TODO: investigate).
+float GetShiftedNdotV(float3 N, float3 V)
+{
+    // The amount we shift the normal toward the view vector is defined by the dot product.
+    float shiftAmount = dot(N, V);
+    N = shiftAmount < 0.0 ? N + V * (-shiftAmount + 1e-5f) : N;
+    N = normalize(N);
+
+    return saturate(dot(N, V)); // TODO: this saturate should not be necessary here
+}
+
+// Performs the mapping of the vector 'v' located within the cube of dimensions [-r, r]^3
+// to a vector within the sphere of radius 'r', where r = sqrt(r2).
+// Modified version of http://mathproofs.blogspot.com/2005/07/mapping-cube-to-sphere.html
+float3 MapCubeToSphere(float3 v, float r2)
+{
+    float3 v2 = v * v;
+    float2 vr3 = v2.xy * rcp(3.0 * r2);
+    return v * sqrt((float3)r2 - 0.5 * v2.yzx - 0.5 * v2.zxy + vr3.yxx * v2.zzy);
+}
+
+// Computes the squared magnitude of the vector 'v' after mapping it
+// to a vector within the sphere of radius 'r', where r = sqrt(r2).
+// The vector is originally defined within the cube of dimensions [-r, r]^3.
+// The mapping is performed as per MapCubeToSphere().
+// 'dotV' is dot(v, v) (often calculated when calling such a function)
+float ComputeCubeToSphereMapSqMagnitude(float3 v, float dotV, float r2)
+{
+    float3 v2 = v * v;
+    return r2 * dotV - v2.x * v2.y - v2.y * v2.z - v2.z * v2.x + v2.x * v2.y * v2.z * rcp(r2);
+}
+
 #endif // UNITY_COMMON_LIGHTING_INCLUDED
--- a/Assets/ShaderGenerator/Editor/ShaderTypeGeneration.cs
+++ b/Assets/ShaderGenerator/Editor/ShaderTypeGeneration.cs

        enum PrimitiveType
        {
-            Float, Int, UInt
+            Float, Int, UInt, Bool
        };

        static string PrimitiveToString(PrimitiveType type, int rows, int cols)
                    break;
                case PrimitiveType.UInt:
                    text = "uint";
+                    break;
+                case PrimitiveType.Bool:
+                    text = "bool";
                    break;
            }

        bool ExtractComplex(FieldInfo field, List<ShaderFieldInfo> shaderFields)
        {
            var floatFields = new List<FieldInfo>();
-            var intFields = new List<FieldInfo>();
-            var uintFields = new List<FieldInfo>();
+            var intFields   = new List<FieldInfo>();
+            var uintFields  = new List<FieldInfo>();
+            var boolFields  = new List<FieldInfo>();
            var descs = new string[4] { "x: ", "y: ", "z: ", "w: " };
            int numFields = 0;

                    intFields.Add(subField);
                else if (subField.FieldType == typeof(uint))
                    uintFields.Add(subField);
+                else if (subField.FieldType == typeof(bool))
+                    boolFields.Add(subField);
                else
                {
                    Error("'" + fieldName + "' can not be packed into a register, since it contains an unsupported field type '" + subField.FieldType + "'");

            if (floatFields.Count > 0)
            {
-                if (intFields.Count + uintFields.Count > 0)
+                if (intFields.Count + uintFields.Count + boolFields.Count > 0)
                {
                    Error(mismatchErrorMsg);
                    return false;
            else if (intFields.Count > 0)
            {
-                if (floatFields.Count + uintFields.Count > 0)
+                if (floatFields.Count + uintFields.Count + boolFields.Count > 0)
                {
                    Error(mismatchErrorMsg);
                    return false;
            else if (uintFields.Count > 0)
            {
-                if (floatFields.Count + intFields.Count > 0)
+                if (floatFields.Count + intFields.Count + boolFields.Count > 0)
+            }
+            else if (boolFields.Count > 0)
+            {
+                if (floatFields.Count + intFields.Count + uintFields.Count > 0)
+                {
+                    Error(mismatchErrorMsg);
+                    return false;
+                }
+                EmitPrimitiveType(PrimitiveType.Bool, boolFields.Count, field.Name, "", shaderFields);
            }
            else
            {
                        EmitPrimitiveType(PrimitiveType.Int, 1, field.Name, "", m_ShaderFields);
                    else if (field.FieldType == typeof(uint))
                        EmitPrimitiveType(PrimitiveType.UInt, 1, field.Name, "", m_ShaderFields);
+                        else if (field.FieldType == typeof(bool))
+                        EmitPrimitiveType(PrimitiveType.Bool, 1, field.Name, "", m_ShaderFields);
                    else
                    {
                        Error("unsupported field type '" + field.FieldType + "'");
--- a/Assets/TestScenes/HDTest/HDRenderLoopTest.unity
+++ b/Assets/TestScenes/HDTest/HDRenderLoopTest.unity
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &88941115
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &98730443
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &112575350
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &129451985
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &130303207
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!64 &146321730
 MeshCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &179154812
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!64 &291640079
 MeshCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!64 &336015814
 MeshCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &426381628
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &501648657
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &505986556
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!64 &559905036
 MeshCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!65 &609148482
 BoxCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &632653808
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &657202132
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &663023704
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!64 &745410969
 MeshCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &747895459
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &818701171
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &891124082
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!64 &925222276
 MeshCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &977219682
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &1016495512
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!64 &1035351688
 MeshCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &1072084080
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!64 &1124900850
 MeshCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!64 &1163258125
 MeshCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!64 &1216278628
 MeshCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &1217550446
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!64 &1258713068
 MeshCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &1269195142
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &1363055977
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &1370166357
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &1440897294
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &1449468231
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &1484493183
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &1514376232
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &1538518950
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &1586360514
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!64 &1614424512
 MeshCollider:
  m_Father: {fileID: 0}
  m_RootOrder: 15
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1640077383
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 1640077386}
+  - component: {fileID: 1640077385}
+  - component: {fileID: 1640077384}
+  m_Layer: 0
+  m_Name: Test - LTC Area Light Attenuation
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1640077384
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1640077383}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  shadowResolution: 512
+  shadowDimmer: 1
+  affectDiffuse: 1
+  affectSpecular: 1
+  treatAsAreaLight: 1
+  isDoubleSided: 1
+  areaLightLength: 4
+  areaLightWidth: 2
+--- !u!108 &1640077385
+Light:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1640077383}
+  m_Enabled: 1
+  serializedVersion: 7
+  m_Type: 2
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Intensity: 1
+  m_Range: 6
+  m_SpotAngle: 30
+  m_CookieSize: 10
+  m_Shadows:
+    m_Type: 0
+    m_Resolution: -1
+    m_CustomResolution: -1
+    m_Strength: 1
+    m_Bias: 0.05
+    m_NormalBias: 0.4
+    m_NearPlane: 0.2
+  m_Cookie: {fileID: 0}
+  m_DrawHalo: 0
+  m_Flare: {fileID: 0}
+  m_RenderMode: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_Lightmapping: 4
+  m_AreaSize: {x: 1, y: 1}
+  m_BounceIntensity: 1
+  m_ShadowRadius: 0
+  m_ShadowAngle: 0
+--- !u!4 &1640077386
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1640077383}
+  m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: -100, y: 2, z: 36}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 1690686862}
+  - {fileID: 1731870435}
+  m_Father: {fileID: 0}
+  m_RootOrder: 25
+  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
 --- !u!1 &1667969571
 GameObject:
  m_ObjectHideFlags: 0
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &1667969574
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &1672515619
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &1683234573
 SphereCollider:
  m_PrefabParentObject: {fileID: 4000010760374938, guid: 1faa212e4ad88f04a81c5ed019001de5,
    type: 2}
  m_PrefabInternal: {fileID: 1314842926}
+--- !u!1 &1690686861
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 1690686862}
+  - component: {fileID: 1690686865}
+  - component: {fileID: 1690686864}
+  - component: {fileID: 1690686863}
+  m_Layer: 0
+  m_Name: LightQuad
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1690686862
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1690686861}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 4, y: 2, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1640077386}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &1690686863
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1690686861}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_Materials:
+  - {fileID: 2100000, guid: 492d83e00e5c35841bcdbcea025f2c50, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 1
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!64 &1690686864
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1690686861}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Convex: 0
+  m_InflateMesh: 0
+  m_SkinWidth: 0.01
+  m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!33 &1690686865
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1690686861}
+  m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1 &1731870434
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 1731870435}
+  - component: {fileID: 1731870438}
+  - component: {fileID: 1731870437}
+  - component: {fileID: 1731870436}
+  m_Layer: 0
+  m_Name: Quad
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1731870435
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1731870434}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 2}
+  m_LocalScale: {x: 20, y: 12, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1640077386}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &1731870436
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1731870434}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_Materials:
+  - {fileID: 2100000, guid: 7af9798eeefeae34c83aca56762a2938, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 1
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!64 &1731870437
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1731870434}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Convex: 0
+  m_InflateMesh: 0
+  m_SkinWidth: 0.01
+  m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!33 &1731870438
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1731870434}
+  m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1 &1733289783
 GameObject:
  m_ObjectHideFlags: 0
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &1762987047
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &1774532635
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &1808459749
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &1823834829
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &1828745842
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!64 &1883914493
 MeshCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &1899786480
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!64 &1907476406
 MeshCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &1936798411
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &1968535692
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &1989256447
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!64 &2070887974
 MeshCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &2073488456
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &2091750489
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &2117217834
 SphereCollider:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!135 &2132979583
 SphereCollider: