Loading dev tool environment from JSON

Source/AtomicEditor/Source/AEApplication.cpp

@@ -167,7 +167,6 @@ void AEApplication::Setup()
 
 #endif
 
-
     const Vector<String>& arguments = GetArguments();
 
     for (unsigned i = 0; i < arguments.Size(); ++i)
@@ -209,10 +208,20 @@ void AEApplication::Setup()
         engineParameters_["WindowHeight"] = prefs.windowHeight;
     }
 
+#ifdef ATOMIC_DEV_BUILD
+    engineParameters_["ResourcePrefixPath"] = "";
+    String resourcePaths = env->GetCoreDataDir() + ";" +  env->GetEditorDataDir();
+    engineParameters_["ResourcePaths"] = resourcePaths;
+#else
+
 #ifdef __APPLE__
     engineParameters_["ResourcePrefixPath"] = "../Resources";
-#else
-     engineParameters_["WindowIcon"] = "Images/AtomicLogo32.png";
+#endif
+
+#endif // ATOMIC_DEV_BUILD
+
+#ifndef __APPLE__
+    engineParameters_["WindowIcon"] = "Images/AtomicLogo32.png";
 #endif
 
     engineParameters_["LogName"] = filesystem->GetAppPreferencesDir("AtomicEditor", "Logs") + "AtomicEditor.log";

Source/ToolCore/ToolEnvironment.cpp

@@ -57,8 +57,17 @@ bool ToolEnvironment::InitFromJSON()
         return false;
     }
 
-    //env->SetRootSourceDir("/Users/josh/Dev/atomic/AtomicGameEngine");
-    //env->SetRootBuildDir("/Users/josh/Dev/atomic/AtomicGameEngine-build", true);
+    const Value::Member* rootSourceDir = document.FindMember("rootSourceDir");
+    if (rootSourceDir && rootSourceDir->value.IsString())
+        SetRootSourceDir(rootSourceDir->value.GetString());
+    else
+        return false;
+
+    const Value::Member* rootBuildDir = document.FindMember("rootBuildDir");
+    if (rootBuildDir && rootBuildDir->value.IsString())
+        SetRootBuildDir(rootBuildDir->value.GetString(), true);
+    else
+        return false;
 
     return true;
 
@@ -75,7 +84,7 @@ const String& ToolEnvironment::GetDevConfigFilename()
     FileSystem* fileSystem = GetSubsystem<FileSystem>();
 
 #ifdef ATOMIC_PLATFORM_OSX
-    devConfigFilename_ = fileSystem->GetUserDocumentsDir() = ".atomicgameengine/devConfig.json";
+    devConfigFilename_ = fileSystem->GetUserDocumentsDir() + ".atomicgameengine/toolEnv.json";
 #endif
 
     return devConfigFilename_;
@@ -85,6 +94,7 @@ void ToolEnvironment::SetRootSourceDir(const String& sourceDir)
 {
     rootSourceDir_ = AddTrailingSlash(sourceDir);
     resourceCoreDataDir_ = rootSourceDir_ + "Data/AtomicPlayer/Resources/CoreData";
+    resourceEditorDataDir_ = rootSourceDir_ + "Data/AtomicEditor/Resources/EditorData";
 }
 
 void ToolEnvironment::SetRootBuildDir(const String& buildDir, bool setBinaryPaths)

Source/ToolCore/ToolEnvironment.h

@@ -34,6 +34,7 @@ public:
     const String& GetToolBinary() { return toolBinary_; }
 
     const String& GetCoreDataDir() { return resourceCoreDataDir_; }
+    const String& GetEditorDataDir() { return resourceEditorDataDir_; }
 
     const String& GetDeploymentDataDir() { return toolBinary_; }
 
@@ -65,6 +66,7 @@ private:
 
     // resources
     String resourceCoreDataDir_;
+    String resourceEditorDataDir_;
 
     // deployment