Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

issue #2905: Updating include path for 'cocostudio' module, adding 'cocostudio' prefix.

This commit is contained in:
James Chen 2013-10-16 11:19:01 +08:00
parent 5da40240b8
commit 7dc8aeb156
60 changed files with 224 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/editor-support/cocostudio/action/CCActionFrameEasing.cpp
View File

@ -24,7 +24,7 @@
#include <math.h> #include <math.h>
#include "CCActionFrameEasing.h" #include "CCActionFrameEasing.h"
#include "json/DictionaryHelper.h" #include "cocostudio/json/DictionaryHelper.h"
namespace cocostudio { namespace cocostudio {
#ifndef M_PI_X_2 #ifndef M_PI_X_2

2
cocos/editor-support/cocostudio/action/CCActionFrameEasing.h
View File

@ -26,7 +26,7 @@
#define __ActionFrameEasing_H__ #define __ActionFrameEasing_H__
#include "cocos2d.h" #include "cocos2d.h"
#include "json/CSContentJsonDictionary.h" #include "cocostudio/json/CSContentJsonDictionary.h"
namespace cocostudio { namespace cocostudio {

2
cocos/editor-support/cocostudio/action/CCActionManagerEx.cpp
View File

@ -23,7 +23,7 @@
****************************************************************************/ ****************************************************************************/
#include "CCActionManagerEx.h" #include "CCActionManagerEx.h"
#include "json/DictionaryHelper.h" #include "cocostudio/json/DictionaryHelper.h"
using namespace cocos2d; using namespace cocos2d;

2
cocos/editor-support/cocostudio/action/CCActionManagerEx.h
View File

@ -27,7 +27,7 @@
#include "cocos2d.h" #include "cocos2d.h"
#include "CCActionObject.h" #include "CCActionObject.h"
#include "json/CSContentJsonDictionary.h" #include "cocostudio/json/CSContentJsonDictionary.h"
namespace cocostudio { namespace cocostudio {

2
cocos/editor-support/cocostudio/action/CCActionNode.cpp
View File

@ -26,7 +26,7 @@ THE SOFTWARE.
#include "CCActionFrameEasing.h" #include "CCActionFrameEasing.h"
#include "base-classes/UIWidget.h" #include "base-classes/UIWidget.h"
#include "system/UIHelper.h" #include "system/UIHelper.h"
#include "json/DictionaryHelper.h" #include "cocostudio/json/DictionaryHelper.h"
using namespace cocos2d; using namespace cocos2d;
using namespace gui; using namespace gui;

2
cocos/editor-support/cocostudio/action/CCActionNode.h
View File

@ -27,7 +27,7 @@
#include "cocos2d.h" #include "cocos2d.h"
#include "CCActionFrame.h" #include "CCActionFrame.h"
#include "json/CSContentJsonDictionary.h" #include "cocostudio/json/CSContentJsonDictionary.h"
namespace cocostudio { namespace cocostudio {

2
cocos/editor-support/cocostudio/action/CCActionObject.cpp
View File

@ -23,7 +23,7 @@
****************************************************************************/ ****************************************************************************/
#include "CCActionObject.h" #include "CCActionObject.h"
#include "json/DictionaryHelper.h" #include "cocostudio/json/DictionaryHelper.h"
using namespace cocos2d; using namespace cocos2d;

2
cocos/editor-support/cocostudio/action/CCActionObject.h
View File

@ -27,7 +27,7 @@
#include "cocos2d.h" #include "cocos2d.h"
#include "CCActionNode.h" #include "CCActionNode.h"
#include "json/CSContentJsonDictionary.h" #include "cocostudio/json/CSContentJsonDictionary.h"
namespace cocostudio { namespace cocostudio {

10
cocos/editor-support/cocostudio/armature/animation/CCArmatureAnimation.cpp
View File

@ -23,11 +23,11 @@ THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "CCArmatureAnimation.h" #include "CCArmatureAnimation.h"
#include "armature/CCArmature.h" #include "cocostudio/armature/CCArmature.h"
#include "armature/CCBone.h" #include "cocostudio/armature/CCBone.h"
#include "armature/utils/CCArmatureDefine.h" #include "cocostudio/armature/utils/CCArmatureDefine.h"
#include "armature/utils/CCUtilMath.h" #include "cocostudio/armature/utils/CCUtilMath.h"
#include "armature/datas/CCDatas.h" #include "cocostudio/armature/datas/CCDatas.h"
using namespace cocos2d; using namespace cocos2d;

2
cocos/editor-support/cocostudio/armature/animation/CCProcessBase.cpp
View File

@ -23,7 +23,7 @@ THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "CCProcessBase.h" #include "CCProcessBase.h"
#include "armature/utils/CCUtilMath.h" #include "cocostudio/armature/utils/CCUtilMath.h"
using namespace cocos2d; using namespace cocos2d;

4
cocos/editor-support/cocostudio/armature/animation/CCProcessBase.h
View File

@ -26,8 +26,8 @@ THE SOFTWARE.
#ifndef __CCPROCESSBASE_H__ #ifndef __CCPROCESSBASE_H__
#define __CCPROCESSBASE_H__ #define __CCPROCESSBASE_H__
#include "armature/utils/CCArmatureDefine.h" #include "cocostudio/armature/utils/CCArmatureDefine.h"
#include "armature/datas/CCDatas.h" #include "cocostudio/armature/datas/CCDatas.h"
namespace cocostudio { namespace cocostudio {

10
cocos/editor-support/cocostudio/armature/animation/CCTween.cpp
View File

@ -25,11 +25,11 @@ THE SOFTWARE.
#include "CCTween.h" #include "CCTween.h"
#include "CCArmatureAnimation.h" #include "CCArmatureAnimation.h"
#include "armature/CCBone.h" #include "cocostudio/armature/CCBone.h"
#include "armature/CCArmature.h" #include "cocostudio/armature/CCArmature.h"
#include "armature/utils/CCUtilMath.h" #include "cocostudio/armature/utils/CCUtilMath.h"
#include "armature/utils/CCTweenFunction.h" #include "cocostudio/armature/utils/CCTweenFunction.h"
#include "armature/utils/CCTransformHelp.h" #include "cocostudio/armature/utils/CCTransformHelp.h"
namespace cocostudio { namespace cocostudio {

2
cocos/editor-support/cocostudio/armature/animation/CCTween.h
View File

@ -27,7 +27,7 @@ THE SOFTWARE.
#define __CCTWEEN_H__ #define __CCTWEEN_H__
#include "CCProcessBase.h" #include "CCProcessBase.h"
#include "armature/utils/CCTweenFunction.h" #include "cocostudio/armature/utils/CCTweenFunction.h"
namespace cocostudio { namespace cocostudio {

4
cocos/editor-support/cocostudio/armature/datas/CCDatas.cpp
View File

@ -23,8 +23,8 @@ THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "CCDatas.h" #include "CCDatas.h"
#include "armature/utils/CCUtilMath.h" #include "cocostudio/armature/utils/CCUtilMath.h"
#include "armature/utils/CCTransformHelp.h" #include "cocostudio/armature/utils/CCTransformHelp.h"
using namespace cocos2d; using namespace cocos2d;

4
cocos/editor-support/cocostudio/armature/datas/CCDatas.h
View File

@ -25,8 +25,8 @@ THE SOFTWARE.
#ifndef __CCARMATURE_DATAS_H__ #ifndef __CCARMATURE_DATAS_H__
#define __CCARMATURE_DATAS_H__ #define __CCARMATURE_DATAS_H__
#include "armature/utils/CCArmatureDefine.h" #include "cocostudio/armature/utils/CCArmatureDefine.h"
#include "armature/utils/CCTweenFunction.h" #include "cocostudio/armature/utils/CCTweenFunction.h"
#define CC_CREATE_NO_PARAM_NO_INIT(varType)\ #define CC_CREATE_NO_PARAM_NO_INIT(varType)\

4
cocos/editor-support/cocostudio/armature/display/CCBatchNode.cpp
View File

@ -23,8 +23,8 @@ THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "CCBatchNode.h" #include "CCBatchNode.h"
#include "armature/utils/CCArmatureDefine.h" #include "cocostudio/armature/utils/CCArmatureDefine.h"
#include "armature/CCArmature.h" #include "cocostudio/armature/CCArmature.h"
using namespace cocos2d; using namespace cocos2d;

2
cocos/editor-support/cocostudio/armature/display/CCBatchNode.h
View File

@ -25,7 +25,7 @@ THE SOFTWARE.
#ifndef __CCBATCHNODE_H__ #ifndef __CCBATCHNODE_H__
#define __CCBATCHNODE_H__ #define __CCBATCHNODE_H__
#include "armature/utils/CCArmatureDefine.h" #include "cocostudio/armature/utils/CCArmatureDefine.h"
namespace cocostudio { namespace cocostudio {

4
cocos/editor-support/cocostudio/armature/display/CCDecorativeDisplay.h
View File

@ -25,9 +25,9 @@ THE SOFTWARE.
#ifndef __CCDECORATIVEDISPLAY_H__ #ifndef __CCDECORATIVEDISPLAY_H__
#define __CCDECORATIVEDISPLAY_H__ #define __CCDECORATIVEDISPLAY_H__
#include "armature/utils/CCArmatureDefine.h" #include "cocostudio/armature/utils/CCArmatureDefine.h"
#include "CCDisplayFactory.h" #include "CCDisplayFactory.h"
#include "armature/datas/CCDatas.h" #include "cocostudio/armature/datas/CCDatas.h"
#if ENABLE_PHYSICS_BOX2D_DETECT || ENABLE_PHYSICS_CHIPMUNK_DETECT #if ENABLE_PHYSICS_BOX2D_DETECT || ENABLE_PHYSICS_CHIPMUNK_DETECT

12
cocos/editor-support/cocostudio/armature/display/CCDisplayFactory.cpp
View File

@ -23,12 +23,12 @@ THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "CCDisplayFactory.h" #include "CCDisplayFactory.h"
#include "armature/CCBone.h" #include "cocostudio/armature/CCBone.h"
#include "armature/CCArmature.h" #include "cocostudio/armature/CCArmature.h"
#include "armature/display/CCSkin.h" #include "cocostudio/armature/display/CCSkin.h"
#include "armature/utils/CCSpriteFrameCacheHelper.h" #include "cocostudio/armature/utils/CCSpriteFrameCacheHelper.h"
#include "armature/utils/CCArmatureDataManager.h" #include "cocostudio/armature/utils/CCArmatureDataManager.h"
#include "armature/utils/CCTransformHelp.h" #include "cocostudio/armature/utils/CCTransformHelp.h"
using namespace cocos2d; using namespace cocos2d;

4
cocos/editor-support/cocostudio/armature/display/CCDisplayFactory.h
View File

@ -25,8 +25,8 @@ THE SOFTWARE.
#ifndef __CCDISPLAYFACTORY_H__ #ifndef __CCDISPLAYFACTORY_H__
#define __CCDISPLAYFACTORY_H__ #define __CCDISPLAYFACTORY_H__
#include "armature/utils/CCArmatureDefine.h" #include "cocostudio/armature/utils/CCArmatureDefine.h"
#include "armature/datas/CCDatas.h" #include "cocostudio/armature/datas/CCDatas.h"
namespace cocostudio { namespace cocostudio {

8
cocos/editor-support/cocostudio/armature/display/CCDisplayManager.cpp
View File

@ -23,10 +23,10 @@ THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "CCDisplayManager.h" #include "CCDisplayManager.h"
#include "armature/CCBone.h" #include "cocostudio/armature/CCBone.h"
#include "armature/CCArmature.h" #include "cocostudio/armature/CCArmature.h"
#include "armature/utils/CCUtilMath.h" #include "cocostudio/armature/utils/CCUtilMath.h"
#include "armature/display/CCSkin.h" #include "cocostudio/armature/display/CCSkin.h"
using namespace cocos2d; using namespace cocos2d;

6
cocos/editor-support/cocostudio/armature/display/CCDisplayManager.h
View File

@ -25,9 +25,9 @@ THE SOFTWARE.
#ifndef __CCDISPLAYMANAGER_H__ #ifndef __CCDISPLAYMANAGER_H__
#define __CCDISPLAYMANAGER_H__ #define __CCDISPLAYMANAGER_H__
#include "armature/utils/CCArmatureDefine.h" #include "cocostudio/armature/utils/CCArmatureDefine.h"
#include "armature/display/CCDecorativeDisplay.h" #include "cocostudio/armature/display/CCDecorativeDisplay.h"
#include "armature/datas/CCDatas.h" #include "cocostudio/armature/datas/CCDatas.h"
namespace cocostudio { namespace cocostudio {

6
cocos/editor-support/cocostudio/armature/display/CCSkin.cpp
View File

@ -23,9 +23,9 @@ THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "CCSkin.h" #include "CCSkin.h"
#include "armature/utils/CCTransformHelp.h" #include "cocostudio/armature/utils/CCTransformHelp.h"
#include "armature/utils/CCSpriteFrameCacheHelper.h" #include "cocostudio/armature/utils/CCSpriteFrameCacheHelper.h"
#include "armature/CCArmature.h" #include "cocostudio/armature/CCArmature.h"
using namespace cocos2d; using namespace cocos2d;

4
cocos/editor-support/cocostudio/armature/display/CCSkin.h
View File

@ -25,8 +25,8 @@ THE SOFTWARE.
#ifndef __CCSKIN_H__ #ifndef __CCSKIN_H__
#define __CCSKIN_H__ #define __CCSKIN_H__
#include "armature/utils/CCArmatureDefine.h" #include "cocostudio/armature/utils/CCArmatureDefine.h"
#include "armature/CCBone.h" #include "cocostudio/armature/CCBone.h"
namespace cocostudio { namespace cocostudio {

4
cocos/editor-support/cocostudio/armature/physics/CCColliderDetector.cpp
View File

@ -23,8 +23,8 @@ THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "CCColliderDetector.h" #include "CCColliderDetector.h"
#include "armature/CCBone.h" #include "cocostudio/armature/CCBone.h"
#include "armature/utils/CCTransformHelp.h" #include "cocostudio/armature/utils/CCTransformHelp.h"
#if ENABLE_PHYSICS_BOX2D_DETECT #if ENABLE_PHYSICS_BOX2D_DETECT
#include "Box2D/Box2D.h" #include "Box2D/Box2D.h"

4
cocos/editor-support/cocostudio/armature/physics/CCColliderDetector.h
View File

@ -25,8 +25,8 @@ THE SOFTWARE.
#ifndef __CCCOLLIDERDETECTOR_H__ #ifndef __CCCOLLIDERDETECTOR_H__
#define __CCCOLLIDERDETECTOR_H__ #define __CCCOLLIDERDETECTOR_H__
#include "armature/utils/CCArmatureDefine.h" #include "cocostudio/armature/utils/CCArmatureDefine.h"
#include "armature/datas/CCDatas.h" #include "cocostudio/armature/datas/CCDatas.h"
#ifndef PT_RATIO #ifndef PT_RATIO
#define PT_RATIO 32 #define PT_RATIO 32

2
cocos/editor-support/cocostudio/armature/utils/CCArmatureDataManager.h
View File

@ -26,7 +26,7 @@ THE SOFTWARE.
#define __CCARMATUREDATAMANAGER_H__ #define __CCARMATUREDATAMANAGER_H__
#include "CCArmatureDefine.h" #include "CCArmatureDefine.h"
#include "armature/datas/CCDatas.h" #include "cocostudio/armature/datas/CCDatas.h"
namespace cocostudio { namespace cocostudio {

2
cocos/editor-support/cocostudio/armature/utils/CCDataReaderHelper.cpp
View File

@ -28,7 +28,7 @@ THE SOFTWARE.
#include "CCTransformHelp.h" #include "CCTransformHelp.h"
#include "CCUtilMath.h" #include "CCUtilMath.h"
#include "CCArmatureDefine.h" #include "CCArmatureDefine.h"
#include "armature/datas/CCDatas.h" #include "cocostudio/armature/datas/CCDatas.h"
using namespace cocos2d; using namespace cocos2d;

6
cocos/editor-support/cocostudio/armature/utils/CCDataReaderHelper.h
View File

@ -26,9 +26,9 @@ THE SOFTWARE.
#define __CCDATAREADERHELPER_H__ #define __CCDATAREADERHELPER_H__
#include "CCArmatureDefine.h" #include "CCArmatureDefine.h"
#include "armature/datas/CCDatas.h" #include "cocostudio/armature/datas/CCDatas.h"
#include "armature/CCArmature.h" #include "cocostudio/armature/CCArmature.h"
#include "json/CSContentJsonDictionary.h" #include "cocostudio/json/CSContentJsonDictionary.h"
#include <string> #include <string>
#include <queue> #include <queue>

2
cocos/editor-support/cocostudio/armature/utils/CCTransformHelp.h
View File

@ -26,7 +26,7 @@ THE SOFTWARE.
#define __CCTRANSFORMHELP_H__ #define __CCTRANSFORMHELP_H__
#include "CCArmatureDefine.h" #include "CCArmatureDefine.h"
#include "armature/datas/CCDatas.h" #include "cocostudio/armature/datas/CCDatas.h"
namespace cocostudio { namespace cocostudio {

2
cocos/editor-support/cocostudio/components/CCComAttribute.h
View File

@ -27,7 +27,7 @@ THE SOFTWARE.
#include "cocos2d.h" #include "cocos2d.h"
#include <string> #include <string>
#include "json/CSContentJsonDictionary.h" #include "cocostudio/json/CSContentJsonDictionary.h"
namespace cocostudio { namespace cocostudio {

2
cocos/editor-support/cocostudio/json/CSContentJsonDictionary.h
View File

@ -28,7 +28,7 @@
#define COCOSTUDIO_CSCONTENTJSONDICTIONARY_H #define COCOSTUDIO_CSCONTENTJSONDICTIONARY_H
#include "json.h" #include "json/json.h"
#include <vector> #include <vector>
#include <string> #include <string>

4
cocos/editor-support/cocostudio/reader/CCSGUIReader.cpp
View File

@ -23,8 +23,8 @@
****************************************************************************/ ****************************************************************************/
#include "system/CocosGUI.h" #include "system/CocosGUI.h"
#include "json/DictionaryHelper.h" #include "cocostudio/json/DictionaryHelper.h"
#include "action/CCActionManagerEx.h" #include "cocostudio/action/CCActionManagerEx.h"
#include <fstream> #include <fstream>
#include <iostream> #include <iostream>

2
cocos/editor-support/cocostudio/reader/CCSGUIReader.h
View File

@ -26,7 +26,7 @@
#define __CCSGUIREADER_H__ #define __CCSGUIREADER_H__
#include "base-classes/UIWidget.h" #include "base-classes/UIWidget.h"
#include "json/CSContentJsonDictionary.h" #include "cocostudio/json/CSContentJsonDictionary.h"
namespace cocostudio { namespace cocostudio {

2
cocos/editor-support/cocostudio/reader/CCSSceneReader.h
View File

@ -26,7 +26,7 @@
#define __CCSSCENEREADER_H__ #define __CCSSCENEREADER_H__
#include "cocos2d.h" #include "cocos2d.h"
#include "json/CSContentJsonDictionary.h" #include "cocostudio/json/CSContentJsonDictionary.h"
namespace cocostudio { namespace cocostudio {

2
cocos/gui/layouts/Layout.cpp
View File

@ -25,7 +25,7 @@
#include "layout.h" #include "layout.h"
#include "system/UILayer.h" #include "system/UILayer.h"
#include "system/UIHelper.h" #include "system/UIHelper.h"
#include "GUI/CCControlExtension/CCScale9Sprite.h" #include "extensions/GUI/CCControlExtension/CCScale9Sprite.h"
using namespace cocos2d; using namespace cocos2d;
using namespace cocos2d::extension; using namespace cocos2d::extension;

2
cocos/gui/system/CocosGUI.h
View File

@ -43,7 +43,7 @@
#include "widgets/UILabelBMFont.h" #include "widgets/UILabelBMFont.h"
#include "widgets/scroll-widget/UIPageView.h" #include "widgets/scroll-widget/UIPageView.h"
#include "UIHelper.h" #include "UIHelper.h"
#include "reader/CCSGUIReader.h" #include "cocostudio/reader/CCSGUIReader.h"
#include "UILayer.h" #include "UILayer.h"
namespace gui { namespace gui {

4
cocos/gui/system/UIHelper.cpp
View File

@ -23,9 +23,9 @@
****************************************************************************/ ****************************************************************************/
#include "UIHelper.h" #include "UIHelper.h"
#include "json/DictionaryHelper.h" #include "cocostudio/json/DictionaryHelper.h"
#include "cocos2d.h" #include "cocos2d.h"
#include "reader/CCSGUIReader.h" #include "cocostudio/reader/CCSGUIReader.h"
using namespace cocos2d; using namespace cocos2d;
using namespace cocostudio; using namespace cocostudio;

2
cocos/gui/system/UIHelper.h
View File

@ -26,7 +26,7 @@
#define __UIHELPER_H__ #define __UIHELPER_H__
#include "UIInputManager.h" #include "UIInputManager.h"
#include "json/CSContentJsonDictionary.h" #include "cocostudio/json/CSContentJsonDictionary.h"
#define CCUIHELPER gui::UIHelper::instance() #define CCUIHELPER gui::UIHelper::instance()

2
cocos/gui/widgets/UIButton.cpp
View File

@ -23,7 +23,7 @@
****************************************************************************/ ****************************************************************************/
#include "UIButton.h" #include "UIButton.h"
#include "GUI/CCControlExtension/CCScale9Sprite.h" #include "extensions/GUI/CCControlExtension/CCScale9Sprite.h"
using namespace cocos2d; using namespace cocos2d;
using namespace cocos2d::extension; using namespace cocos2d::extension;

2
cocos/gui/widgets/UIImageView.cpp
View File

@ -23,7 +23,7 @@
****************************************************************************/ ****************************************************************************/
#include "UIImageView.h" #include "UIImageView.h"
#include "GUI/CCControlExtension/CCScale9Sprite.h" #include "extensions/GUI/CCControlExtension/CCScale9Sprite.h"
using namespace cocos2d; using namespace cocos2d;
using namespace cocos2d::extension; using namespace cocos2d::extension;

2
cocos/gui/widgets/UILoadingBar.cpp
View File

@ -23,7 +23,7 @@
****************************************************************************/ ****************************************************************************/
#include "UILoadingBar.h" #include "UILoadingBar.h"
#include "GUI/CCControlExtension/CCScale9Sprite.h" #include "extensions/GUI/CCControlExtension/CCScale9Sprite.h"
using namespace cocos2d; using namespace cocos2d;
using namespace cocos2d::extension; using namespace cocos2d::extension;

2
cocos/gui/widgets/UISlider.cpp
View File

@ -23,7 +23,7 @@
****************************************************************************/ ****************************************************************************/
#include "UISlider.h" #include "UISlider.h"
#include "GUI/CCControlExtension/CCScale9Sprite.h" #include "extensions/GUI/CCControlExtension/CCScale9Sprite.h"
using namespace cocos2d; using namespace cocos2d;
using namespace cocos2d::extension; using namespace cocos2d::extension;

262
samples/Cpp/TestCpp/Android.mk
View File

@ -7,137 +7,137 @@ LOCAL_MODULE := cocos_testcpp_common
LOCAL_MODULE_FILENAME := libtestcppcommon LOCAL_MODULE_FILENAME := libtestcppcommon
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
$(LOCAL_PATH)/Classes/AppDelegate.cpp \ ./Classes/AppDelegate.cpp \
$(LOCAL_PATH)/Classes/BaseTest.cpp \ ./Classes/BaseTest.cpp \
$(LOCAL_PATH)/Classes/controller.cpp \ ./Classes/controller.cpp \
$(LOCAL_PATH)/Classes/testBasic.cpp \ ./Classes/testBasic.cpp \
$(LOCAL_PATH)/Classes/VisibleRect.cpp \ ./Classes/VisibleRect.cpp \
$(LOCAL_PATH)/Classes/AccelerometerTest/AccelerometerTest.cpp \ ./Classes/AccelerometerTest/AccelerometerTest.cpp \
$(LOCAL_PATH)/Classes/ActionManagerTest/ActionManagerTest.cpp \ ./Classes/ActionManagerTest/ActionManagerTest.cpp \
$(LOCAL_PATH)/Classes/ActionsEaseTest/ActionsEaseTest.cpp \ ./Classes/ActionsEaseTest/ActionsEaseTest.cpp \
$(LOCAL_PATH)/Classes/ActionsProgressTest/ActionsProgressTest.cpp \ ./Classes/ActionsProgressTest/ActionsProgressTest.cpp \
$(LOCAL_PATH)/Classes/ActionsTest/ActionsTest.cpp \ ./Classes/ActionsTest/ActionsTest.cpp \
$(LOCAL_PATH)/Classes/Box2DTest/Box2dTest.cpp \ ./Classes/Box2DTest/Box2dTest.cpp \
$(LOCAL_PATH)/Classes/Box2DTestBed/Box2dView.cpp \ ./Classes/Box2DTestBed/Box2dView.cpp \
$(LOCAL_PATH)/Classes/Box2DTestBed/GLES-Render.cpp \ ./Classes/Box2DTestBed/GLES-Render.cpp \
$(LOCAL_PATH)/Classes/Box2DTestBed/Test.cpp \ ./Classes/Box2DTestBed/Test.cpp \
$(LOCAL_PATH)/Classes/Box2DTestBed/TestEntries.cpp \ ./Classes/Box2DTestBed/TestEntries.cpp \
$(LOCAL_PATH)/Classes/BugsTest/Bug-1159.cpp \ ./Classes/BugsTest/Bug-1159.cpp \
$(LOCAL_PATH)/Classes/BugsTest/Bug-1174.cpp \ ./Classes/BugsTest/Bug-1174.cpp \
$(LOCAL_PATH)/Classes/BugsTest/Bug-350.cpp \ ./Classes/BugsTest/Bug-350.cpp \
$(LOCAL_PATH)/Classes/BugsTest/Bug-422.cpp \ ./Classes/BugsTest/Bug-422.cpp \
$(LOCAL_PATH)/Classes/BugsTest/Bug-624.cpp \ ./Classes/BugsTest/Bug-624.cpp \
$(LOCAL_PATH)/Classes/BugsTest/Bug-886.cpp \ ./Classes/BugsTest/Bug-886.cpp \
$(LOCAL_PATH)/Classes/BugsTest/Bug-899.cpp \ ./Classes/BugsTest/Bug-899.cpp \
$(LOCAL_PATH)/Classes/BugsTest/Bug-914.cpp \ ./Classes/BugsTest/Bug-914.cpp \
$(LOCAL_PATH)/Classes/BugsTest/BugsTest.cpp \ ./Classes/BugsTest/BugsTest.cpp \
$(LOCAL_PATH)/Classes/BugsTest/Bug-458/Bug-458.cpp \ ./Classes/BugsTest/Bug-458/Bug-458.cpp \
$(LOCAL_PATH)/Classes/BugsTest/Bug-458/QuestionContainerSprite.cpp \ ./Classes/BugsTest/Bug-458/QuestionContainerSprite.cpp \
$(LOCAL_PATH)/Classes/ChipmunkTest/ChipmunkTest.cpp \ ./Classes/ChipmunkTest/ChipmunkTest.cpp \
$(LOCAL_PATH)/Classes/ClickAndMoveTest/ClickAndMoveTest.cpp \ ./Classes/ClickAndMoveTest/ClickAndMoveTest.cpp \
$(LOCAL_PATH)/Classes/ClippingNodeTest/ClippingNodeTest.cpp \ ./Classes/ClippingNodeTest/ClippingNodeTest.cpp \
$(LOCAL_PATH)/Classes/CocosDenshionTest/CocosDenshionTest.cpp \ ./Classes/CocosDenshionTest/CocosDenshionTest.cpp \
$(LOCAL_PATH)/Classes/ConfigurationTest/ConfigurationTest.cpp \ ./Classes/ConfigurationTest/ConfigurationTest.cpp \
$(LOCAL_PATH)/Classes/CurlTest/CurlTest.cpp \ ./Classes/CurlTest/CurlTest.cpp \
$(LOCAL_PATH)/Classes/CurrentLanguageTest/CurrentLanguageTest.cpp \ ./Classes/CurrentLanguageTest/CurrentLanguageTest.cpp \
$(LOCAL_PATH)/Classes/DataVisitorTest/DataVisitorTest.cpp \ ./Classes/DataVisitorTest/DataVisitorTest.cpp \
$(LOCAL_PATH)/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp \ ./Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp \
$(LOCAL_PATH)/Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp \ ./Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp \
$(LOCAL_PATH)/Classes/EffectsTest/EffectsTest.cpp \ ./Classes/EffectsTest/EffectsTest.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/ExtensionsTest.cpp \ ./Classes/ExtensionsTest/ExtensionsTest.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.cpp \ ./Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp \ ./Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.cpp \ ./Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.cpp \ ./Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.cpp \ ./Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.cpp \ ./Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.cpp \ ./Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp \ ./Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.cpp \ ./Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.cpp \ ./Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.cpp \ ./Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp \ ./Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp \ ./Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp \ ./Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp \ ./Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp \ ./Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.cpp \ ./Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp \ ./Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp \ ./Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UIDragPanelTest/UIDragPanelTest.cpp \ ./Classes/ExtensionsTest/CocoStudioGUITest/UIDragPanelTest/UIDragPanelTest.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp \ ./Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.cpp \ ./Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.cpp \ ./Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.cpp \ ./Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp \ ./Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp \ ./Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UINodeContainerTest/UINodeContainerTest.cpp \ ./Classes/ExtensionsTest/CocoStudioGUITest/UINodeContainerTest/UINodeContainerTest.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp \ ./Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UIPanelTest/UIPanelTest.cpp \ ./Classes/ExtensionsTest/CocoStudioGUITest/UIPanelTest/UIPanelTest.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp \ ./Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp \ ./Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UITextAreaTest/UITextAreaTest.cpp \ ./Classes/ExtensionsTest/CocoStudioGUITest/UITextAreaTest/UITextAreaTest.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UITextButtonTest/UITextButtonTest.cpp \ ./Classes/ExtensionsTest/CocoStudioGUITest/UITextButtonTest/UITextButtonTest.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp \ ./Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp \ ./Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.cpp \ ./Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.cpp \ ./Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.cpp \ ./Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.cpp \ ./Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.cpp \ ./Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp \ ./Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.cpp \ ./Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.cpp \ ./Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.cpp \ ./Classes/ExtensionsTest/EditBoxTest/EditBoxTest.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp \ ./Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/NetworkTest/SocketIOTest.cpp \ ./Classes/ExtensionsTest/NetworkTest/SocketIOTest.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/NetworkTest/WebSocketTest.cpp \ ./Classes/ExtensionsTest/NetworkTest/WebSocketTest.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.cpp \ ./Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp \ ./Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp \ ./Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp \
$(LOCAL_PATH)/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp \ ./Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp \
$(LOCAL_PATH)/Classes/FileUtilsTest/FileUtilsTest.cpp \ ./Classes/FileUtilsTest/FileUtilsTest.cpp \
$(LOCAL_PATH)/Classes/FontTest/FontTest.cpp \ ./Classes/FontTest/FontTest.cpp \
$(LOCAL_PATH)/Classes/IntervalTest/IntervalTest.cpp \ ./Classes/IntervalTest/IntervalTest.cpp \
$(LOCAL_PATH)/Classes/KeyboardTest/KeyboardTest.cpp \ ./Classes/KeyboardTest/KeyboardTest.cpp \
$(LOCAL_PATH)/Classes/KeypadTest/KeypadTest.cpp \ ./Classes/KeypadTest/KeypadTest.cpp \
$(LOCAL_PATH)/Classes/LabelTest/LabelTest.cpp \ ./Classes/LabelTest/LabelTest.cpp \
$(LOCAL_PATH)/Classes/LabelTest/LabelTestNew.cpp \ ./Classes/LabelTest/LabelTestNew.cpp \
$(LOCAL_PATH)/Classes/LayerTest/LayerTest.cpp \ ./Classes/LayerTest/LayerTest.cpp \
$(LOCAL_PATH)/Classes/MenuTest/MenuTest.cpp \ ./Classes/MenuTest/MenuTest.cpp \
$(LOCAL_PATH)/Classes/MotionStreakTest/MotionStreakTest.cpp \ ./Classes/MotionStreakTest/MotionStreakTest.cpp \
$(LOCAL_PATH)/Classes/MutiTouchTest/MutiTouchTest.cpp \ ./Classes/MutiTouchTest/MutiTouchTest.cpp \
$(LOCAL_PATH)/Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp \ ./Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp \
$(LOCAL_PATH)/Classes/NodeTest/NodeTest.cpp \ ./Classes/NodeTest/NodeTest.cpp \
$(LOCAL_PATH)/Classes/ParallaxTest/ParallaxTest.cpp \ ./Classes/ParallaxTest/ParallaxTest.cpp \
$(LOCAL_PATH)/Classes/ParticleTest/ParticleTest.cpp \ ./Classes/ParticleTest/ParticleTest.cpp \
$(LOCAL_PATH)/Classes/PerformanceTest/PerformanceAllocTest.cpp \ ./Classes/PerformanceTest/PerformanceAllocTest.cpp \
$(LOCAL_PATH)/Classes/PerformanceTest/PerformanceNodeChildrenTest.cpp \ ./Classes/PerformanceTest/PerformanceNodeChildrenTest.cpp \
$(LOCAL_PATH)/Classes/PerformanceTest/PerformanceParticleTest.cpp \ ./Classes/PerformanceTest/PerformanceParticleTest.cpp \
$(LOCAL_PATH)/Classes/PerformanceTest/PerformanceSpriteTest.cpp \ ./Classes/PerformanceTest/PerformanceSpriteTest.cpp \
$(LOCAL_PATH)/Classes/PerformanceTest/PerformanceTest.cpp \ ./Classes/PerformanceTest/PerformanceTest.cpp \
$(LOCAL_PATH)/Classes/PerformanceTest/PerformanceTextureTest.cpp \ ./Classes/PerformanceTest/PerformanceTextureTest.cpp \
$(LOCAL_PATH)/Classes/PerformanceTest/PerformanceTouchesTest.cpp \ ./Classes/PerformanceTest/PerformanceTouchesTest.cpp \
$(LOCAL_PATH)/Classes/PhysicsTest/PhysicsTest.cpp \ ./Classes/PhysicsTest/PhysicsTest.cpp \
$(LOCAL_PATH)/Classes/RenderTextureTest/RenderTextureTest.cpp \ ./Classes/RenderTextureTest/RenderTextureTest.cpp \
$(LOCAL_PATH)/Classes/RotateWorldTest/RotateWorldTest.cpp \ ./Classes/RotateWorldTest/RotateWorldTest.cpp \
$(LOCAL_PATH)/Classes/SceneTest/SceneTest.cpp \ ./Classes/SceneTest/SceneTest.cpp \
$(LOCAL_PATH)/Classes/SchedulerTest/SchedulerTest.cpp \ ./Classes/SchedulerTest/SchedulerTest.cpp \
$(LOCAL_PATH)/Classes/ShaderTest/ShaderTest.cpp \ ./Classes/ShaderTest/ShaderTest.cpp \
$(LOCAL_PATH)/Classes/ShaderTest/ShaderTest2.cpp \ ./Classes/ShaderTest/ShaderTest2.cpp \
$(LOCAL_PATH)/Classes/SpineTest/SpineTest.cpp \ ./Classes/SpineTest/SpineTest.cpp \
$(LOCAL_PATH)/Classes/SpriteTest/SpriteTest.cpp \ ./Classes/SpriteTest/SpriteTest.cpp \
$(LOCAL_PATH)/Classes/TextInputTest/TextInputTest.cpp \ ./Classes/TextInputTest/TextInputTest.cpp \
$(LOCAL_PATH)/Classes/Texture2dTest/Texture2dTest.cpp \ ./Classes/Texture2dTest/Texture2dTest.cpp \
$(LOCAL_PATH)/Classes/TextureCacheTest/TextureCacheTest.cpp \ ./Classes/TextureCacheTest/TextureCacheTest.cpp \
$(LOCAL_PATH)/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp \ ./Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp \
$(LOCAL_PATH)/Classes/TileMapTest/TileMapTest.cpp \ ./Classes/TileMapTest/TileMapTest.cpp \
$(LOCAL_PATH)/Classes/TouchesTest/Ball.cpp \ ./Classes/TouchesTest/Ball.cpp \
$(LOCAL_PATH)/Classes/TouchesTest/Paddle.cpp \ ./Classes/TouchesTest/Paddle.cpp \
$(LOCAL_PATH)/Classes/TouchesTest/TouchesTest.cpp \ ./Classes/TouchesTest/TouchesTest.cpp \
$(LOCAL_PATH)/Classes/TransitionsTest/TransitionsTest.cpp \ ./Classes/TransitionsTest/TransitionsTest.cpp \
$(LOCAL_PATH)/Classes/UserDefaultTest/UserDefaultTest.cpp \ ./Classes/UserDefaultTest/UserDefaultTest.cpp \
$(LOCAL_PATH)/Classes/ZwoptexTest/ZwoptexTest.cpp ./Classes/ZwoptexTest/ZwoptexTest.cpp
LOCAL_C_INCLUDES := $(LOCAL_PATH)/Classes LOCAL_C_INCLUDES := $(LOCAL_PATH)/Classes

3
samples/Cpp/TestCpp/Classes/AppDelegate.cpp
View File

@ -3,7 +3,7 @@
#include "cocos2d.h" #include "cocos2d.h"
#include "controller.h" #include "controller.h"
#include "SimpleAudioEngine.h" #include "SimpleAudioEngine.h"
#include "cocostudio/armature/utils/CCArmatureDataManager.h" #include "cocostudio/CocoStudio.h"
#include "cocos-ext.h" #include "cocos-ext.h"
USING_NS_CC; USING_NS_CC;
@ -51,6 +51,7 @@ bool AppDelegate::applicationDidFinishLaunching()
{ {
searchPaths.push_back("scenetest"); searchPaths.push_back("scenetest");
} }
pFileUtils->setSearchPaths(searchPaths); pFileUtils->setSearchPaths(searchPaths);
EGLView::getInstance()->setDesignResolutionSize(designSize.width, designSize.height, ResolutionPolicy::NO_BORDER); EGLView::getInstance()->setDesignResolutionSize(designSize.width, designSize.height, ResolutionPolicy::NO_BORDER);

2
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
View File

@ -1,6 +1,6 @@
#include "ArmatureScene.h" #include "ArmatureScene.h"
#include "../../testResource.h" #include "../../testResource.h"
#include "armature/display/CCSkin.h" #include "cocostudio/CocoStudio.h"
using namespace cocos2d; using namespace cocos2d;

2
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h
View File

@ -5,7 +5,7 @@
#include "cocos-ext.h" #include "cocos-ext.h"
#include "../../VisibleRect.h" #include "../../VisibleRect.h"
#include "../../testBasic.h" #include "../../testBasic.h"
#include "armature/CCArmature.h" #include "cocostudio/CocoStudio.h"
#if ENABLE_PHYSICS_BOX2D_DETECT #if ENABLE_PHYSICS_BOX2D_DETECT
#include "../../Box2DTestBed/GLES-Render.h" #include "../../Box2DTestBed/GLES-Render.h"

2
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h
View File

@ -3,7 +3,7 @@
#include "cocos2d.h" #include "cocos2d.h"
#include "cocos-ext.h" #include "cocos-ext.h"
#include "CocoStudio.h" #include "cocostudio/CocoStudio.h"
class EnemyController : public cocostudio::ComController class EnemyController : public cocostudio::ComController

2
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h
View File

@ -3,7 +3,7 @@
#include "cocos2d.h" #include "cocos2d.h"
#include "cocos-ext.h" #include "cocos-ext.h"
#include "CocoStudio.h" #include "cocostudio/CocoStudio.h"
class PlayerController : public cocostudio::ComController class PlayerController : public cocostudio::ComController

2
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h
View File

@ -3,7 +3,7 @@
#include "cocos2d.h" #include "cocos2d.h"
#include "cocos-ext.h" #include "cocos-ext.h"
#include "CocoStudio.h" #include "cocostudio/CocoStudio.h"
class ProjectileController : public cocostudio::ComController class ProjectileController : public cocostudio::ComController
{ {

2
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h
View File

@ -3,7 +3,7 @@
#include "cocos2d.h" #include "cocos2d.h"
#include "cocos-ext.h" #include "cocos-ext.h"
#include "CocoStudio.h" #include "cocostudio/CocoStudio.h"
class SceneController : public cocostudio::ComController class SceneController : public cocostudio::ComController
{ {

3
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp
View File

@ -1,8 +1,7 @@
#include "CocosGUIScene.h" #include "CocosGUIScene.h"
#include "UISceneManager.h" #include "UISceneManager.h"
//#include "CocosGUIExamplesRegisterScene.h"
#include "../ExtensionsTest.h" #include "../ExtensionsTest.h"
#include "CocoStudio.h" #include "cocostudio/CocoStudio.h"
const char* gui_scene_names[2] = const char* gui_scene_names[2] =
{ {

2
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp
View File

@ -2,7 +2,7 @@
#include "cocos-ext.h" #include "cocos-ext.h"
#include "../ExtensionsTest.h" #include "../ExtensionsTest.h"
#include "SceneEditorTest.h" #include "SceneEditorTest.h"
#include "CocoStudio.h" #include "cocostudio/CocoStudio.h"
#include "system/CocosGUI.h" #include "system/CocosGUI.h"
using namespace cocos2d; using namespace cocos2d;

2
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.h
View File

@ -3,7 +3,7 @@
#include "cocos2d.h" #include "cocos2d.h"
#include "cocos-ext.h" #include "cocos-ext.h"
#include "CocosBuilder.h" #include "cocosbuilder/CocosBuilder.h"
class AnimationsTestLayer class AnimationsTestLayer
: public cocos2d::Layer : public cocos2d::Layer

2
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h
View File

@ -3,7 +3,7 @@
#include "cocos2d.h" #include "cocos2d.h"
#include "cocos-ext.h" #include "cocos-ext.h"
#include "CocosBuilder.h" #include "cocosbuilder/CocosBuilder.h"
class ButtonTestLayer class ButtonTestLayer
: public cocos2d::Layer : public cocos2d::Layer

2
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h
View File

@ -3,7 +3,7 @@
#include "cocos2d.h" #include "cocos2d.h"
#include "cocos-ext.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! * Note: for some pretty hard fucked up reason, the order of inheritance is important!

2
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h
View File

@ -3,7 +3,7 @@
#include "cocos2d.h" #include "cocos2d.h"
#include "cocos-ext.h" #include "cocos-ext.h"
#include "CocosBuilder.h" #include "cocosbuilder/CocosBuilder.h"
class MenuTestLayer class MenuTestLayer
: public cocos2d::Layer : public cocos2d::Layer

2
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h
View File

@ -3,7 +3,7 @@
#include "cocos2d.h" #include "cocos2d.h"
#include "cocos-ext.h" #include "cocos-ext.h"
#include "CocosBuilder.h" #include "cocosbuilder/CocosBuilder.h"
class TestHeaderLayer class TestHeaderLayer
: public cocos2d::Layer : public cocos2d::Layer

2
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h
View File

@ -3,7 +3,7 @@
#include "cocos2d.h" #include "cocos2d.h"
#include "cocos-ext.h" #include "cocos-ext.h"
#include "CocosBuilder.h" #include "cocosbuilder/CocosBuilder.h"
class TimelineCallbackTestLayer class TimelineCallbackTestLayer
: public cocos2d::Layer : public cocos2d::Layer

2
samples/Cpp/TestCpp/Classes/testBasic.cpp
View File

@ -1,7 +1,7 @@
#include "testBasic.h" #include "testBasic.h"
#include "controller.h" #include "controller.h"
#include "cocos-ext.h" #include "cocos-ext.h"
#include "cocostudio/armature/utils/CCArmatureDataManager.h" #include "cocostudio/CocoStudio.h"
TestScene::TestScene(bool bPortrait) TestScene::TestScene(bool bPortrait)
{ {