Cleaning up events and removing events that are no longer used

Script/AtomicEditor/ui/frames/MainFrame.ts

@@ -60,9 +60,9 @@ class MainFrame extends ScriptWidget {
 
         this.disableProjectMenus();
 
-        this.subscribeToEvent(Editor.ResourceEditorChangedEvent((data) => this.handleResourceEditorChanged(data)));
+        this.subscribeToEvent(Editor.EditorResourceEditorChangedEvent((data) => this.handleResourceEditorChanged(data)));
 
-        this.subscribeToEvent(Editor.ProjectLoadedEvent((data) => {
+        this.subscribeToEvent(ToolCore.ProjectLoadedEvent((data) => {
             this.showWelcomeFrame(false);
             this.enableProjectMenus();
         }));
@@ -156,9 +156,9 @@ class MainFrame extends ScriptWidget {
 
     }
 
-    handleResourceEditorChanged(data): void {
+    handleResourceEditorChanged(data: Editor.EditorResourceEditorChangedEvent): void {
 
-        var editor = <Editor.ResourceEditor> data.editor;
+        var editor = data.resourceEditor;
 
         if (editor) {
 

Script/AtomicEditor/ui/frames/ProjectFrame.ts

@@ -67,7 +67,7 @@ class ProjectFrame extends ScriptWidget {
         foldercontainer.addChild(folderList);
 
         // events
-        this.subscribeToEvent(Editor.ProjectLoadedEvent((data) => this.handleProjectLoaded(data)));
+        this.subscribeToEvent(ToolCore.ProjectLoadedEvent((data) => this.handleProjectLoaded(data)));
         this.subscribeToEvent(Editor.ProjectUnloadedNotificationEvent((data) => this.handleProjectUnloaded(data)));
         this.subscribeToEvent(Atomic.DragEndedEvent((data: Atomic.DragEndedEvent) => this.handleDragEnded(data)));
 
@@ -415,7 +415,7 @@ class ProjectFrame extends ScriptWidget {
 
     }
 
-    handleProjectLoaded(data) {
+    handleProjectLoaded(data: ToolCore.ProjectLoadedEvent) {
 
         this.folderList.rootList.value = 0;
         this.folderList.setExpanded(this.resourcesID, true);

Script/AtomicEditor/ui/frames/ResourceFrame.ts

@@ -191,9 +191,9 @@ class ResourceFrame extends ScriptWidget {
 
     }
 
-    handleResourceEditorChanged(data) {
+    handleResourceEditorChanged(data: Editor.EditorResourceEditorChangedEvent) {
 
-        var editor = <Editor.ResourceEditor> data.editor;
+        var editor = data.resourceEditor;
         this.currentResourceEditor = editor;
 
     }
@@ -222,7 +222,7 @@ class ResourceFrame extends ScriptWidget {
 
                     }
 
-                    this.sendEvent(Editor.ResourceEditorChangedEventType, { editor: w.editor });
+                    this.sendEvent(Editor.EditorResourceEditorChangedEventType, { resourceEditor: w.editor });
 
                 }
 
@@ -284,7 +284,7 @@ class ResourceFrame extends ScriptWidget {
         this.subscribeToEvent(Editor.EditorRenameResourceNotificationEvent((ev: Editor.EditorRenameResourceNotificationEvent) => this.handleRenameResource(ev)));
         this.subscribeToEvent(Editor.EditorDeleteResourceNotificationEvent((data) => this.handleDeleteResource(data)));
 
-        this.subscribeToEvent(Editor.ResourceEditorChangedEvent((data) => this.handleResourceEditorChanged(data)));
+        this.subscribeToEvent(Editor.EditorResourceEditorChangedEvent((data) => this.handleResourceEditorChanged(data)));
 
         this.subscribeToEvent(Atomic.UIWidgetEvent((data) => this.handleWidgetEvent(data)));
 

Source/AtomicEditor/EditorMode/AEEditorEvents.h

@@ -36,40 +36,14 @@ static const unsigned FINDTEXT_FLAG_WRAP = 0x4;
 static const unsigned FINDTEXT_FLAG_NEXT = 0x8;
 static const unsigned FINDTEXT_FLAG_PREV = 0x10;
 
-ATOMIC_EVENT(E_FINDTEXT, FindText)
-{
-    ATOMIC_PARAM(P_FLAGS, Flags);    // int
-    ATOMIC_PARAM(P_TEXT, Text);      // string
-}
-
-ATOMIC_EVENT(E_FINDTEXTCLOSE, FindTextClose)
-{
-
-}
-
-ATOMIC_EVENT(E_FINDTEXTOPEN, FindTextOpen)
-{
-
-}
-
-ATOMIC_EVENT(E_JAVASCRIPTSAVED, JavascriptSaved)
-{
-
-}
 
 // emitted when the play button has been pressed in the editor, but the player has not yet started
 ATOMIC_EVENT(E_EDITORPLAYREQUEST, EditorPlayRequest)
 {
     ATOMIC_PARAM(P_MODE, Mode);    // uint (AEPlayerMode)
-
-}
-
-// stop play mode
-ATOMIC_EVENT(E_EDITORPLAYSTOP, EditorPlayStop)
-{
-
 }
 
+// Called when the active resource editor has changed
 ATOMIC_EVENT(E_EDITORRESOURCEEDITORCHANGED, EditorResourceEditorChanged)
 {
     ATOMIC_PARAM(P_RESOURCEEDITOR, ResourceEditor); // ResourceEditor*
@@ -99,6 +73,7 @@ ATOMIC_EVENT(E_EDITORPLAYERSTOPPED, EditorPlayerStopped)
 
 }
 
+// NOT CURRENTLY WIRED
 ATOMIC_EVENT(E_EDITORBUILD, EditorBuild)
 {
     ATOMIC_PARAM(P_PLATFORM, Platform);      // string
@@ -119,62 +94,38 @@ ATOMIC_EVENT(E_EDITORMODAL, EditorModal)
     ATOMIC_PARAM(P_MESSAGE, Message);    // string (for modal errors, error text)
 }
 
+// emitted when a Scene editor gains focus.  Could be null.
 ATOMIC_EVENT(E_EDITORACTIVESCENEEDITORCHANGE, EditorActiveSceneEditorChange)
 {
     ATOMIC_PARAM(P_SCENEEDITOR, SceneEditor);  // SceneEditor3D pointer
 }
 
+// NOTE: This is not triggered by anything
 ATOMIC_EVENT(E_EDITORSCENECLOSED, EditorSceneClosed)
 {
     ATOMIC_PARAM(P_SCENE, Scene); // Scene pointer
 }
 
-ATOMIC_EVENT(E_PLAYERERROR, PlayerError)
-{
-    ATOMIC_PARAM(P_TEXT, Text);      // string
-}
-
-ATOMIC_EVENT(E_CONSOLEMESSAGE, ConsoleMessage)
-{
-    ATOMIC_PARAM(P_TEXT, Text);      // string
-}
-
-ATOMIC_EVENT(E_CONSOLEERRORMESSAGE, ConsoleErrorMessage)
-{
-    ATOMIC_PARAM(P_TEXT, Text);      // string
-}
-
-ATOMIC_EVENT(E_PLATFORMCHANGE, PlatformChange)
-{
-    ATOMIC_PARAM(P_PLATFORM, Platform);      // uint (AEEditorPlatform)
-}
-
+// emitted when a subprocess logs information to the console
 ATOMIC_EVENT(E_SUBPROCESSOUTPUT, SubprocessOutput)
 {
     ATOMIC_PARAM(P_TEXT, Text);      // string
 }
 
+// emitted when a subprocess has completed
 ATOMIC_EVENT(E_SUBPROCESSCOMPLETE, SubprocessComplete)
 {
     ATOMIC_PARAM(P_PROCESSKEY, ProcessKey); // unsigned
     ATOMIC_PARAM(P_RETCODE, RetCode);      // int (return code of process)
 }
 
-ATOMIC_EVENT(E_CURLCOMPLETE, CurlComplete)
-{
-    ATOMIC_PARAM(P_CURLREQUEST, Request);      // CurlRequest*
-}
-
-ATOMIC_EVENT(E_EDITORSHUTDOWN, EditorShutdown)
-{
-
-}
-
+// Command called to load a new project
 ATOMIC_EVENT(E_EDITORLOADPROJECT, EditorLoadProject)
 {
     ATOMIC_PARAM(P_PATH, Path);     // string
 }
 
+// emitted once a content folder has been refreshed
 ATOMIC_EVENT(E_CONTENTFOLDERCHANGED, ContentFolderChanged)
 {
     ATOMIC_PARAM(P_PATH, Path);     // string
@@ -186,6 +137,7 @@ ATOMIC_EVENT(E_EDITORCLOSEPROJECT, EditorCloseProject)
 
 }
 
+// emitted once a project has completed closing
 ATOMIC_EVENT(E_EDITORPROJECTCLOSED, EditorProjectClosed)
 {
 
@@ -197,34 +149,37 @@ ATOMIC_EVENT(E_EDITORSAVEALLRESOURCES, EditorSaveAllResources)
 
 }
 
+// command to save a specific resource
 ATOMIC_EVENT(E_EDITORSAVERESOURCE, EditorSaveResource)
 {
     ATOMIC_PARAM(P_PATH, Path);     // string full path of the current resource
 }
 
-// Called once the resource has been saved
+// emitted once the resource has been saved
 ATOMIC_EVENT(E_EDITORSAVERESOURCENOTIFICATION, EditorSaveResourceNotification)
 {
     ATOMIC_PARAM(P_PATH, Path);     // string
 }
 
+// emitted when a resource gains focus
 ATOMIC_EVENT(E_EDITOREDITRESOURCE, EditorEditResource)
 {
     ATOMIC_PARAM(P_PATH, Path);     // string
 }
 
+// command to delete a resource
 ATOMIC_EVENT(E_EDITORDELETERESOURCE, EditorDeleteResource)
 {
     ATOMIC_PARAM(P_PATH, Path);     // string
 }
 
-// Called once the resource has been deleted
+// emitted once the resource has been deleted
 ATOMIC_EVENT(E_EDITORDELETERESOURCENOTIFICATION, EditorDeleteResourceNotification)
 {
     ATOMIC_PARAM(P_PATH, Path);     // string
 }
 
-// Called when a resource has been renamed
+// emitted when a resource has been renamed
 ATOMIC_EVENT(E_EDITORRENAMERESOURCENOTIFICATION, EditorRenameResourceNotification)
 {
     ATOMIC_PARAM(P_PATH, Path);     // string (full path of the old resource)
@@ -233,48 +188,45 @@ ATOMIC_EVENT(E_EDITORRENAMERESOURCENOTIFICATION, EditorRenameResourceNotificatio
     ATOMIC_PARAM(P_ASSET, Asset);       // Asset pointer
 }
 
+// emitted when user preferences have been changed
 ATOMIC_EVENT(E_USERPREFERENCESCHANGEDNOTIFICATION, UserPreferencesChangedNotification)
 {
    ATOMIC_PARAM(P_PROJECTPREFERENCES, ProjectPreferences);  // string (JSON object)
    ATOMIC_PARAM(P_APPLICATIONPREFERENCES, ApplicationPreferences);        // string (JSON object)
 }
 
+// emitted when an item is selected in a scene
 ATOMIC_EVENT(E_INSPECTORPROJECTREFERENCE, InspectorProjectReference)
 {
     ATOMIC_PARAM(P_PATH, Path);     // string (Full path of the resource to edit)
 }
 
+// emitted when a component attribute has been changed
 ATOMIC_EVENT(E_ATTRIBUTEEDITRESOURCECHANGED, AttributeEditResourceChanged)
 {
     ATOMIC_PARAM(P_RESOURCE, Resource); // Resource pointer
 }
 
-ATOMIC_EVENT(E_RESOURCEEDITORCHANGED, ResourceEditorChanged)
-{
-    ATOMIC_PARAM(P_EDITOR, Editor); // ResourceEditor pointer
-}
-
+// emitted when the built in player logs something
 ATOMIC_EVENT(E_EDITORPLAYERLOG, EditorPlayerLog)
 {
     ATOMIC_PARAM(P_MESSAGE, Message);   // string
     ATOMIC_PARAM(P_LEVEL, Level);       // int
 }
 
+// emitted right before a project is unloaded
 ATOMIC_EVENT(E_PROJECTUNLOADEDNOTIFICATION, ProjectUnloadedNotification)
 {
 
 }
 
+// command to load a new project
 ATOMIC_EVENT(E_REQUESTPROJECTLOAD, RequestProjectLoad)
 {
     ATOMIC_PARAM(P_PATH, Path);     // string (Full path to the .atomic file)
 }
 
-ATOMIC_EVENT(E_PROJECTLOADED, ProjectLoaded)
-{
-
-}
-
+// emitted once a project has been loaded
 ATOMIC_EVENT(E_LOADPROJECTNOTIFICATION,LoadProjectNotification)
 {
     ATOMIC_PARAM(P_PATH, Path);     // string (Full path to the .atomic file)

Source/ToolCore/Project/ProjectEvents.h

@@ -35,11 +35,12 @@ ATOMIC_EVENT(E_PROJECTBEGINLOAD, ProjectBeginLoad)
     ATOMIC_PARAM(P_PROJECT, Project);           // Project *
 }
 
+// Event is triggered once a project has been loaded and after prefs have been loaded
 ATOMIC_EVENT(E_PROJECTLOADED, ProjectLoaded)
 {
-    ATOMIC_PARAM(P_PROJECTPATH, ProjectPath);   // string
-    ATOMIC_PARAM(P_PROJECT, Project);           // Project *
-    ATOMIC_PARAM(P_RESULT, Result);             // bool
+    ATOMIC_PARAM(P_PROJECTPATH, ProjectPath);   // string (The path to the project that was loaded)
+    ATOMIC_PARAM(P_PROJECT, Project);           // Project * (The reference to the project)
+    ATOMIC_PARAM(P_RESULT, Result);             // bool (whether the project loaded successfully)
 }
 
 ATOMIC_EVENT(E_PROJECTUNLOADED, ProjectUnloaded)