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

ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Lighting/Reflection/PlanarReflectionProbeUI.Handles.cs

             }
 
             if (d.proxyVolumeReference != null)
-                ProxyVolumeComponentUI.DrawHandles_EditNone(s.proxyVolume, d.proxyVolumeReference);
+                ReflectionProxyVolumeComponentUI.DrawHandles_EditNone(s.reflectionProxyVolume, d.proxyVolumeReference);
         }
 
         [DrawGizmo(GizmoType.Selected)]
             }
 
             if (d.proxyVolumeReference != null)
-                ProxyVolumeComponentUI.DrawGizmos_EditNone(s.proxyVolume, d.proxyVolumeReference);
+                ReflectionProxyVolumeComponentUI.DrawGizmos_EditNone(s.reflectionProxyVolume, d.proxyVolumeReference);
 
             var showFrustrum = s.showCaptureHandles
                 || EditMode.editMode == EditCenter;

ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Lighting/Reflection/PlanarReflectionProbeUI.cs

 
         public InfluenceVolumeUI influenceVolume = new InfluenceVolumeUI();
         public FrameSettingsUI frameSettings = new FrameSettingsUI();
-        public ProxyVolumeComponentUI proxyVolume = new ProxyVolumeComponentUI();
+        public ReflectionProxyVolumeComponentUI reflectionProxyVolume = new ReflectionProxyVolumeComponentUI();
 
         public AnimBool isSectionExpandedInfluenceSettings { get { return m_AnimBools[k_ReflectionProbeModeModeCount]; } }
         public AnimBool isSectionExpandedCaptureSettings { get { return m_AnimBools[k_ReflectionProbeModeModeCount + 1]; } }
 
         public override void Reset(SerializedPlanarReflectionProbe data, UnityAction repaint)
         {
-            proxyVolume.Reset(data.proxyVolume, repaint);
+            reflectionProxyVolume.Reset(data.reflectionProxyVolume, repaint);
             frameSettings.Reset(data.frameSettings, repaint);
             influenceVolume.Reset(data.influenceVolume, repaint);
             base.Reset(data, repaint);
             isSectionExpandedCaptureMirrorSettings.target = data.isMirrored;
             isSectionExpandedCaptureStaticSettings.target = !data.isMirrored;
 
-            proxyVolume.Update();
+            reflectionProxyVolume.Update();
             frameSettings.Update();
             influenceVolume.Update();
             base.Update();

ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Lighting/Reflection/SerializedPlanarReflectionProbe.cs

         public SerializedObject serializedObject;
 
         public SerializedProperty proxyVolumeReference;
-        public SerializedProxyVolumeComponent proxyVolume;
+        public SerializedReflectionProxyVolumeComponent reflectionProxyVolume;
 
         public SerializedInfluenceVolume influenceVolume;
 
             var objs = new List<Object>();
             for (var i = 0; i < serializedObject.targetObjects.Length; i++)
                 objs.Add(((PlanarReflectionProbe)serializedObject.targetObjects[i]).proxyVolumeReference);
-            proxyVolume = new SerializedProxyVolumeComponent(new SerializedObject(objs.ToArray()));
+            reflectionProxyVolume = new SerializedReflectionProxyVolumeComponent(new SerializedObject(objs.ToArray()));
         }
 
         public void Update()
-            var updateProxyVolume = serializedObject.targetObjects.Length != proxyVolume.serializedObject.targetObjects.Length;
+            var updateProxyVolume = serializedObject.targetObjects.Length != reflectionProxyVolume.serializedObject.targetObjects.Length;
-                var proxyVolumeTargets = proxyVolume.serializedObject.targetObjects;
+                var proxyVolumeTargets = reflectionProxyVolume.serializedObject.targetObjects;
                 for (var i = 0; i < serializedObject.targetObjects.Length; i++)
                 {
                     if (proxyVolumeTargets[i] != ((PlanarReflectionProbe)serializedObject.targetObjects[i]).proxyVolumeReference)
         public void Apply()
         {
             serializedObject.ApplyModifiedProperties();
-            proxyVolume.Apply();
+            reflectionProxyVolume.Apply();
         }
     }
 }

ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Lighting/Reflection/Volume/SerializedReflectionProxyVolumeComponent.cs

 
 namespace UnityEditor.Experimental.Rendering.HDPipeline
 {
-    public class SerializedProxyVolumeComponent
+    public class SerializedReflectionProxyVolumeComponent
-        public SerializedProxyVolumeComponent(SerializedObject serializedObject)
+        public SerializedReflectionProxyVolumeComponent(SerializedObject serializedObject)
         {
             this.serializedObject = serializedObject;
 

ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Lighting/Reflection/Volume/ProxyVolumeEditor.cs

     class ProxyVolumeEditor : Editor
     {
         ReflectionProxyVolumeComponent[] m_TypedTargets;
-        SerializedProxyVolumeComponent m_SerializedData;
-        ProxyVolumeComponentUI m_UIState = new ProxyVolumeComponentUI();
-        ProxyVolumeComponentUI[] m_UIHandlerState;
+        SerializedReflectionProxyVolumeComponent m_SerializedData;
+        ReflectionProxyVolumeComponentUI m_UIState = new ReflectionProxyVolumeComponentUI();
+        ReflectionProxyVolumeComponentUI[] m_UIHandlerState;
-            m_SerializedData = new SerializedProxyVolumeComponent(serializedObject);
+            m_SerializedData = new SerializedReflectionProxyVolumeComponent(serializedObject);
-            m_UIHandlerState = new ProxyVolumeComponentUI[m_TypedTargets.Length];
+            m_UIHandlerState = new ReflectionProxyVolumeComponentUI[m_TypedTargets.Length];
-                m_UIHandlerState[i] = new ProxyVolumeComponentUI();
+                m_UIHandlerState[i] = new ReflectionProxyVolumeComponentUI();
         }
 
         public override void OnInspectorGUI()
             d.Update();
             s.Update();
 
-            ProxyVolumeComponentUI.Inspector.Draw(s, d, o);
+            ReflectionProxyVolumeComponentUI.Inspector.Draw(s, d, o);
 
             d.Apply();
         }
             for (var i = 0; i < m_TypedTargets.Length; i++)
-                ProxyVolumeComponentUI.DrawHandles_EditBase(m_UIHandlerState[i], m_TypedTargets[i]);
+                ReflectionProxyVolumeComponentUI.DrawHandles_EditBase(m_UIHandlerState[i], m_TypedTargets[i]);
         }
     }
 }

ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Lighting/Reflection.meta

+fileFormatVersion: 2
+guid: e1a5c33ed5617b44b814c2db1aca82e3
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Lighting/Reflection/Volume/ReflectionProxyVolumeComponentUI.cs

+using UnityEngine.Events;
+using UnityEngine.Experimental.Rendering.HDPipeline;
+
+namespace UnityEditor.Experimental.Rendering.HDPipeline
+{
+    using CED = CoreEditorDrawer<ReflectionProxyVolumeComponentUI, SerializedReflectionProxyVolumeComponent>;
+
+    class ReflectionProxyVolumeComponentUI : BaseUI<SerializedReflectionProxyVolumeComponent>
+    {
+        public static readonly CED.IDrawer Inspector;
+
+        static ReflectionProxyVolumeComponentUI()
+        {
+            Inspector = CED.Select(
+                (s, d, o) => s.proxyVolume,
+                (s, d, o) => d.proxyVolume,
+                ProxyVolumeUI.SectionShape
+            );
+        }
+
+        public ProxyVolumeUI proxyVolume = new ProxyVolumeUI();
+
+        public ReflectionProxyVolumeComponentUI()
+            : base(0)
+        {
+            
+        }
+
+        public override void Reset(SerializedReflectionProxyVolumeComponent data, UnityAction repaint)
+        {
+            proxyVolume.Reset(data.proxyVolume, repaint);
+            base.Reset(data, repaint);
+        }
+
+        public override void Update()
+        {
+            proxyVolume.Update();
+            base.Update();
+        }
+
+        public static void DrawHandles_EditBase(ReflectionProxyVolumeComponentUI ui, ReflectionProxyVolumeComponent target)
+        {
+            ProxyVolumeUI.DrawHandles_EditBase(target.transform, target.proxyVolume, ui.proxyVolume, target);
+        }
+
+        public static void DrawHandles_EditNone(ReflectionProxyVolumeComponentUI ui, ReflectionProxyVolumeComponent target)
+        {
+            ProxyVolumeUI.DrawHandles_EditNone(target.transform, target.proxyVolume, ui.proxyVolume, target);
+        }
+
+        public static void DrawGizmos_EditNone(ReflectionProxyVolumeComponentUI ui, ReflectionProxyVolumeComponent target)
+        {
+            ProxyVolumeUI.DrawGizmos_EditNone(target.transform, target.proxyVolume, ui.proxyVolume, target);
+        }
+    }
+}

ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Lighting/PreviewCubemapMaterial.mat

-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2100000
-Material:
-  serializedVersion: 6
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_Name: PreviewCubemapMaterial
-  m_Shader: {fileID: 4800000, guid: dfb0f7452ff8af24da7ad152669043b1, type: 3}
-  m_ShaderKeywords: _ALBEDOAFFECTEMISSIVE_OFF _ALPHACUTOFFENABLE_OFF _DEPTHOFFSETENABLE_OFF
-    _DISTORTIONDEPTHTEST_OFF _DISTORTIONENABLE_OFF _DISTORTIONONLY_OFF _DOUBLESIDEDENABLE_OFF
-    _ENABLEPERPIXELDISPLACEMENT_OFF _ENABLESPECULAROCCLUSION_OFF _ENABLEWIND_OFF
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _AnisotropyMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _BaseColorMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _BentNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _BentNormalMapOS:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _Cubemap:
-        m_Texture: {fileID: 8900000, guid: 92b5e3ec0b8d42049a853f0f4f01e4a7, type: 3}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DistortionVectorMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissiveColorMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _HeightMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MaskMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _NormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _NormalMapOS:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _SpecularColorMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _SubsurfaceRadiusMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _TangentMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _TangentMapOS:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ThicknessMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Floats:
-    - _AlbedoAffectEmissive: 0
-    - _AlphaCutoff: 0.5
-    - _AlphaCutoffEnable: 0
-    - _Anisotropy: 0
-    - _BlendMode: 0
-    - _CoatCoverage: 1
-    - _CoatIOR: 0.5
-    - _CullMode: 2
-    - _DepthOffsetEnable: 0
-    - _DetailAlbedoScale: 1
-    - _DetailNormalScale: 1
-    - _DetailSmoothnessScale: 1
-    - _DistortionDepthTest: 0
-    - _DistortionEnable: 0
-    - _DistortionOnly: 0
-    - _DoubleSidedEnable: 0
-    - _DoubleSidedNormalMode: 1
-    - _Drag: 1
-    - _DstBlend: 0
-    - _EmissiveColorMode: 1
-    - _EmissiveIntensity: 0
-    - _EnablePerPixelDisplacement: 0
-    - _EnableSpecularOcclusion: 0
-    - _EnableWind: 0
-    - _Exposure: 0
-    - _HeightAmplitude: 0.01
-    - _HeightCenter: 0.5
-    - _HeightMax: 1
-    - _HeightMin: -1
-    - _InitialBend: 1
-    - _MaterialID: 1
-    - _Metallic: 0
-    - _MipLevel: 0
-    - _NormalMapSpace: 0
-    - _NormalScale: 1
-    - _PPDLodThreshold: 5
-    - _PPDMaxSamples: 15
-    - _PPDMinSamples: 5
-    - _ShiverDirectionality: 0.5
-    - _ShiverDrag: 0.2
-    - _Smoothness: 1
-    - _SmoothnessRemapMax: 1
-    - _SmoothnessRemapMin: 0
-    - _SrcBlend: 1
-    - _StencilRef: 2
-    - _Stiffness: 1
-    - _SubsurfaceProfile: 0
-    - _SubsurfaceRadius: 1
-    - _SurfaceType: 0
-    - _TexWorldScale: 1
-    - _Thickness: 1
-    - _UVBase: 0
-    - _UVDetail: 0
-    - _ZTestMode: 8
-    - _ZWrite: 1
-    m_Colors:
-    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
-    - _CameraWorldPosition: {r: 1, g: 1, b: 1, a: 1}
-    - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
-    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
-    - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
-    - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
-    - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}

ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Lighting/PreviewCubemapMaterial.mat.meta

-fileFormatVersion: 2
-guid: 2d429e5e71c1df34791a7779fdf54dc8
-timeCreated: 1507739089
-licenseType: Pro
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Lighting/Reflection/Volume/ProxyVolumeComponentUI.cs

-using UnityEngine.Events;
-using UnityEngine.Experimental.Rendering.HDPipeline;
-
-namespace UnityEditor.Experimental.Rendering.HDPipeline
-{
-    using CED = CoreEditorDrawer<ProxyVolumeComponentUI, SerializedProxyVolumeComponent>;
-
-    class ProxyVolumeComponentUI : BaseUI<SerializedProxyVolumeComponent>
-    {
-        public static readonly CED.IDrawer Inspector;
-
-        static ProxyVolumeComponentUI()
-        {
-            Inspector = CED.Select(
-                (s, d, o) => s.proxyVolume,
-                (s, d, o) => d.proxyVolume,
-                ProxyVolumeUI.SectionShape
-            );
-        }
-
-        public ProxyVolumeUI proxyVolume = new ProxyVolumeUI();
-
-        public ProxyVolumeComponentUI()
-            : base(0)
-        {
-            
-        }
-
-        public override void Reset(SerializedProxyVolumeComponent data, UnityAction repaint)
-        {
-            proxyVolume.Reset(data.proxyVolume, repaint);
-            base.Reset(data, repaint);
-        }
-
-        public override void Update()
-        {
-            proxyVolume.Update();
-            base.Update();
-        }
-
-        public static void DrawHandles_EditBase(ProxyVolumeComponentUI ui, ReflectionProxyVolumeComponent target)
-        {
-            ProxyVolumeUI.DrawHandles_EditBase(target.transform, target.proxyVolume, ui.proxyVolume, target);
-        }
-
-        public static void DrawHandles_EditNone(ProxyVolumeComponentUI ui, ReflectionProxyVolumeComponent target)
-        {
-            ProxyVolumeUI.DrawHandles_EditNone(target.transform, target.proxyVolume, ui.proxyVolume, target);
-        }
-
-        public static void DrawGizmos_EditNone(ProxyVolumeComponentUI ui, ReflectionProxyVolumeComponent target)
-        {
-            ProxyVolumeUI.DrawGizmos_EditNone(target.transform, target.proxyVolume, ui.proxyVolume, target);
-        }
-    }
-}