Skip to content
This repository was archived by the owner on Jul 22, 2024. It is now read-only.

Fixes for 2017.2.0f3 #28

Open
psfblair wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixes for 2017.2.0f3 #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
65e7936
Fixes for 2017.2.0f3
pblair-clear Oct 22, 2017
187ef41
Additional fixes
pblair-clear Oct 22, 2017
ca9b83d
Fully qualified namespace needed for WorldAnchorStore in PointOfRefer…
pblair-clear Oct 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions HUX/Editor/InteractionManagerInspector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ public override void OnInspectorGUI()
{
InteractionManager interactionManager = (InteractionManager)target;

interactionManager.RecognizableGesures = (UnityEngine.VR.WSA.Input.GestureSettings)HUXEditorUtils.EnumCheckboxField<UnityEngine.VR.WSA.Input.GestureSettings>(
interactionManager.RecognizableGesures = (UnityEngine.XR.WSA.Input.GestureSettings)HUXEditorUtils.EnumCheckboxField<UnityEngine.XR.WSA.Input.GestureSettings>(
"Recognizable gestures",
interactionManager.RecognizableGesures,
"Default",
UnityEngine.VR.WSA.Input.GestureSettings.Tap |
UnityEngine.VR.WSA.Input.GestureSettings.DoubleTap |
UnityEngine.VR.WSA.Input.GestureSettings.Hold |
UnityEngine.VR.WSA.Input.GestureSettings.NavigationX |
UnityEngine.VR.WSA.Input.GestureSettings.NavigationY);
UnityEngine.XR.WSA.Input.GestureSettings.Tap |
UnityEngine.XR.WSA.Input.GestureSettings.DoubleTap |
UnityEngine.XR.WSA.Input.GestureSettings.Hold |
UnityEngine.XR.WSA.Input.GestureSettings.NavigationX |
UnityEngine.XR.WSA.Input.GestureSettings.NavigationY);

HUXEditorUtils.SaveChanges(target, serializedObject);
}
Expand Down
4 changes: 3 additions & 1 deletion HUX/Prefabs/Dialogs/BoundingBoxShell.prefab.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions HUX/Scripts/Core/Veil.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ private void SetDeviceFOV()
switch (CurrentDevice)
{
case DeviceTypeEnum.Auto:
switch (VRSettings.loadedDeviceName)
switch (UnityEngine.XR.XRSettings.loadedDeviceName)
{
case "Oculus":
m_deviceFOV = OCULUS_FOV;
Expand Down Expand Up @@ -307,9 +307,9 @@ public IEnumerator CoViewFromVeilFOV()
#if UNITY_EDITOR || !UNITY_WSA
if (SetVeilFOVOnStartInEditor)
{
if (VRDevice.isPresent)
if (UnityEngine.XR.XRDevice.isPresent)
{
while (!VRSettings.enabled)
while (!UnityEngine.XR.XRSettings.enabled)
{
yield return null;
}
Expand Down
2 changes: 1 addition & 1 deletion HUX/Scripts/Dialogs/Debug/DebugLog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ private void Awake()
Application.logMessageReceived += HandleLog;
s_DebugOutputs.Add(this);

if (m_DebugLogObj && (UnityEngine.VR.VRSettings.loadedDeviceName == "Oculus" || UnityEngine.VR.VRSettings.loadedDeviceName == "OpenVR"))
if (m_DebugLogObj && (UnityEngine.XR.XRSettings.loadedDeviceName == "Oculus" || UnityEngine.XR.XRSettings.loadedDeviceName == "OpenVR"))
{
// Scale up
RectTransform rectTransform = m_DebugLogObj.GetComponent<RectTransform>();
Expand Down
2 changes: 1 addition & 1 deletion HUX/Scripts/Dialogs/Debug/DebugMenu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ private void Start()
gameObject.AddComponent<DebugMenuAttributeList>();
}

if (m_MenuContainer && (UnityEngine.VR.VRSettings.loadedDeviceName == "Oculus" || UnityEngine.VR.VRSettings.loadedDeviceName == "OpenVR"))
if (m_MenuContainer && (UnityEngine.XR.XRSettings.loadedDeviceName == "Oculus" || UnityEngine.XR.XRSettings.loadedDeviceName == "OpenVR"))
{
// Scale up -- We have to do this every time the page is dirty.
transform.localScale = Vector3.one * m_ScaleForHMD;
Expand Down
Loading