diff --git a/samples/TestJavascript/Resources/animations/grossini.pvr.REMOVED.git-id b/samples/TestJavascript/Resources/animations/grossini.pvr.REMOVED.git-id new file mode 100644 index 0000000000..e21e7e3480 --- /dev/null +++ b/samples/TestJavascript/Resources/animations/grossini.pvr.REMOVED.git-id @@ -0,0 +1 @@ +b246dd4d711b4039b68d800f0dc098a923f5c747 \ No newline at end of file diff --git a/samples/TestJavascript/Resources/js/test-sprite.js b/samples/TestJavascript/Resources/js/test-sprite.js index 9ab2b06b67..ab6464d0dc 100644 --- a/samples/TestJavascript/Resources/js/test-sprite.js +++ b/samples/TestJavascript/Resources/js/test-sprite.js @@ -273,7 +273,7 @@ var SpriteFrameTest = function() { var sprite1 = cc.Sprite.createWithSpriteFrameName("grossini_dance_01.png"); sprite1.setPosition( cc.p( winSize.width/2-80, winSize.height/2) ); - var spritebatch = cc.SpriteBatchNode.create("animations/grossini.pvr.gz"); + var spritebatch = cc.SpriteBatchNode.create("animations/grossini.pvr"); spritebatch.addChild(sprite1); this.addChild( spritebatch ); @@ -529,7 +529,7 @@ var SpriteBatchOffsetAnchorFlip = function() { cache.addSpriteFrames("animations/grossini.plist"); cache.addSpriteFrames("animations/grossini_gray.plist", "animations/grossini_gray.png"); - var batch = cc.SpriteBatchNode.create("animations/grossini.pvr.gz"); + var batch = cc.SpriteBatchNode.create("animations/grossini.pvr"); for(var i=0;i<3;i++) { var sprite = cc.Sprite.createWithSpriteFrameName("grossini_dance_01.png"); diff --git a/samples/TestJavascript/proj.android/build_native.sh b/samples/TestJavascript/proj.android/build_native.sh index 0280a925d6..217c268791 100755 --- a/samples/TestJavascript/proj.android/build_native.sh +++ b/samples/TestJavascript/proj.android/build_native.sh @@ -67,21 +67,6 @@ if [ -f "$file" ]; then fi done -for file in "$APP_ANDROID_ROOT"/assets/Images/*; do -if [ -d "$file" ];then - cp -rf "$file" "$APP_ANDROID_ROOT"/assets -fi - -done - - -for file in "$APP_ANDROID_ROOT"/assets/Fonts/*; do -if [ -d "$file" ];then - cp -f "$file" "$APP_ANDROID_ROOT"/assets -fi - -done -rm -rf "$APP_ANDROID_ROOT"/assets/Fonts rm -f "$APP_ANDROID_ROOT"/assets/Images/landscape-1024x1024-rgba8888.pvr.gz rm -f "$APP_ANDROID_ROOT"/assets/Images/test_image_rgba4444.pvr.gz diff --git a/samples/TestJavascript/proj.ios/TestJavascript.xcodeproj/project.pbxproj b/samples/TestJavascript/proj.ios/TestJavascript.xcodeproj/project.pbxproj index d6bb78f885..d3b05e614b 100644 --- a/samples/TestJavascript/proj.ios/TestJavascript.xcodeproj/project.pbxproj +++ b/samples/TestJavascript/proj.ios/TestJavascript.xcodeproj/project.pbxproj @@ -13,7 +13,6 @@ 15426FE815B5743C00712A7F /* CocosDenshion.m in Sources */ = {isa = PBXBuildFile; fileRef = 15426FD515B5743C00712A7F /* CocosDenshion.m */; }; 15426FE915B5743C00712A7F /* SimpleAudioEngine.mm in Sources */ = {isa = PBXBuildFile; fileRef = 15426FD615B5743C00712A7F /* SimpleAudioEngine.mm */; }; 15426FEA15B5743C00712A7F /* SimpleAudioEngine_objc.m in Sources */ = {isa = PBXBuildFile; fileRef = 15426FD815B5743C00712A7F /* SimpleAudioEngine_objc.m */; }; - 15628F6B15F0F5E5000CF24B /* animations in Resources */ = {isa = PBXBuildFile; fileRef = 15628F5C15F0F5E5000CF24B /* animations */; }; 15628F6C15F0F5E5000CF24B /* ballbounce.wav in Resources */ = {isa = PBXBuildFile; fileRef = 15628F5D15F0F5E5000CF24B /* ballbounce.wav */; }; 15628F6D15F0F5E5000CF24B /* cowbell.wav in Resources */ = {isa = PBXBuildFile; fileRef = 15628F5E15F0F5E5000CF24B /* cowbell.wav */; }; 15628F6E15F0F5E5000CF24B /* Cyber Advance!.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 15628F5F15F0F5E5000CF24B /* Cyber Advance!.mp3 */; }; @@ -28,6 +27,7 @@ 15628F7715F0F5E5000CF24B /* tank.tps in Resources */ = {isa = PBXBuildFile; fileRef = 15628F6815F0F5E5000CF24B /* tank.tps */; }; 15628F7815F0F5E5000CF24B /* tank1.png in Resources */ = {isa = PBXBuildFile; fileRef = 15628F6915F0F5E5000CF24B /* tank1.png */; }; 15628F7915F0F5E5000CF24B /* TileMaps in Resources */ = {isa = PBXBuildFile; fileRef = 15628F6A15F0F5E5000CF24B /* TileMaps */; }; + 15628FA915F1057E000CF24B /* animations in Resources */ = {isa = PBXBuildFile; fileRef = 15628FA815F1057E000CF24B /* animations */; }; 2628296215EC6C1B002C4240 /* ScriptingCore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2628295315EC6C1B002C4240 /* ScriptingCore.cpp */; }; 2628296315EC6C1B002C4240 /* js_manual_conversions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2628295515EC6C1B002C4240 /* js_manual_conversions.cpp */; }; 2628296415EC6C1B002C4240 /* js_bindings_chipmunk_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2628295815EC6C1B002C4240 /* js_bindings_chipmunk_manual.cpp */; }; @@ -127,7 +127,6 @@ 15426FD615B5743C00712A7F /* SimpleAudioEngine.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SimpleAudioEngine.mm; sourceTree = ""; }; 15426FD715B5743C00712A7F /* SimpleAudioEngine_objc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimpleAudioEngine_objc.h; sourceTree = ""; }; 15426FD815B5743C00712A7F /* SimpleAudioEngine_objc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SimpleAudioEngine_objc.m; sourceTree = ""; }; - 15628F5C15F0F5E5000CF24B /* animations */ = {isa = PBXFileReference; lastKnownFileType = folder; name = animations; path = ../Resources/animations; sourceTree = ""; }; 15628F5D15F0F5E5000CF24B /* ballbounce.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = ballbounce.wav; path = ../Resources/ballbounce.wav; sourceTree = ""; }; 15628F5E15F0F5E5000CF24B /* cowbell.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = cowbell.wav; path = ../Resources/cowbell.wav; sourceTree = ""; }; 15628F5F15F0F5E5000CF24B /* Cyber Advance!.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = "Cyber Advance!.mp3"; path = "../Resources/Cyber Advance!.mp3"; sourceTree = ""; }; @@ -142,6 +141,7 @@ 15628F6815F0F5E5000CF24B /* tank.tps */ = {isa = PBXFileReference; lastKnownFileType = file; name = tank.tps; path = ../Resources/tank.tps; sourceTree = ""; }; 15628F6915F0F5E5000CF24B /* tank1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = tank1.png; path = ../Resources/tank1.png; sourceTree = ""; }; 15628F6A15F0F5E5000CF24B /* TileMaps */ = {isa = PBXFileReference; lastKnownFileType = folder; name = TileMaps; path = ../Resources/TileMaps; sourceTree = ""; }; + 15628FA815F1057E000CF24B /* animations */ = {isa = PBXFileReference; lastKnownFileType = folder; name = animations; path = ../Resources/animations; sourceTree = ""; }; 2628295015EC6C1B002C4240 /* uthash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uthash.h; sourceTree = ""; }; 2628295115EC6C1B002C4240 /* spidermonkey_specifics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = spidermonkey_specifics.h; sourceTree = ""; }; 2628295215EC6C1B002C4240 /* ScriptingCore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptingCore.h; sourceTree = ""; }; @@ -321,7 +321,7 @@ 15628F5B15F0F5C2000CF24B /* Resources */ = { isa = PBXGroup; children = ( - 15628F5C15F0F5E5000CF24B /* animations */, + 15628FA815F1057E000CF24B /* animations */, 15628F5D15F0F5E5000CF24B /* ballbounce.wav */, 15628F5E15F0F5E5000CF24B /* cowbell.wav */, 15628F5F15F0F5E5000CF24B /* Cyber Advance!.mp3 */, @@ -654,7 +654,6 @@ 262829D915EC7196002C4240 /* chipmunk.vcxproj.user in Resources */, 262829DA15EC7196002C4240 /* README.txt in Resources */, 262829DC15EC7196002C4240 /* CMakeLists.txt in Resources */, - 15628F6B15F0F5E5000CF24B /* animations in Resources */, 15628F6C15F0F5E5000CF24B /* ballbounce.wav in Resources */, 15628F6D15F0F5E5000CF24B /* cowbell.wav in Resources */, 15628F6E15F0F5E5000CF24B /* Cyber Advance!.mp3 in Resources */, @@ -669,6 +668,7 @@ 15628F7715F0F5E5000CF24B /* tank.tps in Resources */, 15628F7815F0F5E5000CF24B /* tank1.png in Resources */, 15628F7915F0F5E5000CF24B /* TileMaps in Resources */, + 15628FA915F1057E000CF24B /* animations in Resources */, ); runOnlyForDeploymentPostprocessing = 0; };