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

Merge pull request #3954 from minggo/iss2905-adjust_folder 

Iss2905 adjust folder
This commit is contained in:
minggo 2013-10-16 01:51:49 -07:00
parent 8e3e454a1e 91eada6c1e
commit 75cf78de67
178 changed files with 682 additions and 691 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

310
cocos/2d/Android.mk
View File

@ -7,165 +7,164 @@ LOCAL_MODULE := cocos2dx_static
LOCAL_MODULE_FILENAME := libcocos2d
LOCAL_SRC_FILES := \
$(LOCAL_PATH)/base64.cpp \
$(LOCAL_PATH)/CCAction.cpp \
$(LOCAL_PATH)/CCActionCamera.cpp \
$(LOCAL_PATH)/CCActionCatmullRom.cpp \
$(LOCAL_PATH)/CCActionEase.cpp \
$(LOCAL_PATH)/CCActionGrid.cpp \
$(LOCAL_PATH)/CCActionGrid3D.cpp \
$(LOCAL_PATH)/CCActionInstant.cpp \
$(LOCAL_PATH)/CCActionInterval.cpp \
$(LOCAL_PATH)/CCActionManager.cpp \
$(LOCAL_PATH)/CCActionPageTurn3D.cpp \
$(LOCAL_PATH)/CCActionProgressTimer.cpp \
$(LOCAL_PATH)/CCActionTiledGrid.cpp \
$(LOCAL_PATH)/CCActionTween.cpp \
$(LOCAL_PATH)/CCAnimation.cpp \
$(LOCAL_PATH)/CCAnimationCache.cpp \
$(LOCAL_PATH)/CCAtlasNode.cpp \
$(LOCAL_PATH)/CCCamera.cpp \
$(LOCAL_PATH)/ccCArray.cpp \
$(LOCAL_PATH)/CCClippingNode.cpp \
$(LOCAL_PATH)/CCComponent.cpp \
$(LOCAL_PATH)/CCComponentContainer.cpp \
$(LOCAL_PATH)/CCConfiguration.cpp \
$(LOCAL_PATH)/CCDeprecated.cpp \
$(LOCAL_PATH)/CCDirector.cpp \
$(LOCAL_PATH)/CCDrawingPrimitives.cpp \
$(LOCAL_PATH)/CCDrawNode.cpp \
$(LOCAL_PATH)/CCEvent.cpp \
$(LOCAL_PATH)/CCEventAcceleration.cpp \
$(LOCAL_PATH)/CCEventCustom.cpp \
$(LOCAL_PATH)/CCEventDispatcher.cpp \
$(LOCAL_PATH)/CCEventKeyboard.cpp \
$(LOCAL_PATH)/CCEventListener.cpp \
$(LOCAL_PATH)/CCEventListenerAcceleration.cpp \
$(LOCAL_PATH)/CCEventListenerCustom.cpp \
$(LOCAL_PATH)/CCEventListenerKeyboard.cpp \
$(LOCAL_PATH)/CCEventListenerTouch.cpp \
$(LOCAL_PATH)/CCEventTouch.cpp \
$(LOCAL_PATH)/CCFont.cpp \
$(LOCAL_PATH)/CCFontAtlas.cpp \
$(LOCAL_PATH)/CCFontAtlasCache.cpp \
$(LOCAL_PATH)/CCFontAtlasFactory.cpp \
$(LOCAL_PATH)/CCFontDefinition.cpp \
$(LOCAL_PATH)/CCFontFNT.cpp \
$(LOCAL_PATH)/CCFontFreeType.cpp \
$(LOCAL_PATH)/ccFPSImages.c \
$(LOCAL_PATH)/CCGLBufferedNode.cpp \
$(LOCAL_PATH)/CCGLProgram.cpp \
$(LOCAL_PATH)/ccGLStateCache.cpp \
$(LOCAL_PATH)/CCGrabber.cpp \
$(LOCAL_PATH)/CCGrid.cpp \
$(LOCAL_PATH)/CCIMEDispatcher.cpp \
$(LOCAL_PATH)/CCLabel.cpp \
$(LOCAL_PATH)/CCLabelAtlas.cpp \
$(LOCAL_PATH)/CCLabelBMFont.cpp \
$(LOCAL_PATH)/CCLabelTextFormatter.cpp \
$(LOCAL_PATH)/CCLabelTTF.cpp \
$(LOCAL_PATH)/CCLayer.cpp \
$(LOCAL_PATH)/CCMenu.cpp \
$(LOCAL_PATH)/CCMenuItem.cpp \
$(LOCAL_PATH)/CCMotionStreak.cpp \
$(LOCAL_PATH)/CCNode.cpp \
$(LOCAL_PATH)/CCNotificationCenter.cpp \
$(LOCAL_PATH)/CCParallaxNode.cpp \
$(LOCAL_PATH)/CCParticleBatchNode.cpp \
$(LOCAL_PATH)/CCParticleExamples.cpp \
$(LOCAL_PATH)/CCParticleSystem.cpp \
$(LOCAL_PATH)/CCParticleSystemQuad.cpp \
$(LOCAL_PATH)/CCProfiling.cpp \
$(LOCAL_PATH)/CCProgressTimer.cpp \
$(LOCAL_PATH)/CCRenderTexture.cpp \
$(LOCAL_PATH)/CCScene.cpp \
$(LOCAL_PATH)/CCScheduler.cpp \
$(LOCAL_PATH)/CCScriptSupport.cpp \
$(LOCAL_PATH)/CCShaderCache.cpp \
$(LOCAL_PATH)/ccShaders.cpp \
$(LOCAL_PATH)/CCSprite.cpp \
$(LOCAL_PATH)/CCSpriteBatchNode.cpp \
$(LOCAL_PATH)/CCSpriteFrame.cpp \
$(LOCAL_PATH)/CCSpriteFrameCache.cpp \
$(LOCAL_PATH)/CCTextFieldTTF.cpp \
$(LOCAL_PATH)/CCTextImage.cpp \
$(LOCAL_PATH)/CCTexture2D.cpp \
$(LOCAL_PATH)/CCTextureAtlas.cpp \
$(LOCAL_PATH)/CCTextureCache.cpp \
$(LOCAL_PATH)/CCTileMapAtlas.cpp \
$(LOCAL_PATH)/CCTMXLayer.cpp \
$(LOCAL_PATH)/CCTMXObjectGroup.cpp \
$(LOCAL_PATH)/CCTMXTiledMap.cpp \
$(LOCAL_PATH)/CCTMXXMLParser.cpp \
$(LOCAL_PATH)/CCTouch.cpp \
$(LOCAL_PATH)/CCTransition.cpp \
$(LOCAL_PATH)/CCTransitionPageTurn.cpp \
$(LOCAL_PATH)/CCTransitionProgress.cpp \
$(LOCAL_PATH)/ccTypes.cpp \
$(LOCAL_PATH)/CCUserDefault.cpp \
$(LOCAL_PATH)/CCUserDefaultAndroid.cpp \
$(LOCAL_PATH)/ccUTF8.cpp \
$(LOCAL_PATH)/ccUtils.cpp \
$(LOCAL_PATH)/CCVertex.cpp \
$(LOCAL_PATH)/cocos2d.cpp \
$(LOCAL_PATH)/TGAlib.cpp \
$(LOCAL_PATH)/TransformUtils.cpp \
$(LOCAL_PATH)/ZipUtils.cpp \
$(LOCAL_PATH)/platform/CCEGLViewProtocol.cpp \
$(LOCAL_PATH)/platform/CCFileUtils.cpp \
$(LOCAL_PATH)/platform/CCSAXParser.cpp \
$(LOCAL_PATH)/platform/CCThread.cpp \
$(LOCAL_PATH)/../base/atitc.cpp \
$(LOCAL_PATH)/../base/CCAffineTransform.cpp \
$(LOCAL_PATH)/../base/CCArray.cpp \
$(LOCAL_PATH)/../base/CCAutoreleasePool.cpp \
$(LOCAL_PATH)/../base/CCData.cpp \
$(LOCAL_PATH)/../base/CCDataVisitor.cpp \
$(LOCAL_PATH)/../base/CCDictionary.cpp \
$(LOCAL_PATH)/../base/CCGeometry.cpp \
$(LOCAL_PATH)/../base/CCNS.cpp \
$(LOCAL_PATH)/../base/CCObject.cpp \
$(LOCAL_PATH)/../base/CCSet.cpp \
$(LOCAL_PATH)/../base/CCString.cpp \
$(LOCAL_PATH)/../base/etc1.cpp \
$(LOCAL_PATH)/../base/s3tc.cpp \
$(LOCAL_PATH)/../math/kazmath/src/aabb.c \
$(LOCAL_PATH)/../math/kazmath/src/mat3.c \
$(LOCAL_PATH)/../math/kazmath/src/mat4.c \
$(LOCAL_PATH)/../math/kazmath/src/neon_matrix_impl.c \
$(LOCAL_PATH)/../math/kazmath/src/plane.c \
$(LOCAL_PATH)/../math/kazmath/src/quaternion.c \
$(LOCAL_PATH)/../math/kazmath/src/ray2.c \
$(LOCAL_PATH)/../math/kazmath/src/utility.c \
$(LOCAL_PATH)/../math/kazmath/src/vec2.c \
$(LOCAL_PATH)/../math/kazmath/src/vec3.c \
$(LOCAL_PATH)/../math/kazmath/src/vec4.c \
$(LOCAL_PATH)/../math/kazmath/src/GL/mat4stack.c \
$(LOCAL_PATH)/../math/kazmath/src/GL/matrix.c \
$(LOCAL_PATH)/../physics/CCPhysicsBody.cpp \
$(LOCAL_PATH)/../physics/CCPhysicsContact.cpp \
$(LOCAL_PATH)/../physics/CCPhysicsJoint.cpp \
$(LOCAL_PATH)/../physics/CCPhysicsShape.cpp \
$(LOCAL_PATH)/../physics/CCPhysicsWorld.cpp \
$(LOCAL_PATH)/../physics/box2d/CCPhysicsBodyInfo.cpp \
$(LOCAL_PATH)/../physics/box2d/CCPhysicsContactInfo.cpp \
$(LOCAL_PATH)/../physics/box2d/CCPhysicsJointInfo.cpp \
$(LOCAL_PATH)/../physics/box2d/CCPhysicsShapeInfo.cpp \
$(LOCAL_PATH)/../physics/box2d/CCPhysicsWorldInfo.cpp \
$(LOCAL_PATH)/../physics/chipmunk/CCPhysicsBodyInfo.cpp \
$(LOCAL_PATH)/../physics/chipmunk/CCPhysicsContactInfo.cpp \
$(LOCAL_PATH)/../physics/chipmunk/CCPhysicsJointInfo.cpp \
$(LOCAL_PATH)/../physics/chipmunk/CCPhysicsShapeInfo.cpp \
$(LOCAL_PATH)/../physics/chipmunk/CCPhysicsWorldInfo.cpp \
$(LOCAL_PATH)/../../external/tinyxml2/tinyxml2.cpp \
$(LOCAL_PATH)/../../external/unzip/ioapi.cpp \
$(LOCAL_PATH)/../../external/unzip/unzip.cpp
base64.cpp \
CCAction.cpp \
CCActionCamera.cpp \
CCActionCatmullRom.cpp \
CCActionEase.cpp \
CCActionGrid.cpp \
CCActionGrid3D.cpp \
CCActionInstant.cpp \
CCActionInterval.cpp \
CCActionManager.cpp \
CCActionPageTurn3D.cpp \
CCActionProgressTimer.cpp \
CCActionTiledGrid.cpp \
CCActionTween.cpp \
CCAnimation.cpp \
CCAnimationCache.cpp \
CCAtlasNode.cpp \
CCCamera.cpp \
ccCArray.cpp \
CCClippingNode.cpp \
CCComponent.cpp \
CCComponentContainer.cpp \
CCConfiguration.cpp \
CCDeprecated.cpp \
CCDirector.cpp \
CCDrawingPrimitives.cpp \
CCDrawNode.cpp \
CCEvent.cpp \
CCEventAcceleration.cpp \
CCEventCustom.cpp \
CCEventDispatcher.cpp \
CCEventKeyboard.cpp \
CCEventListener.cpp \
CCEventListenerAcceleration.cpp \
CCEventListenerCustom.cpp \
CCEventListenerKeyboard.cpp \
CCEventListenerTouch.cpp \
CCEventTouch.cpp \
CCFont.cpp \
CCFontAtlas.cpp \
CCFontAtlasCache.cpp \
CCFontAtlasFactory.cpp \
CCFontDefinition.cpp \
CCFontFNT.cpp \
CCFontFreeType.cpp \
ccFPSImages.c \
CCGLBufferedNode.cpp \
CCGLProgram.cpp \
ccGLStateCache.cpp \
CCGrabber.cpp \
CCGrid.cpp \
CCIMEDispatcher.cpp \
CCLabel.cpp \
CCLabelAtlas.cpp \
CCLabelBMFont.cpp \
CCLabelTextFormatter.cpp \
CCLabelTTF.cpp \
CCLayer.cpp \
CCMenu.cpp \
CCMenuItem.cpp \
CCMotionStreak.cpp \
CCNode.cpp \
CCNotificationCenter.cpp \
CCParallaxNode.cpp \
CCParticleBatchNode.cpp \
CCParticleExamples.cpp \
CCParticleSystem.cpp \
CCParticleSystemQuad.cpp \
CCProfiling.cpp \
CCProgressTimer.cpp \
CCRenderTexture.cpp \
CCScene.cpp \
CCScheduler.cpp \
CCScriptSupport.cpp \
CCShaderCache.cpp \
ccShaders.cpp \
CCSprite.cpp \
CCSpriteBatchNode.cpp \
CCSpriteFrame.cpp \
CCSpriteFrameCache.cpp \
CCTextFieldTTF.cpp \
CCTextImage.cpp \
CCTexture2D.cpp \
CCTextureAtlas.cpp \
CCTextureCache.cpp \
CCTileMapAtlas.cpp \
CCTMXLayer.cpp \
CCTMXObjectGroup.cpp \
CCTMXTiledMap.cpp \
CCTMXXMLParser.cpp \
CCTouch.cpp \
CCTransition.cpp \
CCTransitionPageTurn.cpp \
CCTransitionProgress.cpp \
ccTypes.cpp \
CCUserDefault.cpp \
CCUserDefaultAndroid.cpp \
ccUTF8.cpp \
ccUtils.cpp \
CCVertex.cpp \
cocos2d.cpp \
TGAlib.cpp \
TransformUtils.cpp \
ZipUtils.cpp \
platform/CCEGLViewProtocol.cpp \
platform/CCFileUtils.cpp \
platform/CCSAXParser.cpp \
platform/CCThread.cpp \
../base/atitc.cpp \
../base/CCAffineTransform.cpp \
../base/CCArray.cpp \
../base/CCAutoreleasePool.cpp \
../base/CCData.cpp \
../base/CCDataVisitor.cpp \
../base/CCDictionary.cpp \
../base/CCGeometry.cpp \
../base/CCNS.cpp \
../base/CCObject.cpp \
../base/CCSet.cpp \
../base/CCString.cpp \
../base/etc1.cpp \
../base/s3tc.cpp \
../math/kazmath/src/aabb.c \
../math/kazmath/src/mat3.c \
../math/kazmath/src/mat4.c \
../math/kazmath/src/neon_matrix_impl.c \
../math/kazmath/src/plane.c \
../math/kazmath/src/quaternion.c \
../math/kazmath/src/ray2.c \
../math/kazmath/src/utility.c \
../math/kazmath/src/vec2.c \
../math/kazmath/src/vec3.c \
../math/kazmath/src/vec4.c \
../math/kazmath/src/GL/mat4stack.c \
../math/kazmath/src/GL/matrix.c \
../physics/CCPhysicsBody.cpp \
../physics/CCPhysicsContact.cpp \
../physics/CCPhysicsJoint.cpp \
../physics/CCPhysicsShape.cpp \
../physics/CCPhysicsWorld.cpp \
../physics/box2d/CCPhysicsBodyInfo.cpp \
../physics/box2d/CCPhysicsContactInfo.cpp \
../physics/box2d/CCPhysicsJointInfo.cpp \
../physics/box2d/CCPhysicsShapeInfo.cpp \
../physics/box2d/CCPhysicsWorldInfo.cpp \
../physics/chipmunk/CCPhysicsBodyInfo.cpp \
../physics/chipmunk/CCPhysicsContactInfo.cpp \
../physics/chipmunk/CCPhysicsJointInfo.cpp \
../physics/chipmunk/CCPhysicsShapeInfo.cpp \
../physics/chipmunk/CCPhysicsWorldInfo.cpp \
../../external/tinyxml2/tinyxml2.cpp \
../../external/unzip/ioapi.cpp \
../../external/unzip/unzip.cpp
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \
$(LOCAL_PATH)/include \
$(LOCAL_PATH)/../math/kazmath/include \
$(LOCAL_PATH)/platform/android \
platform/android \
$(LOCAL_PATH)/../physics \
$(LOCAL_PATH)/../base \
$(LOCAL_PATH)/../../external/tinyxml2 \
@ -173,7 +172,6 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \
$(LOCAL_PATH)/../../external/chipmunk/include/chipmunk
LOCAL_C_INCLUDES := $(LOCAL_PATH) \
$(LOCAL_PATH)/include \
$(LOCAL_PATH)/../math/kazmath/include \
$(LOCAL_PATH)/platform/android \
$(LOCAL_PATH)/../physics \

2
cocos/editor-support/cocosbuilder/CCBAnimationManager.h
View File

@ -2,7 +2,7 @@
#define __CCB_CCBANIMATION_MANAGER_H__
#include "cocos2d.h"
#include "ExtensionMacros.h"
#include "extensions/ExtensionMacros.h"
#include "CCBSequence.h"
#include "CCBValue.h"
#include "CCBSequenceProperty.h"

72
cocos/editor-support/cocostudio/Android.mk
View File

@ -5,50 +5,50 @@ LOCAL_MODULE := cocostudio_static
LOCAL_MODULE_FILENAME := libcocostudio
LOCAL_SRC_FILES := action/CCActionFrame.cpp \
action/CCActionFrameEasing.cpp \
action/CCActionManagerEx.cpp \
action/CCActionNode.cpp \
action/CCActionObject.cpp \
armature/CCArmature.cpp \
armature/CCBone.cpp \
armature/animation/CCArmatureAnimation.cpp \
armature/animation/CCProcessBase.cpp \
armature/animation/CCTween.cpp \
armature/datas/CCDatas.cpp \
armature/display/CCBatchNode.cpp \
armature/display/CCDecorativeDisplay.cpp \
armature/display/CCDisplayFactory.cpp \
armature/display/CCDisplayManager.cpp \
armature/display/CCSkin.cpp \
armature/physics/CCColliderDetector.cpp \
armature/utils/CCArmatureDataManager.cpp \
armature/utils/CCArmatureDefine.cpp \
armature/utils/CCDataReaderHelper.cpp \
armature/utils/CCSpriteFrameCacheHelper.cpp \
armature/utils/CCTransformHelp.cpp \
armature/utils/CCTweenFunction.cpp \
armature/utils/CCUtilMath.cpp \
components/CCComAttribute.cpp \
components/CCComAudio.cpp \
components/CCComController.cpp \
components/CCComRender.cpp \
components/CCInputDelegate.cpp \
json/CSContentJsonDictionary.cpp \
json/DictionaryHelper.cpp \
reader/CCSGUIReader.cpp \
reader/CCSSceneReader.cpp \
LOCAL_SRC_FILES := CCActionFrame.cpp \
CCActionFrameEasing.cpp \
CCActionManagerEx.cpp \
CCActionNode.cpp \
CCActionObject.cpp \
CCArmature.cpp \
CCBone.cpp \
CCArmatureAnimation.cpp \
CCProcessBase.cpp \
CCTween.cpp \
CCDatas.cpp \
CCBatchNode.cpp \
CCDecorativeDisplay.cpp \
CCDisplayFactory.cpp \
CCDisplayManager.cpp \
CCSkin.cpp \
CCColliderDetector.cpp \
CCArmatureDataManager.cpp \
CCArmatureDefine.cpp \
CCDataReaderHelper.cpp \
CCSpriteFrameCacheHelper.cpp \
CCTransformHelp.cpp \
CCTweenFunction.cpp \
CCUtilMath.cpp \
CCComAttribute.cpp \
CCComAudio.cpp \
CCComController.cpp \
CCComRender.cpp \
CCInputDelegate.cpp \
CSContentJsonDictionary.cpp \
DictionaryHelper.cpp \
CCSGUIReader.cpp \
CCSSceneReader.cpp \
../../../external/json/json_reader.cpp \
../../../external/json/json_value.cpp \
../../../external/json/json_writer.cpp
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. \
$(LOCAL_PATH)/../../../external/json
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../2d \
$(LOCAL_PATH)/../../../external/json \
$(LOCAL_PATH) \
$(LOCAL_PATH)/../../gui \
$(LOCAL_PATH)/.. \
$(LOCAL_PATH)/../.. \
$(LOCAL_PATH)/../../../external
LOCAL_CFLAGS += -Wno-psabi -fexceptions

0
cocos/editor-support/cocostudio/action/CCActionFrame.cpp → cocos/editor-support/cocostudio/CCActionFrame.cpp
View File

0
cocos/editor-support/cocostudio/action/CCActionFrame.h → cocos/editor-support/cocostudio/CCActionFrame.h
View File

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

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

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

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

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

@ -22,8 +22,8 @@
THE SOFTWARE.
****************************************************************************/
#include "CCActionManagerEx.h"
#include "cocostudio/json/DictionaryHelper.h"
#include "cocostudio/CCActionManagerEx.h"
#include "cocostudio/DictionaryHelper.h"
using namespace cocos2d;

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

@ -26,8 +26,8 @@
#define __ActionMANAGER_H__
#include "cocos2d.h"
#include "CCActionObject.h"
#include "cocostudio/json/CSContentJsonDictionary.h"
#include "cocostudio/CCActionObject.h"
#include "cocostudio/CSContentJsonDictionary.h"
namespace cocostudio {

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

@ -22,11 +22,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "CCActionNode.h"
#include "CCActionFrameEasing.h"
#include "base-classes/UIWidget.h"
#include "system/UIHelper.h"
#include "cocostudio/json/DictionaryHelper.h"
#include "cocostudio/CCActionNode.h"
#include "cocostudio/CCActionFrameEasing.h"
#include "cocostudio/DictionaryHelper.h"
#include "gui/UIWidget.h"
#include "gui/UIHelper.h"
using namespace cocos2d;
using namespace gui;

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

@ -26,8 +26,8 @@
#define __ActionNODE_H__
#include "cocos2d.h"
#include "CCActionFrame.h"
#include "cocostudio/json/CSContentJsonDictionary.h"
#include "cocostudio/CCActionFrame.h"
#include "cocostudio/CSContentJsonDictionary.h"
namespace cocostudio {

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

@ -22,8 +22,8 @@
THE SOFTWARE.
****************************************************************************/
#include "CCActionObject.h"
#include "cocostudio/json/DictionaryHelper.h"
#include "cocostudio/CCActionObject.h"
#include "cocostudio/DictionaryHelper.h"
using namespace cocos2d;

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

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

12
cocos/editor-support/cocostudio/armature/CCArmature.cpp → cocos/editor-support/cocostudio/CCArmature.cpp
View File

@ -22,12 +22,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "CCArmature.h"
#include "utils/CCArmatureDataManager.h"
#include "utils/CCArmatureDefine.h"
#include "utils/CCDataReaderHelper.h"
#include "datas/CCDatas.h"
#include "display/CCSkin.h"
#include "cocostudio/CCArmature.h"
#include "cocostudio/CCArmatureDataManager.h"
#include "cocostudio/CCArmatureDefine.h"
#include "cocostudio/CCDataReaderHelper.h"
#include "cocostudio/CCDatas.h"
#include "cocostudio/CCSkin.h"
#if ENABLE_PHYSICS_BOX2D_DETECT
#include "Box2D/Box2D.h"

12
cocos/editor-support/cocostudio/armature/CCArmature.h → cocos/editor-support/cocostudio/CCArmature.h
View File

@ -25,12 +25,12 @@ THE SOFTWARE.
#ifndef __CCARMATURE_H__
#define __CCARMATURE_H__
#include "utils/CCArmatureDefine.h"
#include "CCBone.h"
#include "display/CCBatchNode.h"
#include "animation/CCArmatureAnimation.h"
#include "utils/CCSpriteFrameCacheHelper.h"
#include "utils/CCArmatureDataManager.h"
#include "cocostudio/CCArmatureDefine.h"
#include "cocostudio/CCBone.h"
#include "cocostudio/CCBatchNode.h"
#include "cocostudio/CCArmatureAnimation.h"
#include "cocostudio/CCSpriteFrameCacheHelper.h"
#include "cocostudio/CCArmatureDataManager.h"
class b2Body;
struct cpBody;

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

@ -22,12 +22,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "CCArmatureAnimation.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"
#include "cocostudio/CCArmatureAnimation.h"
#include "cocostudio/CCArmature.h"
#include "cocostudio/CCBone.h"
#include "cocostudio/CCArmatureDefine.h"
#include "cocostudio/CCUtilMath.h"
#include "cocostudio/CCDatas.h"
using namespace cocos2d;

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

@ -26,7 +26,7 @@ THE SOFTWARE.
#ifndef __CCANIMATION_H__
#define __CCANIMATION_H__
#include "CCProcessBase.h"
#include "cocostudio/CCProcessBase.h"
namespace cocostudio {

8
cocos/editor-support/cocostudio/armature/utils/CCArmatureDataManager.cpp → cocos/editor-support/cocostudio/CCArmatureDataManager.cpp
View File

@ -23,10 +23,10 @@ THE SOFTWARE.
****************************************************************************/
#include "CCArmatureDataManager.h"
#include "CCTransformHelp.h"
#include "CCDataReaderHelper.h"
#include "CCSpriteFrameCacheHelper.h"
#include "cocostudio/CCArmatureDataManager.h"
#include "cocostudio/CCTransformHelp.h"
#include "cocostudio/CCDataReaderHelper.h"
#include "cocostudio/CCSpriteFrameCacheHelper.h"
using namespace cocos2d;

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

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

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

@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "CCArmatureDefine.h"
#include "cocostudio/CCArmatureDefine.h"
namespace cocostudio {

0
cocos/editor-support/cocostudio/armature/utils/CCArmatureDefine.h → cocos/editor-support/cocostudio/CCArmatureDefine.h
View File

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

@ -22,9 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "CCBatchNode.h"
#include "cocostudio/armature/utils/CCArmatureDefine.h"
#include "cocostudio/armature/CCArmature.h"
#include "cocostudio/CCBatchNode.h"
#include "cocostudio/CCArmatureDefine.h"
#include "cocostudio/CCArmature.h"
using namespace cocos2d;

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

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

12
cocos/editor-support/cocostudio/armature/CCBone.cpp → cocos/editor-support/cocostudio/CCBone.cpp
View File

@ -22,12 +22,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "CCBone.h"
#include "CCArmature.h"
#include "utils/CCUtilMath.h"
#include "utils/CCArmatureDataManager.h"
#include "utils/CCTransformHelp.h"
#include "display/CCDisplayManager.h"
#include "cocostudio/CCBone.h"
#include "cocostudio/CCArmature.h"
#include "cocostudio/CCUtilMath.h"
#include "cocostudio/CCArmatureDataManager.h"
#include "cocostudio/CCTransformHelp.h"
#include "cocostudio/CCDisplayManager.h"
using namespace cocos2d;

10
cocos/editor-support/cocostudio/armature/CCBone.h → cocos/editor-support/cocostudio/CCBone.h
View File

@ -25,11 +25,11 @@ THE SOFTWARE.
#ifndef __CCBONE_H__
#define __CCBONE_H__
#include "utils/CCArmatureDefine.h"
#include "datas/CCDatas.h"
#include "animation/CCTween.h"
#include "display/CCDecorativeDisplay.h"
#include "display/CCDisplayManager.h"
#include "cocostudio/CCArmatureDefine.h"
#include "cocostudio/CCDatas.h"
#include "cocostudio/CCTween.h"
#include "cocostudio/CCDecorativeDisplay.h"
#include "cocostudio/CCDisplayManager.h"
namespace cocostudio {

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

@ -22,9 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "CCColliderDetector.h"
#include "cocostudio/armature/CCBone.h"
#include "cocostudio/armature/utils/CCTransformHelp.h"
#include "cocostudio/CCColliderDetector.h"
#include "cocostudio/CCBone.h"
#include "cocostudio/CCTransformHelp.h"
#if ENABLE_PHYSICS_BOX2D_DETECT
#include "Box2D/Box2D.h"

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

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

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

@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "CCComAttribute.h"
#include "cocostudio/CCComAttribute.h"
using namespace cocos2d;
namespace cocostudio {

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

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

2
cocos/editor-support/cocostudio/components/CCComAudio.cpp → cocos/editor-support/cocostudio/CCComAudio.cpp
View File

@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "CCComAudio.h"
#include "cocostudio/CCComAudio.h"
#include "SimpleAudioEngine.h"
namespace cocostudio {

0
cocos/editor-support/cocostudio/components/CCComAudio.h → cocos/editor-support/cocostudio/CCComAudio.h
View File

2
cocos/editor-support/cocostudio/components/CCComController.cpp → cocos/editor-support/cocostudio/CCComController.cpp
View File

@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "CCComController.h"
#include "cocostudio/CCComController.h"
namespace cocostudio {

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

@ -26,7 +26,7 @@ THE SOFTWARE.
#define __CC_EXTENTIONS_CCCOMCONTROLLER_H__
#include "cocos2d.h"
#include "CCInputDelegate.h"
#include "cocostudio/CCInputDelegate.h"
namespace cocostudio {

2
cocos/editor-support/cocostudio/components/CCComRender.cpp → cocos/editor-support/cocostudio/CCComRender.cpp
View File

@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "CCComRender.h"
#include "cocostudio/CCComRender.h"
namespace cocostudio {

0
cocos/editor-support/cocostudio/components/CCComRender.h → cocos/editor-support/cocostudio/CCComRender.h
View File

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

@ -23,12 +23,12 @@ THE SOFTWARE.
****************************************************************************/
#include "tinyxml2.h"
#include "CCDataReaderHelper.h"
#include "CCArmatureDataManager.h"
#include "CCTransformHelp.h"
#include "CCUtilMath.h"
#include "CCArmatureDefine.h"
#include "cocostudio/armature/datas/CCDatas.h"
#include "cocostudio/CCDataReaderHelper.h"
#include "cocostudio/CCArmatureDataManager.h"
#include "cocostudio/CCTransformHelp.h"
#include "cocostudio/CCUtilMath.h"
#include "cocostudio/CCArmatureDefine.h"
#include "cocostudio/CCDatas.h"
using namespace cocos2d;

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

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

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

@ -22,9 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "CCDatas.h"
#include "cocostudio/armature/utils/CCUtilMath.h"
#include "cocostudio/armature/utils/CCTransformHelp.h"
#include "cocostudio/CCDatas.h"
#include "cocostudio/CCUtilMath.h"
#include "cocostudio/CCTransformHelp.h"
using namespace cocos2d;

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

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

2
cocos/editor-support/cocostudio/armature/display/CCDecorativeDisplay.cpp → cocos/editor-support/cocostudio/CCDecorativeDisplay.cpp
View File

@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "CCDecorativeDisplay.h"
#include "cocostudio/CCDecorativeDisplay.h"
using namespace cocos2d;

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

@ -25,13 +25,13 @@ THE SOFTWARE.
#ifndef __CCDECORATIVEDISPLAY_H__
#define __CCDECORATIVEDISPLAY_H__
#include "cocostudio/armature/utils/CCArmatureDefine.h"
#include "CCDisplayFactory.h"
#include "cocostudio/armature/datas/CCDatas.h"
#include "cocostudio/CCArmatureDefine.h"
#include "cocostudio/CCDisplayFactory.h"
#include "cocostudio/CCDatas.h"
#if ENABLE_PHYSICS_BOX2D_DETECT || ENABLE_PHYSICS_CHIPMUNK_DETECT
#include "../physics/CCColliderDetector.h"
#include "cocostudio/CCColliderDetector.h"
#endif
namespace cocostudio {

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

@ -22,13 +22,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "CCDisplayFactory.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"
#include "cocostudio/CCDisplayFactory.h"
#include "cocostudio/CCBone.h"
#include "cocostudio/CCArmature.h"
#include "cocostudio/CCSkin.h"
#include "cocostudio/CCSpriteFrameCacheHelper.h"
#include "cocostudio/CCArmatureDataManager.h"
#include "cocostudio/CCTransformHelp.h"
using namespace cocos2d;

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

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

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

@ -22,11 +22,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "CCDisplayManager.h"
#include "cocostudio/armature/CCBone.h"
#include "cocostudio/armature/CCArmature.h"
#include "cocostudio/armature/utils/CCUtilMath.h"
#include "cocostudio/armature/display/CCSkin.h"
#include "cocostudio/CCDisplayManager.h"
#include "cocostudio/CCBone.h"
#include "cocostudio/CCArmature.h"
#include "cocostudio/CCUtilMath.h"
#include "cocostudio/CCSkin.h"
using namespace cocos2d;

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

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

2
cocos/editor-support/cocostudio/components/CCInputDelegate.cpp → cocos/editor-support/cocostudio/CCInputDelegate.cpp
View File

@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "CCInputDelegate.h"
#include "cocostudio/CCInputDelegate.h"
using namespace cocos2d;

0
cocos/editor-support/cocostudio/components/CCInputDelegate.h → cocos/editor-support/cocostudio/CCInputDelegate.h
View File

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

@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "CCProcessBase.h"
#include "cocostudio/armature/utils/CCUtilMath.h"
#include "cocostudio/CCProcessBase.h"
#include "cocostudio/CCUtilMath.h"
using namespace cocos2d;

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

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

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

@ -21,10 +21,10 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "system/CocosGUI.h"
#include "cocostudio/json/DictionaryHelper.h"
#include "cocostudio/action/CCActionManagerEx.h"
#include "cocostudio/CCSGUIReader.h"
#include "gui/CocosGUI.h"
#include "cocostudio/DictionaryHelper.h"
#include "cocostudio/CCActionManagerEx.h"
#include <fstream>
#include <iostream>

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

@ -25,8 +25,8 @@
#ifndef __CCSGUIREADER_H__
#define __CCSGUIREADER_H__
#include "base-classes/UIWidget.h"
#include "cocostudio/json/CSContentJsonDictionary.h"
#include "gui/UIWidget.h"
#include "cocostudio/CSContentJsonDictionary.h"
namespace cocostudio {

5
cocos/editor-support/cocostudio/reader/CCSSceneReader.cpp → cocos/editor-support/cocostudio/CCSSceneReader.cpp
View File

@ -22,9 +22,8 @@
THE SOFTWARE.
****************************************************************************/
#include "CCSSceneReader.h"
#include "CocoStudio.h"
#include "system/CocosGUI.h"
#include "cocostudio/CocoStudio.h"
#include "gui/CocosGUI.h"
using namespace cocos2d;
using namespace gui;

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

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

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

@ -22,10 +22,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "CCSkin.h"
#include "cocostudio/armature/utils/CCTransformHelp.h"
#include "cocostudio/armature/utils/CCSpriteFrameCacheHelper.h"
#include "cocostudio/armature/CCArmature.h"
#include "cocostudio/CCSkin.h"
#include "cocostudio/CCTransformHelp.h"
#include "cocostudio/CCSpriteFrameCacheHelper.h"
#include "cocostudio/CCArmature.h"
using namespace cocos2d;

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

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

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

@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "CCSpriteFrameCacheHelper.h"
#include "cocostudio/CCSpriteFrameCacheHelper.h"
using namespace cocos2d;

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

@ -24,7 +24,7 @@ THE SOFTWARE.
#ifndef __CCSPRITEFRAMECACHEHELPER_H__
#define __CCSPRITEFRAMECACHEHELPER_H__
#include "CCArmatureDefine.h"
#include "cocostudio/CCArmatureDefine.h"
#include <stack>
using namespace std;

4
cocos/editor-support/cocostudio/armature/utils/CCTransformHelp.cpp → cocos/editor-support/cocostudio/CCTransformHelp.cpp
View File

@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "CCTransformHelp.h"
#include "CCUtilMath.h"
#include "cocostudio/CCTransformHelp.h"
#include "cocostudio/CCUtilMath.h"
using namespace cocos2d;

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

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

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

@ -23,13 +23,13 @@ THE SOFTWARE.
****************************************************************************/
#include "CCTween.h"
#include "CCArmatureAnimation.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"
#include "cocostudio/CCTween.h"
#include "cocostudio/CCArmatureAnimation.h"
#include "cocostudio/CCBone.h"
#include "cocostudio/CCArmature.h"
#include "cocostudio/CCUtilMath.h"
#include "cocostudio/CCTweenFunction.h"
#include "cocostudio/CCTransformHelp.h"
namespace cocostudio {

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

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

4
cocos/editor-support/cocostudio/armature/utils/CCTweenFunction.cpp → cocos/editor-support/cocostudio/CCTweenFunction.cpp
View File

@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "CCTweenFunction.h"
#include "CCUtilMath.h"
#include "cocostudio/CCTweenFunction.h"
#include "cocostudio/CCUtilMath.h"
namespace cocostudio {

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

@ -26,7 +26,7 @@ THE SOFTWARE.
#define __CCTWEENFUNCTION_H__
#include "CCArmatureDefine.h"
#include "cocostudio/CCArmatureDefine.h"
#include <math.h>
namespace cocostudio {

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

@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "CCUtilMath.h"
#include "cocostudio/CCUtilMath.h"
using namespace cocos2d;

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

@ -25,7 +25,7 @@ THE SOFTWARE.
#ifndef __CCUTILMATH_H__
#define __CCUTILMATH_H__
#include "CCArmatureDefine.h"
#include "cocostudio/CCArmatureDefine.h"
#include <math.h>
namespace cocostudio {

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

@ -25,7 +25,7 @@
*/
#include <iostream>
#include "CSContentJsonDictionary.h"
#include "cocostudio/CSContentJsonDictionary.h"
namespace cocostudio {

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

66
cocos/editor-support/cocostudio/CocoStudio.h
View File

@ -25,38 +25,38 @@
#ifndef __EDITOR_SUPPORT_COCOSTUDIO_H__
#define __EDITOR_SUPPORT_COCOSTUDIO_H__
#include "action/CCActionFrame.h"
#include "action/CCActionFrameEasing.h"
#include "action/CCActionManagerEx.h"
#include "action/CCActionNode.h"
#include "action/CCActionObject.h"
#include "armature/CCArmature.h"
#include "armature/CCBone.h"
#include "armature/animation/CCArmatureAnimation.h"
#include "armature/animation/CCProcessBase.h"
#include "armature/animation/CCTween.h"
#include "armature/datas/CCDatas.h"
#include "armature/display/CCBatchNode.h"
#include "armature/display/CCDecorativeDisplay.h"
#include "armature/display/CCDisplayFactory.h"
#include "armature/display/CCDisplayManager.h"
#include "armature/display/CCSkin.h"
#include "armature/physics/CCColliderDetector.h"
#include "armature/utils/CCArmatureDataManager.h"
#include "armature/utils/CCArmatureDefine.h"
#include "armature/utils/CCDataReaderHelper.h"
#include "armature/utils/CCSpriteFrameCacheHelper.h"
#include "armature/utils/CCTransformHelp.h"
#include "armature/utils/CCTweenFunction.h"
#include "armature/utils/CCUtilMath.h"
#include "components/CCComAttribute.h"
#include "components/CCComAudio.h"
#include "components/CCComController.h"
#include "components/CCComRender.h"
#include "components/CCInputDelegate.h"
#include "json/CSContentJsonDictionary.h"
#include "json/DictionaryHelper.h"
#include "reader/CCSGUIReader.h"
#include "reader/CCSSceneReader.h"
#include "cocostudio/CCActionFrame.h"
#include "cocostudio/CCActionFrameEasing.h"
#include "cocostudio/CCActionManagerEx.h"
#include "cocostudio/CCActionNode.h"
#include "cocostudio/CCActionObject.h"
#include "cocostudio/CCArmature.h"
#include "cocostudio/CCBone.h"
#include "cocostudio/CCArmatureAnimation.h"
#include "cocostudio/CCProcessBase.h"
#include "cocostudio/CCTween.h"
#include "cocostudio/CCDatas.h"
#include "cocostudio/CCBatchNode.h"
#include "cocostudio/CCDecorativeDisplay.h"
#include "cocostudio/CCDisplayFactory.h"
#include "cocostudio/CCDisplayManager.h"
#include "cocostudio/CCSkin.h"
#include "cocostudio/CCColliderDetector.h"
#include "cocostudio/CCArmatureDataManager.h"
#include "cocostudio/CCArmatureDefine.h"
#include "cocostudio/CCDataReaderHelper.h"
#include "cocostudio/CCSpriteFrameCacheHelper.h"
#include "cocostudio/CCTransformHelp.h"
#include "cocostudio/CCTweenFunction.h"
#include "cocostudio/CCUtilMath.h"
#include "cocostudio/CCComAttribute.h"
#include "cocostudio/CCComAudio.h"
#include "cocostudio/CCComController.h"
#include "cocostudio/CCComRender.h"
#include "cocostudio/CCInputDelegate.h"
#include "cocostudio/CSContentJsonDictionary.h"
#include "cocostudio/DictionaryHelper.h"
#include "cocostudio/CCSGUIReader.h"
#include "cocostudio/CCSSceneReader.h"
#endif

2
cocos/editor-support/cocostudio/json/DictionaryHelper.cpp → cocos/editor-support/cocostudio/DictionaryHelper.cpp
View File

@ -22,7 +22,7 @@
THE SOFTWARE.
****************************************************************************/
#include "DictionaryHelper.h"
#include "cocostudio/DictionaryHelper.h"
namespace cocostudio {

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

@ -26,7 +26,7 @@
#define __DICTIONARYHELPER_H__
#include "cocos2d.h"
#include "CSContentJsonDictionary.h"
#include "cocostudio/CSContentJsonDictionary.h"
#define DICTOOL DictionaryHelper::shareHelper()

BIN
cocos/editor-support/cocostudio/json/.DS_Store vendored
View File

Binary file not shown.

47
cocos/gui/Android.mk
View File

@ -5,34 +5,33 @@ LOCAL_MODULE := gui_static
LOCAL_MODULE_FILENAME := libgui
LOCAL_SRC_FILES := base-classes/UIRootWidget.cpp \
base-classes/UIWidget.cpp \
layouts/Layout.cpp \
layouts/LayoutParameter.cpp \
layouts/UILayoutDefine.cpp \
system/CocosGUI.cpp \
system/UIHelper.cpp \
system/UIInputManager.cpp \
system/UILayer.cpp \
widgets/scroll-widget/UIDragPanel.cpp \
widgets/scroll-widget/UIListView.cpp \
widgets/scroll-widget/UIPageView.cpp \
widgets/scroll-widget/UIScrollView.cpp \
widgets/UIButton.cpp \
widgets/UICheckBox.cpp \
widgets/UIImageView.cpp \
widgets/UILabel.cpp \
widgets/UILabelAtlas.cpp \
widgets/UILabelBMFont.cpp \
widgets/UILoadingBar.cpp \
widgets/UISlider.cpp \
widgets/UITextField.cpp
LOCAL_SRC_FILES := UIRootWidget.cpp \
UIWidget.cpp \
Layout.cpp \
LayoutParameter.cpp \
UILayoutDefine.cpp \
CocosGUI.cpp \
UIHelper.cpp \
UIInputManager.cpp \
UILayer.cpp \
UIDragPanel.cpp \
UIListView.cpp \
UIPageView.cpp \
UIScrollView.cpp \
UIButton.cpp \
UICheckBox.cpp \
UIImageView.cpp \
UILabel.cpp \
UILabelAtlas.cpp \
UILabelBMFont.cpp \
UILoadingBar.cpp \
UISlider.cpp \
UITextField.cpp
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/..
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../2d \
$(LOCAL_PATH) \
$(LOCAL_PATH)/..
LOCAL_CFLAGS += -Wno-psabi

2
cocos/gui/system/CocosGUI.cpp → cocos/gui/CocosGUI.cpp
View File

@ -22,7 +22,7 @@
THE SOFTWARE.
****************************************************************************/
#include "CocosGUI.h"
#include "gui/CocosGUI.h"
namespace gui {

37
cocos/gui/system/CocosGUI.h → cocos/gui/CocosGUI.h
View File

@ -26,25 +26,24 @@
#define __COCOSGUI_H__
#include "base-classes/UIWidget.h"
#include "layouts/Layout.h"
#include "base-classes/UIRootWidget.h"
#include "widgets/UIButton.h"
#include "widgets/UICheckBox.h"
#include "widgets/UIImageView.h"
#include "widgets/UILabel.h"
#include "widgets/UILabelAtlas.h"
#include "widgets/UILoadingBar.h"
#include "widgets/scroll-widget/UIScrollView.h"
#include "widgets/UISlider.h"
#include "widgets/UITextField.h"
#include "widgets/scroll-widget/UIListView.h"
#include "widgets/scroll-widget/UIDragPanel.h"
#include "widgets/UILabelBMFont.h"
#include "widgets/scroll-widget/UIPageView.h"
#include "UIHelper.h"
#include "cocostudio/reader/CCSGUIReader.h"
#include "UILayer.h"
#include "gui/UIWidget.h"
#include "gui/Layout.h"
#include "gui/UIRootWidget.h"
#include "gui/UIButton.h"
#include "gui/UICheckBox.h"
#include "gui/UIImageView.h"
#include "gui/UILabel.h"
#include "gui/UILabelAtlas.h"
#include "gui/UILoadingBar.h"
#include "gui/UIScrollView.h"
#include "gui/UISlider.h"
#include "gui/UITextField.h"
#include "gui/UIListView.h"
#include "gui/UIDragPanel.h"
#include "gui/UILabelBMFont.h"
#include "gui/UIPageView.h"
#include "gui/UIHelper.h"
#include "gui/UILayer.h"
namespace gui {
const char* CocosGUIVersion();

6
cocos/gui/layouts/Layout.cpp → cocos/gui/Layout.cpp
View File

@ -22,9 +22,9 @@
THE SOFTWARE.
****************************************************************************/
#include "layout.h"
#include "system/UILayer.h"
#include "system/UIHelper.h"
#include "gui/layout.h"
#include "gui/UILayer.h"
#include "gui/UIHelper.h"
#include "extensions/GUI/CCControlExtension/CCScale9Sprite.h"
using namespace cocos2d;

2
cocos/gui/layouts/Layout.h → cocos/gui/Layout.h
View File

@ -25,7 +25,7 @@
#ifndef __LAYOUT_H__
#define __LAYOUT_H__
#include "base-classes/UIWidget.h"
#include "gui/UIWidget.h"
namespace gui {

4
cocos/gui/layouts/LayoutParameter.cpp → cocos/gui/LayoutParameter.cpp
View File

@ -22,8 +22,8 @@
THE SOFTWARE.
****************************************************************************/
#include "LayoutParameter.h"
#include "Layout.h"
#include "gui/LayoutParameter.h"
#include "gui/Layout.h"
namespace gui {

2
cocos/gui/layouts/LayoutParameter.h → cocos/gui/LayoutParameter.h
View File

@ -25,7 +25,7 @@
#ifndef __LAYOUTPARMETER_H__
#define __LAYOUTPARMETER_H__
#include "UILayoutDefine.h"
#include "gui/UILayoutDefine.h"
namespace gui {

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

@ -22,7 +22,7 @@
THE SOFTWARE.
****************************************************************************/
#include "UIButton.h"
#include "gui/UIButton.h"
#include "extensions/GUI/CCControlExtension/CCScale9Sprite.h"
using namespace cocos2d;

2
cocos/gui/widgets/UIButton.h → cocos/gui/UIButton.h
View File

@ -25,7 +25,7 @@
#ifndef __UIBUTTON_H__
#define __UIBUTTON_H__
#include "base-classes/UIWidget.h"
#include "gui/UIWidget.h"
namespace gui {

2
cocos/gui/widgets/UICheckBox.cpp → cocos/gui/UICheckBox.cpp
View File

@ -22,7 +22,7 @@
THE SOFTWARE.
****************************************************************************/
#include "UICheckBox.h"
#include "gui/UICheckBox.h"
using namespace cocos2d;

2
cocos/gui/widgets/UICheckBox.h → cocos/gui/UICheckBox.h
View File

@ -25,7 +25,7 @@
#ifndef __UICHECKBOX_H__
#define __UICHECKBOX_H__
#include "base-classes/UIWidget.h"
#include "gui/UIWidget.h"
namespace gui {

4
cocos/gui/widgets/scroll-widget/UIDragPanel.cpp → cocos/gui/UIDragPanel.cpp
View File

@ -22,8 +22,8 @@
THE SOFTWARE.
****************************************************************************/
#include "UIDragPanel.h"
#include "system/UILayer.h"
#include "gui/UIDragPanel.h"
#include "gui/UILayer.h"
using namespace cocos2d;

4
cocos/gui/widgets/scroll-widget/UIDragPanel.h → cocos/gui/UIDragPanel.h
View File

@ -25,8 +25,8 @@
#ifndef __UIDRAGPANEL_H__
#define __UIDRAGPANEL_H__
#include "layouts/Layout.h"
#include "UIScrollInterface.h"
#include "gui/Layout.h"
#include "gui/UIScrollInterface.h"
namespace gui {

7
cocos/gui/system/UIHelper.cpp → cocos/gui/UIHelper.cpp
View File

@ -22,10 +22,11 @@
THE SOFTWARE.
****************************************************************************/
#include "UIHelper.h"
#include "cocostudio/json/DictionaryHelper.h"
#include "gui/UIHelper.h"
#include "cocos2d.h"
#include "cocostudio/reader/CCSGUIReader.h"
#include "cocostudio/DictionaryHelper.h"
#include "cocostudio/CCSGUIReader.h"
using namespace cocos2d;
using namespace cocostudio;

4
cocos/gui/system/UIHelper.h → cocos/gui/UIHelper.h
View File

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

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

@ -22,7 +22,7 @@
THE SOFTWARE.
****************************************************************************/
#include "UIImageView.h"
#include "gui/UIImageView.h"
#include "extensions/GUI/CCControlExtension/CCScale9Sprite.h"
using namespace cocos2d;

2
cocos/gui/widgets/UIImageView.h → cocos/gui/UIImageView.h
View File

@ -25,7 +25,7 @@
#ifndef __UIIMAGEVIEW_H__
#define __UIIMAGEVIEW_H__
#include "base-classes/UIWidget.h"
#include "gui/UIWidget.h"
namespace gui {

4
cocos/gui/system/UIInputManager.cpp → cocos/gui/UIInputManager.cpp
View File

@ -22,8 +22,8 @@
THE SOFTWARE.
****************************************************************************/
#include "UIInputManager.h"
#include "UIHelper.h"
#include "gui/UIInputManager.h"
#include "gui/UIHelper.h"
using namespace cocos2d;

2
cocos/gui/system/UIInputManager.h → cocos/gui/UIInputManager.h
View File

@ -26,7 +26,7 @@
#define __UIINPUTMANAGER_H__
#include "cocos2d.h"
#include "layouts/Layout.h"
#include "gui/Layout.h"
namespace gui {

2
cocos/gui/widgets/UILabel.cpp → cocos/gui/UILabel.cpp
View File

@ -22,7 +22,7 @@
THE SOFTWARE.
****************************************************************************/
#include "UILabel.h"
#include "gui/UILabel.h"
using namespace cocos2d;

2
cocos/gui/widgets/UILabel.h → cocos/gui/UILabel.h
View File

@ -25,7 +25,7 @@
#ifndef __UILABEL_H__
#define __UILABEL_H__
#include "base-classes/UIWidget.h"
#include "gui/UIWidget.h"
namespace gui {

2
cocos/gui/widgets/UILabelAtlas.cpp → cocos/gui/UILabelAtlas.cpp
View File

@ -22,7 +22,7 @@
THE SOFTWARE.
****************************************************************************/
#include "UILabelAtlas.h"
#include "gui/UILabelAtlas.h"
using namespace cocos2d;

2
cocos/gui/widgets/UILabelAtlas.h → cocos/gui/UILabelAtlas.h
View File

@ -25,7 +25,7 @@
#ifndef __UILABELATLAS_H__
#define __UILABELATLAS_H__
#include "base-classes/UIWidget.h"
#include "gui/UIWidget.h"
namespace gui {

2
cocos/gui/widgets/UILabelBMFont.cpp → cocos/gui/UILabelBMFont.cpp
View File

@ -22,7 +22,7 @@
THE SOFTWARE.
****************************************************************************/
#include "UILabelBMFont.h"
#include "gui/UILabelBMFont.h"
using namespace cocos2d;

2
cocos/gui/widgets/UILabelBMFont.h → cocos/gui/UILabelBMFont.h
View File

@ -25,7 +25,7 @@
#ifndef __UILABELBMFONT_H__
#define __UILABELBMFONT_H__
#include "base-classes/UIWidget.h"
#include "gui/UIWidget.h"
namespace gui {

4
cocos/gui/system/UILayer.cpp → cocos/gui/UILayer.cpp
View File

@ -22,8 +22,8 @@
THE SOFTWARE.
****************************************************************************/
#include "UILayer.h"
#include "UIHelper.h"
#include "gui/UILayer.h"
#include "gui/UIHelper.h"
using namespace cocos2d;

4
cocos/gui/system/UILayer.h → cocos/gui/UILayer.h
View File

@ -27,8 +27,8 @@
#define __UILAYER_H__
#include "cocos2d.h"
#include "base-classes/UIRootWidget.h"
#include "system/UIInputManager.h"
#include "gui/UIRootWidget.h"
#include "gui/UIInputManager.h"
namespace gui {

2
cocos/gui/layouts/UILayoutDefine.cpp → cocos/gui/UILayoutDefine.cpp
View File

@ -21,7 +21,7 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "UILayoutDefine.h"
#include "gui/UILayoutDefine.h"
namespace gui {

0
cocos/gui/layouts/UILayoutDefine.h → cocos/gui/UILayoutDefine.h
View File

Some files were not shown because too many files have changed in this diff Show More