Skip to content

Commit 98d568f

Browse files
JessTelloJessTello
committed
Remove Overrides folder and Config class
The Overrides folder has been removed and its responsibilities have been migrated to the Core/<Feature> structure for better modularity and clarity. Additionally, the Config class has been deprecated. Its constants have been merged into the Common module to centralize configuration.
1 parent 4d329cd commit 98d568f

24 files changed

+173
-261
lines changed

‎Assets/Plugins/Windows/Core/WindowsPlatformSpecifics.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public override void LoadDelegatesWithEOSBindingAPI()
9595
{
9696
// In the editor, EOS needs to be dynamically bound.
9797
#if EOS_DYNAMIC_BINDINGS || UNITY_EDITOR
98-
const string EOSBinaryName = Epic.OnlineServices.Config.LibraryName;
98+
const string EOSBinaryName = Epic.OnlineServices.Common.LIBRARY_NAME;
9999
var eosLibraryHandle = EOSManager.EOSSingleton.LoadDynamicLibrary(EOSBinaryName);
100100
Epic.OnlineServices.WindowsBindings.Hook<DLLHandle>(eosLibraryHandle, (DLLHandle handle, string functionName) => {
101101
return handle.LoadFunctionAsIntPtr(functionName);

‎com.playeveryware.eos/Runtime/Core/EOSManager_DynamicLoading.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public partial class EOSSingleton
5252
#if !EOS_DISABLE
5353
static private PlatformInterface s_eosPlatformInterface;
5454

55-
public const string EOSBinaryName = Epic.OnlineServices.Config.LibraryName;
55+
public const string EOSBinaryName = Epic.OnlineServices.Common.LIBRARY_NAME;
5656

5757
#if USE_EOS_GFX_PLUGIN_NATIVE_RENDER
5858
public const string GfxPluginNativeRenderPath =

‎com.playeveryware.eos/Runtime/EOS_SDK/Core/Config.cs‎

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

‎com.playeveryware.eos/Runtime/EOS_SDK/Core/NotForLicensees.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎com.playeveryware.eos/Runtime/EOS_SDK/Core/NotForLicensees/Common.cs‎

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
// Copyright Epic Games, Inc. All Rights Reserved.
2+
3+
#if DEBUG
4+
#define EOS_DEBUG
5+
#endif
6+
7+
#if UNITY_EDITOR
8+
#define EOS_EDITOR
9+
#endif
10+
11+
#if UNITY_EDITOR || UNITY_STANDALONE || UNITY_IOS || UNITY_ANDROID
12+
#define EOS_UNITY
13+
#endif
14+
15+
#if UNITY_EDITOR_WIN
16+
#define EOS_PLATFORM_WINDOWS_64
17+
#elif UNITY_STANDALONE_WIN
18+
#if UNITY_64
19+
#define EOS_PLATFORM_WINDOWS_64
20+
#else
21+
#define EOS_PLATFORM_WINDOWS_32
22+
#endif
23+
24+
#elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX
25+
#define EOS_PLATFORM_OSX
26+
27+
#elif UNITY_EDITOR_LINUX || UNITY_STANDALONE_LINUX
28+
#define EOS_PLATFORM_LINUX
29+
30+
#elif UNITY_IOS || __IOS__
31+
#define EOS_PLATFORM_IOS
32+
33+
#elif UNITY_ANDROID || __ANDROID__
34+
#define EOS_PLATFORM_ANDROID
35+
36+
#endif
37+
38+
using System.Runtime.InteropServices;
39+
40+
namespace Epic.OnlineServices
41+
{
42+
public sealed partial class Common
43+
{
44+
//public const string LIBRARY_NAME =
45+
//#if EOS_DEBUG
46+
// #if EOS_PLATFORM_WINDOWS_32 && EOS_UNITY
47+
// "EOSSDK-Win32-Debug"
48+
// #elif EOS_PLATFORM_WINDOWS_32
49+
// "EOSSDK-Win32-Debug.dll"
50+
51+
// #elif EOS_PLATFORM_WINDOWS_64 && EOS_UNITY
52+
// "EOSSDK-Win64-Debug"
53+
// #elif EOS_PLATFORM_WINDOWS_64
54+
// "EOSSDK-Win64-Debug.dll"
55+
56+
// #elif EOS_PLATFORM_OSX && EOS_UNITY
57+
// "libEOSSDK-Mac-Debug"
58+
// #elif EOS_PLATFORM_OSX
59+
// "libEOSSDK-Mac-Debug.dylib"
60+
61+
// #elif EOS_PLATFORM_LINUX && EOS_UNITY
62+
// "libEOSSDK-Linux-Debug"
63+
// #elif EOS_PLATFORM_LINUX
64+
// "libEOSSDK-Linux-Debug.so"
65+
66+
// #elif EOS_PLATFORM_IOS && EOS_UNITY && EOS_EDITOR
67+
// "EOSSDK"
68+
// #elif EOS_PLATFORM_IOS
69+
// "EOSSDK.framework/EOSSDK"
70+
71+
// #elif EOS_PLATFORM_ANDROID
72+
// "EOSSDK"
73+
74+
// #elif EOS_PLATFORM_PS4 && !EOS_UNITY
75+
// "/app0/EOSSDK-PS4-Debug.prx"
76+
77+
// #else
78+
// #error Unable to determine name of the EOSSDK library. Ensure your project defines the correct EOS symbol for your platform, such as EOS_PLATFORM_WINDOWS_64, or define it here if it hasn't been already.
79+
// "EOSSDK-UnknownPlatform-Debug"
80+
81+
// #endif
82+
//#else
83+
// #if EOS_PLATFORM_WINDOWS_32 && EOS_UNITY
84+
// "EOSSDK-Win32-Shipping"
85+
// #elif EOS_PLATFORM_WINDOWS_32
86+
// "EOSSDK-Win32-Shipping.dll"
87+
88+
// #elif EOS_PLATFORM_WINDOWS_64 && EOS_UNITY
89+
// "EOSSDK-Win64-Shipping"
90+
// #elif EOS_PLATFORM_WINDOWS_64
91+
// "EOSSDK-Win64-Shipping.dll"
92+
93+
// #elif EOS_PLATFORM_OSX && EOS_UNITY
94+
// "libEOSSDK-Mac-Shipping"
95+
// #elif EOS_PLATFORM_OSX
96+
// "libEOSSDK-Mac-Shipping.dylib"
97+
98+
// #elif EOS_PLATFORM_LINUX && EOS_UNITY
99+
// "libEOSSDK-Linux-Shipping"
100+
// #elif EOS_PLATFORM_LINUX
101+
// "libEOSSDK-Linux-Shipping.so"
102+
103+
// #elif EOS_PLATFORM_IOS && EOS_UNITY && EOS_EDITOR
104+
// "EOSSDK"
105+
// #elif EOS_PLATFORM_IOS
106+
// "EOSSDK.framework/EOSSDK"
107+
108+
// #elif EOS_PLATFORM_ANDROID
109+
// "EOSSDK"
110+
111+
// #elif EOS_PLATFORM_PS4 && !EOS_UNITY
112+
// "/app0/EOSSDK-PS4-Shipping.prx"
113+
114+
// #else
115+
// #error Unable to determine name of the EOSSDK library. Ensure your project defines the correct EOS symbol for your platform, such as EOS_PLATFORM_WINDOWS_64, or define it here if it hasn't been already.
116+
// "EOSSDK-UnknownPlatform-Shipping"
117+
118+
// #endif
119+
//#endif
120+
//;
121+
122+
//internal const CallingConvention LIBRARY_CALLING_CONVENTION =
123+
//#if EOS_PLATFORM_WINDOWS_32
124+
// CallingConvention.StdCall
125+
//#else
126+
// CallingConvention.Cdecl
127+
//#endif
128+
//;
129+
}
130+
}

com.playeveryware.eos/Runtime/EOS_SDK/Overrides/P2PInterfaceOverrides.cs.meta renamed to com.playeveryware.eos/Runtime/EOS_SDK/Core/NotForLicensees/Common.cs.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎com.playeveryware.eos/Runtime/EOS_SDK/Core/P2P.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

com.playeveryware.eos/Runtime/EOS_SDK/Overrides/GetNextReceivedPacketSizeOptions.cs renamed to com.playeveryware.eos/Runtime/EOS_SDK/Core/P2P/GetNextReceivedPacketSizeOptions.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// Copyright Epic Games, Inc. All Rights Reserved.
2-
// This file is automatically generated. Changes to this file may be overwritten.
32

43
using System;
54

@@ -52,8 +51,8 @@ public byte? RequestedChannel
5251
internal struct GetNextReceivedPacketSizeOptionsInternal : ISettable<GetNextReceivedPacketSizeOptions>, System.IDisposable
5352
{
5453
private int m_ApiVersion;
55-
private System.IntPtr m_LocalUserId;
56-
private System.IntPtr m_RequestedChannel;
54+
private IntPtr m_LocalUserId;
55+
private IntPtr m_RequestedChannel;
5756

5857
public void Set(ref GetNextReceivedPacketSizeOptions other)
5958
{

com.playeveryware.eos/Runtime/EOS_SDK/Overrides/GetNextReceivedPacketSizeOptions.cs.meta renamed to com.playeveryware.eos/Runtime/EOS_SDK/Core/P2P/GetNextReceivedPacketSizeOptions.cs.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

com.playeveryware.eos/Runtime/EOS_SDK/Overrides/P2PInterfaceOverrides.cs renamed to com.playeveryware.eos/Runtime/EOS_SDK/Core/P2P/P2PInterface.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
// Copyright Epic Games, Inc. All Rights Reserved.
2-
// This file is automatically generated. Changes to this file may be overwritten.
32

43
using System;
5-
using System.Runtime.InteropServices;
64

75
namespace Epic.OnlineServices.P2P
86
{
97
public sealed partial class P2PInterface : Handle
108
{
11-
129
/// <summary>
1310
/// Receive the next packet for the local user, and information associated with this packet, if it exists.
1411
/// <seealso cref="GetNextReceivedPacketSize" />
@@ -32,8 +29,8 @@ public Result ReceivePacket(ref ReceivePacketOptions options, ref ProductUserId
3229
var optionsInternal = new ReceivePacketOptionsInternal(ref options);
3330
try
3431
{
35-
var outPeerIdAddress = System.IntPtr.Zero;
36-
outChannel = Helper.GetDefault<byte>();
32+
var outPeerIdAddress = IntPtr.Zero;
33+
outChannel = default;
3734
outBytesWritten = 0;
3835
var funcResult = Bindings.EOS_P2P_ReceivePacket(InnerHandle, ref optionsInternal, out outPeerIdAddress, outSocketIdAddr, out outChannel, outDataAddress, out outBytesWritten);
3936

0 commit comments

Comments
 (0)