浏览代码

[PlanarReflection] small fixes

/main
Frédéric Vauchelles 7 年前
当前提交
122c5ff4
共有 9 个文件被更改,包括 12 次插入12 次删除
  1. 6
      ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Lighting/Volume/ProxyVolumeComponentUI.cs
  2. 6
      ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Lighting/Volume/ProxyVolumeEditor.cs
  3. 2
      ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Lighting/Volume/SerializedProxyVolumeComponent.cs
  4. 2
      ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/HDAdditionalReflectionData.cs
  5. 4
      ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/Reflection/PlanarReflectionProbe.cs
  6. 2
      ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/Reflection/Volumes/ReflectionProxyVolumeComponent.cs
  7. 2
      ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
  8. 0
      /ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/Reflection/Volumes/ReflectionProxyVolumeComponent.cs.meta
  9. 0
      /ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/Reflection/Volumes/ReflectionProxyVolumeComponent.cs

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


base.Update();
}
public static void DrawHandles_EditBase(ProxyVolumeComponentUI ui, ProxyVolumeComponent target)
public static void DrawHandles_EditBase(ProxyVolumeComponentUI ui, ReflectionProxyVolumeComponent target)
public static void DrawHandles_EditNone(ProxyVolumeComponentUI ui, ProxyVolumeComponent target)
public static void DrawHandles_EditNone(ProxyVolumeComponentUI ui, ReflectionProxyVolumeComponent target)
public static void DrawGizmos_EditNone(ProxyVolumeComponentUI ui, ProxyVolumeComponent target)
public static void DrawGizmos_EditNone(ProxyVolumeComponentUI ui, ReflectionProxyVolumeComponent target)
{
ProxyVolumeUI.DrawGizmos_EditNone(target.transform, target.proxyVolume, ui.proxyVolume, target);
}

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


namespace UnityEditor.Experimental.Rendering.HDPipeline
{
[CustomEditor(typeof(ProxyVolumeComponent))]
[CustomEditor(typeof(ReflectionProxyVolumeComponent))]
ProxyVolumeComponent[] m_TypedTargets;
ReflectionProxyVolumeComponent[] m_TypedTargets;
SerializedProxyVolumeComponent m_SerializedData;
ProxyVolumeComponentUI m_UIState = new ProxyVolumeComponentUI();
ProxyVolumeComponentUI[] m_UIHandlerState;

m_TypedTargets = targets.Cast<ProxyVolumeComponent>().ToArray();
m_TypedTargets = targets.Cast<ReflectionProxyVolumeComponent>().ToArray();
m_SerializedData = new SerializedProxyVolumeComponent(serializedObject);
m_UIState.Reset(m_SerializedData, Repaint);

2
ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Lighting/Volume/SerializedProxyVolumeComponent.cs


{
this.serializedObject = serializedObject;
proxyVolume = new SerializedProxyVolume(serializedObject.Find((ProxyVolumeComponent c) => c.proxyVolume));
proxyVolume = new SerializedProxyVolume(serializedObject.Find((ReflectionProxyVolumeComponent c) => c.proxyVolume));
}
public void Update()

2
ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/HDAdditionalReflectionData.cs


public Vector3 boxSideFadePositive = Vector3.one;
public Vector3 boxSideFadeNegative = Vector3.one;
public ProxyVolumeComponent proxyVolumeComponent;
public ReflectionProxyVolumeComponent proxyVolumeComponent;
public Vector3 boxBlendCenterOffset { get { return (blendDistanceNegative - blendDistancePositive) * 0.5f; } }
public Vector3 boxBlendSizeOffset { get { return -(blendDistancePositive + blendDistanceNegative); } }

4
ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/Reflection/PlanarReflectionProbe.cs


}
[SerializeField]
ProxyVolumeComponent m_ProxyVolumeReference;
ReflectionProxyVolumeComponent m_ProxyVolumeReference;
[SerializeField]
InfluenceVolume m_InfluenceVolume;
[SerializeField]

public bool overrideFieldOfView { get { return m_OverrideFieldOfView; } }
public float fieldOfViewOverride { get { return m_FieldOfViewOverride; } }
public ProxyVolumeComponent proxyVolumeReference { get { return m_ProxyVolumeReference; } }
public ReflectionProxyVolumeComponent proxyVolumeReference { get { return m_ProxyVolumeReference; } }
public InfluenceVolume influenceVolume { get { return m_InfluenceVolume; } }
public BoundingSphere boundingSphere { get { return m_InfluenceVolume.GetBoundingSphereAt(transform); } }

2
ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/Reflection/Volumes/ReflectionProxyVolumeComponent.cs


namespace UnityEngine.Experimental.Rendering.HDPipeline
{
public class ProxyVolumeComponent : MonoBehaviour
public class ReflectionProxyVolumeComponent : MonoBehaviour
{
[SerializeField]
ProxyVolume m_ProxyVolume = new ProxyVolume();

2
ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl


#include "Lit.cs.hlsl"
#include "../SubsurfaceScattering/SubsurfaceScattering.hlsl"
#include "CoreRP/ShaderLibrary/VolumeRendering.hlsl"
#include "../../Lighting/Reflection/VolumeProjection.hlsl"
//-----------------------------------------------------------------------------
// Texture and constant buffer declaration

#endif
#include "../../Lighting/LightEvaluation.hlsl"
#include "../../Lighting/Reflection/VolumeProjection.hlsl"
//-----------------------------------------------------------------------------
// Lighting structure for light accumulation

/ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/Reflection/Volumes/ProxyVolumeComponent.cs.meta → /ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/Reflection/Volumes/ReflectionProxyVolumeComponent.cs.meta

/ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/Reflection/Volumes/ProxyVolumeComponent.cs → /ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/Reflection/Volumes/ReflectionProxyVolumeComponent.cs

正在加载...
取消
保存