Merge pull request #18 from bgr/PackageManager

Reorganized files for use with Unity Package Manager
marijnz · May 19, 2020 · 097ae87 · 097ae87
2 parents d076c08 + 419b101
commit 097ae87
Show file tree

Hide file tree

Showing 42 changed files with 77 additions and 1,567 deletions.
diff --git a/Assets/ToolbarExtender/Scripts/Editor.meta → Editor.meta b/Assets/ToolbarExtender/Scripts/Editor.meta → Editor.meta
diff --git a/...xtender/Scripts/Editor/ToolbarCallback.cs → Editor/ToolbarCallback.cs b/...xtender/Scripts/Editor/ToolbarCallback.cs → Editor/ToolbarCallback.cs
diff --git a/...er/Scripts/Editor/ToolbarCallback.cs.meta → Editor/ToolbarCallback.cs.meta b/...er/Scripts/Editor/ToolbarCallback.cs.meta → Editor/ToolbarCallback.cs.meta
diff --git a/Editor/ToolbarExtender.Editor.asmdef b/Editor/ToolbarExtender.Editor.asmdef
@@ -0,0 +1,14 @@
+{
+    "name": "ToolbarExtender.Editor",
+    "references": [],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": []
+}
diff --git a/Assets/ToolbarExtender/Example.meta → Editor/ToolbarExtender.Editor.asmdef.meta b/Assets/ToolbarExtender/Example.meta → Editor/ToolbarExtender.Editor.asmdef.meta
diff --git a/...xtender/Scripts/Editor/ToolbarExtender.cs → Editor/ToolbarExtender.cs b/...xtender/Scripts/Editor/ToolbarExtender.cs → Editor/ToolbarExtender.cs
diff --git a/...er/Scripts/Editor/ToolbarExtender.cs.meta → Editor/ToolbarExtender.cs.meta b/...er/Scripts/Editor/ToolbarExtender.cs.meta → Editor/ToolbarExtender.cs.meta
diff --git a/...r/Example/Scripts/Editor/SceneSwitcher.cs → ...le~/SceneSwitcher/Editor/SceneSwitcher.cs b/...r/Example/Scripts/Editor/SceneSwitcher.cs → ...le~/SceneSwitcher/Editor/SceneSwitcher.cs
@@ -1,4 +1,5 @@
 using UnityEditor;
+using UnityEngine.SceneManagement;
 using UnityEditor.SceneManagement;
 using UnityEngine;
 
@@ -34,12 +35,12 @@ static void OnToolbarGUI()
 
 			if(GUILayout.Button(new GUIContent("1", "Start Scene 1"), ToolbarStyles.commandButtonStyle))
 			{
-				SceneHelper.StartScene("Assets/ToolbarExtender/Example/Scenes/Scene1.unity");
+				SceneHelper.StartScene("ToolbarExtenderExampleScene1");
 			}
 
 			if(GUILayout.Button(new GUIContent("2", "Start Scene 2"), ToolbarStyles.commandButtonStyle))
 			{
-				SceneHelper.StartScene("Assets/ToolbarExtender/Example/Scenes/Scene2.unity");
+				SceneHelper.StartScene("ToolbarExtenderExampleScene2");
 			}
 		}
 	}
@@ -48,14 +49,14 @@ static class SceneHelper
 	{
 		static string sceneToOpen;
 
-		public static void StartScene(string scene)
+		public static void StartScene(string sceneName)
 		{
 			if(EditorApplication.isPlaying)
 			{
 				EditorApplication.isPlaying = false;
 			}
 
-			sceneToOpen = scene;
+			sceneToOpen = sceneName;
 			EditorApplication.update += OnUpdate;
 		}
 
@@ -72,8 +73,19 @@ static void OnUpdate()
 
 			if(EditorSceneManager.SaveCurrentModifiedScenesIfUserWantsTo())
 			{
-				EditorSceneManager.OpenScene(sceneToOpen);
-				EditorApplication.isPlaying = true;
+				// need to get scene via search because the path to the scene
+				// file contains the package version so it'll change over time
+				string[] guids = AssetDatabase.FindAssets("t:scene " + sceneToOpen, null);
+				if (guids.Length == 0)
+				{
+					Debug.LogWarning("Couldn't find scene file");
+				}
+				else
+				{
+					string scenePath = AssetDatabase.GUIDToAssetPath(guids[0]);
+					EditorSceneManager.OpenScene(scenePath);
+					EditorApplication.isPlaying = true;
+				}
 			}
 			sceneToOpen = null;
 		}

diff --git a/...mple/Scripts/Editor/SceneSwitcher.cs.meta → ...ceneSwitcher/Editor/SceneSwitcher.cs.meta b/...mple/Scripts/Editor/SceneSwitcher.cs.meta → ...ceneSwitcher/Editor/SceneSwitcher.cs.meta
diff --git a/Assets/ToolbarExtender/Example/Fonts.meta → Example~/SceneSwitcher/Fonts.meta b/Assets/ToolbarExtender/Example/Fonts.meta → Example~/SceneSwitcher/Fonts.meta
diff --git a/...ender/Example/Fonts/OpenSans-SemiBold.ttf → ...SceneSwitcher/Fonts/OpenSans-SemiBold.ttf b/...ender/Example/Fonts/OpenSans-SemiBold.ttf → ...SceneSwitcher/Fonts/OpenSans-SemiBold.ttf
diff --git a/.../Example/Fonts/OpenSans-SemiBold.ttf.meta → ...Switcher/Fonts/OpenSans-SemiBold.ttf.meta b/.../Example/Fonts/OpenSans-SemiBold.ttf.meta → ...Switcher/Fonts/OpenSans-SemiBold.ttf.meta
diff --git a/Assets/ToolbarExtender/Example/Scenes.meta → Example~/SceneSwitcher/Scenes.meta b/Assets/ToolbarExtender/Example/Scenes.meta → Example~/SceneSwitcher/Scenes.meta
diff --git a/...olbarExtender/Example/Scenes/Scene1.unity → ...Scenes/ToolbarExtenderExampleScene1.unity b/...olbarExtender/Example/Scenes/Scene1.unity → ...Scenes/ToolbarExtenderExampleScene1.unity
diff --git a/...Extender/Example/Scenes/Scene1.unity.meta → ...s/ToolbarExtenderExampleScene1.unity.meta b/...Extender/Example/Scenes/Scene1.unity.meta → ...s/ToolbarExtenderExampleScene1.unity.meta
diff --git a/...olbarExtender/Example/Scenes/Scene2.unity → ...Scenes/ToolbarExtenderExampleScene2.unity b/...olbarExtender/Example/Scenes/Scene2.unity → ...Scenes/ToolbarExtenderExampleScene2.unity
diff --git a/...Extender/Example/Scenes/Scene2.unity.meta → ...s/ToolbarExtenderExampleScene2.unity.meta b/...Extender/Example/Scenes/Scene2.unity.meta → ...s/ToolbarExtenderExampleScene2.unity.meta
diff --git a/...olbarExtender/Example/Scripts/Editor.meta → Example~/SceneViewFocuser/Editor.meta b/...olbarExtender/Example/Scripts/Editor.meta → Example~/SceneViewFocuser/Editor.meta
diff --git a/...xample/Scripts/Editor/SceneViewFocuser.cs → ...eneViewFocuser/Editor/SceneViewFocuser.cs b/...xample/Scripts/Editor/SceneViewFocuser.cs → ...eneViewFocuser/Editor/SceneViewFocuser.cs
diff --git a/...e/Scripts/Editor/SceneViewFocuser.cs.meta → ...ewFocuser/Editor/SceneViewFocuser.cs.meta b/...e/Scripts/Editor/SceneViewFocuser.cs.meta → ...ewFocuser/Editor/SceneViewFocuser.cs.meta
diff --git a/Assets/ToolbarExtender.meta → LICENSE.meta b/Assets/ToolbarExtender.meta → LICENSE.meta
diff --git a/ProjectSettings/AudioManager.asset b/ProjectSettings/AudioManager.asset
diff --git a/ProjectSettings/ClusterInputManager.asset b/ProjectSettings/ClusterInputManager.asset
diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset
diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset