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

Merge pull request #15252 from xiaofeng11/v3_studioRef 

Remove cocos2dx.h reference from all cocos studio related files
This commit is contained in:
zilongshanren 2016-03-17 11:38:20 +08:00
parent 561fa96a00 0a657cd219
commit 18992b0404
23 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cocos/editor-support/cocosbuilder/CCNodeLoader.cpp
View File

@ -1,10 +1,15 @@
#include "cocos2d.h"
#include "CCNodeLoader.h"
#include "CCBSelectorResolver.h"
#include "CCBMemberVariableAssigner.h"
#include "CCBAnimationManager.h"
#include "CCNode+CCBRelativePositioning.h"
#include "deprecated/CCArray.h"
#include "deprecated/CCString.h"
#include "base/CCDirector.h"
#include "renderer/CCTextureCache.h"
#include "2d/CCSpriteFrameCache.h"
#include "2d/CCAnimationCache.h"
#include "platform/CCFileUtils.h"
using namespace std;

6
cocos/editor-support/cocostudio/FlatBuffersSerialize.h
View File

@ -25,9 +25,13 @@
#ifndef __cocos2d_libs__FlatBuffersSerialize__
#define __cocos2d_libs__FlatBuffersSerialize__
#include "cocos2d.h"
#include <string>
#include <vector>
#include "ExtensionMacros.h"
#include "cocostudio/CocosStudioExport.h"
#include "platform/CCPlatformMacros.h"
#include "ui/UIWidget.h"
namespace flatbuffers
{

1
cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h
View File

@ -25,7 +25,6 @@ THE SOFTWARE.
#ifndef __ARMATURENODEREADER_H_
#define __ARMATURENODEREADER_H_
#include "cocos2d.h"
#include "cocostudio/WidgetReader/NodeReaderProtocol.h"
#include "cocostudio/WidgetReader/NodeReaderDefine.h"

4
cocos/editor-support/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.h
View File

@ -25,7 +25,9 @@
#ifndef __cocos2d_libs__ComAudioReader__
#define __cocos2d_libs__ComAudioReader__
#include "cocos2d.h"
#include "base/CCRef.h"
#include "2d/CCComponent.h"
#include "2d/CCNode.h"
#include "cocostudio/CocosStudioExport.h"
#include "cocostudio/WidgetReader/NodeReaderProtocol.h"

1
cocos/editor-support/cocostudio/WidgetReader/GameMapReader/GameMapReader.h
View File

@ -25,7 +25,6 @@
#ifndef __cocos2d_libs__GameMapReader__
#define __cocos2d_libs__GameMapReader__
#include "cocos2d.h"
#include "cocostudio/CocosStudioExport.h"
#include "cocostudio/WidgetReader/NodeReaderProtocol.h"
#include "cocostudio/WidgetReader/NodeReaderDefine.h"

1
cocos/editor-support/cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.h
View File

@ -25,7 +25,6 @@
#ifndef __cocos2d_libs__GameNode3DReader__
#define __cocos2d_libs__GameNode3DReader__
#include "cocos2d.h"
#include "2d/CCCameraBackgroundBrush.h"
#include "cocostudio/CocosStudioExport.h"
#include "cocostudio/WidgetReader/NodeReaderProtocol.h"

1
cocos/editor-support/cocostudio/WidgetReader/Light3DReader/Light3DReader.cpp
View File

@ -23,6 +23,7 @@
****************************************************************************/
#include "Light3DReader.h"
#include "2d/CCLight.h"
#include "cocostudio/CSParseBinary_generated.h"
#include "cocostudio/CSParse3DBinary_generated.h"

2
cocos/editor-support/cocostudio/WidgetReader/Light3DReader/Light3DReader.h
View File

@ -24,7 +24,7 @@
#ifndef __cocos2d_libs__Light3DReader__
#define __cocos2d_libs__Light3DReader__
#include "cocos2d.h"
#include "cocostudio/CocosStudioExport.h"
#include "cocostudio/WidgetReader/NodeReaderProtocol.h"
#include "cocostudio/WidgetReader/NodeReaderDefine.h"

2
cocos/editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.h
View File

@ -25,7 +25,7 @@
#ifndef __cocos2d_libs__Node3DReader__
#define __cocos2d_libs__Node3DReader__
#include "cocos2d.h"
#include "math/Vec3.h"
#include "cocostudio/CocosStudioExport.h"
#include "cocostudio/WidgetReader/NodeReaderProtocol.h"
#include "cocostudio/WidgetReader/NodeReaderDefine.h"

1
cocos/editor-support/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.cpp
View File

@ -22,6 +22,7 @@
THE SOFTWARE.
****************************************************************************/
#include "platform/CCFileUtils.h"
#include "Particle3DReader.h"
#include "cocostudio/CSParseBinary_generated.h"

1
cocos/editor-support/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.h
View File

@ -25,7 +25,6 @@
#ifndef __cocos2d_libs__Particle3DReader__
#define __cocos2d_libs__Particle3DReader__
#include "cocos2d.h"
#include "cocostudio/CocosStudioExport.h"
#include "cocostudio/WidgetReader/NodeReaderProtocol.h"
#include "cocostudio/WidgetReader/NodeReaderDefine.h"

1
cocos/editor-support/cocostudio/WidgetReader/ParticleReader/ParticleReader.h
View File

@ -25,7 +25,6 @@
#ifndef __cocos2d_libs__ParticleReader__
#define __cocos2d_libs__ParticleReader__
#include "cocos2d.h"
#include "cocostudio/CocosStudioExport.h"
#include "cocostudio/WidgetReader/NodeReaderProtocol.h"
#include "cocostudio/WidgetReader/NodeReaderDefine.h"

2
cocos/editor-support/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.h
View File

@ -25,7 +25,7 @@
#ifndef __cocos2d_libs__ProjectNodeReader__
#define __cocos2d_libs__ProjectNodeReader__
#include "cocos2d.h"
#include "base/CCRef.h"
#include "cocostudio/CocosStudioExport.h"
#include "cocostudio/WidgetReader/NodeReaderProtocol.h"

1
cocos/editor-support/cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.h
View File

@ -25,7 +25,6 @@
#ifndef __cocos2d_libs__SingleNodeReader__
#define __cocos2d_libs__SingleNodeReader__
#include "cocos2d.h"
#include "cocostudio/CocosStudioExport.h"
#include "cocostudio/WidgetReader/NodeReaderProtocol.h"
#include "cocostudio/WidgetReader/NodeReaderDefine.h"

1
cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.h
View File

@ -25,7 +25,6 @@ THE SOFTWARE.
#ifndef __BONENODEREADER_H_
#define __BONENODEREADER_H_
#include "cocos2d.h"
#include "cocostudio/WidgetReader/NodeReaderProtocol.h"
#include "cocostudio/WidgetReader/NodeReaderDefine.h"

1
cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.h
View File

@ -25,7 +25,6 @@ THE SOFTWARE.
#ifndef _SKELETONNODEREADER_H_
#define _SKELETONNODEREADER_H_
#include "cocos2d.h"
#include "cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.h"
class SkeletonNodeReader : public BoneNodeReader

5
cocos/editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.cpp
View File

@ -22,6 +22,11 @@
THE SOFTWARE.
****************************************************************************/
#include "2d/CCLight.h"
#include "3d/CCSprite3D.h"
#include "3d/CCAnimate3D.h"
#include "3d/CCAnimation3D.h"
#include "platform/CCFileUtils.h"
#include "Sprite3DReader.h"
#include "cocostudio/CSParseBinary_generated.h"

2
cocos/editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.h
View File

@ -25,7 +25,7 @@
#ifndef __cocos2d_libs__Sprite3DReader__
#define __cocos2d_libs__Sprite3DReader__
#include "cocos2d.h"
#include "math/Vec2.h"
#include "cocostudio/CocosStudioExport.h"
#include "cocostudio/WidgetReader/NodeReaderProtocol.h"
#include "cocostudio/WidgetReader/NodeReaderDefine.h"

1
cocos/editor-support/cocostudio/WidgetReader/SpriteReader/SpriteReader.h
View File

@ -25,7 +25,6 @@
#ifndef __cocos2d_libs__SpriteReader__
#define __cocos2d_libs__SpriteReader__
#include "cocos2d.h"
#include "cocostudio/CocosStudioExport.h"
#include "cocostudio/WidgetReader/NodeReaderProtocol.h"
#include "cocostudio/WidgetReader/NodeReaderDefine.h"

3
cocos/editor-support/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.cpp
View File

@ -22,6 +22,9 @@
THE SOFTWARE.
****************************************************************************/
#include "base/CCDirector.h"
#include "2d/CCCamera.h"
#include "platform/CCFileUtils.h"
#include "UserCameraReader.h"
#include "cocostudio/CSParseBinary_generated.h"

2
cocos/editor-support/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.h
View File

@ -25,7 +25,7 @@
#ifndef __cocos2d_libs__UserCameraReader__
#define __cocos2d_libs__UserCameraReader__
#include "cocos2d.h"
#include "math/Vec2.h"
#include "cocostudio/CocosStudioExport.h"
#include "cocostudio/WidgetReader/NodeReaderProtocol.h"
#include "cocostudio/WidgetReader/NodeReaderDefine.h"

5
cocos/editor-support/spine/PolygonBatch.cpp
View File

@ -31,6 +31,11 @@
#include <spine/PolygonBatch.h>
#include <spine/extension.h>
#include "base/ccMacros.h"
#include "base/CCDirector.h"
#include "renderer/CCRenderer.h"
#include "renderer/ccGLStateCache.h"
#include "renderer/CCGLProgram.h"
USING_NS_CC;

2
cocos/editor-support/spine/PolygonBatch.h
View File

@ -32,7 +32,7 @@
#ifndef SPINE_POLYGONBATCH_H_
#define SPINE_POLYGONBATCH_H_
#include "cocos2d.h"
#include "renderer/CCTexture2D.h"
namespace spine {