Javascript error handling, merging Data and CoreData

Rakefile

@@ -231,8 +231,7 @@ namespace :package do
       MAC_EDITOR_APP_FOLDER_SRC = "#{CMAKE_MACOSX_BUILD_FOLDER}/Source/AtomicEditor/AtomicEditor.app"
 
       # Resources
-      COREDATA_FOLDER_SRC = "#{$RAKE_ROOT}/Data/AtomicPlayer/Resources/CoreData"
-      DATA_FOLDER_SRC = "#{$RAKE_ROOT}/Data/AtomicPlayer/Resources/Data"
+      COREDATA_FOLDER_SRC = "#{$RAKE_ROOT}/Data/AtomicPlayer/Resources/CoreData"    
       EDITORRESOURCES_FOLDER_SRC = "#{$RAKE_ROOT}/Data/AtomicEditor/Resources/EditorData"
       EDITORAPPLICATIONDATA_FOLDER_SRC = "#{$RAKE_ROOT}/Data/AtomicEditor"
 
@@ -260,7 +259,6 @@ namespace :package do
 
       # Copy Resources
       sh "cp -r #{COREDATA_FOLDER_SRC} #{MAC_EDITOR_APP_RESOURCE_FOLDER_DST}/CoreData"
-      sh "cp -r #{DATA_FOLDER_SRC} #{MAC_EDITOR_APP_RESOURCE_FOLDER_DST}/Data"
       sh "cp -r #{EDITORRESOURCES_FOLDER_SRC} #{MAC_EDITOR_APP_RESOURCE_FOLDER_DST}/EditorData"
 
       # Copy Deployment
@@ -348,8 +346,7 @@ namespace :package do
     DEPLOYMENT_FOLDER = "#{EDITOR_APP_FOLDER_DST}/Deployment/Win64"
 
     # Resources
-    COREDATA_FOLDER_SRC = "#{$RAKE_ROOT}/Data/AtomicPlayer/Resources/CoreData"
-    DATA_FOLDER_SRC = "#{$RAKE_ROOT}/Data/AtomicPlayer/Resources/Data"
+    COREDATA_FOLDER_SRC = "#{$RAKE_ROOT}/Data/AtomicPlayer/Resources/CoreData"    
     EDITORRESOURCES_FOLDER_SRC = "#{$RAKE_ROOT}/Data/AtomicEditor/Resources/EditorData"
     EDITORAPPLICATIONDATA_FOLDER_SRC = "#{$RAKE_ROOT}/Data/AtomicEditor"
 
@@ -361,7 +358,6 @@ namespace :package do
     EXAMPLEINFO_FOLDER_SRC = "#{EDITORAPPLICATIONDATA_FOLDER_SRC}/ExampleInfo"    
     
     FileUtils.cp_r("#{COREDATA_FOLDER_SRC}", "#{EDITOR_APP_FOLDER_DST}/CoreData")
-    FileUtils.cp_r("#{DATA_FOLDER_SRC}", "#{EDITOR_APP_FOLDER_DST}/Data")
     FileUtils.cp_r("#{EDITORRESOURCES_FOLDER_SRC}", "#{EDITOR_APP_FOLDER_DST}/EditorData")
 
     FileUtils.cp_r("#{PROJECTTEMPLATES_FOLDER_SRC}", "#{EDITOR_APP_FOLDER_DST}/ProjectTemplates")

Source/Atomic/Engine/Engine.cpp

@@ -215,7 +215,7 @@ bool Engine::Initialize(const VariantMap& parameters)
         resourcePrefixPath = fileSystem->GetProgramDir();
     else if (!IsAbsolutePath(resourcePrefixPath))
         resourcePrefixPath = fileSystem->GetProgramDir() + resourcePrefixPath;
-    Vector<String> resourcePaths = GetParameter(parameters, "ResourcePaths", "Data;CoreData").GetString().Split(';');
+    Vector<String> resourcePaths = GetParameter(parameters, "ResourcePaths", "CoreData").GetString().Split(';');
     Vector<String> resourcePackages = GetParameter(parameters, "ResourcePackages").GetString().Split(';');
     Vector<String> autoLoadPaths = GetParameter(parameters, "AutoloadPaths", "Autoload").GetString().Split(';');
 

Source/Atomic/IO/FileSystem.cpp

@@ -667,8 +667,7 @@ String FileSystem::GetProgramDir() const
     // current working directory instead
     /// \todo Should not rely on such fixed convention
     String currentDir = GetCurrentDir();
-    if (!DirExists(programDir_ + "CoreData") && !DirExists(programDir_ + "Data") && (DirExists(currentDir + "CoreData") ||
-        DirExists(currentDir + "Data")))
+    if (!DirExists(programDir_ + "CoreData") && (DirExists(currentDir + "CoreData")))
         programDir_ = currentDir;
     
     // Sanitate /./ construct away
@@ -772,7 +771,7 @@ void FileSystem::ScanDirInternal(Vector<String>& result, String path, const Stri
     path.Replace(String("//"), String("/"));
     path = RemoveTrailingSlash(path);
 
-    // first path is the Data/CoreData/AtomicResources folder
+    // first path is the CoreData/AtomicResources folder
     path = path.Substring(path.Find('/') + 1) + "/";
 
     String filterExtension = filter.Substring(filter.Find('.'));

Source/Atomic/Javascript/JSVM.cpp

@@ -150,8 +150,9 @@ bool JSVM::ExecuteFunction(const String& functionName)
 
 }
 
-void JSVM::GenerateComponent(const String &cname, const String &jsfilename, const String& csource)
+bool JSVM::GenerateComponent(const String &cname, const String &jsfilename, const String& csource)
 {
+
     String source = "(function() {\n function __component_function(self) {\n";
 
     source += csource.CString();
@@ -210,11 +211,14 @@ void JSVM::GenerateComponent(const String &cname, const String &jsfilename, cons
         if (!duk_is_function(ctx_, -1))
         {
             const char* error = duk_to_string(ctx_, -1);
-            assert(false);
+            SendJSErrorEvent();
         }
 
         duk_put_prop_string(ctx_, -2, cname.CString());
+        return true;
     }
+
+    return false;
 }
 
 void JSVM::InitPackageComponents()
@@ -243,7 +247,9 @@ void JSVM::InitPackageComponents()
             SharedPtr<File> jsfile(cache->GetFile(name));
             String csource;
             jsfile->ReadText(csource);
-            GenerateComponent(cname, jsname, csource);
+
+            if (!GenerateComponent(cname, jsname, csource))
+                break;
 
         }
     }
@@ -285,7 +291,8 @@ void JSVM::InitComponents()
             String csource;
             jsfile->ReadText(csource);
 
-            GenerateComponent(cname, jsname, csource);
+            if (!GenerateComponent(cname, jsname, csource))
+                break;
 
         }
 

Source/Atomic/Javascript/JSVM.h

@@ -128,7 +128,7 @@ public:
 
 private:
 
-    void GenerateComponent(const String& cname, const String& jsfilename, const String& csource);
+    bool GenerateComponent(const String& cname, const String& jsfilename, const String& csource);
 
     void InitComponents();
     void InitPackageComponents();

Source/AtomicEditor/Source/Build/BuildAndroid.cpp

@@ -50,11 +50,9 @@ void BuildAndroid::Initialize()
 #endif
 
     String projectResources = project->GetResourcePath();
-    String dataFolder = bundleResources + "Data/";
     String coreDataFolder = bundleResources + "CoreData/";
 
     AddResourceDir(coreDataFolder);
-    AddResourceDir(dataFolder);
     AddResourceDir(projectResources);
 
     BuildResourceEntries();
@@ -211,7 +209,7 @@ void BuildAndroid::RunADBInstall()
     UIModalOps* ops = GetSubsystem<UIModalOps>();
     ops->SetProgramOutputSubprocess(subprocess);
 
-    ops->PrintToProgramOutput("\n\n<color #D4FB79>Installing on Android Devices</color>\n\n");
+    ops->PrintToProgramOutput("\n\n<color #D4FB79>Installing on Android Device</color>\n\n");
 
 }
 
@@ -364,12 +362,10 @@ void BuildAndroid::Build(const String& buildPath)
 
     String androidProject = buildSourceDir + "Deployment/Android";
     String projectResources = project->GetResourcePath();
-    String dataFolder = buildSourceDir + "Data/";
     String coreDataFolder = buildSourceDir + "CoreData/";
 
     fileSystem->CopyDir(androidProject, buildPath_);
-    fileSystem->CopyDir(projectResources, buildPath_ + "/assets/AtomicResources");
-    fileSystem->CopyDir(dataFolder, buildPath_ + "/assets/Data");
+    fileSystem->CopyDir(projectResources, buildPath_ + "/assets/AtomicResources");    
     fileSystem->CopyDir(coreDataFolder, buildPath_ + "/assets/CoreData");
 
     // write the manifest

Source/AtomicEditor/Source/Build/BuildIOS.cpp

@@ -48,11 +48,9 @@ void BuildIOS::Initialize()
 #endif
 
     String projectResources = project->GetResourcePath();
-    String dataFolder = bundleResources + "Data/";
     String coreDataFolder = bundleResources + "CoreData/";
 
     AddResourceDir(coreDataFolder);
-    AddResourceDir(dataFolder);
     AddResourceDir(projectResources);
 
     BuildResourceEntries();

Source/AtomicEditor/Source/Build/BuildMac.cpp

@@ -38,11 +38,9 @@ void BuildMac::Initialize()
 #endif
 
     String projectResources = project->GetResourcePath();
-    String dataFolder = bundleResources + "Data/";
     String coreDataFolder = bundleResources + "CoreData/";
 
     AddResourceDir(coreDataFolder);
-    AddResourceDir(dataFolder);
     AddResourceDir(projectResources);
 
     BuildResourceEntries();

Source/AtomicEditor/Source/Build/BuildWeb.cpp

@@ -35,11 +35,9 @@ void BuildWeb::Initialize()
     String bundleResources = fileSystem->GetAppBundleResourceFolder();
 
     String projectResources = project->GetResourcePath();
-    String dataFolder = bundleResources + "Data/";
     String coreDataFolder = bundleResources + "CoreData/";
 
     AddResourceDir(coreDataFolder);
-    AddResourceDir(dataFolder);
     AddResourceDir(projectResources);
 
     BuildResourceEntries();

Source/AtomicEditor/Source/Build/BuildWindows.cpp

@@ -39,11 +39,9 @@ void BuildWindows::Initialize()
 #endif
 
     String projectResources = project->GetResourcePath();
-    String dataFolder = bundleResources + "Data/";
     String coreDataFolder = bundleResources + "CoreData/";
 
     AddResourceDir(coreDataFolder);
-    AddResourceDir(dataFolder);
     AddResourceDir(projectResources);
 
     BuildResourceEntries();

Source/AtomicEditor/Source/Player/AEPlayer.cpp

@@ -41,6 +41,10 @@ AEPlayer::AEPlayer(Context* context) :
     SubscribeToEvent(vm_, E_JSERROR, HANDLER(AEPlayer, HandleJSError));
 
     vm_->InitJSContext();
+
+    if (errors_.Size())
+        return;
+
     vm_->SetModuleSearchPath("Modules");
 
     duk_eval_string_noresult(vm_->GetJSContext(), "require(\"AtomicGame\"); require (\"AtomicEditor\");");
@@ -86,6 +90,10 @@ void AEPlayer::HandleJSError(StringHash eventType, VariantMap& eventData)
 
 bool AEPlayer::Play(AEPlayerMode mode, const IntRect &rect)
 {
+
+    if (errors_.Size())
+        return false;
+
     mode_ = mode;
 
     duk_context* ctx = vm_->GetJSContext();
@@ -99,8 +107,6 @@ bool AEPlayer::Play(AEPlayerMode mode, const IntRect &rect)
     Editor* editor = GetSubsystem<Editor>();
     Project* project = editor->GetProject();
 
-    String mainPath = project->GetResourcePath();
-
     bool ok = vm_->ExecuteMain();
 
     if (!ok)

Source/AtomicPlayer/AtomicPlayer.cpp

@@ -60,7 +60,7 @@ void AtomicPlayer::Setup()
 
 #if (ATOMIC_PLATFORM_ANDROID)
     engineParameters_["FullScreen"] = true;
-    engineParameters_["ResourcePaths"] = "CoreData;Data;AtomicResources";
+    engineParameters_["ResourcePaths"] = "CoreData;AtomicResources";
 #elif ATOMIC_PLATFORM_WEB
     engineParameters_["FullScreen"] = false;
     engineParameters_["ResourcePaths"] = "AtomicResources";