mirror of https://github.com/axmolengine/axmol.git
issue #80: include only cocos2d.h
This commit is contained in:
parent
710e29b086
commit
2c84bdda1e
|
@ -1,12 +1,13 @@
|
||||||
#include "ActionsTest.h"
|
#include "ActionsTest.h"
|
||||||
#include "platform/platform.h"
|
// #include "platform/platform.h"
|
||||||
#include "CCIntervalAction.h"
|
// #include "CCIntervalAction.h"
|
||||||
#include "CCInstantAction.h"
|
// #include "CCInstantAction.h"
|
||||||
#include "CCCameraAction.h"
|
// #include "CCCameraAction.h"
|
||||||
#include "CCMenu.h"
|
// #include "CCMenu.h"
|
||||||
#include "CCLabel.h"
|
// #include "CCLabel.h"
|
||||||
#include "touch_dispatcher/CCTouchDispatcher.h"
|
// #include "touch_dispatcher/CCTouchDispatcher.h"
|
||||||
#include "../testResource.h"
|
#include "../testResource.h"
|
||||||
|
/*#include "cocos2d.h"*/
|
||||||
|
|
||||||
static Int32 s_nActionIdx = -1;
|
static Int32 s_nActionIdx = -1;
|
||||||
|
|
||||||
|
|
|
@ -2,11 +2,12 @@
|
||||||
#define _ActionsTest_H_
|
#define _ActionsTest_H_
|
||||||
|
|
||||||
#include "../testBasic.h"
|
#include "../testBasic.h"
|
||||||
#include "CCDirector.h"
|
// #include "CCDirector.h"
|
||||||
#include "CCScene.h"
|
// #include "CCScene.h"
|
||||||
#include "CCLayer.h"
|
// #include "CCLayer.h"
|
||||||
#include "CCSprite.h"
|
// #include "CCSprite.h"
|
||||||
#include "platform/platform.h"
|
// #include "platform/platform.h"
|
||||||
|
#include "cocos2d.h"
|
||||||
|
|
||||||
using namespace cocos2d;
|
using namespace cocos2d;
|
||||||
|
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
#include "ClickAndMoveTest.h"
|
#include "ClickAndMoveTest.h"
|
||||||
#include "CCDirector.h"
|
// #include "CCDirector.h"
|
||||||
#include "CCSprite.h"
|
// #include "CCSprite.h"
|
||||||
#include "../testResource.h"
|
#include "../testResource.h"
|
||||||
#include "CCIntervalAction.h"
|
// #include "CCIntervalAction.h"
|
||||||
#include "CCInstantAction.h"
|
// #include "CCInstantAction.h"
|
||||||
#include "touch_dispatcher/CCTouch.h"
|
// #include "touch_dispatcher/CCTouch.h"
|
||||||
#include "NSSet.h"
|
// #include "NSSet.h"
|
||||||
|
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
#include "EffectsTest.h"
|
#include "EffectsTest.h"
|
||||||
#include "../testResource.h"
|
#include "../testResource.h"
|
||||||
#include "CCDirector.h"
|
// #include "CCDirector.h"
|
||||||
#include "CCGrid3DAction.h"
|
// #include "CCGrid3DAction.h"
|
||||||
#include "CCTiledGridAction.h"
|
// #include "CCTiledGridAction.h"
|
||||||
#include "CCPageTurn3DAction.h"
|
// #include "CCPageTurn3DAction.h"
|
||||||
#include "CCLabel.h"
|
// #include "CCLabel.h"
|
||||||
#include "CCMenu.h"
|
// #include "CCMenu.h"
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
kTagTextLayer = 1,
|
kTagTextLayer = 1,
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
#include "ParticleTest.h"
|
#include "ParticleTest.h"
|
||||||
#include "CCIntervalAction.h"
|
// #include "CCIntervalAction.h"
|
||||||
#include "CCMenu.h"
|
// #include "CCMenu.h"
|
||||||
#include "CCLabel.h"
|
// #include "CCLabel.h"
|
||||||
#include "CCLabelAtlas.h"
|
// #include "CCLabelAtlas.h"
|
||||||
#include "touch_dispatcher/CCTouchDispatcher.h"
|
// #include "touch_dispatcher/CCTouchDispatcher.h"
|
||||||
#include "../testResource.h"
|
#include "../testResource.h"
|
||||||
#include "support/CGPointExtension.h"
|
/*#include "support/CGPointExtension.h"*/
|
||||||
|
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
|
|
|
@ -3,8 +3,8 @@
|
||||||
|
|
||||||
#include "../testBasic.h"
|
#include "../testBasic.h"
|
||||||
#include "cocos2d.h"
|
#include "cocos2d.h"
|
||||||
#include "touch_dispatcher/CCTouch.h"
|
// #include "touch_dispatcher/CCTouch.h"
|
||||||
#include "CCParticleExample.h"
|
// #include "CCParticleExample.h"
|
||||||
|
|
||||||
class ParticleTestScene : public TestScene
|
class ParticleTestScene : public TestScene
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
#include "ProgressActionsTest.h"
|
#include "ProgressActionsTest.h"
|
||||||
#include "CCDirector.h"
|
// #include "CCDirector.h"
|
||||||
#include "CCLabel.h"
|
// #include "CCLabel.h"
|
||||||
#include "CCMenu.h"
|
// #include "CCMenu.h"
|
||||||
#include "CCProgressTimer.h"
|
// #include "CCProgressTimer.h"
|
||||||
#include "CCProgressTimerActions.h"
|
// #include "CCProgressTimerActions.h"
|
||||||
#include "../testResource.h"
|
#include "../testResource.h"
|
||||||
|
|
||||||
static int sceneIdx = -1;
|
static int sceneIdx = -1;
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
#include "RotateWorldTest.h"
|
#include "RotateWorldTest.h"
|
||||||
#include "../testResource.h"
|
#include "../testResource.h"
|
||||||
#include "CCLabel.h"
|
// #include "CCLabel.h"
|
||||||
#include "CCDirector.h"
|
// #include "CCDirector.h"
|
||||||
#include "CCMenu.h"
|
// #include "CCMenu.h"
|
||||||
#include "CCIntervalAction.h"
|
// #include "CCIntervalAction.h"
|
||||||
|
|
||||||
//------------------------------------------------------------------
|
//------------------------------------------------------------------
|
||||||
//
|
//
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
#include "TransitionsTest.h"
|
#include "TransitionsTest.h"
|
||||||
#include "CCDirector.h"
|
// #include "CCDirector.h"
|
||||||
#include "CCSprite.h"
|
// #include "CCSprite.h"
|
||||||
#include "CCMenu.h"
|
// #include "CCMenu.h"
|
||||||
#include "CCLabel.h"
|
// #include "CCLabel.h"
|
||||||
#include "CCTransition.h"
|
// #include "CCTransition.h"
|
||||||
#include "CCRadialTransition.h"
|
// #include "CCRadialTransition.h"
|
||||||
#include "CCPageTurnTransition.h"
|
// #include "CCPageTurnTransition.h"
|
||||||
#include "../testResource.h"
|
#include "../testResource.h"
|
||||||
|
|
||||||
#define MAX_LAYER 37
|
#define MAX_LAYER 37
|
||||||
|
@ -186,7 +186,6 @@ static std::string transitions[] = {
|
||||||
"SlideInTTransition",
|
"SlideInTTransition",
|
||||||
"SlideInBTransition",
|
"SlideInBTransition",
|
||||||
};
|
};
|
||||||
|
|
||||||
static int s_nSceneIdx = 0;
|
static int s_nSceneIdx = 0;
|
||||||
|
|
||||||
CCTransitionScene* createTransition(int nIndex, ccTime t, CCScene* s)
|
CCTransitionScene* createTransition(int nIndex, ccTime t, CCScene* s)
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#include "tests.h"
|
#include "tests.h"
|
||||||
#include "controller.h"
|
#include "controller.h"
|
||||||
#include "CCLabel.h"
|
// #include "CCLabel.h"
|
||||||
#include "touch_dispatcher/CCTouchDispatcher.h"
|
// #include "touch_dispatcher/CCTouchDispatcher.h"
|
||||||
|
|
||||||
#define LINE_SPACE 30
|
#define LINE_SPACE 30
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
#ifndef _CONTROLLER_H_
|
#ifndef _CONTROLLER_H_
|
||||||
#define _CONTROLLER_H_
|
#define _CONTROLLER_H_
|
||||||
|
|
||||||
#include "CCLayer.h"
|
// #include "CCLayer.h"
|
||||||
#include "CCMenu.h"
|
// #include "CCMenu.h"
|
||||||
|
#include "cocos2d.h"
|
||||||
|
|
||||||
using namespace cocos2d;
|
using namespace cocos2d;
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
#include "testBasic.h"
|
#include "testBasic.h"
|
||||||
#include "controller.h"
|
#include "controller.h"
|
||||||
#include "CCMenu.h"
|
// #include "CCMenu.h"
|
||||||
#include "CCLabel.h"
|
// #include "CCLabel.h"
|
||||||
#include "CCDirector.h"
|
// #include "CCDirector.h"
|
||||||
|
|
||||||
BackToMainMenuLayer::BackToMainMenuLayer()
|
BackToMainMenuLayer::BackToMainMenuLayer()
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
#ifndef _TEST_BASIC_H_
|
#ifndef _TEST_BASIC_H_
|
||||||
#define _TEST_BASIC_H_
|
#define _TEST_BASIC_H_
|
||||||
|
|
||||||
#include "CCScene.h"
|
// #include "CCScene.h"
|
||||||
#include "CCLayer.h"
|
// #include "CCLayer.h"
|
||||||
|
#include "cocos2d.h"
|
||||||
|
|
||||||
using namespace cocos2d;
|
using namespace cocos2d;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue