Skip to content

Commit

Permalink
Fix inconsistent line endings
Browse files Browse the repository at this point in the history
  • Loading branch information
mtschoen committed Nov 30, 2017
1 parent 979befa commit 42094e3
Show file tree
Hide file tree
Showing 20 changed files with 270 additions and 270 deletions.
2 changes: 1 addition & 1 deletion Menus/MainMenu/MainMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ void ShowFeedback()
var request = (ProxyFeedbackRequest)this.GetFeedbackRequestObject(typeof(ProxyFeedbackRequest));
request.control = id;
request.node = node;
request.tooltipText = tooltipText;
request.tooltipText = tooltipText;
this.AddFeedbackRequest(request);
}
}
Expand Down
2 changes: 1 addition & 1 deletion Menus/RadialMenu/RadialMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ void ShowFeedback()
var request = (ProxyFeedbackRequest)this.GetFeedbackRequestObject(typeof(ProxyFeedbackRequest));
request.control = id;
request.node = node;
request.tooltipText = "Select Action (Press to Execute)";
request.tooltipText = "Select Action (Press to Execute)";
this.AddFeedbackRequest(request);
}
}
Expand Down
2 changes: 1 addition & 1 deletion Scripts/Core/EditorVR.MiniWorlds.cs
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public void ExitPreviewMode(IUsesSpatialHash hash)
{
hash.AddToSpatialHash(grabData.transform.gameObject);
grabData.ResetScale();
}
}

hasPreview = false;
}
Expand Down
2 changes: 1 addition & 1 deletion Scripts/Handles/SphereHandle.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ protected override HandleEventData GetHandleEventData(RayEventData eventData)
{
k_SphereHandleEventData.rayOrigin = eventData.rayOrigin;
k_SphereHandleEventData.direct = UIUtils.IsDirectEvent(eventData);
k_SphereHandleEventData.raycastHitDistance = eventData.pointerCurrentRaycast.distance;
k_SphereHandleEventData.raycastHitDistance = eventData.pointerCurrentRaycast.distance;

return k_SphereHandleEventData;
}
Expand Down
14 changes: 7 additions & 7 deletions Scripts/Interfaces/Capability/IFeedbackReceiver.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if UNITY_EDITOR
#if UNITY_EDITOR

namespace UnityEditor.Experimental.EditorVR
{
Expand All @@ -19,12 +19,12 @@ public interface IFeedbackReceiver
/// <param name="request">The request object used in AddFeedbackRequest</param>
void RemoveFeedbackRequest(FeedbackRequest request);

/// <summary>
/// Clear feedback requests that were added by this caller.
/// The FeedbackModule can also call this with a null argument, signaling the intent to clear all requests from all callers.
/// </summary>
/// <param name="caller">The IRequestFeedback whose requests will be cleared</param>
void ClearFeedbackRequests(IRequestFeedback caller);
/// <summary>
/// Clear feedback requests that were added by this caller.
/// The FeedbackModule can also call this with a null argument, signaling the intent to clear all requests from all callers.
/// </summary>
/// <param name="caller">The IRequestFeedback whose requests will be cleared</param>
void ClearFeedbackRequests(IRequestFeedback caller);
}
}
#endif
4 changes: 2 additions & 2 deletions Scripts/Interfaces/FunctionalityInjection/IUsesDeviceType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public interface IUsesDeviceType

public static class IUsesDeviceTypeMethods
{
static string s_XRDeviceModel;
static string s_XRDeviceModel;

/// <summary>
/// Returns the type of device currently in use
Expand All @@ -28,7 +28,7 @@ public static class IUsesDeviceTypeMethods
public static DeviceType GetDeviceType(this IUsesDeviceType @this)
{
if (string.IsNullOrEmpty(s_XRDeviceModel))
s_XRDeviceModel = XRDevice.model;
s_XRDeviceModel = XRDevice.model;

return s_XRDeviceModel.IndexOf("oculus", StringComparison.OrdinalIgnoreCase) >= 0
? DeviceType.Oculus : DeviceType.Vive;
Expand Down
2 changes: 1 addition & 1 deletion Scripts/Interfaces/FunctionalityInjection/IWeb.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public static void DownloadTexture(this IWeb obj, string url, Action<DownloadHan
{
downloadTexture(url, completed);
}


/// <summary>
/// Download the given URL to a file on disk
/// </summary>
Expand Down
10 changes: 5 additions & 5 deletions Scripts/Modules/FeedbackModule/FeedbackModule.cs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public GameObject settingsMenuItemInstance
}
}

public Transform rayOrigin { get { return null; } }
public Transform rayOrigin { get { return null; } }

readonly Dictionary<Type, Queue<FeedbackRequest>> m_FeedbackRequestPool = new Dictionary<Type, Queue<FeedbackRequest>>();

Expand Down Expand Up @@ -128,8 +128,8 @@ void RemoveFeedbackRequest(FeedbackRequest request)
foreach (var receiver in m_FeedbackReceivers)
{
receiver.RemoveFeedbackRequest(request);
}

}

RecycleFeedbackRequestObject(request);
}

Expand Down Expand Up @@ -158,7 +158,7 @@ FeedbackRequest GetFeedbackRequestObject(Type type)
var request = pool.Dequeue();
request.Reset();
return request;
}
}

return (FeedbackRequest)Activator.CreateInstance(type);
}
Expand All @@ -171,7 +171,7 @@ void RecycleFeedbackRequestObject(FeedbackRequest request)
{
pool = new Queue<FeedbackRequest>();
m_FeedbackRequestPool[type] = pool;
}
}

pool.Enqueue(request);
}
Expand Down
Loading

0 comments on commit 42094e3

Please sign in to comment.