浏览代码

Merge remote-tracking branch 'origin/master' into fix/Gizmo6FacesBox-folder

/main
RSlysz 7 年前
当前提交
9a03990d
共有 5 个文件被更改,包括 4 次插入17 次删除
  1. 9
      com.unity.render-pipelines.core/CoreRP/Editor/Gizmo/Gizmo6FacesBox.cs
  2. 2
      com.unity.render-pipelines.high-definition/HDRP/Editor/Lighting/Reflection/HDReflectionProbeEditor.Handles.cs
  3. 1
      com.unity.render-pipelines.high-definition/HDRP/Editor/Lighting/Reflection/HDReflectionProbeUI.cs
  4. 1
      com.unity.render-pipelines.high-definition/HDRP/Editor/Lighting/Reflection/PlanarReflectionProbeUI.Drawers.cs
  5. 8
      com.unity.testframework.graphics/Runtime/ImageAssert.cs

9
com.unity.render-pipelines.core/CoreRP/Editor/Gizmo/Gizmo6FacesBox.cs


{
get
{
return m_faceColorsSelected ?? (m_faceColorsSelected = new Color[]
{
new Color(1f, 0f, 0f, .15f),
new Color(0f, 1f, 0f, .15f),
new Color(0f, 0f, 1f, .15f),
new Color(1f, 0f, 0f, .15f),
new Color(0f, 1f, 0f, .15f),
new Color(0f, 0f, 1f, .15f)
});
return m_faceColorsSelected ?? (m_faceColorsSelected = monochromeSelectedFace
? new Color[]
{

2
com.unity.render-pipelines.high-definition/HDRP/Editor/Lighting/Reflection/HDReflectionProbeEditor.Handles.cs


using UnityEngine;
using UnityEngine.Experimental.Rendering;
using UnityEngine.Experimental.Rendering.HDPipeline;
using UnityEngine.Rendering;
using UnityEngine.Experimental.Rendering;
namespace UnityEditor.Experimental.Rendering
{

1
com.unity.render-pipelines.high-definition/HDRP/Editor/Lighting/Reflection/HDReflectionProbeUI.cs


using UnityEngine.Experimental.Rendering;
using UnityEngine.Experimental.Rendering.HDPipeline;
using UnityEngine.Rendering;
using UnityEngine.Experimental.Rendering;
namespace UnityEditor.Experimental.Rendering
{

1
com.unity.render-pipelines.high-definition/HDRP/Editor/Lighting/Reflection/PlanarReflectionProbeUI.Drawers.cs


CED.Action(Drawer_SectionInfluenceSettings)
);
public static readonly CED.IDrawer SectionFoldoutProxySettings;
public static readonly CED.IDrawer SectionFoldoutCaptureSettings;
public static readonly CED.IDrawer SectionCaptureMirrorSettings = CED.Action(Drawer_SectionCaptureMirror);

8
com.unity.testframework.graphics/Runtime/ImageAssert.cs


"The expected image had format {0} but the actual image had format {1}.", expected.format,
actual.format);
using (var expectedPixels = new NativeArray<Color32>(expected.GetPixels32(0), Allocator.Temp))
using (var actualPixels = new NativeArray<Color32>(actual.GetPixels32(0), Allocator.Temp))
using (var diffPixels = new NativeArray<Color32>(expectedPixels.Length, Allocator.Temp))
using (var sumOverThreshold = new NativeArray<float>(Mathf.CeilToInt(expectedPixels.Length / (float)k_BatchSize), Allocator.Temp))
using (var expectedPixels = new NativeArray<Color32>(expected.GetPixels32(0), Allocator.TempJob))
using (var actualPixels = new NativeArray<Color32>(actual.GetPixels32(0), Allocator.TempJob))
using (var diffPixels = new NativeArray<Color32>(expectedPixels.Length, Allocator.TempJob))
using (var sumOverThreshold = new NativeArray<float>(Mathf.CeilToInt(expectedPixels.Length / (float)k_BatchSize), Allocator.TempJob))
{
if (settings == null)
settings = new ImageComparisonSettings();

正在加载...
取消
保存