Browse Source

Moving editor scripts

Josh Engebretson 10 years ago
parent
commit
1a1acec130
29 changed files with 6 additions and 33 deletions
  1. 0 28
      Resources/EditorData/AtomicEditor/Modules/AtomicEditor.js
  2. 0 0
      Script/AtomicEditor/.gitignore
  3. 0 0
      Script/AtomicEditor/AtomicWork.d.ts
  4. 0 0
      Script/AtomicEditor/assets/AssetImport.ts
  5. 0 0
      Script/AtomicEditor/editor/Editor.ts
  6. 0 0
      Script/AtomicEditor/main.ts
  7. 0 0
      Script/AtomicEditor/tsconfig.json
  8. 0 0
      Script/AtomicEditor/ui/EditorStrings.ts
  9. 0 0
      Script/AtomicEditor/ui/HierarchyFrame.ts
  10. 0 0
      Script/AtomicEditor/ui/MainFrame.ts
  11. 0 0
      Script/AtomicEditor/ui/MainFrameMenu.ts
  12. 0 0
      Script/AtomicEditor/ui/MainToolbar.ts
  13. 0 0
      Script/AtomicEditor/ui/ProjectFrame.ts
  14. 0 0
      Script/AtomicEditor/ui/ProjectFrameOld.ts
  15. 0 0
      Script/AtomicEditor/ui/ResourceFrame.ts
  16. 0 0
      Script/AtomicEditor/ui/ScriptWidget.ts
  17. 0 0
      Script/AtomicEditor/ui/UIEvents.ts
  18. 0 0
      Script/AtomicEditor/ui/inspector/ComponentInspector.ts
  19. 0 0
      Script/AtomicEditor/ui/inspector/CreateComponentButton.ts
  20. 0 0
      Script/AtomicEditor/ui/inspector/DataBinding.ts
  21. 0 0
      Script/AtomicEditor/ui/inspector/InspectorFrame.ts
  22. 0 0
      Script/AtomicEditor/ui/inspector/InspectorWidget.ts
  23. 0 0
      Script/AtomicEditor/ui/inspector/MaterialInspector.ts
  24. 0 0
      Script/AtomicEditor/ui/inspector/ModelInspector.ts
  25. 0 0
      Script/AtomicEditor/ui/inspector/NodeInspector.ts
  26. 0 0
      Script/AtomicEditor/ui/inspector/TextureSelector.ts
  27. 0 0
      Script/AtomicEditor/ui/modal/MessageModal.ts
  28. 0 0
      Script/AtomicEditor/ui/modal/ModalOps.ts
  29. 6 5
      Source/AtomicEditorWork/Application/AEEditorApp.cpp

+ 0 - 28
Resources/EditorData/AtomicEditor/Modules/AtomicEditor.js

@@ -1,28 +0,0 @@
-
-var game = Atomic.game;
-
-function Editor() {
-
-	// default to the entire screen
-	this.viewport = {
-		left: 0,
-		top: 0,
-		right: game.graphics.width,
-		bottom: game.graphics.height
-	}
-
-}
-
-Editor.prototype.setViewport = function(left, top, right, bottom) {
-	
-	this.viewport.left = left;
-	this.viewport.top = top;
-	this.viewport.right = right;
-	this.viewport.bottom = bottom;
-
-}
-
-
-var editor = new Editor();
-
-Atomic.editor = exports.editor = editor;

+ 0 - 0
Resources/EditorData/AtomicEditor/typescript/.gitignore → Script/AtomicEditor/.gitignore


+ 0 - 0
Resources/EditorData/AtomicEditor/typescript/AtomicWork.d.ts → Script/AtomicEditor/AtomicWork.d.ts


+ 0 - 0
Resources/EditorData/AtomicEditor/typescript/assets/AssetImport.ts → Script/AtomicEditor/assets/AssetImport.ts


+ 0 - 0
Resources/EditorData/AtomicEditor/typescript/editor/Editor.ts → Script/AtomicEditor/editor/Editor.ts


+ 0 - 0
Resources/EditorData/AtomicEditor/typescript/main.ts → Script/AtomicEditor/main.ts


+ 0 - 0
Resources/EditorData/AtomicEditor/typescript/tsconfig.json → Script/AtomicEditor/tsconfig.json


+ 0 - 0
Resources/EditorData/AtomicEditor/typescript/ui/EditorStrings.ts → Script/AtomicEditor/ui/EditorStrings.ts


+ 0 - 0
Resources/EditorData/AtomicEditor/typescript/ui/HierarchyFrame.ts → Script/AtomicEditor/ui/HierarchyFrame.ts


+ 0 - 0
Resources/EditorData/AtomicEditor/typescript/ui/MainFrame.ts → Script/AtomicEditor/ui/MainFrame.ts


+ 0 - 0
Resources/EditorData/AtomicEditor/typescript/ui/MainFrameMenu.ts → Script/AtomicEditor/ui/MainFrameMenu.ts


+ 0 - 0
Resources/EditorData/AtomicEditor/typescript/ui/MainToolbar.ts → Script/AtomicEditor/ui/MainToolbar.ts


+ 0 - 0
Resources/EditorData/AtomicEditor/typescript/ui/ProjectFrame.ts → Script/AtomicEditor/ui/ProjectFrame.ts


+ 0 - 0
Resources/EditorData/AtomicEditor/typescript/ui/ProjectFrameOld.ts → Script/AtomicEditor/ui/ProjectFrameOld.ts


+ 0 - 0
Resources/EditorData/AtomicEditor/typescript/ui/ResourceFrame.ts → Script/AtomicEditor/ui/ResourceFrame.ts


+ 0 - 0
Resources/EditorData/AtomicEditor/typescript/ui/ScriptWidget.ts → Script/AtomicEditor/ui/ScriptWidget.ts


+ 0 - 0
Resources/EditorData/AtomicEditor/typescript/ui/UIEvents.ts → Script/AtomicEditor/ui/UIEvents.ts


+ 0 - 0
Resources/EditorData/AtomicEditor/typescript/ui/inspector/ComponentInspector.ts → Script/AtomicEditor/ui/inspector/ComponentInspector.ts


+ 0 - 0
Resources/EditorData/AtomicEditor/typescript/ui/inspector/CreateComponentButton.ts → Script/AtomicEditor/ui/inspector/CreateComponentButton.ts


+ 0 - 0
Resources/EditorData/AtomicEditor/typescript/ui/inspector/DataBinding.ts → Script/AtomicEditor/ui/inspector/DataBinding.ts


+ 0 - 0
Resources/EditorData/AtomicEditor/typescript/ui/inspector/InspectorFrame.ts → Script/AtomicEditor/ui/inspector/InspectorFrame.ts


+ 0 - 0
Resources/EditorData/AtomicEditor/typescript/ui/inspector/InspectorWidget.ts → Script/AtomicEditor/ui/inspector/InspectorWidget.ts


+ 0 - 0
Resources/EditorData/AtomicEditor/typescript/ui/inspector/MaterialInspector.ts → Script/AtomicEditor/ui/inspector/MaterialInspector.ts


+ 0 - 0
Resources/EditorData/AtomicEditor/typescript/ui/inspector/ModelInspector.ts → Script/AtomicEditor/ui/inspector/ModelInspector.ts


+ 0 - 0
Resources/EditorData/AtomicEditor/typescript/ui/inspector/NodeInspector.ts → Script/AtomicEditor/ui/inspector/NodeInspector.ts


+ 0 - 0
Resources/EditorData/AtomicEditor/typescript/ui/inspector/TextureSelector.ts → Script/AtomicEditor/ui/inspector/TextureSelector.ts


+ 0 - 0
Resources/EditorData/AtomicEditor/typescript/ui/modal/MessageModal.ts → Script/AtomicEditor/ui/modal/MessageModal.ts


+ 0 - 0
Resources/EditorData/AtomicEditor/typescript/ui/modal/ModalOps.ts → Script/AtomicEditor/ui/modal/ModalOps.ts


+ 6 - 5
Source/AtomicEditorWork/Application/AEEditorApp.cpp

@@ -59,22 +59,22 @@ void AEEditorApp::Start()
     // Instantiate and register the Javascript subsystem
     // Instantiate and register the Javascript subsystem
     vm_ = javascript->InstantiateVM("MainVM");
     vm_ = javascript->InstantiateVM("MainVM");
     vm_->InitJSContext();
     vm_->InitJSContext();
-    vm_->SetModuleSearchPaths("AtomicEditor/typescript");
+    vm_->SetModuleSearchPaths("AtomicEditor");
 
 
     jsapi_init_toolcore(vm_);
     jsapi_init_toolcore(vm_);
     jsapi_init_editor(vm_);
     jsapi_init_editor(vm_);
 
 
-    SharedPtr<File> file (GetSubsystem<ResourceCache>()->GetFile("AtomicEditor/typescript/main.js"));
+    SharedPtr<File> file (GetSubsystem<ResourceCache>()->GetFile("AtomicEditor/main.js"));
 
 
     if (file.Null())
     if (file.Null())
     {
     {
-        ErrorExit("Unable to load AtomicEditor/typescript/main.js");
+        ErrorExit("Unable to load AtomicEditor/main.js");
         return;
         return;
     }
     }
 
 
     if (!vm_->ExecuteFile(file))
     if (!vm_->ExecuteFile(file))
     {
     {
-        ErrorExit("Error executing AtomicEditor/typescript/main.js");
+        ErrorExit("Error executing AtomicEditor/main.js");
         return;
         return;
     }
     }
 
 
@@ -115,7 +115,8 @@ void AEEditorApp::Setup()
 
 
 #ifdef ATOMIC_DEV_BUILD
 #ifdef ATOMIC_DEV_BUILD
     engineParameters_["ResourcePrefixPath"] = "";
     engineParameters_["ResourcePrefixPath"] = "";
-    String resourcePaths = env->GetCoreDataDir() + ";" +  env->GetEditorDataDir();
+    String ScriptPath = env->GetRootSourceDir() + "Script";
+    String resourcePaths = env->GetCoreDataDir() + ";" +  env->GetEditorDataDir() + ";" + ScriptPath;
     engineParameters_["ResourcePaths"] = resourcePaths;
     engineParameters_["ResourcePaths"] = resourcePaths;
 #else
 #else