Skip to content

Commit

Permalink
Move OSC into Game
Browse files Browse the repository at this point in the history
  • Loading branch information
@VolcanicArts
VolcanicArts committed Jan 22, 2023
1 parent 13df660 commit 2a69d11
Show file tree
Hide file tree
Showing 24 changed files with 57 additions and 51 deletions.
2 changes: 1 addition & 1 deletion VRCOSC.Game/Graphics/ModuleRun/ParameterContainer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using osu.Framework.Graphics.Shapes;
using VRCOSC.Game.Graphics.Themes;
using VRCOSC.Game.Modules;
using VRCOSC.OSC.VRChat;
using VRCOSC.Game.OSC.VRChat;

namespace VRCOSC.Game.Graphics.ModuleRun;

Expand Down
4 changes: 2 additions & 2 deletions VRCOSC.Game/Modules/ChatBoxInterface.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
using System.Linq;
using osu.Framework.Bindables;
using osu.Framework.Extensions.IEnumerableExtensions;
using VRCOSC.OSC.Client;
using VRCOSC.OSC.VRChat;
using VRCOSC.Game.OSC.Client;
using VRCOSC.Game.OSC.VRChat;

namespace VRCOSC.Game.Modules;

Expand Down
2 changes: 1 addition & 1 deletion VRCOSC.Game/Modules/GameManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
using VRCOSC.Game.Graphics.Notifications;
using VRCOSC.Game.OpenVR;
using VRCOSC.Game.OpenVR.Metadata;
using VRCOSC.OSC.VRChat;
using VRCOSC.Game.OSC.VRChat;

namespace VRCOSC.Game.Modules;

Expand Down
2 changes: 1 addition & 1 deletion VRCOSC.Game/Modules/Module.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
using osu.Framework.Graphics;
using osu.Framework.Platform;
using VRCOSC.Game.OpenVR;
using VRCOSC.OSC.VRChat;
using VRCOSC.Game.OSC.VRChat;

// ReSharper disable MemberCanBePrivate.Global
// ReSharper disable InconsistentNaming
Expand Down
2 changes: 1 addition & 1 deletion VRCOSC.Game/Modules/ParameterMetadata.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// See the LICENSE file in the repository root for full license text.

using System;
using VRCOSC.OSC.VRChat;
using VRCOSC.Game.OSC.VRChat;

namespace VRCOSC.Game.Modules;

Expand Down
2 changes: 1 addition & 1 deletion VRCOSC.Game/Modules/Player.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using System;
using System.Threading.Tasks;
using VRCOSC.OSC.Client;
using VRCOSC.Game.OSC.Client;

namespace VRCOSC.Game.Modules;

Expand Down
6 changes: 5 additions & 1 deletion VRCOSC.OSC/Client/OscClient.cs → VRCOSC.Game/OSC/Client/OscClient.cs
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
// Copyright (c) VolcanicArts. Licensed under the GPL-3.0 License.
// See the LICENSE file in the repository root for full license text.

using System;
using System.Collections.Generic;
using System.Net;
using System.Net.Sockets;
using System.Threading;
using System.Threading.Tasks;

namespace VRCOSC.OSC.Client;
namespace VRCOSC.Game.OSC.Client;

public abstract class OscClient
{
Expand Down
2 changes: 1 addition & 1 deletion VRCOSC.OSC/Client/OscConstants.cs → VRCOSC.Game/OSC/Client/OscConstants.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using System.Text;

namespace VRCOSC.OSC.Client;
namespace VRCOSC.Game.OSC.Client;

internal static class OscConstants
{
Expand Down
6 changes: 5 additions & 1 deletion VRCOSC.OSC/Client/OscData.cs → VRCOSC.Game/OSC/Client/OscData.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
// Copyright (c) VolcanicArts. Licensed under the GPL-3.0 License.
// See the LICENSE file in the repository root for full license text.

namespace VRCOSC.OSC.Client;
using System;
using System.Collections.Generic;
using System.Linq;

namespace VRCOSC.Game.OSC.Client;

public class OscData
{
Expand Down
6 changes: 5 additions & 1 deletion VRCOSC.OSC/Client/OscDecoder.cs → VRCOSC.Game/OSC/Client/OscDecoder.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
// Copyright (c) VolcanicArts. Licensed under the GPL-3.0 License.
// See the LICENSE file in the repository root for full license text.

namespace VRCOSC.OSC.Client;
using System;
using System.Collections.Generic;
using System.Linq;

namespace VRCOSC.Game.OSC.Client;

internal static class OscDecoder
{
Expand Down
5 changes: 4 additions & 1 deletion VRCOSC.OSC/Client/OscEncoder.cs → VRCOSC.Game/OSC/Client/OscEncoder.cs
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
// Copyright (c) VolcanicArts. Licensed under the GPL-3.0 License.
// See the LICENSE file in the repository root for full license text.

using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;

namespace VRCOSC.OSC.Client;
namespace VRCOSC.Game.OSC.Client;

internal static class OscEncoder
{
Expand Down
6 changes: 5 additions & 1 deletion VRCOSC.OSC/Client/OscExtensions.cs → VRCOSC.Game/OSC/Client/OscExtensions.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
// Copyright (c) VolcanicArts. Licensed under the GPL-3.0 License.
// See the LICENSE file in the repository root for full license text.

namespace VRCOSC.OSC.Client;
using System;
using System.Collections.Generic;
using System.Linq;

namespace VRCOSC.Game.OSC.Client;

internal static class OscExtensions
{
Expand Down
5 changes: 4 additions & 1 deletion VRCOSC.OSC/Client/OscMessage.cs → VRCOSC.Game/OSC/Client/OscMessage.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
// Copyright (c) VolcanicArts. Licensed under the GPL-3.0 License.
// See the LICENSE file in the repository root for full license text.

namespace VRCOSC.OSC.Client;
using System;
using System.Collections.Generic;

namespace VRCOSC.Game.OSC.Client;

public class OscMessage
{
Expand Down
6 changes: 5 additions & 1 deletion VRCOSC.OSC/Client/OscTypeConverter.cs → VRCOSC.Game/OSC/Client/OscTypeConverter.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
// Copyright (c) VolcanicArts. Licensed under the GPL-3.0 License.
// See the LICENSE file in the repository root for full license text.

namespace VRCOSC.OSC.Client;
using System;
using System.Collections.Generic;
using System.Linq;

namespace VRCOSC.Game.OSC.Client;

internal static class OscTypeConverter
{
Expand Down
4 changes: 3 additions & 1 deletion VRCOSC.OSC/Client/SocketExtensions.cs → VRCOSC.Game/OSC/Client/SocketExtensions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
// See the LICENSE file in the repository root for full license text.

using System.Net.Sockets;
using System.Threading;
using System.Threading.Tasks;

namespace VRCOSC.OSC.Client;
namespace VRCOSC.Game.OSC.Client;

public static class SocketExtensions
{
Expand Down
6 changes: 4 additions & 2 deletions VRCOSC.OSC/VRChat/VRChatOscClient.cs → VRCOSC.Game/OSC/VRChat/VRChatOscClient.cs
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
// Copyright (c) VolcanicArts. Licensed under the GPL-3.0 License.
// See the LICENSE file in the repository root for full license text.

using VRCOSC.OSC.Client;
using System;
using System.Linq;
using VRCOSC.Game.OSC.Client;

namespace VRCOSC.OSC.VRChat;
namespace VRCOSC.Game.OSC.VRChat;

public class VRChatOscClient : OscClient
{
Expand Down
4 changes: 3 additions & 1 deletion VRCOSC.OSC/VRChat/VRChatOscConstants.cs → VRCOSC.Game/OSC/VRChat/VRChatOscConstants.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@

// ReSharper disable MemberCanBePrivate.Global

namespace VRCOSC.OSC.VRChat;
using System;

namespace VRCOSC.Game.OSC.VRChat;

public static class VRChatOscConstants
{
Expand Down
4 changes: 2 additions & 2 deletions VRCOSC.OSC/VRChat/VRChatOscData.cs → VRCOSC.Game/OSC/VRChat/VRChatOscData.cs
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Copyright (c) VolcanicArts. Licensed under the GPL-3.0 License.
// See the LICENSE file in the repository root for full license text.

using VRCOSC.OSC.Client;
using VRCOSC.Game.OSC.Client;

namespace VRCOSC.OSC.VRChat;
namespace VRCOSC.Game.OSC.VRChat;

public class VRChatOscData : OscData
{
Expand Down
4 changes: 1 addition & 3 deletions VRCOSC.Game/VRCOSC.Game.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\VRCOSC.OpenVR\VRCOSC.OpenVR.csproj" />
<ProjectReference Include="..\VRCOSC.OSC\VRCOSC.OSC.csproj" />
<ProjectReference Include="..\VRCOSC.Resources\VRCOSC.Resources.csproj" />
</ItemGroup>
<ItemGroup>
Expand All @@ -26,6 +24,6 @@
</PackageReference>
<PackageReference Include="ppy.osu.Framework" Version="2023.120.0" />
<PackageReference Include="WebSocket4Net" Version="0.15.2" />
<PackageReference Include="VolcanicArts.Libs.OpenVR" Version="1.23.7"/>
<PackageReference Include="VolcanicArts.Libs.OpenVR" Version="1.23.7" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion VRCOSC.Modules/Clock/ClockModule.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// See the LICENSE file in the repository root for full license text.

using VRCOSC.Game.Modules;
using VRCOSC.OSC.VRChat;
using VRCOSC.Game.OSC.VRChat;

namespace VRCOSC.Modules.Clock;

Expand Down
2 changes: 1 addition & 1 deletion VRCOSC.Modules/OpenVR/GestureExtensionsModule.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using VRCOSC.Game.Modules;
using VRCOSC.Game.OpenVR.Input;
using VRCOSC.OSC.VRChat;
using VRCOSC.Game.OSC.VRChat;

namespace VRCOSC.Modules.OpenVR;

Expand Down
2 changes: 1 addition & 1 deletion VRCOSC.Modules/OpenVR/OpenVRControllerStatisticsModule.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// See the LICENSE file in the repository root for full license text.

using VRCOSC.Game.Modules;
using VRCOSC.OSC.VRChat;
using VRCOSC.Game.OSC.VRChat;

namespace VRCOSC.Modules.OpenVR;

Expand Down
18 changes: 0 additions & 18 deletions VRCOSC.OSC/VRCOSC.OSC.csproj
View file

This file was deleted.

6 changes: 0 additions & 6 deletions VRCOSC.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
VRCOSC.sln.DotSettings = VRCOSC.sln.DotSettings
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VRCOSC.OSC", "VRCOSC.OSC\VRCOSC.OSC.csproj", "{1840B885-A863-4193-A41B-1490FB49E5FF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VRCOSC.Modules", "VRCOSC.Modules\VRCOSC.Modules.csproj", "{936B16A3-A07B-4280-AD03-4330BEE4F0D5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VRCOSC.Templates", "VRCOSC.Templates\VRCOSC.Templates.csproj", "{5B401F37-6C2F-416B-AE7E-64525AF3B46D}"
Expand All @@ -45,10 +43,6 @@ Global
{31D3872C-3A4F-437E-9655-3EF58DD62F46}.Debug|Any CPU.Build.0 = Debug|Any CPU
{31D3872C-3A4F-437E-9655-3EF58DD62F46}.Release|Any CPU.ActiveCfg = Release|Any CPU
{31D3872C-3A4F-437E-9655-3EF58DD62F46}.Release|Any CPU.Build.0 = Release|Any CPU
{1840B885-A863-4193-A41B-1490FB49E5FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1840B885-A863-4193-A41B-1490FB49E5FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1840B885-A863-4193-A41B-1490FB49E5FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1840B885-A863-4193-A41B-1490FB49E5FF}.Release|Any CPU.Build.0 = Release|Any CPU
{936B16A3-A07B-4280-AD03-4330BEE4F0D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{936B16A3-A07B-4280-AD03-4330BEE4F0D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{936B16A3-A07B-4280-AD03-4330BEE4F0D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down

0 comments on commit 2a69d11

Please sign in to comment.