[PlanarReflection] Fixed disabling planar probe

7 年前 · 7998876a
--- a/SampleScenes/HDTest/PlanarReflectionTests.unity
+++ b/SampleScenes/HDTest/PlanarReflectionTests.unity
  shadowResolution: 512
  shadowDimmer: 1
  shadowFadeDistance: 10000
+  enableContactShadows: 0
+  contactShadowLength: 0
+  contactShadowDistanceScaleFactor: 0.5
+  contactShadowMaxDistance: 50
+  contactShadowFadeDistance: 5
+  contactShadowSampleCount: 8
  shadowCascadeCount: 4
  shadowCascadeRatios:
  - 0.05
  shadowResolution: 512
  shadowDimmer: 1
  shadowFadeDistance: 10000
+  enableContactShadows: 0
+  contactShadowLength: 0
+  contactShadowDistanceScaleFactor: 0.5
+  contactShadowMaxDistance: 50
+  contactShadowFadeDistance: 5
+  contactShadowSampleCount: 8
  shadowCascadeCount: 4
  shadowCascadeRatios:
  - 0.05
  shadowResolution: 512
  shadowDimmer: 1
  shadowFadeDistance: 10000
+  enableContactShadows: 0
+  contactShadowLength: 0
+  contactShadowDistanceScaleFactor: 0.5
+  contactShadowMaxDistance: 50
+  contactShadowFadeDistance: 5
+  contactShadowSampleCount: 8
  shadowCascadeCount: 4
  shadowCascadeRatios:
  - 0.05
  shadowResolution: 512
  shadowDimmer: 1
  shadowFadeDistance: 10000
+  enableContactShadows: 0
+  contactShadowLength: 0
+  contactShadowDistanceScaleFactor: 0.5
+  contactShadowMaxDistance: 50
+  contactShadowFadeDistance: 5
+  contactShadowSampleCount: 8
  shadowCascadeCount: 4
  shadowCascadeRatios:
  - 0.05
  shadowResolution: 512
  shadowDimmer: 1
  shadowFadeDistance: 10000
+  enableContactShadows: 0
+  contactShadowLength: 0
+  contactShadowDistanceScaleFactor: 0.5
+  contactShadowMaxDistance: 50
+  contactShadowFadeDistance: 5
+  contactShadowSampleCount: 8
  shadowCascadeCount: 4
  shadowCascadeRatios:
  - 0.05
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 1596124444}
-  m_RootOrder: 2
+  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &547467867
 MonoBehaviour:
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 547467865}
-  m_Enabled: 0
+  m_Enabled: 1
  m_CastShadows: 0
  m_ReceiveShadows: 1
  m_DynamicOccludee: 1
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 547467865}
-  m_Enabled: 0
+  m_Enabled: 1
  serializedVersion: 2
  m_Type: 0
  m_Mode: 0
  shadowResolution: 512
  shadowDimmer: 1
  shadowFadeDistance: 10000
+  enableContactShadows: 0
+  contactShadowLength: 0
+  contactShadowDistanceScaleFactor: 0.5
+  contactShadowMaxDistance: 50
+  contactShadowFadeDistance: 5
+  contactShadowSampleCount: 8
  shadowCascadeCount: 4
  shadowCascadeRatios:
  - 0.05
  m_UseColorTemperature: 0
  m_ShadowRadius: 0
  m_ShadowAngle: 0
+--- !u!1 &599505012
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 599505013}
+  - component: {fileID: 599505015}
+  - component: {fileID: 599505014}
+  m_Layer: 0
+  m_Name: Mirror (4) Sphere
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 4294967295
+  m_IsActive: 0
+--- !u!4 &599505013
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 599505012}
+  m_LocalRotation: {x: -0, y: 0.7071066, z: -0, w: -0.70710707}
+  m_LocalPosition: {x: 0.564, y: 2.603, z: -0.037}
+  m_LocalScale: {x: 1.95, y: 2.73, z: 1.0000005}
+  m_Children: []
+  m_Father: {fileID: 1233674353}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 270, z: 0}
+--- !u!23 &599505014
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 599505012}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 4294967295
+  m_Materials:
+  - {fileID: 2100000, guid: 84bad4356027d8a43ac1ab6531dbab4c, 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: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 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!33 &599505015
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 599505012}
+  m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1 &605786282
 GameObject:
  m_ObjectHideFlags: 0
  shadowResolution: 512
  shadowDimmer: 1
  shadowFadeDistance: 10000
+  enableContactShadows: 0
+  contactShadowLength: 0
+  contactShadowDistanceScaleFactor: 0.5
+  contactShadowMaxDistance: 50
+  contactShadowFadeDistance: 5
+  contactShadowSampleCount: 8
  shadowCascadeCount: 4
  shadowCascadeRatios:
  - 0.05
  shadowResolution: 512
  shadowDimmer: 1
  shadowFadeDistance: 10000
+  enableContactShadows: 0
+  contactShadowLength: 0
+  contactShadowDistanceScaleFactor: 0.5
+  contactShadowMaxDistance: 50
+  contactShadowFadeDistance: 5
+  contactShadowSampleCount: 8
  shadowCascadeCount: 4
  shadowCascadeRatios:
  - 0.05
  shadowResolution: 512
  shadowDimmer: 1
  shadowFadeDistance: 10000
+  enableContactShadows: 0
+  contactShadowLength: 0
+  contactShadowDistanceScaleFactor: 0.5
+  contactShadowMaxDistance: 50
+  contactShadowFadeDistance: 5
+  contactShadowSampleCount: 8
  shadowCascadeCount: 4
  shadowCascadeRatios:
  - 0.05
  shadowResolution: 512
  shadowDimmer: 1
  shadowFadeDistance: 10000
+  enableContactShadows: 0
+  contactShadowLength: 0
+  contactShadowDistanceScaleFactor: 0.5
+  contactShadowMaxDistance: 50
+  contactShadowFadeDistance: 5
+  contactShadowSampleCount: 8
  shadowCascadeCount: 4
  shadowCascadeRatios:
  - 0.05
  - {fileID: 2037444866}
  - {fileID: 1927838485}
  - {fileID: 556113918}
+  - {fileID: 599505013}
-  - {fileID: 1596124444}
+  - {fileID: 1561776758}
  m_Father: {fileID: 241156469}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 0.97464997, y: 3, z: 1}
  m_Children: []
  m_Father: {fileID: 1233674353}
-  m_RootOrder: 4
+  m_RootOrder: 5
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!23 &1250450218
 MeshRenderer:
  - {fileID: 241156469}
  - {fileID: 1192322822}
  - {fileID: 1179256903}
+  - {fileID: 1596124444}
  m_Father: {fileID: 0}
  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  shadowResolution: 512
  shadowDimmer: 1
  shadowFadeDistance: 10000
+  enableContactShadows: 0
+  contactShadowLength: 0
+  contactShadowDistanceScaleFactor: 0.5
+  contactShadowMaxDistance: 50
+  contactShadowFadeDistance: 5
+  contactShadowSampleCount: 8
  shadowCascadeCount: 4
  shadowCascadeRatios:
  - 0.05
  shadowResolution: 512
  shadowDimmer: 1
  shadowFadeDistance: 10000
+  enableContactShadows: 0
+  contactShadowLength: 0
+  contactShadowDistanceScaleFactor: 0.5
+  contactShadowMaxDistance: 50
+  contactShadowFadeDistance: 5
+  contactShadowSampleCount: 8
  shadowCascadeCount: 4
  shadowCascadeRatios:
  - 0.05
  shadowResolution: 512
  shadowDimmer: 1
  shadowFadeDistance: 10000
+  enableContactShadows: 0
+  contactShadowLength: 0
+  contactShadowDistanceScaleFactor: 0.5
+  contactShadowMaxDistance: 50
+  contactShadowFadeDistance: 5
+  contactShadowSampleCount: 8
  shadowCascadeCount: 4
  shadowCascadeRatios:
  - 0.05
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 1561776757}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -4.987, y: 2.751, z: 3.33}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.8410001, y: 2.751, z: -0.10100007}
-  m_Father: {fileID: 1596124444}
-  m_RootOrder: 1
+  m_Father: {fileID: 1233674353}
+  m_RootOrder: 6
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1561776759
 MonoBehaviour:
  m_GameObject: {fileID: 1561776757}
-  m_Enabled: 1
+  m_Enabled: 0
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: a4ee7c3a3b205a14a94094d01ff91d6b, type: 3}
  m_Name: 
    m_ShapeType: 0
-    m_BoxBaseSize: {x: 0.39704847, y: 3.2606697, z: 3.1991441}
-    m_BoxBaseOffset: {x: -0.11343217, y: -0.14608002, z: 0.078737855}
+    m_BoxBaseSize: {x: 0.93428564, y: 3.2606697, z: 3.1991441}
+    m_BoxBaseOffset: {x: 0.15518641, y: -0.14608002, z: 0.078737855}
    m_BoxInfluencePositiveFade: {x: 0, y: 0, z: 0}
    m_BoxInfluenceNegativeFade: {x: 0, y: 0, z: 0}
    m_BoxInfluenceNormalPositiveFade: {x: 0, y: 0, z: 0}
  m_RealtimeTexture: {fileID: 1830406945}
  m_FrameSettings:
    enableShadow: 1
+    enableContactShadows: 1
    enableSSR: 1
    enableSSAO: 1
    enableSubsurfaceScattering: 1
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 1596124443}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 5.828, y: 0, z: -3.431}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
-  - {fileID: 1561776758}
-  m_Father: {fileID: 1233674353}
-  m_RootOrder: 5
+  m_Father: {fileID: 1306845494}
+  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1623506277
 GameObject:
  shadowResolution: 512
  shadowDimmer: 1
  shadowFadeDistance: 10000
+  enableContactShadows: 0
+  contactShadowLength: 0
+  contactShadowDistanceScaleFactor: 0.5
+  contactShadowMaxDistance: 50
+  contactShadowFadeDistance: 5
+  contactShadowSampleCount: 8
  shadowCascadeCount: 4
  shadowCascadeRatios:
  - 0.05
    m_Bits: 4294967295
  m_FrameSettings:
    enableShadow: 1
+    enableContactShadows: 1
    enableSSR: 1
    enableSSAO: 1
    enableSubsurfaceScattering: 1
  shadowResolution: 512
  shadowDimmer: 1
  shadowFadeDistance: 10000
+  enableContactShadows: 0
+  contactShadowLength: 0
+  contactShadowDistanceScaleFactor: 0.5
+  contactShadowMaxDistance: 50
+  contactShadowFadeDistance: 5
+  contactShadowSampleCount: 8
  shadowCascadeCount: 4
  shadowCascadeRatios:
  - 0.05
  shadowResolution: 512
  shadowDimmer: 1
  shadowFadeDistance: 10000
+  enableContactShadows: 0
+  contactShadowLength: 0
+  contactShadowDistanceScaleFactor: 0.5
+  contactShadowMaxDistance: 50
+  contactShadowFadeDistance: 5
+  contactShadowSampleCount: 8
  shadowCascadeCount: 4
  shadowCascadeRatios:
  - 0.05
--- a/ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/ReflectionSystemInternal.cs
+++ b/ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/ReflectionSystemInternal.cs
        public void UnregisterProbe(PlanarReflectionProbe planarProbe)
        {
            m_PlanarReflectionProbes.Remove(planarProbe);
+            m_PlanarReflectionProbeBounds.Remove(planarProbe);
            m_PlanarReflectionProbe_DirtyBounds.Remove(planarProbe);
            m_PlanarReflectionProbe_RequestRealtimeRender.Remove(planarProbe);
            m_PlanarReflectionProbe_RealtimeUpdate.Remove(planarProbe);