From 7dc8aeb156a200d1626a9929d69b682deb6763e7 Mon Sep 17 00:00:00 2001 From: James Chen Date: Wed, 16 Oct 2013 11:19:01 +0800 Subject: [PATCH] issue #2905: Updating include path for 'cocostudio' module, adding 'cocostudio' prefix. --- .../cocostudio/action/CCActionFrameEasing.cpp | 2 +- .../cocostudio/action/CCActionFrameEasing.h | 2 +- .../cocostudio/action/CCActionManagerEx.cpp | 2 +- .../cocostudio/action/CCActionManagerEx.h | 2 +- .../cocostudio/action/CCActionNode.cpp | 2 +- .../cocostudio/action/CCActionNode.h | 2 +- .../cocostudio/action/CCActionObject.cpp | 2 +- .../cocostudio/action/CCActionObject.h | 2 +- .../animation/CCArmatureAnimation.cpp | 10 +- .../armature/animation/CCProcessBase.cpp | 2 +- .../armature/animation/CCProcessBase.h | 4 +- .../cocostudio/armature/animation/CCTween.cpp | 10 +- .../cocostudio/armature/animation/CCTween.h | 2 +- .../cocostudio/armature/datas/CCDatas.cpp | 4 +- .../cocostudio/armature/datas/CCDatas.h | 4 +- .../armature/display/CCBatchNode.cpp | 4 +- .../cocostudio/armature/display/CCBatchNode.h | 2 +- .../armature/display/CCDecorativeDisplay.h | 4 +- .../armature/display/CCDisplayFactory.cpp | 12 +- .../armature/display/CCDisplayFactory.h | 4 +- .../armature/display/CCDisplayManager.cpp | 8 +- .../armature/display/CCDisplayManager.h | 6 +- .../cocostudio/armature/display/CCSkin.cpp | 6 +- .../cocostudio/armature/display/CCSkin.h | 4 +- .../armature/physics/CCColliderDetector.cpp | 4 +- .../armature/physics/CCColliderDetector.h | 4 +- .../armature/utils/CCArmatureDataManager.h | 2 +- .../armature/utils/CCDataReaderHelper.cpp | 2 +- .../armature/utils/CCDataReaderHelper.h | 6 +- .../armature/utils/CCTransformHelp.h | 2 +- .../cocostudio/components/CCComAttribute.h | 2 +- .../cocostudio/json/CSContentJsonDictionary.h | 2 +- .../cocostudio/reader/CCSGUIReader.cpp | 4 +- .../cocostudio/reader/CCSGUIReader.h | 2 +- .../cocostudio/reader/CCSSceneReader.h | 2 +- cocos/gui/layouts/Layout.cpp | 2 +- cocos/gui/system/CocosGUI.h | 2 +- cocos/gui/system/UIHelper.cpp | 4 +- cocos/gui/system/UIHelper.h | 2 +- cocos/gui/widgets/UIButton.cpp | 2 +- cocos/gui/widgets/UIImageView.cpp | 2 +- cocos/gui/widgets/UILoadingBar.cpp | 2 +- cocos/gui/widgets/UISlider.cpp | 2 +- samples/Cpp/TestCpp/Android.mk | 262 +++++++++--------- samples/Cpp/TestCpp/Classes/AppDelegate.cpp | 3 +- .../CocoStudioArmatureTest/ArmatureScene.cpp | 2 +- .../CocoStudioArmatureTest/ArmatureScene.h | 2 +- .../EnemyController.h | 2 +- .../PlayerController.h | 2 +- .../ProjectileController.h | 2 +- .../SceneController.h | 2 +- .../CocoStudioGUITest/CocosGUIScene.cpp | 3 +- .../CocoStudioSceneTest/SceneEditorTest.cpp | 2 +- .../AnimationsTest/AnimationsTestLayer.h | 2 +- .../ButtonTest/ButtonTestLayer.h | 2 +- .../HelloCocosBuilderLayer.h | 2 +- .../CocosBuilderTest/MenuTest/MenuTestLayer.h | 2 +- .../TestHeader/TestHeaderLayer.h | 2 +- .../TimelineCallbackTestLayer.h | 2 +- samples/Cpp/TestCpp/Classes/testBasic.cpp | 2 +- 60 files changed, 224 insertions(+), 224 deletions(-) diff --git a/cocos/editor-support/cocostudio/action/CCActionFrameEasing.cpp b/cocos/editor-support/cocostudio/action/CCActionFrameEasing.cpp index 1e6513b56c..74c7467c71 100644 --- a/cocos/editor-support/cocostudio/action/CCActionFrameEasing.cpp +++ b/cocos/editor-support/cocostudio/action/CCActionFrameEasing.cpp @@ -24,7 +24,7 @@ #include #include "CCActionFrameEasing.h" -#include "json/DictionaryHelper.h" +#include "cocostudio/json/DictionaryHelper.h" namespace cocostudio { #ifndef M_PI_X_2 diff --git a/cocos/editor-support/cocostudio/action/CCActionFrameEasing.h b/cocos/editor-support/cocostudio/action/CCActionFrameEasing.h index aa6fd570e4..74ba932d4c 100644 --- a/cocos/editor-support/cocostudio/action/CCActionFrameEasing.h +++ b/cocos/editor-support/cocostudio/action/CCActionFrameEasing.h @@ -26,7 +26,7 @@ #define __ActionFrameEasing_H__ #include "cocos2d.h" -#include "json/CSContentJsonDictionary.h" +#include "cocostudio/json/CSContentJsonDictionary.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/action/CCActionManagerEx.cpp b/cocos/editor-support/cocostudio/action/CCActionManagerEx.cpp index 8d842715b1..b863c1f9a2 100644 --- a/cocos/editor-support/cocostudio/action/CCActionManagerEx.cpp +++ b/cocos/editor-support/cocostudio/action/CCActionManagerEx.cpp @@ -23,7 +23,7 @@ ****************************************************************************/ #include "CCActionManagerEx.h" -#include "json/DictionaryHelper.h" +#include "cocostudio/json/DictionaryHelper.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/action/CCActionManagerEx.h b/cocos/editor-support/cocostudio/action/CCActionManagerEx.h index 4c757dfa37..8776fce030 100644 --- a/cocos/editor-support/cocostudio/action/CCActionManagerEx.h +++ b/cocos/editor-support/cocostudio/action/CCActionManagerEx.h @@ -27,7 +27,7 @@ #include "cocos2d.h" #include "CCActionObject.h" -#include "json/CSContentJsonDictionary.h" +#include "cocostudio/json/CSContentJsonDictionary.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/action/CCActionNode.cpp b/cocos/editor-support/cocostudio/action/CCActionNode.cpp index ca7db6cc5f..1390d64ed6 100644 --- a/cocos/editor-support/cocostudio/action/CCActionNode.cpp +++ b/cocos/editor-support/cocostudio/action/CCActionNode.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "CCActionFrameEasing.h" #include "base-classes/UIWidget.h" #include "system/UIHelper.h" -#include "json/DictionaryHelper.h" +#include "cocostudio/json/DictionaryHelper.h" using namespace cocos2d; using namespace gui; diff --git a/cocos/editor-support/cocostudio/action/CCActionNode.h b/cocos/editor-support/cocostudio/action/CCActionNode.h index 9e69981bbb..67a424bda8 100644 --- a/cocos/editor-support/cocostudio/action/CCActionNode.h +++ b/cocos/editor-support/cocostudio/action/CCActionNode.h @@ -27,7 +27,7 @@ #include "cocos2d.h" #include "CCActionFrame.h" -#include "json/CSContentJsonDictionary.h" +#include "cocostudio/json/CSContentJsonDictionary.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/action/CCActionObject.cpp b/cocos/editor-support/cocostudio/action/CCActionObject.cpp index c649268a23..e218dca888 100644 --- a/cocos/editor-support/cocostudio/action/CCActionObject.cpp +++ b/cocos/editor-support/cocostudio/action/CCActionObject.cpp @@ -23,7 +23,7 @@ ****************************************************************************/ #include "CCActionObject.h" -#include "json/DictionaryHelper.h" +#include "cocostudio/json/DictionaryHelper.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/action/CCActionObject.h b/cocos/editor-support/cocostudio/action/CCActionObject.h index 34807e2127..7137f57355 100644 --- a/cocos/editor-support/cocostudio/action/CCActionObject.h +++ b/cocos/editor-support/cocostudio/action/CCActionObject.h @@ -27,7 +27,7 @@ #include "cocos2d.h" #include "CCActionNode.h" -#include "json/CSContentJsonDictionary.h" +#include "cocostudio/json/CSContentJsonDictionary.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/armature/animation/CCArmatureAnimation.cpp b/cocos/editor-support/cocostudio/armature/animation/CCArmatureAnimation.cpp index 4c42af7d1e..5490b4f4ee 100644 --- a/cocos/editor-support/cocostudio/armature/animation/CCArmatureAnimation.cpp +++ b/cocos/editor-support/cocostudio/armature/animation/CCArmatureAnimation.cpp @@ -23,11 +23,11 @@ THE SOFTWARE. ****************************************************************************/ #include "CCArmatureAnimation.h" -#include "armature/CCArmature.h" -#include "armature/CCBone.h" -#include "armature/utils/CCArmatureDefine.h" -#include "armature/utils/CCUtilMath.h" -#include "armature/datas/CCDatas.h" +#include "cocostudio/armature/CCArmature.h" +#include "cocostudio/armature/CCBone.h" +#include "cocostudio/armature/utils/CCArmatureDefine.h" +#include "cocostudio/armature/utils/CCUtilMath.h" +#include "cocostudio/armature/datas/CCDatas.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/armature/animation/CCProcessBase.cpp b/cocos/editor-support/cocostudio/armature/animation/CCProcessBase.cpp index a30f68abd4..e235c1cb1e 100644 --- a/cocos/editor-support/cocostudio/armature/animation/CCProcessBase.cpp +++ b/cocos/editor-support/cocostudio/armature/animation/CCProcessBase.cpp @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ #include "CCProcessBase.h" -#include "armature/utils/CCUtilMath.h" +#include "cocostudio/armature/utils/CCUtilMath.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/armature/animation/CCProcessBase.h b/cocos/editor-support/cocostudio/armature/animation/CCProcessBase.h index dbde23dd1f..3d247e51a4 100644 --- a/cocos/editor-support/cocostudio/armature/animation/CCProcessBase.h +++ b/cocos/editor-support/cocostudio/armature/animation/CCProcessBase.h @@ -26,8 +26,8 @@ THE SOFTWARE. #ifndef __CCPROCESSBASE_H__ #define __CCPROCESSBASE_H__ -#include "armature/utils/CCArmatureDefine.h" -#include "armature/datas/CCDatas.h" +#include "cocostudio/armature/utils/CCArmatureDefine.h" +#include "cocostudio/armature/datas/CCDatas.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/armature/animation/CCTween.cpp b/cocos/editor-support/cocostudio/armature/animation/CCTween.cpp index 23896d1e8b..c9ba8cbe6e 100644 --- a/cocos/editor-support/cocostudio/armature/animation/CCTween.cpp +++ b/cocos/editor-support/cocostudio/armature/animation/CCTween.cpp @@ -25,11 +25,11 @@ THE SOFTWARE. #include "CCTween.h" #include "CCArmatureAnimation.h" -#include "armature/CCBone.h" -#include "armature/CCArmature.h" -#include "armature/utils/CCUtilMath.h" -#include "armature/utils/CCTweenFunction.h" -#include "armature/utils/CCTransformHelp.h" +#include "cocostudio/armature/CCBone.h" +#include "cocostudio/armature/CCArmature.h" +#include "cocostudio/armature/utils/CCUtilMath.h" +#include "cocostudio/armature/utils/CCTweenFunction.h" +#include "cocostudio/armature/utils/CCTransformHelp.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/armature/animation/CCTween.h b/cocos/editor-support/cocostudio/armature/animation/CCTween.h index bcbdde822c..f78e7ef927 100644 --- a/cocos/editor-support/cocostudio/armature/animation/CCTween.h +++ b/cocos/editor-support/cocostudio/armature/animation/CCTween.h @@ -27,7 +27,7 @@ THE SOFTWARE. #define __CCTWEEN_H__ #include "CCProcessBase.h" -#include "armature/utils/CCTweenFunction.h" +#include "cocostudio/armature/utils/CCTweenFunction.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/armature/datas/CCDatas.cpp b/cocos/editor-support/cocostudio/armature/datas/CCDatas.cpp index e03213ab8a..6d2468cb58 100644 --- a/cocos/editor-support/cocostudio/armature/datas/CCDatas.cpp +++ b/cocos/editor-support/cocostudio/armature/datas/CCDatas.cpp @@ -23,8 +23,8 @@ THE SOFTWARE. ****************************************************************************/ #include "CCDatas.h" -#include "armature/utils/CCUtilMath.h" -#include "armature/utils/CCTransformHelp.h" +#include "cocostudio/armature/utils/CCUtilMath.h" +#include "cocostudio/armature/utils/CCTransformHelp.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/armature/datas/CCDatas.h b/cocos/editor-support/cocostudio/armature/datas/CCDatas.h index 81fca8ebcb..2725750c84 100644 --- a/cocos/editor-support/cocostudio/armature/datas/CCDatas.h +++ b/cocos/editor-support/cocostudio/armature/datas/CCDatas.h @@ -25,8 +25,8 @@ THE SOFTWARE. #ifndef __CCARMATURE_DATAS_H__ #define __CCARMATURE_DATAS_H__ -#include "armature/utils/CCArmatureDefine.h" -#include "armature/utils/CCTweenFunction.h" +#include "cocostudio/armature/utils/CCArmatureDefine.h" +#include "cocostudio/armature/utils/CCTweenFunction.h" #define CC_CREATE_NO_PARAM_NO_INIT(varType)\ diff --git a/cocos/editor-support/cocostudio/armature/display/CCBatchNode.cpp b/cocos/editor-support/cocostudio/armature/display/CCBatchNode.cpp index 04ae69a524..ba273731b1 100644 --- a/cocos/editor-support/cocostudio/armature/display/CCBatchNode.cpp +++ b/cocos/editor-support/cocostudio/armature/display/CCBatchNode.cpp @@ -23,8 +23,8 @@ THE SOFTWARE. ****************************************************************************/ #include "CCBatchNode.h" -#include "armature/utils/CCArmatureDefine.h" -#include "armature/CCArmature.h" +#include "cocostudio/armature/utils/CCArmatureDefine.h" +#include "cocostudio/armature/CCArmature.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/armature/display/CCBatchNode.h b/cocos/editor-support/cocostudio/armature/display/CCBatchNode.h index fac221adb6..7e0c52bc29 100644 --- a/cocos/editor-support/cocostudio/armature/display/CCBatchNode.h +++ b/cocos/editor-support/cocostudio/armature/display/CCBatchNode.h @@ -25,7 +25,7 @@ THE SOFTWARE. #ifndef __CCBATCHNODE_H__ #define __CCBATCHNODE_H__ -#include "armature/utils/CCArmatureDefine.h" +#include "cocostudio/armature/utils/CCArmatureDefine.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/armature/display/CCDecorativeDisplay.h b/cocos/editor-support/cocostudio/armature/display/CCDecorativeDisplay.h index 3b42c9c64e..f65f143163 100644 --- a/cocos/editor-support/cocostudio/armature/display/CCDecorativeDisplay.h +++ b/cocos/editor-support/cocostudio/armature/display/CCDecorativeDisplay.h @@ -25,9 +25,9 @@ THE SOFTWARE. #ifndef __CCDECORATIVEDISPLAY_H__ #define __CCDECORATIVEDISPLAY_H__ -#include "armature/utils/CCArmatureDefine.h" +#include "cocostudio/armature/utils/CCArmatureDefine.h" #include "CCDisplayFactory.h" -#include "armature/datas/CCDatas.h" +#include "cocostudio/armature/datas/CCDatas.h" #if ENABLE_PHYSICS_BOX2D_DETECT || ENABLE_PHYSICS_CHIPMUNK_DETECT diff --git a/cocos/editor-support/cocostudio/armature/display/CCDisplayFactory.cpp b/cocos/editor-support/cocostudio/armature/display/CCDisplayFactory.cpp index 30d3184ff8..56e5f8c427 100644 --- a/cocos/editor-support/cocostudio/armature/display/CCDisplayFactory.cpp +++ b/cocos/editor-support/cocostudio/armature/display/CCDisplayFactory.cpp @@ -23,12 +23,12 @@ THE SOFTWARE. ****************************************************************************/ #include "CCDisplayFactory.h" -#include "armature/CCBone.h" -#include "armature/CCArmature.h" -#include "armature/display/CCSkin.h" -#include "armature/utils/CCSpriteFrameCacheHelper.h" -#include "armature/utils/CCArmatureDataManager.h" -#include "armature/utils/CCTransformHelp.h" +#include "cocostudio/armature/CCBone.h" +#include "cocostudio/armature/CCArmature.h" +#include "cocostudio/armature/display/CCSkin.h" +#include "cocostudio/armature/utils/CCSpriteFrameCacheHelper.h" +#include "cocostudio/armature/utils/CCArmatureDataManager.h" +#include "cocostudio/armature/utils/CCTransformHelp.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/armature/display/CCDisplayFactory.h b/cocos/editor-support/cocostudio/armature/display/CCDisplayFactory.h index 80aa33680d..f8f6009ffb 100644 --- a/cocos/editor-support/cocostudio/armature/display/CCDisplayFactory.h +++ b/cocos/editor-support/cocostudio/armature/display/CCDisplayFactory.h @@ -25,8 +25,8 @@ THE SOFTWARE. #ifndef __CCDISPLAYFACTORY_H__ #define __CCDISPLAYFACTORY_H__ -#include "armature/utils/CCArmatureDefine.h" -#include "armature/datas/CCDatas.h" +#include "cocostudio/armature/utils/CCArmatureDefine.h" +#include "cocostudio/armature/datas/CCDatas.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/armature/display/CCDisplayManager.cpp b/cocos/editor-support/cocostudio/armature/display/CCDisplayManager.cpp index da87bea351..29ae581cbb 100644 --- a/cocos/editor-support/cocostudio/armature/display/CCDisplayManager.cpp +++ b/cocos/editor-support/cocostudio/armature/display/CCDisplayManager.cpp @@ -23,10 +23,10 @@ THE SOFTWARE. ****************************************************************************/ #include "CCDisplayManager.h" -#include "armature/CCBone.h" -#include "armature/CCArmature.h" -#include "armature/utils/CCUtilMath.h" -#include "armature/display/CCSkin.h" +#include "cocostudio/armature/CCBone.h" +#include "cocostudio/armature/CCArmature.h" +#include "cocostudio/armature/utils/CCUtilMath.h" +#include "cocostudio/armature/display/CCSkin.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/armature/display/CCDisplayManager.h b/cocos/editor-support/cocostudio/armature/display/CCDisplayManager.h index 2e9eb217fc..fd51ca759b 100644 --- a/cocos/editor-support/cocostudio/armature/display/CCDisplayManager.h +++ b/cocos/editor-support/cocostudio/armature/display/CCDisplayManager.h @@ -25,9 +25,9 @@ THE SOFTWARE. #ifndef __CCDISPLAYMANAGER_H__ #define __CCDISPLAYMANAGER_H__ -#include "armature/utils/CCArmatureDefine.h" -#include "armature/display/CCDecorativeDisplay.h" -#include "armature/datas/CCDatas.h" +#include "cocostudio/armature/utils/CCArmatureDefine.h" +#include "cocostudio/armature/display/CCDecorativeDisplay.h" +#include "cocostudio/armature/datas/CCDatas.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/armature/display/CCSkin.cpp b/cocos/editor-support/cocostudio/armature/display/CCSkin.cpp index cd91c18ef4..ecc83c7ff6 100644 --- a/cocos/editor-support/cocostudio/armature/display/CCSkin.cpp +++ b/cocos/editor-support/cocostudio/armature/display/CCSkin.cpp @@ -23,9 +23,9 @@ THE SOFTWARE. ****************************************************************************/ #include "CCSkin.h" -#include "armature/utils/CCTransformHelp.h" -#include "armature/utils/CCSpriteFrameCacheHelper.h" -#include "armature/CCArmature.h" +#include "cocostudio/armature/utils/CCTransformHelp.h" +#include "cocostudio/armature/utils/CCSpriteFrameCacheHelper.h" +#include "cocostudio/armature/CCArmature.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/armature/display/CCSkin.h b/cocos/editor-support/cocostudio/armature/display/CCSkin.h index 4c20063bed..1915ff550b 100644 --- a/cocos/editor-support/cocostudio/armature/display/CCSkin.h +++ b/cocos/editor-support/cocostudio/armature/display/CCSkin.h @@ -25,8 +25,8 @@ THE SOFTWARE. #ifndef __CCSKIN_H__ #define __CCSKIN_H__ -#include "armature/utils/CCArmatureDefine.h" -#include "armature/CCBone.h" +#include "cocostudio/armature/utils/CCArmatureDefine.h" +#include "cocostudio/armature/CCBone.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/armature/physics/CCColliderDetector.cpp b/cocos/editor-support/cocostudio/armature/physics/CCColliderDetector.cpp index 8d4dbf60cd..f7e0c1c500 100644 --- a/cocos/editor-support/cocostudio/armature/physics/CCColliderDetector.cpp +++ b/cocos/editor-support/cocostudio/armature/physics/CCColliderDetector.cpp @@ -23,8 +23,8 @@ THE SOFTWARE. ****************************************************************************/ #include "CCColliderDetector.h" -#include "armature/CCBone.h" -#include "armature/utils/CCTransformHelp.h" +#include "cocostudio/armature/CCBone.h" +#include "cocostudio/armature/utils/CCTransformHelp.h" #if ENABLE_PHYSICS_BOX2D_DETECT #include "Box2D/Box2D.h" diff --git a/cocos/editor-support/cocostudio/armature/physics/CCColliderDetector.h b/cocos/editor-support/cocostudio/armature/physics/CCColliderDetector.h index 725036fddf..5febb92aef 100644 --- a/cocos/editor-support/cocostudio/armature/physics/CCColliderDetector.h +++ b/cocos/editor-support/cocostudio/armature/physics/CCColliderDetector.h @@ -25,8 +25,8 @@ THE SOFTWARE. #ifndef __CCCOLLIDERDETECTOR_H__ #define __CCCOLLIDERDETECTOR_H__ -#include "armature/utils/CCArmatureDefine.h" -#include "armature/datas/CCDatas.h" +#include "cocostudio/armature/utils/CCArmatureDefine.h" +#include "cocostudio/armature/datas/CCDatas.h" #ifndef PT_RATIO #define PT_RATIO 32 diff --git a/cocos/editor-support/cocostudio/armature/utils/CCArmatureDataManager.h b/cocos/editor-support/cocostudio/armature/utils/CCArmatureDataManager.h index b3122d34f2..016156bec0 100644 --- a/cocos/editor-support/cocostudio/armature/utils/CCArmatureDataManager.h +++ b/cocos/editor-support/cocostudio/armature/utils/CCArmatureDataManager.h @@ -26,7 +26,7 @@ THE SOFTWARE. #define __CCARMATUREDATAMANAGER_H__ #include "CCArmatureDefine.h" -#include "armature/datas/CCDatas.h" +#include "cocostudio/armature/datas/CCDatas.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/armature/utils/CCDataReaderHelper.cpp b/cocos/editor-support/cocostudio/armature/utils/CCDataReaderHelper.cpp index 67d0264825..d1dc3e0655 100644 --- a/cocos/editor-support/cocostudio/armature/utils/CCDataReaderHelper.cpp +++ b/cocos/editor-support/cocostudio/armature/utils/CCDataReaderHelper.cpp @@ -28,7 +28,7 @@ THE SOFTWARE. #include "CCTransformHelp.h" #include "CCUtilMath.h" #include "CCArmatureDefine.h" -#include "armature/datas/CCDatas.h" +#include "cocostudio/armature/datas/CCDatas.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/armature/utils/CCDataReaderHelper.h b/cocos/editor-support/cocostudio/armature/utils/CCDataReaderHelper.h index d7f8a9f19e..be8b4c9297 100644 --- a/cocos/editor-support/cocostudio/armature/utils/CCDataReaderHelper.h +++ b/cocos/editor-support/cocostudio/armature/utils/CCDataReaderHelper.h @@ -26,9 +26,9 @@ THE SOFTWARE. #define __CCDATAREADERHELPER_H__ #include "CCArmatureDefine.h" -#include "armature/datas/CCDatas.h" -#include "armature/CCArmature.h" -#include "json/CSContentJsonDictionary.h" +#include "cocostudio/armature/datas/CCDatas.h" +#include "cocostudio/armature/CCArmature.h" +#include "cocostudio/json/CSContentJsonDictionary.h" #include #include diff --git a/cocos/editor-support/cocostudio/armature/utils/CCTransformHelp.h b/cocos/editor-support/cocostudio/armature/utils/CCTransformHelp.h index 540b62f1a3..195d5a1468 100644 --- a/cocos/editor-support/cocostudio/armature/utils/CCTransformHelp.h +++ b/cocos/editor-support/cocostudio/armature/utils/CCTransformHelp.h @@ -26,7 +26,7 @@ THE SOFTWARE. #define __CCTRANSFORMHELP_H__ #include "CCArmatureDefine.h" -#include "armature/datas/CCDatas.h" +#include "cocostudio/armature/datas/CCDatas.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/components/CCComAttribute.h b/cocos/editor-support/cocostudio/components/CCComAttribute.h index d36ce4ebb2..959e8ac1b8 100644 --- a/cocos/editor-support/cocostudio/components/CCComAttribute.h +++ b/cocos/editor-support/cocostudio/components/CCComAttribute.h @@ -27,7 +27,7 @@ THE SOFTWARE. #include "cocos2d.h" #include -#include "json/CSContentJsonDictionary.h" +#include "cocostudio/json/CSContentJsonDictionary.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/json/CSContentJsonDictionary.h b/cocos/editor-support/cocostudio/json/CSContentJsonDictionary.h index e3815ae2a6..f8f047b19a 100644 --- a/cocos/editor-support/cocostudio/json/CSContentJsonDictionary.h +++ b/cocos/editor-support/cocostudio/json/CSContentJsonDictionary.h @@ -28,7 +28,7 @@ #define COCOSTUDIO_CSCONTENTJSONDICTIONARY_H -#include "json.h" +#include "json/json.h" #include #include diff --git a/cocos/editor-support/cocostudio/reader/CCSGUIReader.cpp b/cocos/editor-support/cocostudio/reader/CCSGUIReader.cpp index 3ee822c330..ad0eb9ef8d 100755 --- a/cocos/editor-support/cocostudio/reader/CCSGUIReader.cpp +++ b/cocos/editor-support/cocostudio/reader/CCSGUIReader.cpp @@ -23,8 +23,8 @@ ****************************************************************************/ #include "system/CocosGUI.h" -#include "json/DictionaryHelper.h" -#include "action/CCActionManagerEx.h" +#include "cocostudio/json/DictionaryHelper.h" +#include "cocostudio/action/CCActionManagerEx.h" #include #include diff --git a/cocos/editor-support/cocostudio/reader/CCSGUIReader.h b/cocos/editor-support/cocostudio/reader/CCSGUIReader.h index 43c0c9693c..0041997bcd 100755 --- a/cocos/editor-support/cocostudio/reader/CCSGUIReader.h +++ b/cocos/editor-support/cocostudio/reader/CCSGUIReader.h @@ -26,7 +26,7 @@ #define __CCSGUIREADER_H__ #include "base-classes/UIWidget.h" -#include "json/CSContentJsonDictionary.h" +#include "cocostudio/json/CSContentJsonDictionary.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/reader/CCSSceneReader.h b/cocos/editor-support/cocostudio/reader/CCSSceneReader.h index ca95088c59..a042edfbf2 100644 --- a/cocos/editor-support/cocostudio/reader/CCSSceneReader.h +++ b/cocos/editor-support/cocostudio/reader/CCSSceneReader.h @@ -26,7 +26,7 @@ #define __CCSSCENEREADER_H__ #include "cocos2d.h" - #include "json/CSContentJsonDictionary.h" + #include "cocostudio/json/CSContentJsonDictionary.h" namespace cocostudio { diff --git a/cocos/gui/layouts/Layout.cpp b/cocos/gui/layouts/Layout.cpp index 6403262bd9..25e3833bb6 100644 --- a/cocos/gui/layouts/Layout.cpp +++ b/cocos/gui/layouts/Layout.cpp @@ -25,7 +25,7 @@ #include "layout.h" #include "system/UILayer.h" #include "system/UIHelper.h" -#include "GUI/CCControlExtension/CCScale9Sprite.h" +#include "extensions/GUI/CCControlExtension/CCScale9Sprite.h" using namespace cocos2d; using namespace cocos2d::extension; diff --git a/cocos/gui/system/CocosGUI.h b/cocos/gui/system/CocosGUI.h index 97046adde2..2c7c6c915b 100644 --- a/cocos/gui/system/CocosGUI.h +++ b/cocos/gui/system/CocosGUI.h @@ -43,7 +43,7 @@ #include "widgets/UILabelBMFont.h" #include "widgets/scroll-widget/UIPageView.h" #include "UIHelper.h" -#include "reader/CCSGUIReader.h" +#include "cocostudio/reader/CCSGUIReader.h" #include "UILayer.h" namespace gui { diff --git a/cocos/gui/system/UIHelper.cpp b/cocos/gui/system/UIHelper.cpp index c023bf23bf..fd6326b851 100644 --- a/cocos/gui/system/UIHelper.cpp +++ b/cocos/gui/system/UIHelper.cpp @@ -23,9 +23,9 @@ ****************************************************************************/ #include "UIHelper.h" -#include "json/DictionaryHelper.h" +#include "cocostudio/json/DictionaryHelper.h" #include "cocos2d.h" -#include "reader/CCSGUIReader.h" +#include "cocostudio/reader/CCSGUIReader.h" using namespace cocos2d; using namespace cocostudio; diff --git a/cocos/gui/system/UIHelper.h b/cocos/gui/system/UIHelper.h index 15487fbf60..e13f8d74f3 100644 --- a/cocos/gui/system/UIHelper.h +++ b/cocos/gui/system/UIHelper.h @@ -26,7 +26,7 @@ #define __UIHELPER_H__ #include "UIInputManager.h" -#include "json/CSContentJsonDictionary.h" +#include "cocostudio/json/CSContentJsonDictionary.h" #define CCUIHELPER gui::UIHelper::instance() diff --git a/cocos/gui/widgets/UIButton.cpp b/cocos/gui/widgets/UIButton.cpp index 7325007d27..47b6a03492 100644 --- a/cocos/gui/widgets/UIButton.cpp +++ b/cocos/gui/widgets/UIButton.cpp @@ -23,7 +23,7 @@ ****************************************************************************/ #include "UIButton.h" -#include "GUI/CCControlExtension/CCScale9Sprite.h" +#include "extensions/GUI/CCControlExtension/CCScale9Sprite.h" using namespace cocos2d; using namespace cocos2d::extension; diff --git a/cocos/gui/widgets/UIImageView.cpp b/cocos/gui/widgets/UIImageView.cpp index 89491f8141..88625107fa 100644 --- a/cocos/gui/widgets/UIImageView.cpp +++ b/cocos/gui/widgets/UIImageView.cpp @@ -23,7 +23,7 @@ ****************************************************************************/ #include "UIImageView.h" -#include "GUI/CCControlExtension/CCScale9Sprite.h" +#include "extensions/GUI/CCControlExtension/CCScale9Sprite.h" using namespace cocos2d; using namespace cocos2d::extension; diff --git a/cocos/gui/widgets/UILoadingBar.cpp b/cocos/gui/widgets/UILoadingBar.cpp index 8037d1df33..c3f3167d60 100644 --- a/cocos/gui/widgets/UILoadingBar.cpp +++ b/cocos/gui/widgets/UILoadingBar.cpp @@ -23,7 +23,7 @@ ****************************************************************************/ #include "UILoadingBar.h" -#include "GUI/CCControlExtension/CCScale9Sprite.h" +#include "extensions/GUI/CCControlExtension/CCScale9Sprite.h" using namespace cocos2d; using namespace cocos2d::extension; diff --git a/cocos/gui/widgets/UISlider.cpp b/cocos/gui/widgets/UISlider.cpp index dcadbc2132..8409c0eb3c 100644 --- a/cocos/gui/widgets/UISlider.cpp +++ b/cocos/gui/widgets/UISlider.cpp @@ -23,7 +23,7 @@ ****************************************************************************/ #include "UISlider.h" -#include "GUI/CCControlExtension/CCScale9Sprite.h" +#include "extensions/GUI/CCControlExtension/CCScale9Sprite.h" using namespace cocos2d; using namespace cocos2d::extension; diff --git a/samples/Cpp/TestCpp/Android.mk b/samples/Cpp/TestCpp/Android.mk index 9ed6038242..81e523e55f 100644 --- a/samples/Cpp/TestCpp/Android.mk +++ b/samples/Cpp/TestCpp/Android.mk @@ -7,137 +7,137 @@ LOCAL_MODULE := cocos_testcpp_common LOCAL_MODULE_FILENAME := libtestcppcommon LOCAL_SRC_FILES := \ -$(LOCAL_PATH)/Classes/AppDelegate.cpp \ -$(LOCAL_PATH)/Classes/BaseTest.cpp \ -$(LOCAL_PATH)/Classes/controller.cpp \ -$(LOCAL_PATH)/Classes/testBasic.cpp \ -$(LOCAL_PATH)/Classes/VisibleRect.cpp \ -$(LOCAL_PATH)/Classes/AccelerometerTest/AccelerometerTest.cpp \ -$(LOCAL_PATH)/Classes/ActionManagerTest/ActionManagerTest.cpp \ -$(LOCAL_PATH)/Classes/ActionsEaseTest/ActionsEaseTest.cpp \ -$(LOCAL_PATH)/Classes/ActionsProgressTest/ActionsProgressTest.cpp \ -$(LOCAL_PATH)/Classes/ActionsTest/ActionsTest.cpp \ -$(LOCAL_PATH)/Classes/Box2DTest/Box2dTest.cpp \ -$(LOCAL_PATH)/Classes/Box2DTestBed/Box2dView.cpp \ -$(LOCAL_PATH)/Classes/Box2DTestBed/GLES-Render.cpp \ -$(LOCAL_PATH)/Classes/Box2DTestBed/Test.cpp \ -$(LOCAL_PATH)/Classes/Box2DTestBed/TestEntries.cpp \ -$(LOCAL_PATH)/Classes/BugsTest/Bug-1159.cpp \ -$(LOCAL_PATH)/Classes/BugsTest/Bug-1174.cpp \ -$(LOCAL_PATH)/Classes/BugsTest/Bug-350.cpp \ -$(LOCAL_PATH)/Classes/BugsTest/Bug-422.cpp \ -$(LOCAL_PATH)/Classes/BugsTest/Bug-624.cpp \ -$(LOCAL_PATH)/Classes/BugsTest/Bug-886.cpp \ -$(LOCAL_PATH)/Classes/BugsTest/Bug-899.cpp \ -$(LOCAL_PATH)/Classes/BugsTest/Bug-914.cpp \ -$(LOCAL_PATH)/Classes/BugsTest/BugsTest.cpp \ -$(LOCAL_PATH)/Classes/BugsTest/Bug-458/Bug-458.cpp \ -$(LOCAL_PATH)/Classes/BugsTest/Bug-458/QuestionContainerSprite.cpp \ -$(LOCAL_PATH)/Classes/ChipmunkTest/ChipmunkTest.cpp \ -$(LOCAL_PATH)/Classes/ClickAndMoveTest/ClickAndMoveTest.cpp \ -$(LOCAL_PATH)/Classes/ClippingNodeTest/ClippingNodeTest.cpp \ -$(LOCAL_PATH)/Classes/CocosDenshionTest/CocosDenshionTest.cpp \ -$(LOCAL_PATH)/Classes/ConfigurationTest/ConfigurationTest.cpp \ -$(LOCAL_PATH)/Classes/CurlTest/CurlTest.cpp \ -$(LOCAL_PATH)/Classes/CurrentLanguageTest/CurrentLanguageTest.cpp \ -$(LOCAL_PATH)/Classes/DataVisitorTest/DataVisitorTest.cpp \ -$(LOCAL_PATH)/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp \ -$(LOCAL_PATH)/Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp \ -$(LOCAL_PATH)/Classes/EffectsTest/EffectsTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/ExtensionsTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UIDragPanelTest/UIDragPanelTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UINodeContainerTest/UINodeContainerTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UIPanelTest/UIPanelTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UITextAreaTest/UITextAreaTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UITextButtonTest/UITextButtonTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/NetworkTest/SocketIOTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/NetworkTest/WebSocketTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp \ -$(LOCAL_PATH)/Classes/FileUtilsTest/FileUtilsTest.cpp \ -$(LOCAL_PATH)/Classes/FontTest/FontTest.cpp \ -$(LOCAL_PATH)/Classes/IntervalTest/IntervalTest.cpp \ -$(LOCAL_PATH)/Classes/KeyboardTest/KeyboardTest.cpp \ -$(LOCAL_PATH)/Classes/KeypadTest/KeypadTest.cpp \ -$(LOCAL_PATH)/Classes/LabelTest/LabelTest.cpp \ -$(LOCAL_PATH)/Classes/LabelTest/LabelTestNew.cpp \ -$(LOCAL_PATH)/Classes/LayerTest/LayerTest.cpp \ -$(LOCAL_PATH)/Classes/MenuTest/MenuTest.cpp \ -$(LOCAL_PATH)/Classes/MotionStreakTest/MotionStreakTest.cpp \ -$(LOCAL_PATH)/Classes/MutiTouchTest/MutiTouchTest.cpp \ -$(LOCAL_PATH)/Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp \ -$(LOCAL_PATH)/Classes/NodeTest/NodeTest.cpp \ -$(LOCAL_PATH)/Classes/ParallaxTest/ParallaxTest.cpp \ -$(LOCAL_PATH)/Classes/ParticleTest/ParticleTest.cpp \ -$(LOCAL_PATH)/Classes/PerformanceTest/PerformanceAllocTest.cpp \ -$(LOCAL_PATH)/Classes/PerformanceTest/PerformanceNodeChildrenTest.cpp \ -$(LOCAL_PATH)/Classes/PerformanceTest/PerformanceParticleTest.cpp \ -$(LOCAL_PATH)/Classes/PerformanceTest/PerformanceSpriteTest.cpp \ -$(LOCAL_PATH)/Classes/PerformanceTest/PerformanceTest.cpp \ -$(LOCAL_PATH)/Classes/PerformanceTest/PerformanceTextureTest.cpp \ -$(LOCAL_PATH)/Classes/PerformanceTest/PerformanceTouchesTest.cpp \ -$(LOCAL_PATH)/Classes/PhysicsTest/PhysicsTest.cpp \ -$(LOCAL_PATH)/Classes/RenderTextureTest/RenderTextureTest.cpp \ -$(LOCAL_PATH)/Classes/RotateWorldTest/RotateWorldTest.cpp \ -$(LOCAL_PATH)/Classes/SceneTest/SceneTest.cpp \ -$(LOCAL_PATH)/Classes/SchedulerTest/SchedulerTest.cpp \ -$(LOCAL_PATH)/Classes/ShaderTest/ShaderTest.cpp \ -$(LOCAL_PATH)/Classes/ShaderTest/ShaderTest2.cpp \ -$(LOCAL_PATH)/Classes/SpineTest/SpineTest.cpp \ -$(LOCAL_PATH)/Classes/SpriteTest/SpriteTest.cpp \ -$(LOCAL_PATH)/Classes/TextInputTest/TextInputTest.cpp \ -$(LOCAL_PATH)/Classes/Texture2dTest/Texture2dTest.cpp \ -$(LOCAL_PATH)/Classes/TextureCacheTest/TextureCacheTest.cpp \ -$(LOCAL_PATH)/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp \ -$(LOCAL_PATH)/Classes/TileMapTest/TileMapTest.cpp \ -$(LOCAL_PATH)/Classes/TouchesTest/Ball.cpp \ -$(LOCAL_PATH)/Classes/TouchesTest/Paddle.cpp \ -$(LOCAL_PATH)/Classes/TouchesTest/TouchesTest.cpp \ -$(LOCAL_PATH)/Classes/TransitionsTest/TransitionsTest.cpp \ -$(LOCAL_PATH)/Classes/UserDefaultTest/UserDefaultTest.cpp \ -$(LOCAL_PATH)/Classes/ZwoptexTest/ZwoptexTest.cpp +./Classes/AppDelegate.cpp \ +./Classes/BaseTest.cpp \ +./Classes/controller.cpp \ +./Classes/testBasic.cpp \ +./Classes/VisibleRect.cpp \ +./Classes/AccelerometerTest/AccelerometerTest.cpp \ +./Classes/ActionManagerTest/ActionManagerTest.cpp \ +./Classes/ActionsEaseTest/ActionsEaseTest.cpp \ +./Classes/ActionsProgressTest/ActionsProgressTest.cpp \ +./Classes/ActionsTest/ActionsTest.cpp \ +./Classes/Box2DTest/Box2dTest.cpp \ +./Classes/Box2DTestBed/Box2dView.cpp \ +./Classes/Box2DTestBed/GLES-Render.cpp \ +./Classes/Box2DTestBed/Test.cpp \ +./Classes/Box2DTestBed/TestEntries.cpp \ +./Classes/BugsTest/Bug-1159.cpp \ +./Classes/BugsTest/Bug-1174.cpp \ +./Classes/BugsTest/Bug-350.cpp \ +./Classes/BugsTest/Bug-422.cpp \ +./Classes/BugsTest/Bug-624.cpp \ +./Classes/BugsTest/Bug-886.cpp \ +./Classes/BugsTest/Bug-899.cpp \ +./Classes/BugsTest/Bug-914.cpp \ +./Classes/BugsTest/BugsTest.cpp \ +./Classes/BugsTest/Bug-458/Bug-458.cpp \ +./Classes/BugsTest/Bug-458/QuestionContainerSprite.cpp \ +./Classes/ChipmunkTest/ChipmunkTest.cpp \ +./Classes/ClickAndMoveTest/ClickAndMoveTest.cpp \ +./Classes/ClippingNodeTest/ClippingNodeTest.cpp \ +./Classes/CocosDenshionTest/CocosDenshionTest.cpp \ +./Classes/ConfigurationTest/ConfigurationTest.cpp \ +./Classes/CurlTest/CurlTest.cpp \ +./Classes/CurrentLanguageTest/CurrentLanguageTest.cpp \ +./Classes/DataVisitorTest/DataVisitorTest.cpp \ +./Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp \ +./Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp \ +./Classes/EffectsTest/EffectsTest.cpp \ +./Classes/ExtensionsTest/ExtensionsTest.cpp \ +./Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.cpp \ +./Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp \ +./Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.cpp \ +./Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.cpp \ +./Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.cpp \ +./Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.cpp \ +./Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.cpp \ +./Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp \ +./Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.cpp \ +./Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.cpp \ +./Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.cpp \ +./Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp \ +./Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp \ +./Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp \ +./Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp \ +./Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp \ +./Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.cpp \ +./Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp \ +./Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp \ +./Classes/ExtensionsTest/CocoStudioGUITest/UIDragPanelTest/UIDragPanelTest.cpp \ +./Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp \ +./Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.cpp \ +./Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.cpp \ +./Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.cpp \ +./Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp \ +./Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp \ +./Classes/ExtensionsTest/CocoStudioGUITest/UINodeContainerTest/UINodeContainerTest.cpp \ +./Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp \ +./Classes/ExtensionsTest/CocoStudioGUITest/UIPanelTest/UIPanelTest.cpp \ +./Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp \ +./Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp \ +./Classes/ExtensionsTest/CocoStudioGUITest/UITextAreaTest/UITextAreaTest.cpp \ +./Classes/ExtensionsTest/CocoStudioGUITest/UITextButtonTest/UITextButtonTest.cpp \ +./Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp \ +./Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp \ +./Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.cpp \ +./Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.cpp \ +./Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.cpp \ +./Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.cpp \ +./Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.cpp \ +./Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp \ +./Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.cpp \ +./Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.cpp \ +./Classes/ExtensionsTest/EditBoxTest/EditBoxTest.cpp \ +./Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp \ +./Classes/ExtensionsTest/NetworkTest/SocketIOTest.cpp \ +./Classes/ExtensionsTest/NetworkTest/WebSocketTest.cpp \ +./Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.cpp \ +./Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp \ +./Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp \ +./Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp \ +./Classes/FileUtilsTest/FileUtilsTest.cpp \ +./Classes/FontTest/FontTest.cpp \ +./Classes/IntervalTest/IntervalTest.cpp \ +./Classes/KeyboardTest/KeyboardTest.cpp \ +./Classes/KeypadTest/KeypadTest.cpp \ +./Classes/LabelTest/LabelTest.cpp \ +./Classes/LabelTest/LabelTestNew.cpp \ +./Classes/LayerTest/LayerTest.cpp \ +./Classes/MenuTest/MenuTest.cpp \ +./Classes/MotionStreakTest/MotionStreakTest.cpp \ +./Classes/MutiTouchTest/MutiTouchTest.cpp \ +./Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp \ +./Classes/NodeTest/NodeTest.cpp \ +./Classes/ParallaxTest/ParallaxTest.cpp \ +./Classes/ParticleTest/ParticleTest.cpp \ +./Classes/PerformanceTest/PerformanceAllocTest.cpp \ +./Classes/PerformanceTest/PerformanceNodeChildrenTest.cpp \ +./Classes/PerformanceTest/PerformanceParticleTest.cpp \ +./Classes/PerformanceTest/PerformanceSpriteTest.cpp \ +./Classes/PerformanceTest/PerformanceTest.cpp \ +./Classes/PerformanceTest/PerformanceTextureTest.cpp \ +./Classes/PerformanceTest/PerformanceTouchesTest.cpp \ +./Classes/PhysicsTest/PhysicsTest.cpp \ +./Classes/RenderTextureTest/RenderTextureTest.cpp \ +./Classes/RotateWorldTest/RotateWorldTest.cpp \ +./Classes/SceneTest/SceneTest.cpp \ +./Classes/SchedulerTest/SchedulerTest.cpp \ +./Classes/ShaderTest/ShaderTest.cpp \ +./Classes/ShaderTest/ShaderTest2.cpp \ +./Classes/SpineTest/SpineTest.cpp \ +./Classes/SpriteTest/SpriteTest.cpp \ +./Classes/TextInputTest/TextInputTest.cpp \ +./Classes/Texture2dTest/Texture2dTest.cpp \ +./Classes/TextureCacheTest/TextureCacheTest.cpp \ +./Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp \ +./Classes/TileMapTest/TileMapTest.cpp \ +./Classes/TouchesTest/Ball.cpp \ +./Classes/TouchesTest/Paddle.cpp \ +./Classes/TouchesTest/TouchesTest.cpp \ +./Classes/TransitionsTest/TransitionsTest.cpp \ +./Classes/UserDefaultTest/UserDefaultTest.cpp \ +./Classes/ZwoptexTest/ZwoptexTest.cpp LOCAL_C_INCLUDES := $(LOCAL_PATH)/Classes diff --git a/samples/Cpp/TestCpp/Classes/AppDelegate.cpp b/samples/Cpp/TestCpp/Classes/AppDelegate.cpp index e2c264c37f..515a63c9be 100644 --- a/samples/Cpp/TestCpp/Classes/AppDelegate.cpp +++ b/samples/Cpp/TestCpp/Classes/AppDelegate.cpp @@ -3,7 +3,7 @@ #include "cocos2d.h" #include "controller.h" #include "SimpleAudioEngine.h" -#include "cocostudio/armature/utils/CCArmatureDataManager.h" +#include "cocostudio/CocoStudio.h" #include "cocos-ext.h" USING_NS_CC; @@ -51,6 +51,7 @@ bool AppDelegate::applicationDidFinishLaunching() { searchPaths.push_back("scenetest"); } + pFileUtils->setSearchPaths(searchPaths); EGLView::getInstance()->setDesignResolutionSize(designSize.width, designSize.height, ResolutionPolicy::NO_BORDER); diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp index 63a987f170..66eb20472b 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp @@ -1,6 +1,6 @@ #include "ArmatureScene.h" #include "../../testResource.h" -#include "armature/display/CCSkin.h" +#include "cocostudio/CocoStudio.h" using namespace cocos2d; diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h index 1db21babb0..f6001395c3 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h @@ -5,7 +5,7 @@ #include "cocos-ext.h" #include "../../VisibleRect.h" #include "../../testBasic.h" -#include "armature/CCArmature.h" +#include "cocostudio/CocoStudio.h" #if ENABLE_PHYSICS_BOX2D_DETECT #include "../../Box2DTestBed/GLES-Render.h" diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h index 891c84cf14..31e3fc5f2d 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h @@ -3,7 +3,7 @@ #include "cocos2d.h" #include "cocos-ext.h" -#include "CocoStudio.h" +#include "cocostudio/CocoStudio.h" class EnemyController : public cocostudio::ComController diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h index b8baed4f54..9ce5b3b424 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h @@ -3,7 +3,7 @@ #include "cocos2d.h" #include "cocos-ext.h" -#include "CocoStudio.h" +#include "cocostudio/CocoStudio.h" class PlayerController : public cocostudio::ComController diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h index 68c4e1aaf7..de3c855c86 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h @@ -3,7 +3,7 @@ #include "cocos2d.h" #include "cocos-ext.h" -#include "CocoStudio.h" +#include "cocostudio/CocoStudio.h" class ProjectileController : public cocostudio::ComController { diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h index 203c74e180..f35b663126 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h @@ -3,7 +3,7 @@ #include "cocos2d.h" #include "cocos-ext.h" -#include "CocoStudio.h" +#include "cocostudio/CocoStudio.h" class SceneController : public cocostudio::ComController { diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp index 8bcdd1e0f4..1ba28914df 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp @@ -1,8 +1,7 @@ #include "CocosGUIScene.h" #include "UISceneManager.h" -//#include "CocosGUIExamplesRegisterScene.h" #include "../ExtensionsTest.h" -#include "CocoStudio.h" +#include "cocostudio/CocoStudio.h" const char* gui_scene_names[2] = { diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp index a59f162999..dbc04df6ef 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp @@ -2,7 +2,7 @@ #include "cocos-ext.h" #include "../ExtensionsTest.h" #include "SceneEditorTest.h" -#include "CocoStudio.h" +#include "cocostudio/CocoStudio.h" #include "system/CocosGUI.h" using namespace cocos2d; diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.h index b158784607..2fbbd0f427 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.h @@ -3,7 +3,7 @@ #include "cocos2d.h" #include "cocos-ext.h" -#include "CocosBuilder.h" +#include "cocosbuilder/CocosBuilder.h" class AnimationsTestLayer : public cocos2d::Layer diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h index 9468229dd8..706ec6b2f7 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h @@ -3,7 +3,7 @@ #include "cocos2d.h" #include "cocos-ext.h" -#include "CocosBuilder.h" +#include "cocosbuilder/CocosBuilder.h" class ButtonTestLayer : public cocos2d::Layer diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h index b20072bc30..d6ab2071c4 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h @@ -3,7 +3,7 @@ #include "cocos2d.h" #include "cocos-ext.h" -#include "CocosBuilder.h" +#include "cocosbuilder/CocosBuilder.h" /* * Note: for some pretty hard fucked up reason, the order of inheritance is important! diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h index 4dfe4468e7..11c12da610 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h @@ -3,7 +3,7 @@ #include "cocos2d.h" #include "cocos-ext.h" -#include "CocosBuilder.h" +#include "cocosbuilder/CocosBuilder.h" class MenuTestLayer : public cocos2d::Layer diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h index 316f93d62b..f36dea647e 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h @@ -3,7 +3,7 @@ #include "cocos2d.h" #include "cocos-ext.h" -#include "CocosBuilder.h" +#include "cocosbuilder/CocosBuilder.h" class TestHeaderLayer : public cocos2d::Layer diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h index 4dd14b8b73..87cf80d7b6 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h @@ -3,7 +3,7 @@ #include "cocos2d.h" #include "cocos-ext.h" -#include "CocosBuilder.h" +#include "cocosbuilder/CocosBuilder.h" class TimelineCallbackTestLayer : public cocos2d::Layer diff --git a/samples/Cpp/TestCpp/Classes/testBasic.cpp b/samples/Cpp/TestCpp/Classes/testBasic.cpp index 5892c3e6e2..b35170021f 100644 --- a/samples/Cpp/TestCpp/Classes/testBasic.cpp +++ b/samples/Cpp/TestCpp/Classes/testBasic.cpp @@ -1,7 +1,7 @@ #include "testBasic.h" #include "controller.h" #include "cocos-ext.h" -#include "cocostudio/armature/utils/CCArmatureDataManager.h" +#include "cocostudio/CocoStudio.h" TestScene::TestScene(bool bPortrait) {