Skip to content

Commit d32b822

Browse files
committed
Rename OpenVRWrapper to OpenVRFacade
1 parent 6f3f0cc commit d32b822

File tree

10 files changed

+18
-15
lines changed

10 files changed

+18
-15
lines changed

Source/DynamicOpenVR/DynamicOpenVR.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<Compile Include="Exceptions\OpenVRInputException.cs" />
9090
<Compile Include="Exceptions\OpenVRInitException.cs" />
9191
<Compile Include="OpenVRUtilities.cs" />
92-
<Compile Include="OpenVRWrapper.cs" />
92+
<Compile Include="OpenVRFacade.cs" />
9393
<Compile Include="openvr_api.cs" />
9494
<Compile Include="Properties\AssemblyInfo.cs" />
9595
<Compile Include="SteamUtilities.cs" />

Source/DynamicOpenVR/IO/AnalogInput.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ protected AnalogInput(string name) : base(name) { }
3131

3232
internal override void UpdateData()
3333
{
34-
_actionData = OpenVRWrapper.GetAnalogActionData(handle);
34+
_actionData = OpenVRFacade.GetAnalogActionData(handle);
3535
}
3636
}
3737
}

Source/DynamicOpenVR/IO/BooleanInput.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public BooleanInput(string name) : base(name) { }
4646

4747
internal override void UpdateData()
4848
{
49-
_actionData = OpenVRWrapper.GetDigitalActionData(handle);
49+
_actionData = OpenVRFacade.GetDigitalActionData(handle);
5050
}
5151
}
5252
}

Source/DynamicOpenVR/IO/HapticVibrationOutput.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public HapticVibrationOutput(string name) : base(name) { }
2828
/// <param name="frequency">The frequency in cycles per second of the haptic event.</param>
2929
public void TriggerHapticVibration(float durationSeconds, float magnitude, float frequency = 150f)
3030
{
31-
OpenVRWrapper.TriggerHapticVibrationAction(handle, 0, durationSeconds, frequency, magnitude);
31+
OpenVRFacade.TriggerHapticVibrationAction(handle, 0, durationSeconds, frequency, magnitude);
3232
}
3333
}
3434
}

Source/DynamicOpenVR/IO/OVRAction.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ internal string GetActionSetName()
4747

4848
internal void UpdateHandle()
4949
{
50-
handle = OpenVRWrapper.GetActionHandle(name);
50+
handle = OpenVRFacade.GetActionHandle(name);
5151

5252
if (handle <= 0)
5353
{

Source/DynamicOpenVR/IO/PoseInput.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public PoseInput(string name) : base(name) { }
5858

5959
internal override void UpdateData()
6060
{
61-
_actionData = OpenVRWrapper.GetPoseActionData(handle);
61+
_actionData = OpenVRFacade.GetPoseActionData(handle);
6262
HmdMatrix34_t rawMatrix = _actionData.pose.mDeviceToAbsoluteTracking;
6363
_pose = new Pose(GetPosition(rawMatrix), GetRotation(rawMatrix));
6464
}

Source/DynamicOpenVR/IO/SkeletalInput.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ public SkeletalInput(string name) : base(name) { }
3737

3838
internal override void UpdateData()
3939
{
40-
_actionData = OpenVRWrapper.GetSkeletalActionData(handle);
41-
_summaryData = OpenVRWrapper.GetSkeletalSummaryData(handle);
40+
_actionData = OpenVRFacade.GetSkeletalActionData(handle);
41+
_summaryData = OpenVRFacade.GetSkeletalSummaryData(handle);
4242
}
4343
}
4444
}

Source/DynamicOpenVR/OpenVRActionManager.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public void Initialize(string actionManifestPath)
8282

8383
CombineAndWriteManifest();
8484

85-
OpenVRWrapper.SetActionManifestPath(actionManifestPath);
85+
OpenVRFacade.SetActionManifestPath(actionManifestPath);
8686

8787
IEnumerable<string> actionSetNames = _actions.Values.Select(action => action.GetActionSetName()).Distinct();
8888

@@ -105,7 +105,7 @@ public void Update()
105105

106106
if (_actionSetHandles != null)
107107
{
108-
OpenVRWrapper.UpdateActionState(_actionSetHandles);
108+
OpenVRFacade.UpdateActionState(_actionSetHandles);
109109
}
110110

111111
foreach (var action in _actions.Values.OfType<OVRInput>().ToList())
@@ -278,7 +278,7 @@ private void TryAddActionSet(string actionSetName)
278278
try
279279
{
280280
_actionSetNames.Add(actionSetName);
281-
_actionSetHandles.Add(OpenVRWrapper.GetActionSetHandle(actionSetName));
281+
_actionSetHandles.Add(OpenVRFacade.GetActionSetHandle(actionSetName));
282282
}
283283
catch (OpenVRInputException ex)
284284
{

Source/DynamicOpenVR/OpenVRWrapper.cs renamed to Source/DynamicOpenVR/OpenVRFacade.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,12 @@
2222

2323
namespace DynamicOpenVR
2424
{
25-
internal static class OpenVRWrapper
25+
internal static class OpenVRFacade
2626
{
27-
internal static bool isRuntimeInstalled => OpenVR.IsRuntimeInstalled();
27+
internal static bool IsRuntimeInstalled()
28+
{
29+
return OpenVR.IsRuntimeInstalled();
30+
}
2831

2932
internal static void SetActionManifestPath(string manifestPath)
3033
{

Source/DynamicOpenVR/OpenVRUtilities.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ public static class OpenVRUtilities
2727

2828
public static void Init()
2929
{
30-
if (string.Compare(XRSettings.loadedDeviceName, "OpenVR", StringComparison.InvariantCultureIgnoreCase) != 0) throw new OpenVRInitException($"OpenVR is not the selected VR SDK ({XRSettings.loadedDeviceName})");
31-
if (!OpenVRWrapper.isRuntimeInstalled) throw new OpenVRInitException("OpenVR runtime is not installed");
30+
if (!string.Equals(XRSettings.loadedDeviceName, "OpenVR", StringComparison.InvariantCultureIgnoreCase)) throw new OpenVRInitException($"OpenVR is not the selected VR SDK ({XRSettings.loadedDeviceName})");
31+
if (!OpenVRFacade.IsRuntimeInstalled()) throw new OpenVRInitException("OpenVR runtime is not installed");
3232

3333
EVRInitError error = EVRInitError.None;
3434
CVRSystem system = OpenVR.Init(ref error);

0 commit comments

Comments
 (0)