Merge pull request #401 from AtomicGameEngine/JME-ATOMIC-399

Deployment update for Cache folder

Build/Scripts/BuildMac.js

@@ -54,6 +54,11 @@ task('atomiceditor', {
     fs.copySync(atomicRoot + "Artifacts/Build/Resources/EditorData/AtomicEditor/EditorScripts",
       resourceDest + "EditorData/AtomicEditor/EditorScripts");
 
+    // copy the mac player binary to deployment
+    var playerBinary =  buildDir +  "Source/AtomicPlayer/Application/Release/AtomicPlayer.app/Contents/MacOS/AtomicPlayer";
+
+    fs.copySync(playerBinary,
+      resourceDest + "ToolData/Deployment/MacOS/AtomicPlayer.app/Contents/MacOS/AtomicPlayer");
 
     console.log("\n\nAtomic Editor build to " + editorAppFolder + "\n\n");
 

Build/Scripts/BuildWindows.js

@@ -55,6 +55,12 @@ namespace('build', function() {
       fs.copySync(atomicRoot + "Artifacts/Build/Resources/EditorData/AtomicEditor/EditorScripts",
         editorAppFolder + "Resources/EditorData/AtomicEditor/EditorScripts");
 
+      fs.copySync(buildDir +  "Source/AtomicPlayer/Application/Release/AtomicPlayer.exe",
+        editorAppFolder + "Resources/ToolData/Deployment/Windows/x64/AtomicPlayer.exe");
+
+      fs.copySync(buildDir +  "Source/AtomicPlayer/Application/Release/D3DCompiler_47.dll",
+        editorAppFolder + "Resources/ToolData/Deployment/Windows/x64/D3DCompiler_47.dll");
+
       console.log("Atomic Editor build to ", editorAppFolder);
 
       complete();

Source/Atomic/Atomic3D/Model.cpp

@@ -309,7 +309,7 @@ bool Model::BeginLoad(Deserializer& source)
     ResourceCache* cache = GetSubsystem<ResourceCache>();
     for (unsigned i = 0; i < animList.names_.Size(); ++i)
     {
-        AddAnimationResource(cache->GetResource<Animation>("Cache/" + animList.names_[i]));
+        AddAnimationResource(cache->GetResource<Animation>(animList.names_[i]));
     }
 
     SetMemoryUse(memoryUse);

Source/AtomicPlayer/Application/AtomicPlayer.cpp

@@ -78,7 +78,7 @@ void AtomicPlayerApp::Setup()
 
 #if (ATOMIC_PLATFORM_ANDROID)
     engineParameters_["FullScreen"] = true;
-    engineParameters_["ResourcePaths"] = "CoreData;PlayerData;Cache;AtomicResources";
+    engineParameters_["ResourcePaths"] = "CoreData;PlayerData;AtomicResources";
 #elif ATOMIC_PLATFORM_WEB
     engineParameters_["FullScreen"] = false;
     engineParameters_["ResourcePaths"] = "AtomicResources";

Source/ToolCore/Build/BuildBase.cpp

@@ -123,10 +123,7 @@ void BuildBase::ScanResourceDirectory(const String& resourceDir)
         newEntry->absolutePath_ = resourceDir + filename;
         newEntry->resourceDir_ = resourceDir;
 
-        if (resourceDir.EndsWith("/Cache/"))
-            newEntry->packagePath_ = "Cache/" + filename;
-        else
-            newEntry->packagePath_ = filename;
+        newEntry->packagePath_ = filename;
 
         resourceEntries_.Push(newEntry);