Develop

CoreFramework-ASM.asmdef

@@ -1,7 +1,8 @@
 {
     "name": "CoreFramework-ASM",
     "references": [
-        "Zenject"
+        "Zenject",
+        "UniRx"
     ],
     "optionalUnityReferences": [],
     "includePlatforms": [],

Editor/ClearCacheMenuItem.cs

@@ -8,8 +8,8 @@
 /// </summary>
 public class ClearCacheMenuItem
 {
-	[MenuItem("_Core / Clear Asset Bundle Cache")]
-	private static void CreateRedBlueGameObject()
+	[MenuItem("Core Framework / Clear Asset Bundle Cache")]
+	private static void ClearAssetBundleCache()
 	{
 		//Get all cache paths... in Unity's unique way....
 		var cachePaths = new List<string>();
@@ -29,39 +29,43 @@ private static void CreateRedBlueGameObject()
 
 		if (cachePaths.Count < 1)
 			Debug.Log(("Cache was empty.").Colored(Colors.Yellow));
+	}
 
-		//Delete any cached .manifest files
+	[MenuItem("Core Framework / Delete Persistent Data Directory (Also deletes any saved data files)")]
+	private static void DeletePersistentData()
+	{
+		//Delete Application.persistentDataPath
 		Directory.Delete(Application.persistentDataPath, true);
-		Debug.Log(("Clearing persistent data: Directory " + Application.persistentDataPath + " deleted.").Colored(Colors.Yellow));
+		Debug.Log(("Deleting persistent data directory " + Application.persistentDataPath).Colored(Colors.Yellow));
 	}
 
-	[MenuItem("_Core / Enable Simulate Asset Bundles")]
+	[MenuItem("Core Framework / Enable Simulate Asset Bundles")]
 	private static void GetEnableCachedInfo()
 	{
-		CreateRedBlueGameObject();
+		ClearAssetBundleCache();
 
-		EditorPreferences.EDITORPREF_SIMULATE_ASSET_BUNDLES = true;
+		EditorPreferences.EditorprefSimulateAssetBundles = true;
 		Debug.Log(("Enabled asset bundle simulation mode.").Colored(Colors.Yellow));
 	}
 
-	[MenuItem("_Core / Enable Simulate Asset Bundles", true)]
+	[MenuItem("Core Framework / Enable Simulate Asset Bundles", true)]
 	private static bool GetEnableCachedInfoVal()
 	{
-		return !EditorPreferences.EDITORPREF_SIMULATE_ASSET_BUNDLES ? true : false;
+		return !EditorPreferences.EditorprefSimulateAssetBundles ? true : false;
 	}
 
-	[MenuItem("_Core / Disable Simulate Asset Bundles")]
+	[MenuItem("Core Framework / Disable Simulate Asset Bundles")]
 	private static void GetDisableCachedInfo()
 	{
-		CreateRedBlueGameObject();
+		ClearAssetBundleCache();
 
-		EditorPreferences.EDITORPREF_SIMULATE_ASSET_BUNDLES = false;
+		EditorPreferences.EditorprefSimulateAssetBundles = false;
 		Debug.Log(("Disabled asset bundle simulation mode.").Colored(Colors.Yellow));
 	}
 
-	[MenuItem("_Core / Disable Simulate Asset Bundles", true)]
+	[MenuItem("Core Framework / Disable Simulate Asset Bundles", true)]
 	private static bool GetDisableCachedInfoVal()
 	{
-		return EditorPreferences.EDITORPREF_SIMULATE_ASSET_BUNDLES ? true : false;
+		return EditorPreferences.EditorprefSimulateAssetBundles ? true : false;
 	}
 }

Editor/EditorStartup.cs

@@ -10,12 +10,12 @@ public class Startup
         {
             static Startup()
             {
-                if (EditorPreferences.EDITORPREF_FIRST_TIME_USE)
+                if (EditorPreferences.EditorprefFirstTimeUse)
                 {
                     Debug.Log("First time use. Enabling asset bundle simulation mode.".Colored(Colors.Yellow));
 
-                    EditorPreferences.EDITORPREF_SIMULATE_ASSET_BUNDLES = true;
-                    EditorPreferences.EDITORPREF_FIRST_TIME_USE = false;
+                    EditorPreferences.EditorprefSimulateAssetBundles = true;
+                    EditorPreferences.EditorprefFirstTimeUse = false;
                 }
             }
         }

Editor/GameConfigurationEditor.cs

@@ -10,18 +10,17 @@ namespace Core.Services
 	[CustomEditor(typeof(GameConfiguration))]
 	public class GameConfigurationEditor : Editor
 	{
-		private ReorderableList services;
-		private GameConfiguration gameConfiguration;
+		private ReorderableList _services;
+		private GameConfiguration _gameConfiguration;
 
 		public override void OnInspectorGUI()
 		{
-			gameConfiguration = target as GameConfiguration;
-
-			gameConfiguration.disableLogging = EditorGUILayout.ToggleLeft("Disable Debug.Log?", gameConfiguration.disableLogging);
+			_gameConfiguration = target as GameConfiguration;
+			_gameConfiguration.DisableLogging = EditorGUILayout.ToggleLeft("Disable Debug.Log?", _gameConfiguration.DisableLogging);
 
 			GUILayout.Space(10);
 			serializedObject.Update();
-			services.DoLayoutList();
+			_services.DoLayoutList();
 			serializedObject.ApplyModifiedProperties();
 		}
 
@@ -31,19 +30,19 @@ private void OnEnable()
 			Color contentColor = GUI.contentColor;
 			float line = EditorGUIUtility.singleLineHeight;
 			SerializedProperty property = serializedObject.FindProperty("services");
-			services = new ReorderableList(serializedObject, property);
-			services.showDefaultBackground = true;
-			services.elementHeight = line + 6;
+			_services = new ReorderableList(serializedObject, property);
+			_services.showDefaultBackground = true;
+			_services.elementHeight = line + 6;
 
-			services.drawHeaderCallback = (rect) =>
+			_services.drawHeaderCallback = (rect) =>
 			{
 				EditorGUI.LabelField(rect, "Core Framework Services");
 			};
 
-			services.drawElementCallback = (Rect rect, int index, bool active, bool focused) =>
+			_services.drawElementCallback = (Rect rect, int index, bool active, bool focused) =>
 			{
 				float width = rect.width - 22;
-				SerializedProperty element = services.serializedProperty.GetArrayElementAtIndex(index);
+				SerializedProperty element = _services.serializedProperty.GetArrayElementAtIndex(index);
 
 				if (GUI.Button(new Rect(rect.x + rect.width - 20, rect.y + 4, 18, line), EditorGUIUtility.IconContent("_Popup").image, GUIStyle.none))
 				{
@@ -55,16 +54,16 @@ private void OnEnable()
 
 					menu.AddItem(new GUIContent("Remove"), false, delegate ()
 					{
-						if (!gameConfiguration.services[index])
+						if (!_gameConfiguration.services[index])
 						{
-							gameConfiguration.services.RemoveAt(index);
-							EditorUtility.SetDirty(gameConfiguration);
+							_gameConfiguration.services.RemoveAt(index);
+							EditorUtility.SetDirty(_gameConfiguration);
 						}
-						else if (EditorUtility.DisplayDialog("Remove " + ObjectNames.NicifyVariableName(gameConfiguration.services[index].name) + "?", "Are you sure you want to remove this service? This will delete the ScriptableObject and can't be undone.", "Yes", "No"))
+						else if (EditorUtility.DisplayDialog("Remove " + ObjectNames.NicifyVariableName(_gameConfiguration.services[index].name) + "?", "Are you sure you want to remove this service? This will delete the ScriptableObject and can't be undone.", "Yes", "No"))
 						{
 							AssetDatabase.DeleteAsset(AssetDatabase.GetAssetOrScenePath(element.objectReferenceValue));
-							gameConfiguration.services.RemoveAt(index);
-							EditorUtility.SetDirty(gameConfiguration);
+							_gameConfiguration.services.RemoveAt(index);
+							EditorUtility.SetDirty(_gameConfiguration);
 						}
 					});
 
@@ -74,7 +73,7 @@ private void OnEnable()
 				EditorGUI.PropertyField(new Rect(rect.x, rect.y + 2, width, line), element, GUIContent.none);
 			};
 
-			services.onAddCallback = (list) =>
+			_services.onAddCallback = (list) =>
 			{
 				Type[] allServiceTypes = GetAllServiceTypes();
 				GenericMenu servicesMenu = new GenericMenu();
@@ -90,16 +89,16 @@ private void OnEnable()
 								if (typ.Name == styp.Name + "Config" || typ.Name == styp.Name + "Configuration")
 								{
 									serializedObject.ApplyModifiedProperties();
-									object thing = ScriptableObject.CreateInstance(typ);
-									if (thing == null || (thing as ServiceConfiguration) == null) return;
+									object so = ScriptableObject.CreateInstance(typ);
+									if (so == null || (so as ServiceConfiguration) == null) return;
 									serializedObject.ApplyModifiedProperties();
 									string path = AssetDatabase.GetAssetOrScenePath(serializedObject.targetObject);
 									path = Path.GetDirectoryName(path) + Path.DirectorySeparatorChar + styp.Name + ".asset";
-									AssetDatabase.CreateAsset(thing as ServiceConfiguration, path);
-									if (thing != null)
+									AssetDatabase.CreateAsset(so as ServiceConfiguration, path);
+									if (so != null)
 									{
-										gameConfiguration.services.Add(thing as ServiceConfiguration);
-										EditorUtility.SetDirty(gameConfiguration);
+										_gameConfiguration.services.Add(so as ServiceConfiguration);
+										EditorUtility.SetDirty(_gameConfiguration);
 									}
 									return;
 								}

Editor/Preferences.cs

@@ -13,7 +13,7 @@ private static void CustomPreferencesGUI()
 		{
 			if (!prefsLoaded)
 			{
-				simulateAssetBundles = EditorPreferences.EDITORPREF_SIMULATE_ASSET_BUNDLES;
+				simulateAssetBundles = EditorPreferences.EditorprefSimulateAssetBundles;
 				prefsLoaded = true;
 			}
 
@@ -22,7 +22,7 @@ private static void CustomPreferencesGUI()
 
 			if (GUI.changed)
 			{
-				EditorPreferences.EDITORPREF_SIMULATE_ASSET_BUNDLES = simulateAssetBundles;
+				EditorPreferences.EditorprefSimulateAssetBundles = simulateAssetBundles;
 			}
 
 			EditorUITools.HorizontalLine();

Extensions/ObservableExtensions.cs

@@ -13,7 +13,7 @@ public static class ObservableExtensions
     /// <returns></returns>
     public static IObservable<UnityEngine.Object> ToObservable(this UnityEngine.AssetBundleRequest asyncOperation)
     {
-        if (asyncOperation == null) throw new ArgumentNullException("asyncOperation");
+        if (asyncOperation == null) throw new ArgumentNullException(nameof(asyncOperation));
         return Observable.FromCoroutine<UnityEngine.Object>((observer, cancellationToken) => RunAssetBundleRequestOperation(asyncOperation, observer, cancellationToken));
     }
 
@@ -29,35 +29,44 @@ private static IEnumerator RunAssetBundleRequestOperation(UnityEngine.AssetBundl
         }
     }
 
+    /// <summary>
+    /// Converts a Task to an Observable, runs on main thread.
+    /// </summary>
+    /// <param name="task"></param>
+    /// <returns></returns>
     public static IObservable<Unit> TaskToObservable(this Task task)
     {
         return Observable.Create<Unit>(
             (observer) =>
             {
-                Func<Task> runTask = async () =>
+                task.Run(_ =>
                 {
-                    await task;
                     observer.OnNext(new Unit());
                     observer.OnCompleted();
-                };
-                runTask();
+                });
+
                 return Disposable.Empty;
             }
         );
     }
 
+    /// <summary>
+    /// Converts a Task<T/> to an Observable, runs on main thread.
+    /// </summary>
+    /// <param name="task"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
     public static IObservable<T> TaskToObservable<T>(this Task<T> task) where T : UnityEngine.Object
     {
         return Observable.Create<T>(
             (observer) =>
             {
-                Func<Task> runTask = async () =>
+                task.Run(x =>
                 {
-                    var val = await task;
-                    observer.OnNext(val);
+                    observer.OnNext(x);
                     observer.OnCompleted();
-                };
-                runTask();
+                });
+
                 return Disposable.Empty;
             }
         );