Skip to content

Commit c810856

Browse files
VolcanicArtsVolcanicArts
committed
More organisation
1 parent 7083fb2 commit c810856

27 files changed

+36
-47
lines changed

‎VRCOSC.Game/Graphics/ModuleListing/Listing.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ private void filter()
7979
moduleCardFlow.ForEach(moduleCard =>
8080
{
8181
var hasValidTitle = moduleCard.Module.Title.Contains(searchTerm, StringComparison.InvariantCultureIgnoreCase);
82-
var hasValidType = type is null || moduleCard.Module.ModuleType.Equals(type);
82+
var hasValidType = type is null || moduleCard.Module.Type.Equals(type);
8383

8484
if (hasValidTitle && hasValidType)
8585
moduleCard.Show();

‎VRCOSC.Game/Graphics/ModuleListing/ModuleCard.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -169,13 +169,13 @@ public ModuleCard(Module module)
169169

170170
private Colour4 calculateModuleColour()
171171
{
172-
return Module.ModuleType switch
172+
return Module.Type switch
173173
{
174-
ModuleType.General => Colour4.White.Darken(0.15f),
175-
ModuleType.Health => Colour4.Red,
176-
ModuleType.Integrations => Colour4.Yellow.Darken(0.25f),
177-
ModuleType.Accessibility => Colour4.FromHex(@"66ccff"),
178-
ModuleType.OpenVR => Colour4.FromHex(@"04144d"),
174+
Module.ModuleType.General => Colour4.White.Darken(0.15f),
175+
Module.ModuleType.Health => Colour4.Red,
176+
Module.ModuleType.Integrations => Colour4.Yellow.Darken(0.25f),
177+
Module.ModuleType.Accessibility => Colour4.FromHex(@"66ccff"),
178+
Module.ModuleType.OpenVR => Colour4.FromHex(@"04144d"),
179179
_ => throw new ArgumentOutOfRangeException()
180180
};
181181
}

‎VRCOSC.Game/Graphics/ModuleListing/TypeFilter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,5 @@ private enum Group
4747
OpenVR = 4
4848
}
4949

50-
private static ModuleType? groupToType(Group group) => group == Group.All ? null : (ModuleType)(int)group;
50+
private static Module.ModuleType? groupToType(Group group) => group == Group.All ? null : (Module.ModuleType)(int)group;
5151
}

‎VRCOSC.Game/Modules/BaseWebSocket.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using System.Threading;
66
using System.Threading.Tasks;
77
using SuperSocket.ClientEngine;
8-
using VRCOSC.Game.Util;
98
using WebSocket4Net;
109

1110
// ReSharper disable MemberCanBeProtected.Global

‎VRCOSC.Game/Modules/Module.cs

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
using osu.Framework.Extensions.IEnumerableExtensions;
1414
using osu.Framework.Logging;
1515
using osu.Framework.Platform;
16-
using VRCOSC.Game.Modules.Modules.OpenVR;
17-
using VRCOSC.Game.Util;
1816
using VRCOSC.OSC;
1917

2018
// ReSharper disable MemberCanBePrivate.Global
@@ -44,7 +42,7 @@ public abstract class Module : IOscListener
4442
public virtual string Description => string.Empty;
4543
public virtual string Author => string.Empty;
4644
public virtual string Prefab => string.Empty;
47-
public virtual ModuleType ModuleType => ModuleType.General;
45+
public virtual ModuleType Type => ModuleType.General;
4846
protected virtual int DeltaUpdate => int.MaxValue;
4947
protected virtual int ChatBoxPriority => 0;
5048

@@ -639,4 +637,13 @@ public enum ModuleState
639637
Stopping,
640638
Stopped
641639
}
640+
641+
public enum ModuleType
642+
{
643+
General = 0,
644+
Health = 1,
645+
Integrations = 2,
646+
Accessibility = 3,
647+
OpenVR = 4
648+
}
642649
}

‎VRCOSC.Game/Modules/ModuleManager.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
using VRCOSC.Game.Modules.Modules.Media;
2525
using VRCOSC.Game.Modules.Modules.OpenVR;
2626
using VRCOSC.Game.Modules.Modules.Random;
27-
using VRCOSC.Game.Util;
2827
using VRCOSC.OSC;
2928

3029
namespace VRCOSC.Game.Modules;

‎VRCOSC.Game/Modules/ModuleType.cs

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎VRCOSC.Game/Modules/Modules/ChatBoxText/ChatBoxTextModule.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public class ChatBoxTextModule : ChatBoxModule
88
public override string Title => "ChatBox Text";
99
public override string Description => "Display custom text in the ChatBox";
1010
public override string Author => "VolcanicArts";
11-
public override ModuleType ModuleType => ModuleType.General;
11+
public override ModuleType Type => ModuleType.General;
1212
protected override int ChatBoxPriority => 2;
1313

1414
protected override bool DefaultChatBoxDisplay => true;

‎VRCOSC.Game/Modules/Modules/Clock/ClockModule.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public sealed class ClockModule : ChatBoxModule
1313
public override string Description => "Sends your local time as hours, minutes, and seconds";
1414
public override string Author => "VolcanicArts";
1515
public override string Prefab => "VRCOSC-Watch";
16-
public override ModuleType ModuleType => ModuleType.General;
16+
public override ModuleType Type => ModuleType.General;
1717
protected override int DeltaUpdate => GetSetting<bool>(ClockSetting.SmoothSecond) ? Constants.OSC_UPDATE_DELTA : 1000;
1818

1919
protected override bool DefaultChatBoxDisplay => true;

‎VRCOSC.Game/Modules/Modules/Discord/DiscordModule.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public sealed class DiscordModule : IntegrationModule
1111
public override string Description => "Integration with the Discord desktop app";
1212
public override string Author => "VolcanicArts";
1313
public override string Prefab => "VRCOSC-Discord";
14-
public override ModuleType ModuleType => ModuleType.Integrations;
14+
public override ModuleType Type => ModuleType.Integrations;
1515
protected override string TargetProcess => "discord";
1616

1717
protected override void CreateAttributes()

‎VRCOSC.Game/Modules/Modules/HardwareStats/HardwareStatsModule.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public sealed class HardwareStatsModule : ChatBoxModule
1212
public override string Title => "Hardware Stats";
1313
public override string Description => "Sends hardware stats and displays them in the ChatBox";
1414
public override string Author => "VolcanicArts";
15-
public override ModuleType ModuleType => ModuleType.General;
15+
public override ModuleType Type => ModuleType.General;
1616
protected override int DeltaUpdate => 2000;
1717

1818
protected override bool DefaultChatBoxDisplay => true;

‎VRCOSC.Game/Modules/Modules/Heartrate/HeartRateModule.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public abstract class HeartRateModule : ChatBoxModule
1515

1616
public override string Author => "VolcanicArts";
1717
public override string Prefab => "VRCOSC-Heartrate";
18-
public override ModuleType ModuleType => ModuleType.Health;
18+
public override ModuleType Type => ModuleType.Health;
1919
protected override int DeltaUpdate => 2000;
2020
protected override int ChatBoxPriority => 1;
2121

‎VRCOSC.Game/Modules/Modules/Heartrate/HypeRate/HypeRateProvider.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
using Newtonsoft.Json;
55
using VRCOSC.Game.Modules.Modules.Heartrate.HypeRate.Models;
6-
using VRCOSC.Game.Util;
76

87
namespace VRCOSC.Game.Modules.Modules.Heartrate.HypeRate;
98

‎VRCOSC.Game/Modules/Modules/Heartrate/Pulsoid/PulsoidProvider.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
using Newtonsoft.Json;
55
using VRCOSC.Game.Modules.Modules.Heartrate.Pulsoid.Models;
6-
using VRCOSC.Game.Util;
76

87
namespace VRCOSC.Game.Modules.Modules.Heartrate.Pulsoid;
98

‎VRCOSC.Game/Modules/Modules/IntegrationModule.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using System.Linq;
99
using System.Threading.Tasks;
1010
using osu.Framework.Logging;
11-
using VRCOSC.Game.Util;
11+
using VRCOSC.Game.Processes;
1212

1313
namespace VRCOSC.Game.Modules.Modules;
1414

‎VRCOSC.Game/Modules/Modules/Media/MediaModule.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public sealed class MediaModule : ChatBoxModule
1818
public override string Author => "VolcanicArts";
1919
public override string Prefab => "VRCOSC-Media";
2020
protected override int DeltaUpdate => 2000;
21-
public override ModuleType ModuleType => ModuleType.Integrations;
21+
public override ModuleType Type => ModuleType.Integrations;
2222
protected override int ChatBoxPriority => 2;
2323

2424
protected override bool DefaultChatBoxDisplay => true;

‎VRCOSC.Game/Modules/Modules/Media/MediaProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using System.Threading.Tasks;
88
using Windows.Media;
99
using Windows.Media.Control;
10-
using VRCOSC.Game.Util;
10+
using VRCOSC.Game.Processes;
1111
using WindowsMediaController;
1212

1313
namespace VRCOSC.Game.Modules.Modules.Media;

‎VRCOSC.Game/Modules/Modules/OpenVR/GestureExtensionsModule.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class GestureExtensionsModule : Module
1111
public override string Title => "Gesture Extensions";
1212
public override string Description => "Detect a range of custom gestures from Index controllers";
1313
public override string Author => "VolcanicArts";
14-
public override ModuleType ModuleType => ModuleType.OpenVR;
14+
public override ModuleType Type => ModuleType.OpenVR;
1515
protected override int DeltaUpdate => Constants.OSC_UPDATE_DELTA;
1616

1717
private float lowerThreshold;

‎VRCOSC.Game/Modules/Modules/OpenVR/OpenVRControllerStatisticsModule.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class OpenVRControllerStatisticsModule : Module
1010
public override string Title => "OpenVR Controller Statistics";
1111
public override string Description => "Gets controller statistics from your OpenVR (SteamVR) session";
1212
public override string Author => "VolcanicArts";
13-
public override ModuleType ModuleType => ModuleType.OpenVR;
13+
public override ModuleType Type => ModuleType.OpenVR;
1414
protected override int DeltaUpdate => Constants.OSC_UPDATE_DELTA;
1515

1616
protected override void CreateAttributes()

‎VRCOSC.Game/Modules/Modules/OpenVR/OpenVRStatisticsModule.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class OpenVRStatisticsModule : Module
1313
public override string Title => "OpenVR Statistics";
1414
public override string Description => "Gets statistics from your OpenVR (SteamVR) session";
1515
public override string Author => "VolcanicArts";
16-
public override ModuleType ModuleType => ModuleType.OpenVR;
16+
public override ModuleType Type => ModuleType.OpenVR;
1717
protected override int DeltaUpdate => 5000;
1818

1919
protected override void CreateAttributes()

‎VRCOSC.Game/Modules/Modules/Random/RandomModule.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public abstract class RandomModule<T> : Module where T : struct
1111
public override string Title => $"Random {typeof(T).ToReadableName()}";
1212
public override string Description => $"Sends a random {typeof(T).ToReadableName().ToLowerInvariant()} over a variable time period";
1313
public override string Author => "VolcanicArts";
14-
public override ModuleType ModuleType => ModuleType.General;
14+
public override ModuleType Type => ModuleType.General;
1515
protected override int DeltaUpdate => GetSetting<int>(RandomSetting.DeltaUpdate);
1616

1717
private readonly System.Random random = new();

‎VRCOSC.Game/Util/TerminalLogger.cs renamed to ‎VRCOSC.Game/Modules/TerminalLogger.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using osu.Framework.Extensions.IEnumerableExtensions;
55
using osu.Framework.Logging;
66

7-
namespace VRCOSC.Game.Util;
7+
namespace VRCOSC.Game.Modules;
88

99
public sealed class TerminalLogger
1010
{

‎VRCOSC.Game/Util/ProcessExtensions.cs renamed to ‎VRCOSC.Game/Processes/ProcessExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using osu.Framework.Extensions.IEnumerableExtensions;
99
using VRCOSC.Game.Modules;
1010

11-
namespace VRCOSC.Game.Util;
11+
namespace VRCOSC.Game.Processes;
1212

1313
public static class ProcessExtensions
1414
{

‎VRCOSC.Game/Util/ProcessKey.cs renamed to ‎VRCOSC.Game/Processes/ProcessKey.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using System.Runtime.InteropServices;
55

6-
namespace VRCOSC.Game.Util;
6+
namespace VRCOSC.Game.Processes;
77

88
internal static class ProcessKey
99
{

‎VRCOSC.Game/Util/ProcessVolume.cs renamed to ‎VRCOSC.Game/Processes/ProcessVolume.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// ReSharper disable SuspiciousTypeConversion.Global
88
// ReSharper disable InconsistentNaming
99

10-
namespace VRCOSC.Game.Util;
10+
namespace VRCOSC.Game.Processes;
1111

1212
// https://stackoverflow.com/questions/20938934/controlling-applications-volume-by-process-id
1313
internal static class ProcessVolume

‎VRCOSC.Game/Util/ProcessWindow.cs renamed to ‎VRCOSC.Game/Processes/ProcessWindow.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Diagnostics;
66
using System.Runtime.InteropServices;
77

8-
namespace VRCOSC.Game.Util;
8+
namespace VRCOSC.Game.Processes;
99

1010
internal static class ProcessWindow
1111
{

‎VRCOSC.Game/VRCOSCGame.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
using VRCOSC.Game.Graphics.Themes;
1818
using VRCOSC.Game.Graphics.Updater;
1919
using VRCOSC.Game.Modules;
20-
using VRCOSC.Game.Modules.Modules.OpenVR;
2120

2221
// ReSharper disable InconsistentNaming
2322

@@ -41,7 +40,7 @@ public abstract partial class VRCOSCGame : VRCOSCGameBase
4140
private OpenVRInterface openVrInterface = null!;
4241

4342
public Bindable<string> SearchTermFilter = new(string.Empty);
44-
public Bindable<ModuleType?> TypeFilter = new();
43+
public Bindable<Module.ModuleType?> TypeFilter = new();
4544

4645
[Cached]
4746
private Bindable<Tab> SelectedTab = new();

0 commit comments

Comments
 (0)