浏览代码

Merge branch 'latest-preview' into add-depth-gradient-shader

/4.1
Todd Stinson 4 年前
当前提交
65343152
共有 3 个文件被更改,包括 7 次插入7 次删除
  1. 2
      Assets/Scenes/CpuImages.unity
  2. 8
      Assets/Scenes/Depth/DepthImages.unity
  3. 4
      Assets/Scripts/CameraConfigController.cs

2
Assets/Scenes/CpuImages.unity


m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1024, y: 120}
m_SizeDelta: {x: 500, y: 120}
m_Pivot: {x: 0, y: 0}
--- !u!114 &642201224
MonoBehaviour:

8
Assets/Scenes/Depth/DepthImages.unity


m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 900, y: 120}
m_SizeDelta: {x: 500, y: 120}
m_Pivot: {x: 0, y: 0}
--- !u!114 &642201224
MonoBehaviour:

m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1000, y: 600}
m_AnchoredPosition: {x: -25, y: -75}
m_SizeDelta: {x: 400, y: 400}
m_Pivot: {x: 1, y: 1}
--- !u!114 &901906345
MonoBehaviour:

m_BestFit: 0
m_MinSize: 2
m_MaxSize: 60
m_Alignment: 0
m_Alignment: 2
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0

4
Assets/Scripts/CameraConfigController.cs


set { m_CameraManager = value; }
}
/// <summary>
/// <summary>
/// Callback invoked when <see cref="m_Dropdown"/> changes. This
/// lets us change the camera configuration when the user changes
/// the selection in the UI.

// 1. Use a foreach to iterate over all the available configurations
foreach (var config in configurations)
{
m_ConfigurationNames.Add(config.ToString());
m_ConfigurationNames.Add($"{config.width}x{config.height}{(config.framerate.HasValue ? $" at {config.framerate.Value} Hz" : "")}");
}
m_Dropdown.AddOptions(m_ConfigurationNames);

正在加载...
取消
保存