From 399f5cf721870308cfd970fcf8731ef8d7230b75 Mon Sep 17 00:00:00 2001 From: James Chen Date: Mon, 5 May 2014 15:11:35 +0800 Subject: [PATCH 1/3] Adds submodule for CocoStudio resources (70MB) --- .gitmodules | 3 +++ tests/cpp-tests/Resources/ccs-res | 1 + 2 files changed, 4 insertions(+) create mode 160000 tests/cpp-tests/Resources/ccs-res diff --git a/.gitmodules b/.gitmodules index 8580b9039e..76096d24b9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule "external"] path = external url = git://github.com/cocos2d/cocos2d-x-external.git +[submodule "tests/cpp-tests/Resources/ccs-res"] + path = tests/cpp-tests/Resources/ccs-res + url = git://github.com/dumganhar/ccs-res.git diff --git a/tests/cpp-tests/Resources/ccs-res b/tests/cpp-tests/Resources/ccs-res new file mode 160000 index 0000000000..b77212bf6f --- /dev/null +++ b/tests/cpp-tests/Resources/ccs-res @@ -0,0 +1 @@ +Subproject commit b77212bf6fbdc33b9e08a68ed224121ad93864e5 From 67b2fbf14bc774c58126450d2ade01aa625944d0 Mon Sep 17 00:00:00 2001 From: James Chen Date: Mon, 5 May 2014 15:24:33 +0800 Subject: [PATCH 2/3] Updates xcode project, add ccs-res folder to Resources folder --- build/cocos2d_tests.xcodeproj/project.pbxproj | 8 +++- tests/cpp-tests/Classes/AppDelegate.cpp | 45 ++++++++++--------- 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/build/cocos2d_tests.xcodeproj/project.pbxproj b/build/cocos2d_tests.xcodeproj/project.pbxproj index 6133fdc297..76a473bf11 100644 --- a/build/cocos2d_tests.xcodeproj/project.pbxproj +++ b/build/cocos2d_tests.xcodeproj/project.pbxproj @@ -177,6 +177,8 @@ 1A0EE57D18CDFBBE004CD58F /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37518CD9E180087CE3A /* Opengl.lua */; }; 1A0EE57E18CDFBBE004CD58F /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37618CD9E180087CE3A /* OpenglConstants.lua */; }; 1A0EE57F18CDFBBE004CD58F /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37718CD9E180087CE3A /* StudioConstants.lua */; }; + 1A221C9C191771E300FD2BE4 /* ccs-res in Resources */ = {isa = PBXBuildFile; fileRef = 1A221C9B191771E300FD2BE4 /* ccs-res */; }; + 1A221C9D191771E400FD2BE4 /* ccs-res in Resources */ = {isa = PBXBuildFile; fileRef = 1A221C9B191771E300FD2BE4 /* ccs-res */; }; 1A9F808D177E98A600D9A1CB /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A9F808C177E98A600D9A1CB /* libcurl.dylib */; }; 1AAF534B180E2F4E000584C8 /* libbox2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB61807A4F9005B8026 /* libbox2d Mac.a */; }; 1AAF534C180E2F4E000584C8 /* libchipmunk Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB41807A4F9005B8026 /* libchipmunk Mac.a */; }; @@ -1240,6 +1242,7 @@ 1A0EE31418CDF733004CD58F /* lua-empty-test Mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "lua-empty-test Mac.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 1A0EE41318CDF775004CD58F /* cpp-empty-test iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "cpp-empty-test iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 1A0EE47E18CDF799004CD58F /* lua-empty-test iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "lua-empty-test iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 1A221C9B191771E300FD2BE4 /* ccs-res */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "ccs-res"; path = "../tests/cpp-tests/Resources/ccs-res"; sourceTree = ""; }; 1A9F808C177E98A600D9A1CB /* libcurl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurl.dylib; path = usr/lib/libcurl.dylib; sourceTree = SDKROOT; }; 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_lua_bindings.xcodeproj; path = "../cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj"; sourceTree = ""; }; 1ABCA28618CD91510087CE3A /* lua-tests Mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "lua-tests Mac.app"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -3492,6 +3495,7 @@ children = ( 1AC35CA918CED84500F37B72 /* animations */, 1AC35CAE18CED84500F37B72 /* ccb */, + 1A221C9B191771E300FD2BE4 /* ccs-res */, 1AC35CB318CED84500F37B72 /* components */, 1AC35CB418CED84500F37B72 /* configs */, 1AC35CB818CED84500F37B72 /* extensions */, @@ -3504,10 +3508,10 @@ 1AC35CC718CED84500F37B72 /* spine */, 1AC35CC818CED84500F37B72 /* TileMaps */, 1AC35CC918CED84500F37B72 /* zwoptex */, + C08689C018D370C90093E810 /* background.caf */, 1AC35CAF18CED84500F37B72 /* CocosBuilderExample.ccbproj */, 1AC35CB018CED84500F37B72 /* CocosBuilderExample.ccbresourcelog */, 1AC35CC218CED84500F37B72 /* music.mid */, - C08689C018D370C90093E810 /* background.caf */, 1AC35CAC18CED84500F37B72 /* background.mp3 */, 1AC35CAD18CED84500F37B72 /* background.ogg */, 1AC35CB718CED84500F37B72 /* effect2.ogg */, @@ -4358,6 +4362,7 @@ 1AC35CEC18CED84500F37B72 /* fonts in Resources */, 1AC35CCA18CED84500F37B72 /* animations in Resources */, 1AC35CEA18CED84500F37B72 /* fileLookup.plist in Resources */, + 1A221C9C191771E300FD2BE4 /* ccs-res in Resources */, 1AC35CF018CED84500F37B72 /* hd in Resources */, 1AC35CFC18CED84500F37B72 /* music.mid in Resources */, 1AC35D0A18CED84500F37B72 /* zwoptex in Resources */, @@ -4384,6 +4389,7 @@ 1AC35C9618CECF1400F37B72 /* Icon-76.png in Resources */, 1AC35C8A18CECF1400F37B72 /* Default@2x.png in Resources */, 1AC35CE318CED84500F37B72 /* effect1.raw in Resources */, + 1A221C9D191771E400FD2BE4 /* ccs-res in Resources */, 1AC35C9018CECF1400F37B72 /* Icon-29.png in Resources */, 1AC35D0918CED84500F37B72 /* TileMaps in Resources */, 1AC35CFF18CED84500F37B72 /* Particles in Resources */, diff --git a/tests/cpp-tests/Classes/AppDelegate.cpp b/tests/cpp-tests/Classes/AppDelegate.cpp index b60cec502a..c9b47f1b15 100644 --- a/tests/cpp-tests/Classes/AppDelegate.cpp +++ b/tests/cpp-tests/Classes/AppDelegate.cpp @@ -72,31 +72,34 @@ bool AppDelegate::applicationDidFinishLaunching() { auto resourceSize = Size(960, 640); searchPaths.push_back("hd"); - searchPaths.push_back("hd/scenetest"); - searchPaths.push_back("hd/scenetest/ArmatureComponentTest"); - searchPaths.push_back("hd/scenetest/AttributeComponentTest"); - searchPaths.push_back("hd/scenetest/BackgroundComponentTest"); - searchPaths.push_back("hd/scenetest/EffectComponentTest"); - searchPaths.push_back("hd/scenetest/LoadSceneEdtiorFileTest"); - searchPaths.push_back("hd/scenetest/ParticleComponentTest"); - searchPaths.push_back("hd/scenetest/SpriteComponentTest"); - searchPaths.push_back("hd/scenetest/TmxMapComponentTest"); - searchPaths.push_back("hd/scenetest/UIComponentTest"); - searchPaths.push_back("hd/scenetest/TriggerTest"); + searchPaths.push_back("ccs-res/hd"); + searchPaths.push_back("ccs-res/hd/scenetest"); + searchPaths.push_back("ccs-res/hd/scenetest/ArmatureComponentTest"); + searchPaths.push_back("ccs-res/hd/scenetest/AttributeComponentTest"); + searchPaths.push_back("ccs-res/hd/scenetest/BackgroundComponentTest"); + searchPaths.push_back("ccs-res/hd/scenetest/EffectComponentTest"); + searchPaths.push_back("ccs-res/hd/scenetest/LoadSceneEdtiorFileTest"); + searchPaths.push_back("ccs-res/hd/scenetest/ParticleComponentTest"); + searchPaths.push_back("ccs-res/hd/scenetest/SpriteComponentTest"); + searchPaths.push_back("ccs-res/hd/scenetest/TmxMapComponentTest"); + searchPaths.push_back("ccs-res/hd/scenetest/UIComponentTest"); + searchPaths.push_back("ccs-res/hd/scenetest/TriggerTest"); + searchPaths.push_back("ccs-res"); director->setContentScaleFactor(resourceSize.height/designSize.height); } else { - searchPaths.push_back("scenetest/ArmatureComponentTest"); - searchPaths.push_back("scenetest/AttributeComponentTest"); - searchPaths.push_back("scenetest/BackgroundComponentTest"); - searchPaths.push_back("scenetest/EffectComponentTest"); - searchPaths.push_back("scenetest/LoadSceneEdtiorFileTest"); - searchPaths.push_back("scenetest/ParticleComponentTest"); - searchPaths.push_back("scenetest/SpriteComponentTest"); - searchPaths.push_back("scenetest/TmxMapComponentTest"); - searchPaths.push_back("scenetest/UIComponentTest"); - searchPaths.push_back("scenetest/TriggerTest"); + searchPaths.push_back("ccs-res"); + searchPaths.push_back("ccs-res/scenetest/ArmatureComponentTest"); + searchPaths.push_back("ccs-res/scenetest/AttributeComponentTest"); + searchPaths.push_back("ccs-res/scenetest/BackgroundComponentTest"); + searchPaths.push_back("ccs-res/scenetest/EffectComponentTest"); + searchPaths.push_back("ccs-res/scenetest/LoadSceneEdtiorFileTest"); + searchPaths.push_back("ccs-res/scenetest/ParticleComponentTest"); + searchPaths.push_back("ccs-res/scenetest/SpriteComponentTest"); + searchPaths.push_back("ccs-res/scenetest/TmxMapComponentTest"); + searchPaths.push_back("ccs-res/scenetest/UIComponentTest"); + searchPaths.push_back("ccs-res/scenetest/TriggerTest"); } fileUtils->setSearchPaths(searchPaths); From e31a75afba351913cbbb682d5baee8c23d7d6b02 Mon Sep 17 00:00:00 2001 From: James Chen Date: Mon, 5 May 2014 15:56:51 +0800 Subject: [PATCH 3/3] Update README.md, update branch for travis build status --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 29fa6ec6df..38f3cd75dd 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ cocos2d-x ========= -[![Build Status](https://travis-ci.org/cocos2d/cocos2d-x.png?branch=master)](https://travis-ci.org/cocos2d/cocos2d-x) +[![Build Status](https://travis-ci.org/cocos2d/cocos2d-x.png?branch=v3)](https://travis-ci.org/cocos2d/cocos2d-x) [cocos2d-x][1] is a multi-platform framework for building 2d games, interactive books, demos and other graphical applications. It is based on [cocos2d-iphone][2], but instead of using Objective-C, it uses C++.