Save project on editor exit

Ask to save scene on editor exit
Selection highlight now shows properly on previously pinged entries in Library
You can now browse through Library folders without losing the object you are currently inspecting

BansheeCore/Include/BsCoreApplication.h

@@ -49,6 +49,12 @@ namespace BansheeEngine
 			 */
 			void stopMainLoop();
 
+			/**
+			 * @brief	Issues a request for the application to close. Application may choose to ignore the request
+			 * 			depending on the circumstances and the implementation.
+			 */
+			virtual void quitRequested();
+
 			/**
 			 * @brief	Returns the main window that was created on application start-up.
 			 */

BansheeCore/Source/BsCoreApplication.cpp

@@ -259,6 +259,11 @@ namespace BansheeEngine
 		// a race condition we might run the loop one extra iteration which is acceptable
 	}
 
+	void CoreApplication::quitRequested()
+	{
+		stopMainLoop();
+	}
+
 	void CoreApplication::frameRenderingFinishedCallback()
 	{
 		BS_LOCK_MUTEX(mFrameRenderingFinishedMutex);

BansheeCore/Source/Win32/BsWin32Platform.cpp

@@ -722,7 +722,7 @@ namespace BansheeEngine
 			break;
 		case WM_CLOSE:
 			{
-				gCoreApplication().stopMainLoop();
+				gCoreApplication().quitRequested();
 
 				return 0;
 			}

BansheeEditor/Include/BsEditorApplication.h

@@ -125,15 +125,20 @@ namespace BansheeEngine
 		virtual void onShutDown() override;
 
 		/**
-		 * @copydoc	Module::preUpdate
+		 * @copydoc	CoreApplication::preUpdate
 		 */
 		virtual void preUpdate() override;
 
 		/**
-		 * @copydoc	Module::postUpdate
+		 * @copydoc	CoreApplication::postUpdate
 		 */
 		virtual void postUpdate() override;
 
+		/**
+		 * @copydoc	CoreApplication::quitRequested
+		 */
+		virtual void quitRequested() override;
+
 		/**
 		 * @copydoc	Application::loadScriptSystem
 		 */

BansheeEditor/Source/BsEditorApplication.cpp

@@ -25,9 +25,7 @@
 #include "BsResources.h"
 #include "BsCoreSceneManager.h"
 #include "BsSplashScreen.h"
-
-// DEBUG ONLY
-#include "BsShader.h"
+#include "BsDynLib.h"
 
 namespace BansheeEngine
 {
@@ -102,11 +100,6 @@ namespace BansheeEngine
 
 		MainEditorWindow* mainWindow = MainEditorWindow::create(getPrimaryWindow());
 		ScriptManager::instance().initialize();
-
-#if BS_DEBUG_MODE
-		HShader dummyParsedShader = Importer::instance().import<Shader>(RUNTIME_DATA_PATH + "Raw\\Engine\\Shaders\\TestFX.bsl");
-		assert(dummyParsedShader != nullptr); // Ad hoc unit test
-#endif
 	}
 
 	void EditorApplication::onShutDown()
@@ -160,6 +153,16 @@ namespace BansheeEngine
 		SplashScreen::hide();
 	}
 
+	void EditorApplication::quitRequested()
+	{
+		typedef void(*QuitRequestedFunc)();
+
+		QuitRequestedFunc quitRequestedCall = (QuitRequestedFunc)mSBansheeEditorPlugin->getSymbol("quitRequested");
+
+		if (quitRequestedCall != nullptr)
+			quitRequestedCall();
+	}
+
 	Path EditorApplication::getEditorAssemblyPath() const
 	{
 		Path assemblyPath = getBuiltinAssemblyFolder();

BansheeEditor/Source/BsGUIMenuBar.cpp

@@ -522,7 +522,7 @@ namespace BansheeEngine
 
 	void GUIMenuBar::onCloseClicked()
 	{
-		gCoreApplication().stopMainLoop();
+		gCoreApplication().quitRequested();
 	}
 
 	void GUIMenuBar::refreshNonClientAreas()

MBansheeEditor/EditorApplication.cs

@@ -223,41 +223,53 @@ namespace BansheeEditor
         /// Opens a dialog to allows the user to select a location where to save the current scene. If scene was previously
         /// saved it is instead automatically saved at the last location.
         /// </summary>
-        [MenuItem("File/Save Scene", ButtonModifier.Ctrl, ButtonCode.S, 10049)]
-        [ToolbarItem("Save Scene", ToolbarIcon.SaveScene, "", 1998)]
-        private static void SaveScene()
+        public static void SaveScene(Action onSuccess = null, Action onFailure = null)
         {
             if (!string.IsNullOrEmpty(Scene.ActiveSceneUUID))
             {
                 string scenePath = ProjectLibrary.GetPath(Scene.ActiveSceneUUID);
                 SaveScene(scenePath);
+
+                if (onSuccess != null)
+                    onSuccess();
             }
             else
-                SaveSceneAs();
+                SaveSceneAs(onSuccess, onFailure);
         }
 
         /// <summary>
         /// Opens a dialog to allows the user to select a location where to save the current scene.
         /// </summary>
-        [MenuItem("File/Save Scene As", 10048)]
-        private static void SaveSceneAs()
+        public static void SaveSceneAs(Action onSuccess = null, Action onFailure = null)
         {
             string scenePath = "";
             if (BrowseDialog.SaveFile(ProjectLibrary.ResourceFolder, "*.prefab", out scenePath))
             {
                 if (!PathEx.IsPartOf(scenePath, ProjectLibrary.ResourceFolder))
+                {
                     DialogBox.Open("Error", "The location must be inside the Resources folder of the project.",
-                        DialogBox.Type.OK);
+                        DialogBox.Type.OK,
+                        x =>
+                        {
+                            if (onFailure != null)
+                                onFailure();
+                        });
+                }
                 else
                 {
                     // TODO - If path points to an existing non-scene asset or folder I should delete it otherwise
                     //        Internal_SaveScene will silently fail.
 
                     scenePath += ".prefab";
-
                     SaveScene(scenePath);
                 }
             }
+            else
+            {
+                // User canceled, so technically a success
+                if (onSuccess != null)
+                    onSuccess();
+            }
         }
 
         /// <summary>
@@ -335,6 +347,25 @@ namespace BansheeEditor
             Internal_CreateProject(path);
         }
 
+        /// <summary>
+        /// Wrapper for menu items for <see cref="SaveScene(Action, Action)"/> method
+        /// </summary>
+        [MenuItem("File/Save Scene", ButtonModifier.Ctrl, ButtonCode.S, 10049)]
+        [ToolbarItem("Save Scene", ToolbarIcon.SaveScene, "", 1998)]
+        private static void SaveSceneMenu()
+        {
+            SaveScene();
+        }
+
+        /// <summary>
+        /// Wrapper for menu items for <see cref="SaveSceneAs(Action, Action)"/> method
+        /// </summary>
+        [MenuItem("File/Save Scene As", 10048)]
+        private static void SaveSceneAsMenu()
+        {
+            SaveSceneAs();
+        }
+
         /// <summary>
         /// Opens a Project Window allowing you to browse for or create a project.
         /// </summary>
@@ -352,11 +383,13 @@ namespace BansheeEditor
         [ToolbarItem("Save Project", ToolbarIcon.SaveProject, "", 1999)]
         public static void SaveProject()
         {
+            Debug.Log("Save project");
             foreach (var resourceUUID in dirtyResources)
             {
                 string path = ProjectLibrary.GetPath(resourceUUID);
                 Resource resource = ProjectLibrary.Load<Resource>(path);
 
+                Debug.Log("Save project item: " + path + " - " + (resource != null));
                 if(resource != null)
                     ProjectLibrary.Save(resource);
             }

MBansheeEditor/Library/LibraryGUIContent.cs

@@ -243,6 +243,15 @@ namespace BansheeEditor
             }
         }
 
+        /// <summary>
+        /// Called every frame.
+        /// </summary>
+        public void Update()
+        {
+            for (int i = 0; i < entries.Length; i++)
+                entries[i].Update();
+        }
+
         /// <summary>
         /// Changes the visual representation of an element at the specified path as being hovered over.
         /// </summary>

MBansheeEditor/Library/LibraryGUIEntry.cs

@@ -40,6 +40,17 @@ namespace BansheeEditor
         private UnderlayState underlayState;
         private GUITextBox renameTextBox;
 
+        private bool delayedSelect;
+        private float delayedSelectTime;
+
+        /// <summary>
+        /// Bounds of the entry relative to part content area.
+        /// </summary>
+        public Rect2I Bounds
+        {
+            get { return bounds; }
+        }
+
         /// <summary>
         /// Constructs a new resource tile entry.
         /// </summary>
@@ -112,11 +123,15 @@ namespace BansheeEditor
         }
 
         /// <summary>
-        /// Bounds of the entry relative to part content area.
+        /// Called every frame.
         /// </summary>
-        public Rect2I Bounds
+        public void Update()
         {
-            get { return bounds; }
+            if (delayedSelect && Time.Elapsed > delayedSelectTime)
+            {
+                owner.Window.Select(path);
+                delayedSelect = false;
+            }
         }
 
         /// <summary>
@@ -144,11 +159,13 @@ namespace BansheeEditor
             {
                 CreateUnderlay();
                 underlay.SetTint(SELECTION_COLOR);
+                underlayState = UnderlayState.Selected;
             }
             else
+            {
                 ClearUnderlay();
-
-            underlayState = UnderlayState.Selected;
+                underlayState = UnderlayState.None;
+            }
         }
 
         /// <summary>
@@ -164,11 +181,13 @@ namespace BansheeEditor
             {
                 CreateUnderlay();
                 underlay.SetTint(PING_COLOR);
+                underlayState = UnderlayState.Pinged;
             }
             else
+            {
                 ClearUnderlay();
-
-            underlayState = UnderlayState.Pinged;
+                underlayState = UnderlayState.None;
+            }
         }
 
         /// <summary>
@@ -184,11 +203,13 @@ namespace BansheeEditor
             {
                 CreateUnderlay();
                 underlay.SetTint(HOVER_COLOR);
+                underlayState = UnderlayState.Hovered;
             }
             else
+            {
                 ClearUnderlay();
-
-            underlayState = UnderlayState.Hovered;
+                underlayState = UnderlayState.None;
+            }
         }
 
         /// <summary>
@@ -270,7 +291,18 @@ namespace BansheeEditor
         /// <param name="path">Project library path of the clicked entry.</param>
         private void OnEntryClicked(string path)
         {
-            owner.Window.Select(path);
+            LibraryEntry entry = ProjectLibrary.GetEntry(path);
+            if (entry != null && entry.Type == LibraryEntryType.Directory)
+            {
+                // If entry is a directory delay selection as it might be a double-click, in which case we want to keep
+                // whatever selection is active currently so that user can perform drag and drop with its inspector
+                // from the folder he is browsing to.
+
+                delayedSelect = true;
+                delayedSelectTime = Time.Elapsed + 0.5f;
+            }
+            else
+                owner.Window.Select(path);
         }
 
         /// <summary>
@@ -279,6 +311,8 @@ namespace BansheeEditor
         /// <param name="path">Project library path of the double-clicked entry.</param>
         private void OnEntryDoubleClicked(string path)
         {
+            delayedSelect = false;
+
             LibraryEntry entry = ProjectLibrary.GetEntry(path);
             if (entry != null)
             {

MBansheeEditor/Library/LibraryWindow.cs

@@ -350,6 +350,7 @@ namespace BansheeEditor
                 Refresh();
 
             dropTarget.Update();
+            content.Update();
         }
 
         /// <inheritdoc/>
@@ -583,6 +584,7 @@ namespace BansheeEditor
             }
 
             selectionPaths = paths;
+            Ping("");
 
             if (selectionPaths != null)
             {
@@ -590,7 +592,6 @@ namespace BansheeEditor
                     content.MarkAsSelected(path, true);
             }
 
-            Ping("");
             StopRename();
 
             if (!onlyInternal)
@@ -610,7 +611,7 @@ namespace BansheeEditor
         internal void EnterDirectory(string directory)
         {
             currentDirectory = directory;
-            DeselectAll();
+            DeselectAll(true);
 
             Refresh();
         }

MBansheeEditor/Program.cs

@@ -23,7 +23,7 @@ namespace BansheeEditor
         /// <summary>
         /// Called by the runtime when the editor is first started. Called after <see cref="OnInitialize"/>.
         /// </summary>
-        static void OnEditorLoad()
+        static void OnEditorStartUp()
         {
             if (EditorSettings.AutoLoadLastProject)
             {
@@ -54,5 +54,49 @@ namespace BansheeEditor
         {
             app.OnEditorUpdate();
         }
+
+        /// <summary>
+        /// Attempts to save the current scene, and keeps retrying if failed or until user cancels.
+        /// </summary>
+        static void TrySaveScene()
+        {
+            Action success = () =>
+            {
+                EditorApplication.SaveProject();
+                EditorApplication.Quit();
+            };
+
+            EditorApplication.SaveScene(success, TrySaveScene);
+        }
+
+        /// <summary>
+        /// Called when the user requests that the editor shuts down. You must manually close the editor from this
+        /// method if you choose to accept the users request.
+        /// </summary>
+        static void OnEditorQuitRequested()
+        {
+            Action<DialogBox.ResultType> dialogCallback =
+            (result) =>
+            {
+                if (result == DialogBox.ResultType.Yes)
+                    TrySaveScene();
+                else if (result == DialogBox.ResultType.No)
+                {
+                    EditorApplication.SaveProject();
+                    EditorApplication.Quit();
+                }
+            };
+
+            if (EditorApplication.IsSceneModified())
+            {
+                DialogBox.Open("Warning", "You current scene has modifications. Do you wish to save them first?",
+                    DialogBox.Type.YesNoCancel, dialogCallback);
+            }
+            else
+            {
+                EditorApplication.SaveProject();
+                EditorApplication.Quit();
+            }
+        }
     }
 }

SBansheeEditor/Include/BsEditorScriptManager.h

@@ -21,6 +21,13 @@ namespace BansheeEngine
 		 */
 		void update();
 
+		/**
+		 * @brief	Called when the user requests the application to close.
+		 *
+		 * @note	Internal method.
+		 */
+		void quitRequested();
+
 	private:
 		/**
 		 * @brief	Triggers Program::OnInitialize callback. Should be called

SBansheeEditor/Source/BsEditorScriptManager.cpp

@@ -51,9 +51,9 @@ namespace BansheeEngine
 		mOnAssemblyRefreshDoneConn = ScriptObjectManager::instance().onRefreshComplete.connect(std::bind(&EditorScriptManager::onAssemblyRefreshDone, this));
 		triggerOnInitialize();
 
-		// Trigger OnEditorLoad
-		const String EDITOR_ON_LOAD = "Program::OnEditorLoad";
-		mEditorAssembly->invoke(EDITOR_ON_LOAD);
+		// Trigger OnEditorStartUp
+		const String EDITOR_ON_STARTUP = "Program::OnEditorStartUp";
+		mEditorAssembly->invoke(EDITOR_ON_STARTUP);
 
 		// Initial update
 		mLastUpdateTime = gTime().getTime();
@@ -97,6 +97,13 @@ namespace BansheeEngine
 		ScriptEditorApplication::update();
 	}
 
+	void EditorScriptManager::quitRequested()
+	{
+		// Trigger OnEditorQuitRequested
+		const String EDITOR_ON_QUITREQUESTED = "Program::OnEditorQuitRequested";
+		mEditorAssembly->invoke(EDITOR_ON_QUITREQUESTED);
+	}
+
 	void EditorScriptManager::triggerOnInitialize()
 	{
 		const String ASSEMBLY_ENTRY_POINT = "Program::OnInitialize";

SBansheeEditor/Source/BsScriptEditorPlugin.cpp

@@ -23,4 +23,9 @@ namespace BansheeEngine
 	{
 		EditorScriptManager::instance().update();
 	}
+
+	extern "C" BS_SCR_BED_EXPORT void quitRequested()
+	{
+		EditorScriptManager::instance().quitRequested();
+	}
 }