Skip to content

Commit b677948

Browse files
BOLL7708BOLL7708
committed
Harmonize I/O class names
Fix some spelling errors
1 parent 28ec044 commit b677948

27 files changed

+128
-128
lines changed

‎OpenVR2WS/DataStore.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ internal static class DataStore
1515
new (Environment.ProcessorCount, (int)OpenVR.k_unMaxTrackedDeviceCount);
1616
public static readonly ConcurrentDictionary<InputSource, ulong> sourceToHandle = new();
1717
public static readonly ConcurrentDictionary<InputSource, ConcurrentDictionary<string, Vec3>> analogInputActionData = new();
18-
public static readonly ConcurrentDictionary<InputSource, ConcurrentDictionary<string, JsonPose>> poseInputActionData = new();
19-
public static readonly ConcurrentDictionary<string, JsonSkeletonSummary> skeletonSummaryInputActionData = new();
18+
public static readonly ConcurrentDictionary<InputSource, ConcurrentDictionary<string, OutputDataPose>> poseInputActionData = new();
19+
public static readonly ConcurrentDictionary<string, OutputDataSkeletonSummary> skeletonSummaryInputActionData = new();
2020
public static readonly ConcurrentDictionary<InputSource, int> sourceToIndex = new();
2121
public static readonly ConcurrentDictionary<int, InputSource> indexToSource = new();
2222

@@ -110,22 +110,22 @@ public static void UpdateOrAddPoseInputActionData(InputPoseActionData_t data, In
110110
{
111111
var source = handleToSource[info.sourceHandle];
112112
if (!poseInputActionData.ContainsKey(source))
113-
poseInputActionData[source] = new ConcurrentDictionary<string, JsonPose>();
114-
poseInputActionData[source][info.pathEnd] = new JsonPose(data.pose);
113+
poseInputActionData[source] = new ConcurrentDictionary<string, OutputDataPose>();
114+
poseInputActionData[source][info.pathEnd] = new OutputDataPose(data.pose);
115115
}
116116

117117
public static void UpdateOrAddSkeletonSummaryInputData(VRSkeletalSummaryData_t data, InputActionInfo info)
118118
{
119-
skeletonSummaryInputActionData[info.pathEnd] = new JsonSkeletonSummary(data);
119+
skeletonSummaryInputActionData[info.pathEnd] = new OutputDataSkeletonSummary(data);
120120
}
121121

122122
public static void UpdateOrAddPoseData(TrackedDevicePose_t pose, int deviceIndex)
123123
{
124124
if (indexToSource.TryGetValue(deviceIndex, out var source))
125125
{
126126
if (!poseInputActionData.ContainsKey(source))
127-
poseInputActionData[source] = new ConcurrentDictionary<string, JsonPose>();
128-
poseInputActionData[source]["Pose"] = new JsonPose(pose);
127+
poseInputActionData[source] = new ConcurrentDictionary<string, OutputDataPose>();
128+
poseInputActionData[source]["Pose"] = new OutputDataPose(pose);
129129
}
130130
}
131131

OpenVR2WS/Input/DataDeviceProperty.cs renamed to OpenVR2WS/Input/InputDataDeviceProperty.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
namespace OpenVR2WS.Input;
55

66
[ExportTsInterface]
7-
internal class DataDeviceProperty
7+
internal class InputDataDeviceProperty
88
{
99
public int DeviceIndex = -1;
1010
public ETrackedDeviceProperty Property = ETrackedDeviceProperty.Prop_Invalid;
1111

12-
public static DataDeviceProperty CreateFromEvent(
12+
public static InputDataDeviceProperty CreateFromEvent(
1313
VREvent_t data
1414
)
1515
{
16-
var output = new DataDeviceProperty
16+
var output = new InputDataDeviceProperty
1717
{
1818
DeviceIndex = (int)data.trackedDeviceIndex,
1919
Property = data.data.property.prop

OpenVR2WS/Input/DataFindOverlay.cs renamed to OpenVR2WS/Input/InputDataFindOverlay.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace OpenVR2WS.Input;
44

55
[ExportTsInterface]
6-
internal class DataFindOverlay
6+
internal class InputDataFindOverlay
77
{
88
public string OverlayKey = "";
99
}

OpenVR2WS/Input/DataMoveSpace.cs renamed to OpenVR2WS/Input/InputDataMoveSpace.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
namespace OpenVR2WS.Input;
66

77
[ExportTsInterface]
8-
public class DataMoveSpace
8+
public class InputDataMoveSpace
99
{
1010
public int DurationMs = 0;
1111
public EasingUtils.EasingType EaseInType = EasingUtils.EasingType.Linear;
@@ -19,11 +19,11 @@ public class DataMoveSpace
1919
public Correction Correction = Correction.PlaySpace;
2020
public DataMoveSpaceEntry[] Entries = [];
2121

22-
public static DataMoveSpace BuildEmpty(bool withChild = false)
22+
public static InputDataMoveSpace BuildEmpty(bool withChild = false)
2323
{
2424
return withChild
25-
? new DataMoveSpace { Entries = [new DataMoveSpaceEntry()] }
26-
: new DataMoveSpace();
25+
? new InputDataMoveSpace { Entries = [new DataMoveSpaceEntry()] }
26+
: new InputDataMoveSpace();
2727
}
2828
}
2929

OpenVR2WS/Input/DataRemoteSetting.cs renamed to OpenVR2WS/Input/InputDataRemoteSetting.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
namespace OpenVR2WS.Input;
44

55
[ExportTsInterface]
6-
internal class DataRemoteSetting
6+
internal class InputDataRemoteSetting
77
{
88
public string Section = "";
99
public string Setting = "";
1010
public string Value = "";
11-
public InputValueTypeEnum Type = InputValueTypeEnum.None;
11+
public InputEnumValueType Type = InputEnumValueType.None;
1212
}

OpenVR2WS/Input/DataSetting.cs renamed to OpenVR2WS/Input/InputDataSetting.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
namespace OpenVR2WS.Input;
44

55
[ExportTsInterface]
6-
internal class DataSetting
6+
internal class InputDataSetting
77
{
88
public string Section = "";
99
public string Setting = "";
10-
public Output.OuputTypeEnum Type = Output.OuputTypeEnum.None;
10+
public Output.OutputEnumType Type = Output.OutputEnumType.None;
1111
}

OpenVR2WS/Input/InputValueTypeEnum.cs renamed to OpenVR2WS/Input/InputEnumValueType.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace OpenVR2WS.Input;
22

3-
internal enum InputValueTypeEnum
3+
internal enum InputEnumValueType
44
{
55
None,
66
String,

‎OpenVR2WS/Input/InputMessage.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace OpenVR2WS.Input;
88
[ExportTsInterface]
99
internal class InputMessage
1010
{
11-
public InputMessageKeyEnum Key = InputMessageKeyEnum.None;
11+
public InputMessageEnumKey Key = InputMessageEnumKey.None;
1212
public dynamic? Data;
1313
public string? Password = null;
1414
public string? Nonce = null;

OpenVR2WS/Input/InputMessageKeyEnum.cs renamed to OpenVR2WS/Input/InputMessageEnumKey.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace OpenVR2WS.Input;
22

3-
internal enum InputMessageKeyEnum
3+
internal enum InputMessageEnumKey
44
{
55
None,
66
CumulativeStats,

0 commit comments

Comments
 (0)