Browse Source

Remove a couple more Cache/ references

Josh Engebretson 10 years ago
parent
commit
5c930021e6

+ 5 - 0
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");
 

+ 1 - 1
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);

+ 1 - 4
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);