Browse Source

Some clean ups, moved Preferences to /editor/. TypeScript compiler now will compile all files recursively(no need to add each file into tsconfig.json)

rsredsq 10 years ago
parent
commit
b9793ad2cc

+ 1 - 1
Script/AtomicEditor/editor/Editor.ts

@@ -5,7 +5,7 @@ import AssetImport = require("../assets/AssetImport");
 import PlayMode = require("../ui/playmode/PlayMode");
 import EditorLicense = require("./EditorLicense");
 import EditorEvents = require("./EditorEvents");
-import Preferences = require("../utils/Preferences");
+import Preferences = require("./Preferences");
 
 class Editor extends Atomic.ScriptObject {
 

+ 0 - 0
Script/AtomicEditor/utils/Preferences.ts → Script/AtomicEditor/editor/Preferences.ts


+ 0 - 50
Script/AtomicEditor/tsconfig.json

@@ -9,55 +9,5 @@
     },
     "filesGlob": [
         "./**/*.ts"
-    ],
-    "files": [
-        "./assets/AssetImport.ts",
-        "./editor/Editor.ts",
-        "./editor/EditorEvents.ts",
-        "./editor/EditorLicense.ts",
-        "./main.ts",
-        "./resources/ResourceOps.ts",
-        "./ui/EditorStrings.ts",
-        "./ui/EditorUI.ts",
-        "./ui/HierarchyFrame.ts",
-        "./ui/HierarchyFrameMenu.ts",
-        "./ui/MainFrame.ts",
-        "./ui/MainFrameMenu.ts",
-        "./ui/MainToolbar.ts",
-        "./ui/ProjectFrame.ts",
-        "./ui/ProjectFrameMenu.ts",
-        "./ui/ResourceFrame.ts",
-        "./ui/ScriptWidget.ts",
-        "./ui/Shortcuts.ts",
-        "./ui/UIEvents.ts",
-        "./ui/WelcomeFrame.ts",
-        "./ui/inspector/ArrayEditWidget.ts",
-        "./ui/inspector/ComponentInspector.ts",
-        "./ui/inspector/CreateComponentButton.ts",
-        "./ui/inspector/DataBinding.ts",
-        "./ui/inspector/InspectorFrame.ts",
-        "./ui/inspector/InspectorUtils.ts",
-        "./ui/inspector/InspectorWidget.ts",
-        "./ui/inspector/MaterialInspector.ts",
-        "./ui/inspector/ModelInspector.ts",
-        "./ui/inspector/NodeInspector.ts",
-        "./ui/inspector/TextureSelector.ts",
-        "./ui/license/ActivationSuccessWindow.ts",
-        "./ui/license/ActivationWindow.ts",
-        "./ui/license/EULAWindow.ts",
-        "./ui/license/ManageLicense.ts",
-        "./ui/menus/MenuItemSources.ts",
-        "./ui/modal/About.ts",
-        "./ui/modal/CreateProject.ts",
-        "./ui/modal/MessageModal.ts",
-        "./ui/modal/ModalOps.ts",
-        "./ui/modal/ModalWindow.ts",
-        "./ui/modal/NewProject.ts",
-        "./ui/modal/ProgressModal.ts",
-        "./ui/modal/ResourceSelection.ts",
-        "./ui/modal/UIResourceOps.ts",
-        "./ui/playmode/PlayMode.ts",
-        "./ui/playmode/PlayerOutput.ts",
-        "./utils/Preferences.ts"
     ]
 }

+ 1 - 1
Script/AtomicEditor/ui/HierarchyFrame.ts

@@ -236,7 +236,7 @@ class HierarchyFrame extends Atomic.UIWidget {
 
             // create
             if (id == "menu create") {
-                if (!ToolCore.getToolSystem().project) return;  
+                if (!ToolCore.toolSystem.project) return;  
                 var src = MenuItemSources.getMenuItemSource("hierarchy create items");
                 var menu = new Atomic.UIMenuWindow(data.target, "create popup");
                 menu.show(src);

+ 1 - 1
Script/AtomicEditor/ui/ProjectFrame.ts

@@ -139,7 +139,7 @@ class ProjectFrame extends ScriptWidget {
             
             // create
             if (id == "menu create") {
-                if (!ToolCore.getToolSystem().project) return;  
+                if (!ToolCore.toolSystem.project) return;  
                 var src = MenuItemSources.getMenuItemSource("project create items");
                 var menu = new Atomic.UIMenuWindow(data.target, "create popup");
                 menu.show(src);

+ 2 - 1
Script/AtomicEditor/ui/WelcomeFrame.ts

@@ -2,7 +2,7 @@
 import EditorEvents = require("../editor/EditorEvents");
 import EditorUI = require("./EditorUI");
 import ScriptWidget = require("./ScriptWidget");
-import Preferences = require("../utils/Preferences");
+import Preferences = require("../editor/Preferences");
 
 class WelcomeFrame extends ScriptWidget {
 
@@ -29,6 +29,7 @@ class WelcomeFrame extends ScriptWidget {
         this.subscribeToEvent(EditorEvents.CloseProject, () => {
             this.updateRecentProjects();
         });
+        
     }
 
     handleWidgetEvent(ev: Atomic.UIWidgetEvent) {