EOS Disable and Bindings Fix (#12)

Author: JessTello

Editor/EditorWindows/EncryptionKeyWindow.cs

@@ -48,12 +48,16 @@ public EncryptionKeyWindow() : base("Client Credential Encryption Key", 600f, 50
         /// </param>
         public static void Show(string input, Action<string> onSubmitCallback)
         {
-            ScheduleShow<EncryptionKeyWindow>(
-                input,
-                onSubmitCallback,
-                EOSClientCredentials.IsEncryptionKeyValid,
-                "Enter the encryption key for these client credentials here:",
-                "Invalid encryption key. Encryption key must be 64 characters long and contain only alphanumeric characters.");
+#if !EOS_DISABLE
+    ScheduleShow<EncryptionKeyWindow>(
+        input,
+        onSubmitCallback,
+        EOSClientCredentials.IsEncryptionKeyValid,
+        "Enter the encryption key for these client credentials here:",
+        "Invalid encryption key. Encryption key must be 64 characters long and contain only alphanumeric characters.");
+#else
+            Debug.LogWarning("EOS SDK is disabled. Encryption key window is not available.");
+#endif
         }
 
         /// <summary>
@@ -63,16 +67,25 @@ protected override void RenderModalContents()
         {
             GUILayout.BeginHorizontal();
 
-            _input = GUILayout.TextField(_input, GUILayout.Width(GUIEditorUtility.MeasureLabelWidth(64)), GUILayout.Height(20));
+            _input = GUILayout.TextField(
+                _input,
+                GUILayout.Width(EditorStyles.label.CalcSize(new GUIContent("Encryption Key")).x),
+                GUILayout.Height(20));
 
             GUILayout.Space(5f);
 
-            if (GUILayout.Button(
-                new GUIContent(EditorGUIUtility.IconContent("Refresh").image,
-                "Click here to generate a new encryption key."), GUILayout.Height(20), GUILayout.Width(50)))
-            {
-                _input = EOSClientCredentials.GenerateEncryptionKey();
-            }
+#if !EOS_DISABLE
+    if (GUILayout.Button(
+        new GUIContent(EditorGUIUtility.IconContent("Refresh").image,
+        "Click here to generate a new encryption key."),
+        GUILayout.Height(20), GUILayout.Width(50)))
+    {
+        _input = EOSClientCredentials.GenerateEncryptionKey();
+    }
+#else
+            GUILayout.Label("EOS SDK is disabled.");
+#endif
+
             GUILayout.EndHorizontal();
         }
     }

Editor/EditorWindows/ModalEOSEditorWindow.cs

@@ -189,9 +189,7 @@ protected override void RenderWindow()
             bool shouldClose = false;
 
             // Render the prompt text
-            EditorGUILayout.LabelField(_inputPrompt, GUILayout.Width(
-                GUIEditorUtility.MeasureLabelWidth(_inputPrompt))
-            );
+            EditorGUILayout.LabelField(_inputPrompt, GUILayout.Width(EditorStyles.label.CalcSize(new GUIContent(_inputPrompt)).x));
 
             // Display error if it needs to be displayed.
             if (_showError)

Runtime/Core/EOSManager.cs

@@ -184,17 +184,7 @@ enum EOSState
         static private bool s_isConstrained = true;
         static public bool ApplicationIsConstrained { get => s_isConstrained; }
 
-        /// <summary>
-        /// Actions that need to be executed on the main thread.
-        /// Lazy allocated in <see cref="DispatchAsync"/>.
-        /// </summary>
-        private static List<Action> s_enqueuedTasks;
 
-        /// <summary>
-        /// Locak object used for <see cref="s_enqueuedTasks"/>, such that it can
-        /// be executed thread-safe way.
-        /// </summary>
-        private static System.Object s_enqueuedTasksLock = new System.Object();
         //private static List
 
         //-------------------------------------------------------------------------
@@ -1844,6 +1834,18 @@ static public EOSSingleton Instance
             }
         }
 
+        /// <summary>
+        /// Actions that need to be executed on the main thread.
+        /// Lazy allocated in <see cref="DispatchAsync"/>.
+        /// </summary>
+        private static List<Action> s_enqueuedTasks;
+
+        /// <summary>
+        /// Locak object used for <see cref="s_enqueuedTasks"/>, such that it can
+        /// be executed thread-safe way.
+        /// </summary>
+        private static System.Object s_enqueuedTasksLock = new System.Object();
+
 #if !EOS_DISABLE
         //-------------------------------------------------------------------------
         /// <summary>Unity [Awake](https://docs.unity3d.com/ScriptReference/MonoBehaviour.Awake.html) is called when script instance is being loaded.

Runtime/EOS_SDK/Generated/Bindings.cs

@@ -2,59 +2,62 @@
 // This file is automatically generated. Changes to this file may be overwritten.
 
 #if DEBUG
-	#define EOS_DEBUG
+#define EOS_DEBUG
 #endif
 
 #if UNITY_EDITOR
-	#define EOS_EDITOR
+#define EOS_EDITOR
 #endif
 
 #if UNITY_EDITOR || UNITY_STANDALONE || UNITY_PS4 || UNITY_XBOXONE || UNITY_SWITCH || UNITY_IOS || UNITY_ANDROID
-	#define EOS_UNITY
+#define EOS_UNITY
 #endif
 
 #if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || PLATFORM_64BITS || PLATFORM_32BITS
-	#if UNITY_EDITOR_WIN || UNITY_64 || PLATFORM_64BITS
-		#define EOS_PLATFORM_WINDOWS_64
-	#else
-		#define EOS_PLATFORM_WINDOWS_32
-	#endif
+#if UNITY_EDITOR_WIN || UNITY_64 || PLATFORM_64BITS
+#define EOS_PLATFORM_WINDOWS_64
+#else
+#define EOS_PLATFORM_WINDOWS_32
+#endif
 
 #elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX
-	#define EOS_PLATFORM_OSX
+#define EOS_PLATFORM_OSX
+
+#elif UNITY_EDITOR_OSX
+#define EOS_PLATFORM_OSX_INEDITOR
 
 #elif UNITY_EDITOR_LINUX || UNITY_STANDALONE_LINUX
-	#define EOS_PLATFORM_LINUX
+#define EOS_PLATFORM_LINUX
 
 #elif UNITY_PS4
-	#define EOS_PLATFORM_PS4
+#define EOS_PLATFORM_PS4
 
 #elif UNITY_XBOXONE
-	#define EOS_PLATFORM_XBOXONE
+#define EOS_PLATFORM_XBOXONE
 
 #elif UNITY_SWITCH
-	#define EOS_PLATFORM_SWITCH
+#define EOS_PLATFORM_SWITCH
 
 #elif UNITY_IOS || __IOS__
-	#define EOS_PLATFORM_IOS
+#define EOS_PLATFORM_IOS
 
 #elif UNITY_ANDROID || __ANDROID__
-	#define EOS_PLATFORM_ANDROID
+#define EOS_PLATFORM_ANDROID
 
 #endif
 
 #if EOS_EDITOR
-	#define EOS_DYNAMIC_BINDINGS
+#define EOS_DYNAMIC_BINDINGS
 #endif
 
 #if EOS_DYNAMIC_BINDINGS
-	#if EOS_PLATFORM_WINDOWS_32
-		#define EOS_DYNAMIC_BINDINGS_NAME_TYPE3
-	#elif EOS_PLATFORM_OSX
-		#define EOS_DYNAMIC_BINDINGS_NAME_TYPE2
-	#else
-		#define EOS_DYNAMIC_BINDINGS_NAME_TYPE1
-	#endif
+#if EOS_PLATFORM_WINDOWS_32
+#define EOS_DYNAMIC_BINDINGS_NAME_TYPE3
+#elif EOS_PLATFORM_OSX
+#define EOS_DYNAMIC_BINDINGS_NAME_TYPE2
+#else
+#define EOS_DYNAMIC_BINDINGS_NAME_TYPE1
+#endif
 #endif
 
 using System;
@@ -2141,9 +2144,11 @@ public static void Hook<TLibraryHandle>(TLibraryHandle libraryHandle, Func<TLibr
 			if (functionPointer == System.IntPtr.Zero) throw new DynamicBindingException(EOS_AntiCheatClient_RemoveNotifyPeerAuthStatusChangedName);
 			EOS_AntiCheatClient_RemoveNotifyPeerAuthStatusChanged = (EOS_AntiCheatClient_RemoveNotifyPeerAuthStatusChangedDelegate)Marshal.GetDelegateForFunctionPointer(functionPointer, typeof(EOS_AntiCheatClient_RemoveNotifyPeerAuthStatusChangedDelegate));
 
+#if EOS_PLATFORM_OSX_INEDITOR
 			functionPointer = getFunctionPointer(libraryHandle, EOS_AntiCheatClient_Reserved01Name);
 			if (functionPointer == System.IntPtr.Zero) throw new DynamicBindingException(EOS_AntiCheatClient_Reserved01Name);
 			EOS_AntiCheatClient_Reserved01 = (EOS_AntiCheatClient_Reserved01Delegate)Marshal.GetDelegateForFunctionPointer(functionPointer, typeof(EOS_AntiCheatClient_Reserved01Delegate));
+#endif
 
 			functionPointer = getFunctionPointer(libraryHandle, EOS_AntiCheatClient_UnprotectMessageName);
 			if (functionPointer == System.IntPtr.Zero) throw new DynamicBindingException(EOS_AntiCheatClient_UnprotectMessageName);
@@ -4468,10 +4473,10 @@ public static void Hook<TLibraryHandle>(TLibraryHandle libraryHandle, Func<TLibr
 #endif
 
 #if EOS_DYNAMIC_BINDINGS
-		/// <summary>
-		/// Unhooks the dynamic SDK API bindings. EOS_DYNAMIC_BINDINGS or EOS_EDITOR must be set.
-		/// </summary>
-		public static void Unhook()
+			/// <summary>
+			/// Unhooks the dynamic SDK API bindings. EOS_DYNAMIC_BINDINGS or EOS_EDITOR must be set.
+			/// </summary>
+			public static void Unhook()
 		{
 			EOS_Achievements_AddNotifyAchievementsUnlocked = null;
 			EOS_Achievements_AddNotifyAchievementsUnlockedV2 = null;