浏览代码

resolve conflicts

/3.1
Alexandra Serralta 4 年前
当前提交
32cf57f0
共有 4 个文件被更改,包括 7 次插入8 次删除
  1. 2
      Assets/Scripts/UX/ARSceneSelectUI.cs
  2. 2
      Assets/Scripts/UX/ActiveMenu.cs
  3. 6
      Assets/Scripts/UX/CheckAvailableFeatures.cs
  4. 5
      Assets/Scripts/UX/Tooltip.cs

2
Assets/Scripts/UX/ARSceneSelectUI.cs


}
void Start()
void Start()
{
if(ActiveMenu.currentMenu == MenuType.FaceTracking)
{

2
Assets/Scripts/UX/ActiveMenu.cs


public static class ActiveMenu
{
public static MenuType currentMenu;
public static MenuType currentMenu { get; set; }
}

6
Assets/Scripts/UX/CheckAvailableFeatures.cs


}
if(cameraDescriptors.Count > 0)
{
foreach(XRCameraSubsystemDescriptor cameraDescriptor in cameraDescriptors)
foreach(var cameraDescriptor in cameraDescriptors)
{
if((cameraDescriptor.supportsAverageBrightness || cameraDescriptor.supportsAverageIntensityInLumens) &&
cameraDescriptor.supportsAverageColorTemperature && cameraDescriptor.supportsCameraConfigurations &&

if(planeDescriptors.Count > 0)
{
m_PlaneDetection.interactable = true;
foreach(XRPlaneSubsystemDescriptor planeDescriptor in planeDescriptors)
foreach(var planeDescriptor in planeDescriptors)
{
if(planeDescriptor.supportsClassification)
{

}
if(cameraDescriptors.Count > 0)
{
foreach(XRCameraSubsystemDescriptor cameraDescriptor in cameraDescriptors)
foreach(var cameraDescriptor in cameraDescriptors)
{
if(cameraDescriptor.supportsCameraImage)
{

5
Assets/Scripts/UX/Tooltip.cs


public class Tooltip : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler
{
[SerializeField]
GameObject m_Tooltip;
public GameObject toolTip

}
bool _enteredButton;
Vector3 _toolTipOffset;
bool m_EnteredButton;
Vector3 m_ToolTipOffset;
// Start is called before the first frame update
void Start()
{

正在加载...
取消
保存