From 9b118e5e96b225452796435dde1bedd0205e72ce Mon Sep 17 00:00:00 2001 From: Ricardo Quesada Date: Sat, 26 Apr 2014 10:11:22 -0700 Subject: [PATCH] Squashed commit of the following: commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225 Author: Ricardo Quesada Date: Sat Apr 26 10:10:06 2014 -0700 Updates templates files commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5 Author: Ricardo Quesada Date: Sat Apr 26 10:08:19 2014 -0700 compiles on Windows commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4 Author: Ricardo Quesada Date: Sat Apr 26 09:55:30 2014 -0700 adds cocos2d.h commit 4c3d14f929bac017b93ca843b4f149d352264a30 Author: Ricardo Quesada Date: Sat Apr 26 09:54:24 2014 -0700 re-adds missing files commit f729181728959260d14c4152555534f5beec8e05 Merge: 148da79 2adac67 Author: Ricardo Quesada Date: Sat Apr 26 09:51:12 2014 -0700 Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes commit 148da79010c5dffeab885933624cffaf3d588852 Author: Ricardo Quesada Date: Sat Apr 26 09:49:12 2014 -0700 Adds SimpleAudioEngine commit 2adac67019180ec82b7bd03f0b67c12f62e29e77 Author: Ricardo Quesada Date: Sat Apr 26 09:47:45 2014 -0700 Compiles for Android commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32 Author: Ricardo Quesada Date: Sat Apr 26 09:13:35 2014 -0700 Fixes the includes --- .../project.pbxproj.REMOVED.git-id | 2 +- .../project.pbxproj.REMOVED.git-id | 2 +- cocos/2d/Android.mk | 2 +- cocos/2d/CCAction.cpp | 8 +- cocos/2d/CCAction.h | 4 +- cocos/2d/CCActionCamera.cpp | 4 +- cocos/2d/CCActionCamera.h | 2 +- cocos/2d/CCActionCatmullRom.cpp | 4 +- cocos/2d/CCActionCatmullRom.h | 6 +- cocos/2d/CCActionEase.cpp | 4 +- cocos/2d/CCActionEase.h | 2 +- cocos/2d/CCActionGrid.cpp | 4 +- cocos/2d/CCActionGrid.h | 4 +- cocos/2d/CCActionGrid3D.cpp | 4 +- cocos/2d/CCActionGrid3D.h | 2 +- cocos/2d/CCActionInstant.cpp | 6 +- cocos/2d/CCActionInstant.h | 2 +- cocos/2d/CCActionInterval.cpp | 8 +- cocos/2d/CCActionInterval.h | 8 +- cocos/2d/CCActionManager.cpp | 10 +- cocos/2d/CCActionManager.h | 4 +- cocos/2d/CCActionPageTurn3D.cpp | 2 +- cocos/2d/CCActionPageTurn3D.h | 2 +- cocos/2d/CCActionProgressTimer.cpp | 4 +- cocos/2d/CCActionProgressTimer.h | 2 +- cocos/2d/CCActionTiledGrid.cpp | 6 +- cocos/2d/CCActionTiledGrid.h | 2 +- cocos/2d/CCActionTween.cpp | 2 +- cocos/2d/CCActionTween.h | 2 +- cocos/2d/CCAnimation.cpp | 8 +- cocos/2d/CCAnimation.h | 6 +- cocos/2d/CCAnimationCache.cpp | 8 +- cocos/2d/CCAnimationCache.h | 2 +- cocos/2d/CCAtlasNode.cpp | 10 +- cocos/2d/CCAtlasNode.h | 8 +- cocos/2d/CCClippingNode.cpp | 10 +- cocos/2d/CCClippingNode.h | 6 +- cocos/2d/CCComponent.h | 2 +- cocos/2d/CCComponentContainer.cpp | 2 +- cocos/2d/CCConfiguration.cpp | 6 +- cocos/2d/CCConfiguration.h | 2 +- cocos/2d/CCDirector.cpp | 20 +- cocos/2d/CCDirector.h | 8 +- cocos/2d/CCDrawNode.cpp | 14 +- cocos/2d/CCDrawNode.h | 6 +- cocos/2d/CCDrawingPrimitives.cpp | 12 +- cocos/2d/CCDrawingPrimitives.h | 4 +- cocos/2d/CCEvent.cpp | 2 +- cocos/2d/CCEvent.h | 4 +- cocos/2d/CCEventAcceleration.cpp | 2 +- cocos/2d/CCEventAcceleration.h | 4 +- cocos/2d/CCEventCustom.cpp | 4 +- cocos/2d/CCEventCustom.h | 2 +- cocos/2d/CCEventDispatcher.cpp | 22 +- cocos/2d/CCEventDispatcher.h | 6 +- cocos/2d/CCEventKeyboard.cpp | 2 +- cocos/2d/CCEventKeyboard.h | 2 +- cocos/2d/CCEventListener.cpp | 4 +- cocos/2d/CCEventListener.h | 4 +- cocos/2d/CCEventListenerAcceleration.cpp | 4 +- cocos/2d/CCEventListenerAcceleration.h | 4 +- cocos/2d/CCEventListenerCustom.cpp | 4 +- cocos/2d/CCEventListenerCustom.h | 2 +- cocos/2d/CCEventListenerKeyboard.cpp | 6 +- cocos/2d/CCEventListenerKeyboard.h | 4 +- cocos/2d/CCEventListenerMouse.cpp | 2 +- cocos/2d/CCEventListenerMouse.h | 4 +- cocos/2d/CCEventListenerTouch.cpp | 6 +- cocos/2d/CCEventListenerTouch.h | 4 +- cocos/2d/CCEventMouse.cpp | 2 +- cocos/2d/CCEventMouse.h | 2 +- cocos/2d/CCEventTouch.cpp | 2 +- cocos/2d/CCEventTouch.h | 4 +- cocos/2d/CCFont.h | 2 +- cocos/2d/CCFontAtlas.cpp | 8 +- cocos/2d/CCFontAtlas.h | 4 +- cocos/2d/CCFontAtlasCache.cpp | 2 +- cocos/2d/CCFontAtlasCache.h | 2 +- cocos/2d/CCFontCharMap.cpp | 4 +- cocos/2d/CCFontFNT.cpp | 6 +- cocos/2d/CCFontFreeType.cpp | 2 +- cocos/2d/CCGLProgram.cpp | 10 +- cocos/2d/CCGLProgram.h | 4 +- cocos/2d/CCGrabber.cpp | 4 +- cocos/2d/CCGrabber.h | 2 +- cocos/2d/CCGrid.cpp | 8 +- cocos/2d/CCGrid.h | 10 +- cocos/2d/CCIMEDelegate.h | 2 +- cocos/2d/CCIMEDispatcher.h | 2 +- cocos/2d/CCLabel.cpp | 20 +- cocos/2d/CCLabel.h | 6 +- cocos/2d/CCLabelAtlas.cpp | 14 +- cocos/2d/CCLabelAtlas.h | 2 +- cocos/2d/CCLabelBMFont.cpp | 6 +- cocos/2d/CCLabelBMFont.h | 4 +- cocos/2d/CCLabelTTF.cpp | 2 +- cocos/2d/CCLabelTTF.h | 2 +- cocos/2d/CCLabelTextFormatter.cpp | 4 +- cocos/2d/CCLayer.cpp | 26 +- cocos/2d/CCLayer.h | 10 +- cocos/2d/CCMenu.cpp | 8 +- cocos/2d/CCMenu.h | 6 +- cocos/2d/CCMenuItem.cpp | 8 +- cocos/2d/CCMenuItem.h | 4 +- cocos/2d/CCMotionStreak.cpp | 10 +- cocos/2d/CCMotionStreak.h | 10 +- cocos/2d/CCNode.cpp | 20 +- cocos/2d/CCNode.h | 8 +- cocos/2d/CCNodeGrid.cpp | 6 +- cocos/2d/CCNodeGrid.h | 6 +- cocos/2d/CCParallaxNode.cpp | 2 +- cocos/2d/CCParallaxNode.h | 2 +- cocos/2d/CCParticleBatchNode.cpp | 14 +- cocos/2d/CCParticleBatchNode.h | 6 +- cocos/2d/CCParticleExamples.cpp | 4 +- cocos/2d/CCParticleExamples.h | 2 +- cocos/2d/CCParticleSystem.cpp | 10 +- cocos/2d/CCParticleSystem.h | 4 +- cocos/2d/CCParticleSystemQuad.cpp | 22 +- cocos/2d/CCParticleSystemQuad.h | 2 +- cocos/2d/CCProfiling.h | 4 +- cocos/2d/CCProgressTimer.cpp | 12 +- cocos/2d/CCProgressTimer.h | 4 +- cocos/2d/CCProtocols.h | 4 +- cocos/2d/CCRenderTexture.cpp | 20 +- cocos/2d/CCRenderTexture.h | 10 +- cocos/2d/CCScene.cpp | 8 +- cocos/2d/CCScene.h | 2 +- cocos/2d/CCScheduler.cpp | 6 +- cocos/2d/CCScheduler.h | 4 +- cocos/2d/CCScriptSupport.h | 10 +- cocos/2d/CCShaderCache.cpp | 4 +- cocos/2d/CCShaderCache.h | 2 +- cocos/2d/CCSprite.cpp | 22 +- cocos/2d/CCSprite.h | 12 +- cocos/2d/CCSpriteBatchNode.cpp | 16 +- cocos/2d/CCSpriteBatchNode.h | 10 +- cocos/2d/CCSpriteFrame.cpp | 4 +- cocos/2d/CCSpriteFrame.h | 8 +- cocos/2d/CCSpriteFrameCache.cpp | 12 +- cocos/2d/CCSpriteFrameCache.h | 6 +- cocos/2d/CCTMXLayer.cpp | 8 +- cocos/2d/CCTMXLayer.h | 4 +- cocos/2d/CCTMXObjectGroup.cpp | 2 +- cocos/2d/CCTMXObjectGroup.h | 4 +- cocos/2d/CCTMXTiledMap.cpp | 2 +- cocos/2d/CCTMXTiledMap.h | 2 +- cocos/2d/CCTMXXMLParser.cpp | 6 +- cocos/2d/CCTMXXMLParser.h | 4 +- cocos/2d/CCTextFieldTTF.cpp | 2 +- cocos/2d/CCTextFieldTTF.h | 4 +- cocos/2d/CCTexture2D.cpp | 16 +- cocos/2d/CCTexture2D.h | 6 +- cocos/2d/CCTextureAtlas.cpp | 18 +- cocos/2d/CCTextureAtlas.h | 6 +- cocos/2d/CCTextureCache.cpp | 10 +- cocos/2d/CCTextureCache.h | 8 +- cocos/2d/CCTileMapAtlas.cpp | 8 +- cocos/2d/CCTouch.cpp | 4 +- cocos/2d/CCTouch.h | 4 +- cocos/2d/CCTransition.cpp | 16 +- cocos/2d/CCTransition.h | 2 +- cocos/2d/CCTransitionPageTurn.cpp | 12 +- cocos/2d/CCTransitionPageTurn.h | 2 +- cocos/2d/CCTransitionProgress.cpp | 10 +- cocos/2d/CCTweenFunction.cpp | 2 +- cocos/2d/CCTweenFunction.h | 4 +- cocos/2d/CCUserDefault.cpp | 4 +- cocos/2d/CCUserDefault.h | 2 +- cocos/2d/CCUserDefaultAndroid.cpp | 6 +- cocos/2d/CCVertex.cpp | 2 +- cocos/2d/CCVertex.h | 2 +- cocos/2d/TGAlib.cpp | 2 +- cocos/2d/ZipUtils.cpp | 4 +- cocos/2d/ZipUtils.h | 4 +- cocos/2d/ccCArray.cpp | 6 +- cocos/2d/ccCArray.h | 4 +- cocos/2d/ccGLStateCache.cpp | 6 +- cocos/2d/ccGLStateCache.h | 2 +- cocos/2d/ccMacros.h | 2 +- cocos/2d/ccShaders.h | 2 +- cocos/2d/ccTypes.cpp | 2 +- cocos/2d/ccTypes.h | 2 +- cocos/2d/ccUTF8.cpp | 2 +- cocos/2d/ccUTF8.h | 2 +- cocos/2d/cocos2d.h | 286 ----------------- cocos/2d/cocos2d.vcxproj | 4 +- cocos/2d/cocos2d.vcxproj.filters | 6 +- cocos/2d/cocos2d.vcxproj.user | 3 - cocos/2d/platform/CCApplicationProtocol.h | 2 +- cocos/2d/platform/CCCommon.h | 2 +- cocos/2d/platform/CCDevice.h | 4 +- cocos/2d/platform/CCFileUtils.cpp | 4 +- cocos/2d/platform/CCFileUtils.h | 4 +- cocos/2d/platform/CCGLViewProtocol.cpp | 6 +- cocos/2d/platform/CCGLViewProtocol.h | 4 +- cocos/2d/platform/CCImage.cpp | 2 +- cocos/2d/platform/CCImage.h | 4 +- cocos/2d/platform/CCSAXParser.h | 2 +- cocos/2d/platform/CCThread.h | 6 +- cocos/2d/platform/android/CCApplication.cpp | 2 +- cocos/2d/platform/android/CCApplication.h | 4 +- cocos/2d/platform/android/CCCommon.cpp | 2 +- cocos/2d/platform/android/CCDevice.cpp | 6 +- .../platform/android/CCFileUtilsAndroid.cpp | 2 +- .../2d/platform/android/CCFileUtilsAndroid.h | 6 +- cocos/2d/platform/android/CCGLView.cpp | 4 +- cocos/2d/platform/android/CCGLView.h | 6 +- cocos/2d/platform/android/CCStdC.h | 2 +- cocos/2d/platform/apple/CCFileUtilsApple.h | 4 +- cocos/2d/platform/apple/CCFileUtilsApple.mm | 2 +- cocos/2d/platform/apple/CCLock.h | 2 +- cocos/2d/platform/desktop/CCGLView.cpp | 10 +- cocos/2d/platform/desktop/CCGLView.h | 6 +- cocos/2d/platform/ios/CCApplication.h | 4 +- cocos/2d/platform/ios/CCCommon.mm | 4 +- cocos/2d/platform/ios/CCDevice.mm | 8 +- cocos/2d/platform/ios/CCESRenderer.h | 2 +- cocos/2d/platform/ios/CCGLView.h | 6 +- cocos/2d/platform/ios/CCGLView.mm | 2 +- cocos/2d/platform/ios/CCImage.mm | 4 +- cocos/2d/platform/ios/CCStdC.h | 2 +- cocos/2d/platform/linux/CCApplication.cpp | 4 +- cocos/2d/platform/linux/CCApplication.h | 4 +- cocos/2d/platform/linux/CCCommon.cpp | 2 +- cocos/2d/platform/linux/CCDevice.cpp | 4 +- cocos/2d/platform/linux/CCFileUtilsLinux.cpp | 4 +- cocos/2d/platform/linux/CCFileUtilsLinux.h | 6 +- cocos/2d/platform/linux/CCStdC.h | 2 +- cocos/2d/platform/mac/CCApplication.h | 4 +- cocos/2d/platform/mac/CCApplication.mm | 6 +- cocos/2d/platform/mac/CCCommon.mm | 4 +- cocos/2d/platform/mac/CCDevice.mm | 4 +- cocos/2d/platform/mac/CCStdC.h | 2 +- cocos/2d/platform/win32/CCApplication.cpp | 4 +- cocos/2d/platform/win32/CCApplication.h | 4 +- cocos/2d/platform/win32/CCCommon.cpp | 2 +- cocos/2d/platform/win32/CCDevice.cpp | 4 +- cocos/2d/platform/win32/CCFileUtilsWin32.cpp | 2 +- cocos/2d/platform/win32/CCFileUtilsWin32.h | 6 +- cocos/2d/platform/win32/CCStdC.h | 2 +- cocos/2d/renderer/CCBatchCommand.cpp | 6 +- cocos/2d/renderer/CCBatchCommand.h | 2 +- cocos/2d/renderer/CCCustomCommand.cpp | 2 +- cocos/2d/renderer/CCGroupCommand.cpp | 6 +- cocos/2d/renderer/CCGroupCommand.h | 2 +- cocos/2d/renderer/CCMaterialManager.h | 6 +- cocos/2d/renderer/CCQuadCommand.cpp | 2 +- cocos/2d/renderer/CCQuadCommand.h | 2 +- cocos/2d/renderer/CCRenderCommand.h | 4 +- cocos/2d/renderer/CCRenderCommandPool.h | 2 +- cocos/2d/renderer/CCRenderer.cpp | 18 +- cocos/2d/renderer/CCRenderer.h | 4 +- cocos/base/CCAffineTransform.h | 4 +- cocos/base/CCAutoreleasePool.cpp | 2 +- cocos/base/CCAutoreleasePool.h | 2 +- cocos/base/CCConsole.cpp | 4 +- cocos/base/CCConsole.h | 4 +- cocos/base/CCData.cpp | 4 +- cocos/base/CCData.h | 2 +- cocos/base/CCDataVisitor.cpp | 2 +- cocos/base/CCDataVisitor.h | 2 +- cocos/base/CCGeometry.cpp | 4 +- cocos/base/CCGeometry.h | 4 +- cocos/base/CCMap.h | 4 +- cocos/base/CCNS.h | 2 +- cocos/base/CCPlatformMacros.h | 2 +- cocos/base/CCRef.cpp | 4 +- cocos/base/CCRef.h | 4 +- cocos/base/CCRefPtr.h | 2 +- cocos/base/CCValue.h | 4 +- cocos/base/CCVector.h | 4 +- cocos/{2d => }/cocos2d.cpp | 2 +- cocos/cocos2d.h | 293 ++++++++++++++++++ cocos/deprecated/CCArray.cpp | 2 +- cocos/deprecated/CCArray.h | 8 +- cocos/deprecated/CCBool.h | 4 +- cocos/deprecated/CCDeprecated.h | 4 +- cocos/deprecated/CCDictionary.cpp | 2 +- cocos/deprecated/CCDictionary.h | 4 +- cocos/deprecated/CCDouble.h | 4 +- cocos/deprecated/CCFloat.h | 4 +- cocos/deprecated/CCInteger.h | 6 +- cocos/deprecated/CCNotificationCenter.h | 4 +- cocos/deprecated/CCSet.h | 4 +- cocos/deprecated/CCString.cpp | 4 +- cocos/deprecated/CCString.h | 2 +- .../cocosbuilder/CCBAnimationManager.h | 6 +- .../editor-support/cocosbuilder/CCBKeyframe.h | 2 +- .../editor-support/cocosbuilder/CCBReader.cpp | 6 +- cocos/editor-support/cocosbuilder/CCBReader.h | 2 +- .../editor-support/cocosbuilder/CCBSequence.h | 2 +- .../cocosbuilder/CCBSequenceProperty.h | 2 +- .../cocosbuilder/CCLabelBMFontLoader.h | 4 +- .../cocosbuilder/CCLabelTTFLoader.h | 4 +- .../cocosbuilder/CCMenuItemLoader.h | 4 +- .../cocosbuilder/CCMenuLoader.h | 4 +- .../cocosbuilder/CCParticleSystemQuadLoader.h | 4 +- .../cocostudio/CCActionFrame.cpp | 4 +- .../editor-support/cocostudio/CCActionFrame.h | 4 +- .../cocostudio/CCActionFrameEasing.h | 2 +- .../cocostudio/CCActionObject.cpp | 4 +- .../cocostudio/CCActionObject.h | 4 +- .../editor-support/cocostudio/CCArmature.cpp | 6 +- .../cocostudio/CCArmatureDataManager.cpp | 2 +- .../editor-support/cocostudio/CCBatchNode.cpp | 6 +- cocos/editor-support/cocostudio/CCBatchNode.h | 2 +- cocos/editor-support/cocostudio/CCBone.h | 2 +- .../cocostudio/CCDataReaderHelper.cpp | 4 +- cocos/editor-support/cocostudio/CCDatas.h | 6 +- .../cocostudio/CCDecorativeDisplay.cpp | 2 +- .../cocostudio/CCDisplayFactory.cpp | 2 +- .../cocostudio/CCDisplayManager.cpp | 2 +- .../cocostudio/CCInputDelegate.cpp | 10 +- .../cocostudio/CCInputDelegate.h | 12 +- cocos/editor-support/cocostudio/CCSkin.cpp | 8 +- cocos/editor-support/cocostudio/CCSkin.h | 4 +- .../cocostudio/CCSpriteFrameCacheHelper.cpp | 2 +- .../cocostudio/CCSpriteFrameCacheHelper.h | 2 +- cocos/editor-support/cocostudio/CCTween.h | 2 +- cocos/editor-support/cocostudio/CCUtilMath.h | 2 +- .../cocostudio/DictionaryHelper.cpp | 2 +- cocos/editor-support/spine/CCSkeleton.h | 8 +- cocos/math/MathUtil.cpp | 2 +- cocos/math/Matrix.cpp | 2 +- cocos/math/Quaternion.cpp | 2 +- cocos/math/Vector2.cpp | 2 +- cocos/math/Vector2.h | 4 +- cocos/math/Vector3.cpp | 2 +- cocos/math/Vector4.cpp | 2 +- cocos/network/HttpClient.cpp | 4 +- cocos/network/HttpRequest.h | 4 +- cocos/network/SocketIO.cpp | 2 +- cocos/network/SocketIO.h | 2 +- cocos/network/WebSocket.cpp | 2 +- cocos/network/WebSocket.h | 2 +- cocos/physics/CCPhysicsBody.cpp | 2 +- cocos/physics/CCPhysicsBody.h | 6 +- cocos/physics/CCPhysicsContact.cpp | 2 +- cocos/physics/CCPhysicsContact.h | 12 +- cocos/physics/CCPhysicsJoint.cpp | 2 +- cocos/physics/CCPhysicsJoint.h | 6 +- cocos/physics/CCPhysicsShape.h | 6 +- cocos/physics/CCPhysicsWorld.cpp | 10 +- cocos/physics/CCPhysicsWorld.h | 6 +- .../chipmunk/CCPhysicsBodyInfo_chipmunk.h | 6 +- .../chipmunk/CCPhysicsContactInfo_chipmunk.h | 4 +- .../chipmunk/CCPhysicsHelper_chipmunk.h | 6 +- .../chipmunk/CCPhysicsJointInfo_chipmunk.h | 4 +- .../chipmunk/CCPhysicsShapeInfo_chipmunk.h | 4 +- .../chipmunk/CCPhysicsWorldInfo_chipmunk.h | 6 +- .../lua-bindings/manual/CCLuaStack.cpp | 4 +- .../lua-bindings/manual/CCLuaValue.h | 4 +- .../scripting/lua-bindings/manual/LuaOpengl.h | 4 +- .../lua-bindings/manual/LuaScriptHandlerMgr.h | 6 +- .../lua_cocos2dx_coco_studio_manual.hpp | 2 +- .../manual/lua_cocos2dx_spine_manual.hpp | 2 +- .../manual/lua_cocos2dx_ui_manual.hpp | 2 +- .../lua-bindings/manual/tolua_fix.cpp | 2 +- cocos/storage/local-storage/LocalStorage.cpp | 2 +- .../local-storage/LocalStorageAndroid.cpp | 2 +- cocos/ui/CCProtectedNode.cpp | 4 +- cocos/ui/CCProtectedNode.h | 2 +- cocos/ui/UILayout.cpp | 10 +- .../GUI/CCControlExtension/CCControl.cpp | 10 +- extensions/GUI/CCControlExtension/CCControl.h | 2 +- .../CCControlExtension/CCControlButton.cpp | 6 +- .../CCControlColourPicker.cpp | 4 +- .../CCControlPotentiometer.h | 2 +- .../CCControlExtension/CCControlSlider.cpp | 4 +- .../GUI/CCControlExtension/CCControlStepper.h | 2 +- .../CCControlExtension/CCControlSwitch.cpp | 6 +- .../GUI/CCControlExtension/CCControlUtils.h | 2 +- .../GUI/CCControlExtension/CCInvocation.h | 2 +- .../GUI/CCControlExtension/CCScale9Sprite.cpp | 6 +- .../GUI/CCControlExtension/CCScale9Sprite.h | 6 +- extensions/GUI/CCEditBox/CCEditBox.h | 2 +- extensions/GUI/CCEditBox/CCEditBoxImplMac.mm | 2 +- extensions/GUI/CCScrollView/CCScrollView.cpp | 12 +- extensions/GUI/CCScrollView/CCScrollView.h | 6 +- .../GUI/CCScrollView/CCTableViewCell.cpp | 2 +- extensions/GUI/CCScrollView/CCTableViewCell.h | 2 +- .../physics-nodes/CCPhysicsDebugNode.cpp | 4 +- extensions/physics-nodes/CCPhysicsDebugNode.h | 2 +- extensions/physics-nodes/CCPhysicsSprite.h | 2 +- external/tinyxml2/tinyxml2.h | 2 +- templates/cocos2dx_files.json.REMOVED.git-id | 2 +- .../Classes/ActionsTest/ActionsTest.cpp | 6 +- .../cpp-tests/Classes/Box2DTest/Box2dTest.cpp | 4 +- .../Classes/Box2DTestBed/Box2dView.cpp | 2 +- .../Classes/Box2DTestBed/Box2dView.h | 2 +- .../ClippingNodeTest/ClippingNodeTest.cpp | 2 +- .../ClippingNodeTest/ClippingNodeTest.h | 2 +- .../Classes/ConsoleTest/ConsoleTest.cpp | 1 - .../DrawPrimitivesTest/DrawPrimitivesTest.cpp | 4 +- .../EffectsAdvancedTest.cpp | 1 - .../Classes/EffectsTest/EffectsTest.cpp | 2 +- .../CocoStudioArmatureTest/ArmatureScene.cpp | 3 - .../cpp-tests/Classes/LabelTest/LabelTest.cpp | 4 +- .../Classes/LabelTest/LabelTestNew.cpp | 2 +- .../Classes/LabelTest/LabelTestNew.h | 2 +- .../PerformanceTest/PerformanceAllocTest.h | 1 - .../PerformanceTest/PerformanceCallbackTest.h | 1 - .../PerformanceContainerTest.h | 1 - .../PerformanceEventDispatcherTest.h | 1 - .../PerformanceNodeChildrenTest.h | 1 - .../RenderTextureTest/RenderTextureTest.cpp | 3 - .../RenderTextureTest/RenderTextureTest.h | 2 +- .../Classes/ShaderTest/ShaderTest.cpp | 4 +- .../Classes/ShaderTest/ShaderTest2.cpp | 4 +- .../Classes/Texture2dTest/Texture2dTest.cpp | 2 +- .../Classes/Texture2dTest/Texture2dTest.h | 2 +- .../TextureAtlasEncryptionTest.cpp | 1 - .../Classes/TileMapTest/TileMapTest.cpp | 4 +- .../Classes/TileMapTest/TileMapTest.h | 2 +- .../TransitionsTest/TransitionsTest.cpp | 1 - 416 files changed, 1245 insertions(+), 1258 deletions(-) delete mode 100644 cocos/2d/cocos2d.h delete mode 100644 cocos/2d/cocos2d.vcxproj.user rename cocos/{2d => }/cocos2d.cpp (97%) create mode 100644 cocos/cocos2d.h diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id b/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id index a2e40b2fd9..505c1ae1d0 100644 --- a/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -266d376687910ea1333f99bca86d98b579746e1f \ No newline at end of file +086c0c076d472cd5dd97cc03cfe600085e508d41 \ No newline at end of file diff --git a/build/cocos2d_tests.xcodeproj/project.pbxproj.REMOVED.git-id b/build/cocos2d_tests.xcodeproj/project.pbxproj.REMOVED.git-id index 565113a9aa..bd451d546c 100644 --- a/build/cocos2d_tests.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/build/cocos2d_tests.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -8239dbcfed49ba90f82f4adc053e9946203277c5 \ No newline at end of file +89a1e8751e69f05947a7bb2bb20633a91773e937 \ No newline at end of file diff --git a/cocos/2d/Android.mk b/cocos/2d/Android.mk index b6cbc331a9..66f687e0bd 100644 --- a/cocos/2d/Android.mk +++ b/cocos/2d/Android.mk @@ -106,7 +106,7 @@ CCUserDefaultAndroid.cpp \ ccUTF8.cpp \ ccUtils.cpp \ CCVertex.cpp \ -cocos2d.cpp \ +../cocos2d.cpp \ TGAlib.cpp \ TransformUtils.cpp \ ZipUtils.cpp \ diff --git a/cocos/2d/CCAction.cpp b/cocos/2d/CCAction.cpp index 870167330b..33af63cb6d 100644 --- a/cocos/2d/CCAction.cpp +++ b/cocos/2d/CCAction.cpp @@ -25,10 +25,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCAction.h" -#include "CCActionInterval.h" -#include "CCNode.h" -#include "CCDirector.h" +#include "2d/CCAction.h" +#include "2d/CCActionInterval.h" +#include "2d/CCNode.h" +#include "2d/CCDirector.h" #include "deprecated/CCString.h" NS_CC_BEGIN diff --git a/cocos/2d/CCAction.h b/cocos/2d/CCAction.h index c10735f868..a6133fa372 100644 --- a/cocos/2d/CCAction.h +++ b/cocos/2d/CCAction.h @@ -28,8 +28,8 @@ THE SOFTWARE. #ifndef __ACTIONS_CCACTION_H__ #define __ACTIONS_CCACTION_H__ -#include "CCRef.h" -#include "CCGeometry.h" +#include "base/CCRef.h" +#include "base/CCGeometry.h" NS_CC_BEGIN diff --git a/cocos/2d/CCActionCamera.cpp b/cocos/2d/CCActionCamera.cpp index 48f775a2fe..4799dd46e4 100644 --- a/cocos/2d/CCActionCamera.cpp +++ b/cocos/2d/CCActionCamera.cpp @@ -25,8 +25,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCActionCamera.h" -#include "CCNode.h" +#include "2d/CCActionCamera.h" +#include "2d/CCNode.h" #include "CCStdC.h" NS_CC_BEGIN diff --git a/cocos/2d/CCActionCamera.h b/cocos/2d/CCActionCamera.h index a1b238694d..cec8250cd5 100644 --- a/cocos/2d/CCActionCamera.h +++ b/cocos/2d/CCActionCamera.h @@ -28,7 +28,7 @@ THE SOFTWARE. #ifndef __CCCAMERA_ACTION_H__ #define __CCCAMERA_ACTION_H__ -#include "CCActionInterval.h" +#include "2d/CCActionInterval.h" #include "math/CCMath.h" NS_CC_BEGIN diff --git a/cocos/2d/CCActionCatmullRom.cpp b/cocos/2d/CCActionCatmullRom.cpp index adb68f7c8d..20acae2915 100644 --- a/cocos/2d/CCActionCatmullRom.cpp +++ b/cocos/2d/CCActionCatmullRom.cpp @@ -29,8 +29,8 @@ * * Adapted from cocos2d-x to cocos2d-iphone by Ricardo Quesada */ -#include "ccMacros.h" -#include "CCActionCatmullRom.h" +#include "2d/ccMacros.h" +#include "2d/CCActionCatmullRom.h" using namespace std; diff --git a/cocos/2d/CCActionCatmullRom.h b/cocos/2d/CCActionCatmullRom.h index 814adacece..14d259ac15 100644 --- a/cocos/2d/CCActionCatmullRom.h +++ b/cocos/2d/CCActionCatmullRom.h @@ -37,9 +37,9 @@ #include -#include "CCActionInterval.h" -#include "CCNode.h" -#include "CCGeometry.h" +#include "2d/CCActionInterval.h" +#include "2d/CCNode.h" +#include "base/CCGeometry.h" NS_CC_BEGIN; diff --git a/cocos/2d/CCActionEase.cpp b/cocos/2d/CCActionEase.cpp index fa46945969..db6e8012b3 100644 --- a/cocos/2d/CCActionEase.cpp +++ b/cocos/2d/CCActionEase.cpp @@ -31,8 +31,8 @@ THE SOFTWARE. * by http://github.com/NikhilK */ -#include "CCActionEase.h" -#include "CCTweenFunction.h" +#include "2d/CCActionEase.h" +#include "2d/CCTweenFunction.h" NS_CC_BEGIN diff --git a/cocos/2d/CCActionEase.h b/cocos/2d/CCActionEase.h index f427584c9b..22041e0b5d 100644 --- a/cocos/2d/CCActionEase.h +++ b/cocos/2d/CCActionEase.h @@ -27,7 +27,7 @@ THE SOFTWARE. #ifndef __ACTION_CCEASE_ACTION_H__ #define __ACTION_CCEASE_ACTION_H__ -#include "CCActionInterval.h" +#include "2d/CCActionInterval.h" NS_CC_BEGIN diff --git a/cocos/2d/CCActionGrid.cpp b/cocos/2d/CCActionGrid.cpp index a253f43425..9575abfd1c 100644 --- a/cocos/2d/CCActionGrid.cpp +++ b/cocos/2d/CCActionGrid.cpp @@ -23,8 +23,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCActionGrid.h" -#include "CCDirector.h" +#include "2d/CCActionGrid.h" +#include "2d/CCDirector.h" #include "CCGrid.h" #include "CCNodeGrid.h" diff --git a/cocos/2d/CCActionGrid.h b/cocos/2d/CCActionGrid.h index 13a8544ed4..d0b9c109e1 100644 --- a/cocos/2d/CCActionGrid.h +++ b/cocos/2d/CCActionGrid.h @@ -26,8 +26,8 @@ THE SOFTWARE. #ifndef __ACTION_CCGRID_ACTION_H__ #define __ACTION_CCGRID_ACTION_H__ -#include "CCActionInterval.h" -#include "CCActionInstant.h" +#include "2d/CCActionInterval.h" +#include "2d/CCActionInstant.h" NS_CC_BEGIN diff --git a/cocos/2d/CCActionGrid3D.cpp b/cocos/2d/CCActionGrid3D.cpp index 9a38cbdb8a..398829f71d 100644 --- a/cocos/2d/CCActionGrid3D.cpp +++ b/cocos/2d/CCActionGrid3D.cpp @@ -23,8 +23,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCActionGrid3D.h" -#include "CCDirector.h" +#include "2d/CCActionGrid3D.h" +#include "2d/CCDirector.h" #include NS_CC_BEGIN diff --git a/cocos/2d/CCActionGrid3D.h b/cocos/2d/CCActionGrid3D.h index a0ecd8294e..375f4fd0b8 100644 --- a/cocos/2d/CCActionGrid3D.h +++ b/cocos/2d/CCActionGrid3D.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __ACTION_CCGRID3D_ACTION_H__ #define __ACTION_CCGRID3D_ACTION_H__ -#include "CCActionGrid.h" +#include "2d/CCActionGrid.h" NS_CC_BEGIN diff --git a/cocos/2d/CCActionInstant.cpp b/cocos/2d/CCActionInstant.cpp index 7d71c2a0d8..2e254ae310 100644 --- a/cocos/2d/CCActionInstant.cpp +++ b/cocos/2d/CCActionInstant.cpp @@ -25,9 +25,9 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCActionInstant.h" -#include "CCNode.h" -#include "CCSprite.h" +#include "2d/CCActionInstant.h" +#include "2d/CCNode.h" +#include "2d/CCSprite.h" #include "CCScriptSupport.h" #if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1))) diff --git a/cocos/2d/CCActionInstant.h b/cocos/2d/CCActionInstant.h index 950cf07865..1de17f283d 100644 --- a/cocos/2d/CCActionInstant.h +++ b/cocos/2d/CCActionInstant.h @@ -32,7 +32,7 @@ THE SOFTWARE. #include #include "CCStdC.h" -#include "CCAction.h" +#include "2d/CCAction.h" NS_CC_BEGIN diff --git a/cocos/2d/CCActionInterval.cpp b/cocos/2d/CCActionInterval.cpp index 25e701d1c8..d52949d403 100644 --- a/cocos/2d/CCActionInterval.cpp +++ b/cocos/2d/CCActionInterval.cpp @@ -25,11 +25,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCActionInterval.h" -#include "CCSprite.h" -#include "CCNode.h" +#include "2d/CCActionInterval.h" +#include "2d/CCSprite.h" +#include "2d/CCNode.h" #include "CCStdC.h" -#include "CCActionInstant.h" +#include "2d/CCActionInstant.h" #include NS_CC_BEGIN diff --git a/cocos/2d/CCActionInterval.h b/cocos/2d/CCActionInterval.h index 9e2f3f3d45..05f9e04a89 100644 --- a/cocos/2d/CCActionInterval.h +++ b/cocos/2d/CCActionInterval.h @@ -28,10 +28,10 @@ THE SOFTWARE. #ifndef __ACTION_CCINTERVAL_ACTION_H__ #define __ACTION_CCINTERVAL_ACTION_H__ -#include "CCNode.h" -#include "CCAction.h" -#include "CCProtocols.h" -#include "CCSpriteFrame.h" +#include "2d/CCNode.h" +#include "2d/CCAction.h" +#include "2d/CCProtocols.h" +#include "2d/CCSpriteFrame.h" #include "CCAnimation.h" #include "CCVector.h" #include diff --git a/cocos/2d/CCActionManager.cpp b/cocos/2d/CCActionManager.cpp index 642e0dc6db..fb9a86c04e 100644 --- a/cocos/2d/CCActionManager.cpp +++ b/cocos/2d/CCActionManager.cpp @@ -26,12 +26,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCActionManager.h" -#include "CCNode.h" +#include "2d/CCActionManager.h" +#include "2d/CCNode.h" #include "CCScheduler.h" -#include "ccMacros.h" -#include "ccCArray.h" -#include "uthash.h" +#include "2d/ccMacros.h" +#include "2d/ccCArray.h" +#include "2d/uthash.h" NS_CC_BEGIN // diff --git a/cocos/2d/CCActionManager.h b/cocos/2d/CCActionManager.h index 0b4061571a..f39ee5b326 100644 --- a/cocos/2d/CCActionManager.h +++ b/cocos/2d/CCActionManager.h @@ -29,9 +29,9 @@ THE SOFTWARE. #ifndef __ACTION_CCACTION_MANAGER_H__ #define __ACTION_CCACTION_MANAGER_H__ -#include "CCAction.h" +#include "2d/CCAction.h" #include "CCVector.h" -#include "CCRef.h" +#include "base/CCRef.h" NS_CC_BEGIN diff --git a/cocos/2d/CCActionPageTurn3D.cpp b/cocos/2d/CCActionPageTurn3D.cpp index 91d60a9811..82dc9d0f38 100644 --- a/cocos/2d/CCActionPageTurn3D.cpp +++ b/cocos/2d/CCActionPageTurn3D.cpp @@ -23,7 +23,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCActionPageTurn3D.h" +#include "2d/CCActionPageTurn3D.h" NS_CC_BEGIN diff --git a/cocos/2d/CCActionPageTurn3D.h b/cocos/2d/CCActionPageTurn3D.h index 92bf724653..35b2dd607e 100644 --- a/cocos/2d/CCActionPageTurn3D.h +++ b/cocos/2d/CCActionPageTurn3D.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __ACTION_CCPAGETURN3D_ACTION_H__ #define __ACTION_CCPAGETURN3D_ACTION_H__ -#include "CCActionGrid3D.h" +#include "2d/CCActionGrid3D.h" NS_CC_BEGIN diff --git a/cocos/2d/CCActionProgressTimer.cpp b/cocos/2d/CCActionProgressTimer.cpp index 46d3cca5e8..68b87fe6d2 100644 --- a/cocos/2d/CCActionProgressTimer.cpp +++ b/cocos/2d/CCActionProgressTimer.cpp @@ -23,8 +23,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCActionProgressTimer.h" -#include "CCProgressTimer.h" +#include "2d/CCActionProgressTimer.h" +#include "2d/CCProgressTimer.h" NS_CC_BEGIN diff --git a/cocos/2d/CCActionProgressTimer.h b/cocos/2d/CCActionProgressTimer.h index d1b1c34545..2e465ca3c4 100644 --- a/cocos/2d/CCActionProgressTimer.h +++ b/cocos/2d/CCActionProgressTimer.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __ACTION_CCPROGRESS_TIMER_H__ #define __ACTION_CCPROGRESS_TIMER_H__ -#include "CCActionInterval.h" +#include "2d/CCActionInterval.h" NS_CC_BEGIN diff --git a/cocos/2d/CCActionTiledGrid.cpp b/cocos/2d/CCActionTiledGrid.cpp index 21b2a14b07..d12c0bfcce 100644 --- a/cocos/2d/CCActionTiledGrid.cpp +++ b/cocos/2d/CCActionTiledGrid.cpp @@ -23,9 +23,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCActionTiledGrid.h" -#include "CCDirector.h" -#include "ccMacros.h" +#include "2d/CCActionTiledGrid.h" +#include "2d/CCDirector.h" +#include "2d/ccMacros.h" #include "CCGrid.h" #include "CCNodeGrid.h" #include diff --git a/cocos/2d/CCActionTiledGrid.h b/cocos/2d/CCActionTiledGrid.h index b423ea7d4c..c7887d6c1a 100644 --- a/cocos/2d/CCActionTiledGrid.h +++ b/cocos/2d/CCActionTiledGrid.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __ACTION_CCTILEDGRID_ACTION_H__ #define __ACTION_CCTILEDGRID_ACTION_H__ -#include "CCActionGrid.h" +#include "2d/CCActionGrid.h" NS_CC_BEGIN diff --git a/cocos/2d/CCActionTween.cpp b/cocos/2d/CCActionTween.cpp index 46a4836d68..4c98c1556e 100644 --- a/cocos/2d/CCActionTween.cpp +++ b/cocos/2d/CCActionTween.cpp @@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCActionTween.h" +#include "2d/CCActionTween.h" NS_CC_BEGIN diff --git a/cocos/2d/CCActionTween.h b/cocos/2d/CCActionTween.h index 51745887b5..2cbe1bbafd 100644 --- a/cocos/2d/CCActionTween.h +++ b/cocos/2d/CCActionTween.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __CCACTIONTWEEN_H__ #define __CCACTIONTWEEN_H__ -#include "CCActionInterval.h" +#include "2d/CCActionInterval.h" NS_CC_BEGIN diff --git a/cocos/2d/CCAnimation.cpp b/cocos/2d/CCAnimation.cpp index 1e9783f847..8a98414d1d 100644 --- a/cocos/2d/CCAnimation.cpp +++ b/cocos/2d/CCAnimation.cpp @@ -26,10 +26,10 @@ THE SOFTWARE. ****************************************************************************/ #include "CCAnimation.h" #include "CCTextureCache.h" -#include "CCTexture2D.h" -#include "ccMacros.h" -#include "CCSpriteFrame.h" -#include "CCDirector.h" +#include "2d/CCTexture2D.h" +#include "2d/ccMacros.h" +#include "2d/CCSpriteFrame.h" +#include "2d/CCDirector.h" NS_CC_BEGIN diff --git a/cocos/2d/CCAnimation.h b/cocos/2d/CCAnimation.h index 5f4299dd5e..b701a48cac 100644 --- a/cocos/2d/CCAnimation.h +++ b/cocos/2d/CCAnimation.h @@ -28,10 +28,10 @@ THE SOFTWARE. #define __CC_ANIMATION_H__ #include "CCPlatformConfig.h" -#include "CCRef.h" +#include "base/CCRef.h" #include "CCValue.h" -#include "CCGeometry.h" -#include "CCSpriteFrame.h" +#include "base/CCGeometry.h" +#include "2d/CCSpriteFrame.h" #include "CCVector.h" #include diff --git a/cocos/2d/CCAnimationCache.cpp b/cocos/2d/CCAnimationCache.cpp index fa5c1594f2..48c336e3ba 100644 --- a/cocos/2d/CCAnimationCache.cpp +++ b/cocos/2d/CCAnimationCache.cpp @@ -25,12 +25,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ #include "CCAnimationCache.h" -#include "ccMacros.h" +#include "2d/ccMacros.h" #include "CCAnimation.h" -#include "CCSpriteFrame.h" -#include "CCSpriteFrameCache.h" +#include "2d/CCSpriteFrame.h" +#include "2d/CCSpriteFrameCache.h" #include "deprecated/CCString.h" -#include "platform/CCFileUtils.h" +#include "2d/platform/CCFileUtils.h" using namespace std; diff --git a/cocos/2d/CCAnimationCache.h b/cocos/2d/CCAnimationCache.h index 7f215a3b97..b75ed80022 100644 --- a/cocos/2d/CCAnimationCache.h +++ b/cocos/2d/CCAnimationCache.h @@ -27,7 +27,7 @@ THE SOFTWARE. #ifndef __CC_ANIMATION_CACHE_H__ #define __CC_ANIMATION_CACHE_H__ -#include "CCRef.h" +#include "base/CCRef.h" #include "CCMap.h" #include "CCValue.h" diff --git a/cocos/2d/CCAtlasNode.cpp b/cocos/2d/CCAtlasNode.cpp index 9edc5ef02f..951a0a4c62 100644 --- a/cocos/2d/CCAtlasNode.cpp +++ b/cocos/2d/CCAtlasNode.cpp @@ -26,15 +26,15 @@ THE SOFTWARE. ****************************************************************************/ #include "CCAtlasNode.h" -#include "CCTextureAtlas.h" +#include "2d/CCTextureAtlas.h" #include "CCTextureCache.h" -#include "CCDirector.h" -#include "CCGLProgram.h" +#include "2d/CCDirector.h" +#include "2d/CCGLProgram.h" #include "CCShaderCache.h" #include "ccGLStateCache.h" -#include "CCDirector.h" +#include "2d/CCDirector.h" #include "TransformUtils.h" -#include "renderer/CCRenderer.h" +#include "2d/renderer/CCRenderer.h" NS_CC_BEGIN diff --git a/cocos/2d/CCAtlasNode.h b/cocos/2d/CCAtlasNode.h index e1312f27c7..2454d99110 100644 --- a/cocos/2d/CCAtlasNode.h +++ b/cocos/2d/CCAtlasNode.h @@ -28,10 +28,10 @@ THE SOFTWARE. #ifndef __CCATLAS_NODE_H__ #define __CCATLAS_NODE_H__ -#include "CCNode.h" -#include "CCProtocols.h" -#include "ccTypes.h" -#include "renderer/CCQuadCommand.h" +#include "2d/CCNode.h" +#include "2d/CCProtocols.h" +#include "2d/ccTypes.h" +#include "2d/renderer/CCQuadCommand.h" NS_CC_BEGIN diff --git a/cocos/2d/CCClippingNode.cpp b/cocos/2d/CCClippingNode.cpp index 58af84891a..2baf58f3cf 100644 --- a/cocos/2d/CCClippingNode.cpp +++ b/cocos/2d/CCClippingNode.cpp @@ -26,14 +26,14 @@ */ #include "CCClippingNode.h" -#include "CCGLProgram.h" +#include "2d/CCGLProgram.h" #include "CCShaderCache.h" -#include "CCDirector.h" +#include "2d/CCDirector.h" #include "CCDrawingPrimitives.h" -#include "renderer/CCRenderer.h" -#include "renderer/CCGroupCommand.h" -#include "renderer/CCCustomCommand.h" +#include "2d/renderer/CCRenderer.h" +#include "2d/renderer/CCGroupCommand.h" +#include "2d/renderer/CCCustomCommand.h" NS_CC_BEGIN diff --git a/cocos/2d/CCClippingNode.h b/cocos/2d/CCClippingNode.h index 29431ee4a3..9f9193473c 100644 --- a/cocos/2d/CCClippingNode.h +++ b/cocos/2d/CCClippingNode.h @@ -28,10 +28,10 @@ #ifndef __MISCNODE_CCCLIPPING_NODE_H__ #define __MISCNODE_CCCLIPPING_NODE_H__ -#include "CCNode.h" +#include "2d/CCNode.h" #include "CCGL.h" -#include "renderer/CCGroupCommand.h" -#include "renderer/CCCustomCommand.h" +#include "2d/renderer/CCGroupCommand.h" +#include "2d/renderer/CCCustomCommand.h" NS_CC_BEGIN diff --git a/cocos/2d/CCComponent.h b/cocos/2d/CCComponent.h index 371657587a..94b5ee716c 100644 --- a/cocos/2d/CCComponent.h +++ b/cocos/2d/CCComponent.h @@ -25,7 +25,7 @@ THE SOFTWARE. #ifndef __CC_FRAMEWORK_COMPONENT_H__ #define __CC_FRAMEWORK_COMPONENT_H__ -#include "CCRef.h" +#include "base/CCRef.h" #include "CCScriptSupport.h" #include diff --git a/cocos/2d/CCComponentContainer.cpp b/cocos/2d/CCComponentContainer.cpp index bf97c0b9a6..01fc99794a 100644 --- a/cocos/2d/CCComponentContainer.cpp +++ b/cocos/2d/CCComponentContainer.cpp @@ -25,7 +25,7 @@ THE SOFTWARE. #include "CCComponentContainer.h" #include "CCComponent.h" -#include "CCDirector.h" +#include "2d/CCDirector.h" NS_CC_BEGIN diff --git a/cocos/2d/CCConfiguration.cpp b/cocos/2d/CCConfiguration.cpp index 7df26cec97..99eac09a78 100644 --- a/cocos/2d/CCConfiguration.cpp +++ b/cocos/2d/CCConfiguration.cpp @@ -26,9 +26,9 @@ THE SOFTWARE. #include "CCConfiguration.h" #include -#include "ccMacros.h" -#include "ccConfig.h" -#include "platform/CCFileUtils.h" +#include "2d/ccMacros.h" +#include "2d/ccConfig.h" +#include "2d/platform/CCFileUtils.h" NS_CC_BEGIN diff --git a/cocos/2d/CCConfiguration.h b/cocos/2d/CCConfiguration.h index d3fd097cba..90e1f18d89 100644 --- a/cocos/2d/CCConfiguration.h +++ b/cocos/2d/CCConfiguration.h @@ -27,7 +27,7 @@ THE SOFTWARE. #ifndef __CCCONFIGURATION_H__ #define __CCCONFIGURATION_H__ -#include "CCRef.h" +#include "base/CCRef.h" #include "CCGL.h" #include "CCValue.h" #include diff --git a/cocos/2d/CCDirector.cpp b/cocos/2d/CCDirector.cpp index 0b24d4abce..348ac3f4ea 100644 --- a/cocos/2d/CCDirector.cpp +++ b/cocos/2d/CCDirector.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. ****************************************************************************/ // cocos2d includes -#include "CCDirector.h" +#include "2d/CCDirector.h" // standard includes #include @@ -36,29 +36,29 @@ THE SOFTWARE. #include "CCNS.h" #include "CCScene.h" #include "CCScheduler.h" -#include "ccMacros.h" +#include "2d/ccMacros.h" #include "CCTransition.h" #include "CCTextureCache.h" -#include "CCSpriteFrameCache.h" +#include "2d/CCSpriteFrameCache.h" #include "CCAutoreleasePool.h" -#include "platform/CCFileUtils.h" +#include "2d/platform/CCFileUtils.h" #include "CCApplication.h" #include "CCFontFNT.h" #include "CCFontAtlasCache.h" -#include "CCActionManager.h" +#include "2d/CCActionManager.h" #include "CCAnimationCache.h" -#include "CCTouch.h" +#include "2d/CCTouch.h" #include "CCUserDefault.h" #include "ccGLStateCache.h" #include "CCShaderCache.h" #include "CCProfiling.h" -#include "platform/CCImage.h" +#include "2d/platform/CCImage.h" #include "CCGLView.h" #include "CCConfiguration.h" -#include "CCEventDispatcher.h" -#include "CCEventCustom.h" +#include "2d/CCEventDispatcher.h" +#include "2d/CCEventCustom.h" #include "CCFontFreeType.h" -#include "renderer/CCRenderer.h" +#include "2d/renderer/CCRenderer.h" #include "CCConsole.h" #include "math/CCMath.h" diff --git a/cocos/2d/CCDirector.h b/cocos/2d/CCDirector.h index 6725324958..10ae9d28fa 100644 --- a/cocos/2d/CCDirector.h +++ b/cocos/2d/CCDirector.h @@ -28,11 +28,11 @@ THE SOFTWARE. #ifndef __CCDIRECTOR_H__ #define __CCDIRECTOR_H__ -#include "CCPlatformMacros.h" +#include "base/CCPlatformMacros.h" -#include "CCRef.h" -#include "ccTypes.h" -#include "CCGeometry.h" +#include "base/CCRef.h" +#include "2d/ccTypes.h" +#include "base/CCGeometry.h" #include "CCVector.h" #include "CCGL.h" #include "CCLabelAtlas.h" diff --git a/cocos/2d/CCDrawNode.cpp b/cocos/2d/CCDrawNode.cpp index 3160ba9c6a..8986fbd43f 100644 --- a/cocos/2d/CCDrawNode.cpp +++ b/cocos/2d/CCDrawNode.cpp @@ -21,16 +21,16 @@ * SOFTWARE. */ -#include "CCDrawNode.h" +#include "2d/CCDrawNode.h" #include "CCShaderCache.h" #include "CCGL.h" -#include "CCEventType.h" +#include "2d/CCEventType.h" #include "CCConfiguration.h" -#include "renderer/CCCustomCommand.h" -#include "renderer/CCRenderer.h" -#include "CCDirector.h" -#include "CCEventListenerCustom.h" -#include "CCEventDispatcher.h" +#include "2d/renderer/CCCustomCommand.h" +#include "2d/renderer/CCRenderer.h" +#include "2d/CCDirector.h" +#include "2d/CCEventListenerCustom.h" +#include "2d/CCEventDispatcher.h" NS_CC_BEGIN diff --git a/cocos/2d/CCDrawNode.h b/cocos/2d/CCDrawNode.h index 27b9abc58a..2cca8755f3 100644 --- a/cocos/2d/CCDrawNode.h +++ b/cocos/2d/CCDrawNode.h @@ -31,9 +31,9 @@ #ifndef __CCDRAWNODES_CCDRAW_NODE_H__ #define __CCDRAWNODES_CCDRAW_NODE_H__ -#include "CCNode.h" -#include "ccTypes.h" -#include "renderer/CCCustomCommand.h" +#include "2d/CCNode.h" +#include "2d/ccTypes.h" +#include "2d/renderer/CCCustomCommand.h" NS_CC_BEGIN diff --git a/cocos/2d/CCDrawingPrimitives.cpp b/cocos/2d/CCDrawingPrimitives.cpp index c180f16530..8f5d636e4e 100644 --- a/cocos/2d/CCDrawingPrimitives.cpp +++ b/cocos/2d/CCDrawingPrimitives.cpp @@ -41,15 +41,15 @@ THE SOFTWARE. #include #include -#include "ccTypes.h" -#include "ccMacros.h" +#include "2d/ccTypes.h" +#include "2d/ccMacros.h" #include "CCGL.h" -#include "CCDirector.h" +#include "2d/CCDirector.h" #include "ccGLStateCache.h" #include "CCShaderCache.h" -#include "CCGLProgram.h" -#include "CCActionCatmullRom.h" -#include "renderer/CCRenderer.h" +#include "2d/CCGLProgram.h" +#include "2d/CCActionCatmullRom.h" +#include "2d/renderer/CCRenderer.h" NS_CC_BEGIN #ifndef M_PI diff --git a/cocos/2d/CCDrawingPrimitives.h b/cocos/2d/CCDrawingPrimitives.h index 1018805c84..a4047acf30 100644 --- a/cocos/2d/CCDrawingPrimitives.h +++ b/cocos/2d/CCDrawingPrimitives.h @@ -41,8 +41,8 @@ THE SOFTWARE. #define __CCDRAWING_PRIMITIVES__ -#include "ccTypes.h" -#include "ccMacros.h" +#include "2d/ccTypes.h" +#include "2d/ccMacros.h" #include "math/CCMath.h" /** diff --git a/cocos/2d/CCEvent.cpp b/cocos/2d/CCEvent.cpp index 66855586b0..4525ee97e4 100644 --- a/cocos/2d/CCEvent.cpp +++ b/cocos/2d/CCEvent.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCEvent.h" +#include "2d/CCEvent.h" NS_CC_BEGIN diff --git a/cocos/2d/CCEvent.h b/cocos/2d/CCEvent.h index 9752af6fba..282dcf7ea9 100644 --- a/cocos/2d/CCEvent.h +++ b/cocos/2d/CCEvent.h @@ -29,8 +29,8 @@ #include #include -#include "CCRef.h" -#include "CCPlatformMacros.h" +#include "base/CCRef.h" +#include "base/CCPlatformMacros.h" NS_CC_BEGIN diff --git a/cocos/2d/CCEventAcceleration.cpp b/cocos/2d/CCEventAcceleration.cpp index cf3fc75fda..d1e1d6b091 100644 --- a/cocos/2d/CCEventAcceleration.cpp +++ b/cocos/2d/CCEventAcceleration.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCEventAcceleration.h" +#include "2d/CCEventAcceleration.h" NS_CC_BEGIN diff --git a/cocos/2d/CCEventAcceleration.h b/cocos/2d/CCEventAcceleration.h index b8dbcd09f5..5be7bd4bda 100644 --- a/cocos/2d/CCEventAcceleration.h +++ b/cocos/2d/CCEventAcceleration.h @@ -25,8 +25,8 @@ #ifndef __cocos2d_libs__CCAccelerometerEvent__ #define __cocos2d_libs__CCAccelerometerEvent__ -#include "CCEvent.h" -#include "ccTypes.h" +#include "2d/CCEvent.h" +#include "2d/ccTypes.h" NS_CC_BEGIN diff --git a/cocos/2d/CCEventCustom.cpp b/cocos/2d/CCEventCustom.cpp index 09b5c5048a..beaa6b671a 100644 --- a/cocos/2d/CCEventCustom.cpp +++ b/cocos/2d/CCEventCustom.cpp @@ -22,8 +22,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCEventCustom.h" -#include "ccMacros.h" +#include "2d/CCEventCustom.h" +#include "2d/ccMacros.h" #include NS_CC_BEGIN diff --git a/cocos/2d/CCEventCustom.h b/cocos/2d/CCEventCustom.h index c967069151..8304d49e34 100644 --- a/cocos/2d/CCEventCustom.h +++ b/cocos/2d/CCEventCustom.h @@ -25,7 +25,7 @@ #ifndef __cocos2d_libs__CCCustomEvent__ #define __cocos2d_libs__CCCustomEvent__ -#include "CCEvent.h" +#include "2d/CCEvent.h" NS_CC_BEGIN diff --git a/cocos/2d/CCEventDispatcher.cpp b/cocos/2d/CCEventDispatcher.cpp index 328aea7d7e..7a4832e221 100644 --- a/cocos/2d/CCEventDispatcher.cpp +++ b/cocos/2d/CCEventDispatcher.cpp @@ -21,19 +21,19 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCEventDispatcher.h" -#include "CCEvent.h" -#include "CCEventTouch.h" -#include "CCEventCustom.h" -#include "CCEventListenerTouch.h" -#include "CCEventListenerAcceleration.h" -#include "CCEventListenerMouse.h" -#include "CCEventListenerKeyboard.h" -#include "CCEventListenerCustom.h" +#include "2d/CCEventDispatcher.h" +#include "2d/CCEvent.h" +#include "2d/CCEventTouch.h" +#include "2d/CCEventCustom.h" +#include "2d/CCEventListenerTouch.h" +#include "2d/CCEventListenerAcceleration.h" +#include "2d/CCEventListenerMouse.h" +#include "2d/CCEventListenerKeyboard.h" +#include "2d/CCEventListenerCustom.h" #include "CCScene.h" -#include "CCDirector.h" -#include "CCEventType.h" +#include "2d/CCDirector.h" +#include "2d/CCEventType.h" #include diff --git a/cocos/2d/CCEventDispatcher.h b/cocos/2d/CCEventDispatcher.h index 16d7b62149..696e4a4565 100644 --- a/cocos/2d/CCEventDispatcher.h +++ b/cocos/2d/CCEventDispatcher.h @@ -25,9 +25,9 @@ #ifndef __CC_EVENT_DISPATCHER_H__ #define __CC_EVENT_DISPATCHER_H__ -#include "CCPlatformMacros.h" -#include "CCEventListener.h" -#include "CCEvent.h" +#include "base/CCPlatformMacros.h" +#include "2d/CCEventListener.h" +#include "2d/CCEvent.h" #include "CCStdC.h" #include diff --git a/cocos/2d/CCEventKeyboard.cpp b/cocos/2d/CCEventKeyboard.cpp index 2051e09cbc..a8eb9b76c7 100644 --- a/cocos/2d/CCEventKeyboard.cpp +++ b/cocos/2d/CCEventKeyboard.cpp @@ -23,7 +23,7 @@ ****************************************************************************/ -#include "CCEventKeyboard.h" +#include "2d/CCEventKeyboard.h" NS_CC_BEGIN diff --git a/cocos/2d/CCEventKeyboard.h b/cocos/2d/CCEventKeyboard.h index 942e5738d6..a465c2ed2d 100644 --- a/cocos/2d/CCEventKeyboard.h +++ b/cocos/2d/CCEventKeyboard.h @@ -26,7 +26,7 @@ #ifndef __cocos2d_libs__CCKeyboardEvent__ #define __cocos2d_libs__CCKeyboardEvent__ -#include "CCEvent.h" +#include "2d/CCEvent.h" NS_CC_BEGIN diff --git a/cocos/2d/CCEventListener.cpp b/cocos/2d/CCEventListener.cpp index f36b130173..7feb57cdd3 100644 --- a/cocos/2d/CCEventListener.cpp +++ b/cocos/2d/CCEventListener.cpp @@ -22,8 +22,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCEventListener.h" -#include "platform/CCCommon.h" +#include "2d/CCEventListener.h" +#include "2d/platform/CCCommon.h" NS_CC_BEGIN diff --git a/cocos/2d/CCEventListener.h b/cocos/2d/CCEventListener.h index 3cb750317e..1c001aa1d4 100644 --- a/cocos/2d/CCEventListener.h +++ b/cocos/2d/CCEventListener.h @@ -25,8 +25,8 @@ #ifndef __CCEVENTLISTENER_H__ #define __CCEVENTLISTENER_H__ -#include "CCPlatformMacros.h" -#include "CCRef.h" +#include "base/CCPlatformMacros.h" +#include "base/CCRef.h" #include #include diff --git a/cocos/2d/CCEventListenerAcceleration.cpp b/cocos/2d/CCEventListenerAcceleration.cpp index c0a25afba4..8f39fa5cac 100644 --- a/cocos/2d/CCEventListenerAcceleration.cpp +++ b/cocos/2d/CCEventListenerAcceleration.cpp @@ -22,8 +22,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCEventListenerAcceleration.h" -#include "CCEventAcceleration.h" +#include "2d/CCEventListenerAcceleration.h" +#include "2d/CCEventAcceleration.h" NS_CC_BEGIN diff --git a/cocos/2d/CCEventListenerAcceleration.h b/cocos/2d/CCEventListenerAcceleration.h index 0410b8e436..5cfe310b26 100644 --- a/cocos/2d/CCEventListenerAcceleration.h +++ b/cocos/2d/CCEventListenerAcceleration.h @@ -25,8 +25,8 @@ #ifndef __cocos2d_libs__CCAccelerometerListener__ #define __cocos2d_libs__CCAccelerometerListener__ -#include "CCEventListener.h" -#include "ccTypes.h" +#include "2d/CCEventListener.h" +#include "2d/ccTypes.h" NS_CC_BEGIN diff --git a/cocos/2d/CCEventListenerCustom.cpp b/cocos/2d/CCEventListenerCustom.cpp index 9240c5939c..c50629d880 100644 --- a/cocos/2d/CCEventListenerCustom.cpp +++ b/cocos/2d/CCEventListenerCustom.cpp @@ -22,8 +22,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCEventListenerCustom.h" -#include "CCEventCustom.h" +#include "2d/CCEventListenerCustom.h" +#include "2d/CCEventCustom.h" NS_CC_BEGIN diff --git a/cocos/2d/CCEventListenerCustom.h b/cocos/2d/CCEventListenerCustom.h index eb213c732a..000609655b 100644 --- a/cocos/2d/CCEventListenerCustom.h +++ b/cocos/2d/CCEventListenerCustom.h @@ -25,7 +25,7 @@ #ifndef __cocos2d_libs__CCCustomEventListener__ #define __cocos2d_libs__CCCustomEventListener__ -#include "CCEventListener.h" +#include "2d/CCEventListener.h" NS_CC_BEGIN diff --git a/cocos/2d/CCEventListenerKeyboard.cpp b/cocos/2d/CCEventListenerKeyboard.cpp index b5131c0c3b..84d6d69bdb 100644 --- a/cocos/2d/CCEventListenerKeyboard.cpp +++ b/cocos/2d/CCEventListenerKeyboard.cpp @@ -23,9 +23,9 @@ ****************************************************************************/ -#include "CCEventListenerKeyboard.h" -#include "CCEventKeyboard.h" -#include "ccMacros.h" +#include "2d/CCEventListenerKeyboard.h" +#include "2d/CCEventKeyboard.h" +#include "2d/ccMacros.h" NS_CC_BEGIN diff --git a/cocos/2d/CCEventListenerKeyboard.h b/cocos/2d/CCEventListenerKeyboard.h index a30f517658..53c8c284cf 100644 --- a/cocos/2d/CCEventListenerKeyboard.h +++ b/cocos/2d/CCEventListenerKeyboard.h @@ -26,8 +26,8 @@ #ifndef __cocos2d_libs__CCKeyboardEventListener__ #define __cocos2d_libs__CCKeyboardEventListener__ -#include "CCEventListener.h" -#include "CCEventKeyboard.h" +#include "2d/CCEventListener.h" +#include "2d/CCEventKeyboard.h" NS_CC_BEGIN diff --git a/cocos/2d/CCEventListenerMouse.cpp b/cocos/2d/CCEventListenerMouse.cpp index 7dfd8d4c95..87f7efc1bd 100644 --- a/cocos/2d/CCEventListenerMouse.cpp +++ b/cocos/2d/CCEventListenerMouse.cpp @@ -23,7 +23,7 @@ ****************************************************************************/ -#include "CCEventListenerMouse.h" +#include "2d/CCEventListenerMouse.h" NS_CC_BEGIN diff --git a/cocos/2d/CCEventListenerMouse.h b/cocos/2d/CCEventListenerMouse.h index 8ca58db437..13349da3c4 100644 --- a/cocos/2d/CCEventListenerMouse.h +++ b/cocos/2d/CCEventListenerMouse.h @@ -23,8 +23,8 @@ ****************************************************************************/ -#include "CCEventListener.h" -#include "CCEventMouse.h" +#include "2d/CCEventListener.h" +#include "2d/CCEventMouse.h" #ifndef __cocos2d_libs__CCMouseEventListener__ #define __cocos2d_libs__CCMouseEventListener__ diff --git a/cocos/2d/CCEventListenerTouch.cpp b/cocos/2d/CCEventListenerTouch.cpp index 4730cc7f60..a922ce13fb 100644 --- a/cocos/2d/CCEventListenerTouch.cpp +++ b/cocos/2d/CCEventListenerTouch.cpp @@ -22,9 +22,9 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCEventListenerTouch.h" -#include "CCEventDispatcher.h" -#include "CCEventTouch.h" +#include "2d/CCEventListenerTouch.h" +#include "2d/CCEventDispatcher.h" +#include "2d/CCEventTouch.h" #include diff --git a/cocos/2d/CCEventListenerTouch.h b/cocos/2d/CCEventListenerTouch.h index 4b608e1755..70534449ed 100644 --- a/cocos/2d/CCEventListenerTouch.h +++ b/cocos/2d/CCEventListenerTouch.h @@ -26,8 +26,8 @@ #ifndef __cocos2d_libs__CCTouchEventListener__ #define __cocos2d_libs__CCTouchEventListener__ -#include "CCEventListener.h" -#include "CCTouch.h" +#include "2d/CCEventListener.h" +#include "2d/CCTouch.h" #include diff --git a/cocos/2d/CCEventMouse.cpp b/cocos/2d/CCEventMouse.cpp index a787c79758..440d686e13 100644 --- a/cocos/2d/CCEventMouse.cpp +++ b/cocos/2d/CCEventMouse.cpp @@ -23,7 +23,7 @@ ****************************************************************************/ -#include "CCEventMouse.h" +#include "2d/CCEventMouse.h" NS_CC_BEGIN diff --git a/cocos/2d/CCEventMouse.h b/cocos/2d/CCEventMouse.h index 8da29b84fb..392762c765 100644 --- a/cocos/2d/CCEventMouse.h +++ b/cocos/2d/CCEventMouse.h @@ -26,7 +26,7 @@ #ifndef __cocos2d_libs__CCMouseEvent__ #define __cocos2d_libs__CCMouseEvent__ -#include "CCEvent.h" +#include "2d/CCEvent.h" #define MOUSE_BUTTON_LEFT 0 #define MOUSE_BUTTON_RIGHT 1 diff --git a/cocos/2d/CCEventTouch.cpp b/cocos/2d/CCEventTouch.cpp index f380d412ad..6ee817df6b 100644 --- a/cocos/2d/CCEventTouch.cpp +++ b/cocos/2d/CCEventTouch.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCEventTouch.h" +#include "2d/CCEventTouch.h" NS_CC_BEGIN diff --git a/cocos/2d/CCEventTouch.h b/cocos/2d/CCEventTouch.h index 05d4eb8f2c..ee08e3675a 100644 --- a/cocos/2d/CCEventTouch.h +++ b/cocos/2d/CCEventTouch.h @@ -25,8 +25,8 @@ #ifndef __cocos2d_libs__TouchEvent__ #define __cocos2d_libs__TouchEvent__ -#include "CCEvent.h" -#include "CCTouch.h" +#include "2d/CCEvent.h" +#include "2d/CCTouch.h" #include NS_CC_BEGIN diff --git a/cocos/2d/CCFont.h b/cocos/2d/CCFont.h index 0d07078237..1fd7859b70 100644 --- a/cocos/2d/CCFont.h +++ b/cocos/2d/CCFont.h @@ -28,7 +28,7 @@ #include -#include "CCLabel.h" +#include "2d/CCLabel.h" NS_CC_BEGIN diff --git a/cocos/2d/CCFontAtlas.cpp b/cocos/2d/CCFontAtlas.cpp index 9ac4761537..5740444d38 100644 --- a/cocos/2d/CCFontAtlas.cpp +++ b/cocos/2d/CCFontAtlas.cpp @@ -26,10 +26,10 @@ #include "CCFontAtlas.h" #include "CCFontFreeType.h" #include "ccUTF8.h" -#include "CCDirector.h" -#include "CCEventListenerCustom.h" -#include "CCEventDispatcher.h" -#include "CCEventType.h" +#include "2d/CCDirector.h" +#include "2d/CCEventListenerCustom.h" +#include "2d/CCEventDispatcher.h" +#include "2d/CCEventType.h" NS_CC_BEGIN diff --git a/cocos/2d/CCFontAtlas.h b/cocos/2d/CCFontAtlas.h index 134f360ea3..78c9b44d6e 100644 --- a/cocos/2d/CCFontAtlas.h +++ b/cocos/2d/CCFontAtlas.h @@ -26,8 +26,8 @@ #define _CCFontAtlas_h_ #include -#include "CCPlatformMacros.h" -#include "CCRef.h" +#include "base/CCPlatformMacros.h" +#include "base/CCRef.h" #include "CCStdC.h" NS_CC_BEGIN diff --git a/cocos/2d/CCFontAtlasCache.cpp b/cocos/2d/CCFontAtlasCache.cpp index 98e94e18ab..b0c3a1ec6e 100644 --- a/cocos/2d/CCFontAtlasCache.cpp +++ b/cocos/2d/CCFontAtlasCache.cpp @@ -30,7 +30,7 @@ #include "CCFontFNT.h" #include "CCFontFreeType.h" #include "CCFontCharMap.h" -#include "CCDirector.h" +#include "2d/CCDirector.h" NS_CC_BEGIN diff --git a/cocos/2d/CCFontAtlasCache.h b/cocos/2d/CCFontAtlasCache.h index 4afb7ae2ca..dab9609cca 100644 --- a/cocos/2d/CCFontAtlasCache.h +++ b/cocos/2d/CCFontAtlasCache.h @@ -30,7 +30,7 @@ #include #include "CCFontAtlas.h" -#include "CCLabel.h" +#include "2d/CCLabel.h" NS_CC_BEGIN diff --git a/cocos/2d/CCFontCharMap.cpp b/cocos/2d/CCFontCharMap.cpp index 8a47687061..1a568a1469 100644 --- a/cocos/2d/CCFontCharMap.cpp +++ b/cocos/2d/CCFontCharMap.cpp @@ -25,8 +25,8 @@ #include "CCFontCharMap.h" #include "CCFontAtlas.h" -#include "platform/CCFileUtils.h" -#include "CCDirector.h" +#include "2d/platform/CCFileUtils.h" +#include "2d/CCDirector.h" #include "CCTextureCache.h" #include "ccUTF8.h" diff --git a/cocos/2d/CCFontFNT.cpp b/cocos/2d/CCFontFNT.cpp index 73973e7d0b..ae02af5c12 100644 --- a/cocos/2d/CCFontFNT.cpp +++ b/cocos/2d/CCFontFNT.cpp @@ -24,15 +24,15 @@ ****************************************************************************/ #include "CCFontFNT.h" -#include "uthash.h" +#include "2d/uthash.h" #include "CCConfiguration.h" -#include "CCDirector.h" +#include "2d/CCDirector.h" #include "CCFontAtlas.h" #include "CCMap.h" #include "deprecated/CCString.h" #include "CCTextureCache.h" #include "ccUTF8.h" -#include "platform/CCFileUtils.h" +#include "2d/platform/CCFileUtils.h" using namespace std; NS_CC_BEGIN diff --git a/cocos/2d/CCFontFreeType.cpp b/cocos/2d/CCFontFreeType.cpp index c9fe2d8c41..ea7a4b6034 100644 --- a/cocos/2d/CCFontFreeType.cpp +++ b/cocos/2d/CCFontFreeType.cpp @@ -28,7 +28,7 @@ THE SOFTWARE. #include "ccUTF8.h" #include "CCFontFreeType.h" -#include "platform/CCFileUtils.h" +#include "2d/platform/CCFileUtils.h" #include "edtaa3func.h" #include FT_BBOX_H diff --git a/cocos/2d/CCGLProgram.cpp b/cocos/2d/CCGLProgram.cpp index 84275af7cb..79a1c2e709 100644 --- a/cocos/2d/CCGLProgram.cpp +++ b/cocos/2d/CCGLProgram.cpp @@ -26,12 +26,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCDirector.h" -#include "CCGLProgram.h" +#include "2d/CCDirector.h" +#include "2d/CCGLProgram.h" #include "ccGLStateCache.h" -#include "ccMacros.h" -#include "platform/CCFileUtils.h" -#include "uthash.h" +#include "2d/ccMacros.h" +#include "2d/platform/CCFileUtils.h" +#include "2d/uthash.h" #include "deprecated/CCString.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) diff --git a/cocos/2d/CCGLProgram.h b/cocos/2d/CCGLProgram.h index 3e92e4a3b9..f7a2372261 100644 --- a/cocos/2d/CCGLProgram.h +++ b/cocos/2d/CCGLProgram.h @@ -30,8 +30,8 @@ THE SOFTWARE. #ifndef __CCGLPROGRAM_H__ #define __CCGLPROGRAM_H__ -#include "ccMacros.h" -#include "CCRef.h" +#include "2d/ccMacros.h" +#include "base/CCRef.h" #include "CCGL.h" #include "math/CCMath.h" #include diff --git a/cocos/2d/CCGrabber.cpp b/cocos/2d/CCGrabber.cpp index 0475cca87b..a9b68b702a 100644 --- a/cocos/2d/CCGrabber.cpp +++ b/cocos/2d/CCGrabber.cpp @@ -24,8 +24,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ #include "CCGrabber.h" -#include "ccMacros.h" -#include "CCTexture2D.h" +#include "2d/ccMacros.h" +#include "2d/CCTexture2D.h" NS_CC_BEGIN diff --git a/cocos/2d/CCGrabber.h b/cocos/2d/CCGrabber.h index 6683bb8e2d..9f4326d484 100644 --- a/cocos/2d/CCGrabber.h +++ b/cocos/2d/CCGrabber.h @@ -27,7 +27,7 @@ THE SOFTWARE. #define __EFFECTS_CCGRABBER_H__ #include "CCConfiguration.h" -#include "CCRef.h" +#include "base/CCRef.h" #include "CCGL.h" NS_CC_BEGIN diff --git a/cocos/2d/CCGrid.cpp b/cocos/2d/CCGrid.cpp index e63c7ee6ff..9443cc723d 100644 --- a/cocos/2d/CCGrid.cpp +++ b/cocos/2d/CCGrid.cpp @@ -23,16 +23,16 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "ccMacros.h" +#include "2d/ccMacros.h" #include "CCGrid.h" -#include "CCDirector.h" +#include "2d/CCDirector.h" #include "CCGrabber.h" #include "ccUtils.h" -#include "CCGLProgram.h" +#include "2d/CCGLProgram.h" #include "CCShaderCache.h" #include "ccGLStateCache.h" #include "CCGL.h" -#include "renderer/CCRenderer.h" +#include "2d/renderer/CCRenderer.h" #include "TransformUtils.h" NS_CC_BEGIN diff --git a/cocos/2d/CCGrid.h b/cocos/2d/CCGrid.h index 6e8ac32a5f..a31b3e09dd 100644 --- a/cocos/2d/CCGrid.h +++ b/cocos/2d/CCGrid.h @@ -26,11 +26,11 @@ THE SOFTWARE. #ifndef __EFFECTS_CCGRID_H__ #define __EFFECTS_CCGRID_H__ -#include "CCRef.h" -#include "CCNode.h" -#include "ccTypes.h" -#include "CCTexture2D.h" -#include "CCDirector.h" +#include "base/CCRef.h" +#include "2d/CCNode.h" +#include "2d/ccTypes.h" +#include "2d/CCTexture2D.h" +#include "2d/CCDirector.h" #ifdef EMSCRIPTEN #include "CCGLBufferedNode.h" #endif // EMSCRIPTEN diff --git a/cocos/2d/CCIMEDelegate.h b/cocos/2d/CCIMEDelegate.h index bf230e01df..8e463a9eaf 100644 --- a/cocos/2d/CCIMEDelegate.h +++ b/cocos/2d/CCIMEDelegate.h @@ -27,7 +27,7 @@ THE SOFTWARE. #define __CC_IME_DELEGATE_H__ #include -#include "CCGeometry.h" +#include "base/CCGeometry.h" NS_CC_BEGIN extern const std::string STD_STRING_EMPTY; diff --git a/cocos/2d/CCIMEDispatcher.h b/cocos/2d/CCIMEDispatcher.h index 698f033551..6b6a4b1fc7 100644 --- a/cocos/2d/CCIMEDispatcher.h +++ b/cocos/2d/CCIMEDispatcher.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __CC_IME_DISPATCHER_H__ #define __CC_IME_DISPATCHER_H__ -#include "CCIMEDelegate.h" +#include "2d/CCIMEDelegate.h" NS_CC_BEGIN diff --git a/cocos/2d/CCLabel.cpp b/cocos/2d/CCLabel.cpp index 7ad8fd365e..5b54bf703d 100644 --- a/cocos/2d/CCLabel.cpp +++ b/cocos/2d/CCLabel.cpp @@ -23,21 +23,21 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCLabel.h" +#include "2d/CCLabel.h" #include "CCFontAtlasCache.h" #include "CCLabelTextFormatter.h" -#include "CCSprite.h" +#include "2d/CCSprite.h" #include "CCShaderCache.h" #include "ccUTF8.h" -#include "CCSpriteFrame.h" -#include "CCDirector.h" -#include "renderer/CCRenderer.h" +#include "2d/CCSpriteFrame.h" +#include "2d/CCDirector.h" +#include "2d/renderer/CCRenderer.h" #include "CCFont.h" -#include "CCEventListenerCustom.h" -#include "CCEventDispatcher.h" -#include "CCEventType.h" -#include "CCEventCustom.h" -#include "platform/CCFileUtils.h" +#include "2d/CCEventListenerCustom.h" +#include "2d/CCEventDispatcher.h" +#include "2d/CCEventType.h" +#include "2d/CCEventCustom.h" +#include "2d/platform/CCFileUtils.h" #include "deprecated/CCString.h" #include "CCProfiling.h" diff --git a/cocos/2d/CCLabel.h b/cocos/2d/CCLabel.h index 92058dedf5..46fd6b4098 100644 --- a/cocos/2d/CCLabel.h +++ b/cocos/2d/CCLabel.h @@ -27,9 +27,9 @@ #ifndef _COCOS2D_CCLABEL_H_ #define _COCOS2D_CCLABEL_H_ -#include "CCSpriteBatchNode.h" -#include "ccTypes.h" -#include "renderer/CCCustomCommand.h" +#include "2d/CCSpriteBatchNode.h" +#include "2d/ccTypes.h" +#include "2d/renderer/CCCustomCommand.h" #include "CCFontAtlas.h" NS_CC_BEGIN diff --git a/cocos/2d/CCLabelAtlas.cpp b/cocos/2d/CCLabelAtlas.cpp index 4c367b64c5..eec5fe51c4 100644 --- a/cocos/2d/CCLabelAtlas.cpp +++ b/cocos/2d/CCLabelAtlas.cpp @@ -25,22 +25,22 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ #include "CCLabelAtlas.h" -#include "CCTextureAtlas.h" +#include "2d/CCTextureAtlas.h" #include "CCTextureCache.h" #include "CCDrawingPrimitives.h" -#include "ccConfig.h" +#include "2d/ccConfig.h" #include "CCShaderCache.h" -#include "CCGLProgram.h" +#include "2d/CCGLProgram.h" #include "ccGLStateCache.h" -#include "CCDirector.h" +#include "2d/CCDirector.h" #include "TransformUtils.h" -#include "platform/CCFileUtils.h" +#include "2d/platform/CCFileUtils.h" // external #include "deprecated/CCString.h" #if CC_LABELATLAS_DEBUG_DRAW -#include "renderer/CCRenderer.h" -#include "CCDirector.h" +#include "2d/renderer/CCRenderer.h" +#include "2d/CCDirector.h" #endif NS_CC_BEGIN diff --git a/cocos/2d/CCLabelAtlas.h b/cocos/2d/CCLabelAtlas.h index c2e11ce0f4..467f51371c 100644 --- a/cocos/2d/CCLabelAtlas.h +++ b/cocos/2d/CCLabelAtlas.h @@ -29,7 +29,7 @@ THE SOFTWARE. #include "CCAtlasNode.h" #if CC_LABELATLAS_DEBUG_DRAW -#include "renderer/CCCustomCommand.h" +#include "2d/renderer/CCCustomCommand.h" #endif NS_CC_BEGIN diff --git a/cocos/2d/CCLabelBMFont.cpp b/cocos/2d/CCLabelBMFont.cpp index b6b49dfa34..5788586373 100644 --- a/cocos/2d/CCLabelBMFont.cpp +++ b/cocos/2d/CCLabelBMFont.cpp @@ -34,11 +34,11 @@ http://www.angelcode.com/products/bmfont/ (Free, Windows only) #include "CCLabelBMFont.h" #include "CCDrawingPrimitives.h" #include "deprecated/CCString.h" -#include "CCSprite.h" +#include "2d/CCSprite.h" #if CC_LABELBMFONT_DEBUG_DRAW -#include "renderer/CCRenderer.h" -#include "CCDirector.h" +#include "2d/renderer/CCRenderer.h" +#include "2d/CCDirector.h" #endif using namespace std; diff --git a/cocos/2d/CCLabelBMFont.h b/cocos/2d/CCLabelBMFont.h index 3f405b439d..48fc10d094 100644 --- a/cocos/2d/CCLabelBMFont.h +++ b/cocos/2d/CCLabelBMFont.h @@ -34,9 +34,9 @@ Use any of these editors to generate BMFonts: #ifndef __CCBITMAP_FONT_ATLAS_H__ #define __CCBITMAP_FONT_ATLAS_H__ -#include "CCLabel.h" +#include "2d/CCLabel.h" #if CC_LABELBMFONT_DEBUG_DRAW -#include "renderer/CCCustomCommand.h" +#include "2d/renderer/CCCustomCommand.h" #endif NS_CC_BEGIN diff --git a/cocos/2d/CCLabelTTF.cpp b/cocos/2d/CCLabelTTF.cpp index f33a8d2053..e5ba3b7cb8 100644 --- a/cocos/2d/CCLabelTTF.cpp +++ b/cocos/2d/CCLabelTTF.cpp @@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ #include "CCLabelTTF.h" -#include "CCLabel.h" +#include "2d/CCLabel.h" #include "deprecated/CCString.h" NS_CC_BEGIN diff --git a/cocos/2d/CCLabelTTF.h b/cocos/2d/CCLabelTTF.h index 898ca8f6be..e5731dc02c 100644 --- a/cocos/2d/CCLabelTTF.h +++ b/cocos/2d/CCLabelTTF.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __CCLABELTTF_H__ #define __CCLABELTTF_H__ -#include "CCNode.h" +#include "2d/CCNode.h" NS_CC_BEGIN diff --git a/cocos/2d/CCLabelTextFormatter.cpp b/cocos/2d/CCLabelTextFormatter.cpp index 57231a9aed..80196d60b7 100644 --- a/cocos/2d/CCLabelTextFormatter.cpp +++ b/cocos/2d/CCLabelTextFormatter.cpp @@ -27,8 +27,8 @@ #include "ccUTF8.h" #include "CCLabelTextFormatter.h" -#include "CCDirector.h" -#include "CCLabel.h" +#include "2d/CCDirector.h" +#include "2d/CCLabel.h" using namespace std; diff --git a/cocos/2d/CCLayer.cpp b/cocos/2d/CCLayer.cpp index 643f2abce0..8ccb411e8b 100644 --- a/cocos/2d/CCLayer.cpp +++ b/cocos/2d/CCLayer.cpp @@ -26,25 +26,25 @@ THE SOFTWARE. ****************************************************************************/ #include -#include "CCLayer.h" -#include "CCDirector.h" +#include "2d/CCLayer.h" +#include "2d/CCDirector.h" #include "CCScriptSupport.h" #include "CCShaderCache.h" -#include "CCGLProgram.h" +#include "2d/CCGLProgram.h" #include "ccGLStateCache.h" #include "TransformUtils.h" // extern -#include "CCEventDispatcher.h" -#include "CCEventListenerTouch.h" -#include "CCEventTouch.h" -#include "CCEventKeyboard.h" -#include "CCEventListenerKeyboard.h" -#include "CCEventAcceleration.h" -#include "CCEventListenerAcceleration.h" -#include "platform/CCDevice.h" +#include "2d/CCEventDispatcher.h" +#include "2d/CCEventListenerTouch.h" +#include "2d/CCEventTouch.h" +#include "2d/CCEventKeyboard.h" +#include "2d/CCEventListenerKeyboard.h" +#include "2d/CCEventAcceleration.h" +#include "2d/CCEventListenerAcceleration.h" +#include "2d/platform/CCDevice.h" #include "CCScene.h" -#include "renderer/CCCustomCommand.h" -#include "renderer/CCRenderer.h" +#include "2d/renderer/CCCustomCommand.h" +#include "2d/renderer/CCRenderer.h" #include "deprecated/CCString.h" #if CC_USE_PHYSICS diff --git a/cocos/2d/CCLayer.h b/cocos/2d/CCLayer.h index eca1327d6e..017957d860 100644 --- a/cocos/2d/CCLayer.h +++ b/cocos/2d/CCLayer.h @@ -28,15 +28,15 @@ THE SOFTWARE. #ifndef __CCLAYER_H__ #define __CCLAYER_H__ -#include "CCNode.h" -#include "CCProtocols.h" -#include "CCEventTouch.h" +#include "2d/CCNode.h" +#include "2d/CCProtocols.h" +#include "2d/CCEventTouch.h" #ifdef EMSCRIPTEN #include "CCGLBufferedNode.h" #endif // EMSCRIPTEN -#include "CCEventKeyboard.h" -#include "renderer/CCCustomCommand.h" +#include "2d/CCEventKeyboard.h" +#include "2d/renderer/CCCustomCommand.h" #include "CCPhysicsWorld.h" diff --git a/cocos/2d/CCMenu.cpp b/cocos/2d/CCMenu.cpp index 1c05bb30f4..b739b2aa6a 100644 --- a/cocos/2d/CCMenu.cpp +++ b/cocos/2d/CCMenu.cpp @@ -23,12 +23,12 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCMenu.h" -#include "CCDirector.h" +#include "2d/CCMenu.h" +#include "2d/CCDirector.h" #include "CCApplication.h" -#include "CCTouch.h" +#include "2d/CCTouch.h" #include "CCStdC.h" -#include "CCEventListenerTouch.h" +#include "2d/CCEventListenerTouch.h" #include "deprecated/CCString.h" #include diff --git a/cocos/2d/CCMenu.h b/cocos/2d/CCMenu.h index 71207dbed1..5ab5723234 100644 --- a/cocos/2d/CCMenu.h +++ b/cocos/2d/CCMenu.h @@ -26,10 +26,10 @@ THE SOFTWARE. #ifndef __CCMENU_H_ #define __CCMENU_H_ -#include "CCMenuItem.h" -#include "CCLayer.h" +#include "2d/CCMenuItem.h" +#include "2d/CCLayer.h" #include "CCVector.h" -#include "CCEventTouch.h" +#include "2d/CCEventTouch.h" #include "CCValue.h" NS_CC_BEGIN diff --git a/cocos/2d/CCMenuItem.cpp b/cocos/2d/CCMenuItem.cpp index 1fbac6398f..94ba0f71cb 100644 --- a/cocos/2d/CCMenuItem.cpp +++ b/cocos/2d/CCMenuItem.cpp @@ -25,11 +25,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCMenuItem.h" -#include "CCActionInterval.h" -#include "CCSprite.h" +#include "2d/CCMenuItem.h" +#include "2d/CCActionInterval.h" +#include "2d/CCSprite.h" #include "CCLabelAtlas.h" -#include "CCLabel.h" +#include "2d/CCLabel.h" #include "CCScriptSupport.h" #include "deprecated/CCString.h" #include diff --git a/cocos/2d/CCMenuItem.h b/cocos/2d/CCMenuItem.h index cc85ae34b8..6af521c09f 100644 --- a/cocos/2d/CCMenuItem.h +++ b/cocos/2d/CCMenuItem.h @@ -32,8 +32,8 @@ THE SOFTWARE. #include // cocos2d includes -#include "CCNode.h" -#include "CCProtocols.h" +#include "2d/CCNode.h" +#include "2d/CCProtocols.h" NS_CC_BEGIN diff --git a/cocos/2d/CCMotionStreak.cpp b/cocos/2d/CCMotionStreak.cpp index d182116786..7d58ac1c88 100644 --- a/cocos/2d/CCMotionStreak.cpp +++ b/cocos/2d/CCMotionStreak.cpp @@ -26,13 +26,13 @@ THE SOFTWARE. #include "CCMotionStreak.h" #include "CCTextureCache.h" #include "ccGLStateCache.h" -#include "CCGLProgram.h" +#include "2d/CCGLProgram.h" #include "CCShaderCache.h" -#include "ccMacros.h" -#include "CCDirector.h" +#include "2d/ccMacros.h" +#include "2d/CCDirector.h" #include "CCVertex.h" -#include "renderer/CCCustomCommand.h" -#include "renderer/CCRenderer.h" +#include "2d/renderer/CCCustomCommand.h" +#include "2d/renderer/CCRenderer.h" NS_CC_BEGIN diff --git a/cocos/2d/CCMotionStreak.h b/cocos/2d/CCMotionStreak.h index 9e33907eaf..26896d3102 100644 --- a/cocos/2d/CCMotionStreak.h +++ b/cocos/2d/CCMotionStreak.h @@ -26,11 +26,11 @@ THE SOFTWARE. #ifndef __CCMOTION_STREAK_H__ #define __CCMOTION_STREAK_H__ -#include "CCProtocols.h" -#include "CCTexture2D.h" -#include "ccTypes.h" -#include "CCNode.h" -#include "renderer/CCCustomCommand.h" +#include "2d/CCProtocols.h" +#include "2d/CCTexture2D.h" +#include "2d/ccTypes.h" +#include "2d/CCNode.h" +#include "2d/renderer/CCCustomCommand.h" #ifdef EMSCRIPTEN #include "CCGLBufferedNode.h" #endif // EMSCRIPTEN diff --git a/cocos/2d/CCNode.cpp b/cocos/2d/CCNode.cpp index bf47a90cd6..3ed69a8e34 100644 --- a/cocos/2d/CCNode.cpp +++ b/cocos/2d/CCNode.cpp @@ -26,24 +26,24 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCNode.h" +#include "2d/CCNode.h" #include #include "deprecated/CCString.h" -#include "ccCArray.h" +#include "2d/ccCArray.h" #include "TransformUtils.h" #include "CCGrid.h" -#include "CCDirector.h" +#include "2d/CCDirector.h" #include "CCScheduler.h" -#include "CCTouch.h" -#include "CCActionManager.h" +#include "2d/CCTouch.h" +#include "2d/CCActionManager.h" #include "CCScriptSupport.h" -#include "CCGLProgram.h" -#include "CCEventDispatcher.h" -#include "CCEvent.h" -#include "CCEventTouch.h" -#include "CCLayer.h" +#include "2d/CCGLProgram.h" +#include "2d/CCEventDispatcher.h" +#include "2d/CCEvent.h" +#include "2d/CCEventTouch.h" +#include "2d/CCLayer.h" #if CC_USE_PHYSICS #include "CCPhysicsBody.h" diff --git a/cocos/2d/CCNode.h b/cocos/2d/CCNode.h index 90f7601cd4..31ecc3009f 100644 --- a/cocos/2d/CCNode.h +++ b/cocos/2d/CCNode.h @@ -29,14 +29,14 @@ #ifndef __CCNODE_H__ #define __CCNODE_H__ -#include "ccMacros.h" +#include "2d/ccMacros.h" #include "CCAffineTransform.h" #include "CCGL.h" #include "ccGLStateCache.h" -#include "CCGLProgram.h" +#include "2d/CCGLProgram.h" #include "CCScriptSupport.h" -#include "CCProtocols.h" -#include "CCEventDispatcher.h" +#include "2d/CCProtocols.h" +#include "2d/CCEventDispatcher.h" #include "CCVector.h" #include "math/CCMath.h" diff --git a/cocos/2d/CCNodeGrid.cpp b/cocos/2d/CCNodeGrid.cpp index bc36305932..734f86537d 100644 --- a/cocos/2d/CCNodeGrid.cpp +++ b/cocos/2d/CCNodeGrid.cpp @@ -25,9 +25,9 @@ #include "CCNodeGrid.h" #include "CCGrid.h" -#include "renderer/CCGroupCommand.h" -#include "renderer/CCRenderer.h" -#include "renderer/CCCustomCommand.h" +#include "2d/renderer/CCGroupCommand.h" +#include "2d/renderer/CCRenderer.h" +#include "2d/renderer/CCCustomCommand.h" NS_CC_BEGIN diff --git a/cocos/2d/CCNodeGrid.h b/cocos/2d/CCNodeGrid.h index 65e11e7427..1ba1295313 100644 --- a/cocos/2d/CCNodeGrid.h +++ b/cocos/2d/CCNodeGrid.h @@ -25,9 +25,9 @@ #ifndef __MISCNODE_CCGRID_NODE_H__ #define __MISCNODE_CCGRID_NODE_H__ -#include "CCNode.h" -#include "renderer/CCGroupCommand.h" -#include "renderer/CCCustomCommand.h" +#include "2d/CCNode.h" +#include "2d/renderer/CCGroupCommand.h" +#include "2d/renderer/CCCustomCommand.h" NS_CC_BEGIN diff --git a/cocos/2d/CCParallaxNode.cpp b/cocos/2d/CCParallaxNode.cpp index 0a5c2adc37..0db8acdb7a 100644 --- a/cocos/2d/CCParallaxNode.cpp +++ b/cocos/2d/CCParallaxNode.cpp @@ -25,7 +25,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ #include "CCParallaxNode.h" -#include "ccCArray.h" +#include "2d/ccCArray.h" NS_CC_BEGIN diff --git a/cocos/2d/CCParallaxNode.h b/cocos/2d/CCParallaxNode.h index 6a8e903680..54dc3897dc 100644 --- a/cocos/2d/CCParallaxNode.h +++ b/cocos/2d/CCParallaxNode.h @@ -27,7 +27,7 @@ THE SOFTWARE. #ifndef __CCPARALLAX_NODE_H__ #define __CCPARALLAX_NODE_H__ -#include "CCNode.h" +#include "2d/CCNode.h" /*#include "ccArray.h"*/ NS_CC_BEGIN diff --git a/cocos/2d/CCParticleBatchNode.cpp b/cocos/2d/CCParticleBatchNode.cpp index 3e064d0698..6cb8f62b5f 100644 --- a/cocos/2d/CCParticleBatchNode.cpp +++ b/cocos/2d/CCParticleBatchNode.cpp @@ -30,20 +30,20 @@ #include "CCParticleBatchNode.h" #include "CCTextureCache.h" -#include "CCTextureAtlas.h" -#include "ccConfig.h" -#include "ccMacros.h" +#include "2d/CCTextureAtlas.h" +#include "2d/ccConfig.h" +#include "2d/ccMacros.h" #include "CCGrid.h" #include "CCParticleSystem.h" #include "CCShaderCache.h" -#include "CCGLProgram.h" +#include "2d/CCGLProgram.h" #include "ccGLStateCache.h" #include "base64.h" #include "ZipUtils.h" -#include "platform/CCFileUtils.h" +#include "2d/platform/CCFileUtils.h" #include "CCProfiling.h" -#include "renderer/CCQuadCommand.h" -#include "renderer/CCRenderer.h" +#include "2d/renderer/CCQuadCommand.h" +#include "2d/renderer/CCRenderer.h" NS_CC_BEGIN diff --git a/cocos/2d/CCParticleBatchNode.h b/cocos/2d/CCParticleBatchNode.h index 4c121f2797..f718685ef5 100644 --- a/cocos/2d/CCParticleBatchNode.h +++ b/cocos/2d/CCParticleBatchNode.h @@ -30,9 +30,9 @@ #ifndef __CCPARTICLEBATCHNODE_H__ #define __CCPARTICLEBATCHNODE_H__ -#include "CCNode.h" -#include "CCProtocols.h" -#include "renderer/CCBatchCommand.h" +#include "2d/CCNode.h" +#include "2d/CCProtocols.h" +#include "2d/renderer/CCBatchCommand.h" NS_CC_BEGIN diff --git a/cocos/2d/CCParticleExamples.cpp b/cocos/2d/CCParticleExamples.cpp index 5ccda0d3b5..7386538a8e 100644 --- a/cocos/2d/CCParticleExamples.cpp +++ b/cocos/2d/CCParticleExamples.cpp @@ -25,10 +25,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ #include "CCParticleExamples.h" -#include "CCDirector.h" +#include "2d/CCDirector.h" #include "CCTextureCache.h" #include "firePngData.h" -#include "platform/CCImage.h" +#include "2d/platform/CCImage.h" NS_CC_BEGIN // diff --git a/cocos/2d/CCParticleExamples.h b/cocos/2d/CCParticleExamples.h index 12df7296b3..afbee946fb 100644 --- a/cocos/2d/CCParticleExamples.h +++ b/cocos/2d/CCParticleExamples.h @@ -27,7 +27,7 @@ THE SOFTWARE. #ifndef __CCPARTICLE_EXAMPLE_H__ #define __CCPARTICLE_EXAMPLE_H__ -#include "CCParticleSystemQuad.h" +#include "2d/CCParticleSystemQuad.h" NS_CC_BEGIN diff --git a/cocos/2d/CCParticleSystem.cpp b/cocos/2d/CCParticleSystem.cpp index ef9ee4ade5..0525a20b33 100644 --- a/cocos/2d/CCParticleSystem.cpp +++ b/cocos/2d/CCParticleSystem.cpp @@ -47,14 +47,14 @@ THE SOFTWARE. #include #include "CCParticleBatchNode.h" -#include "ccTypes.h" +#include "2d/ccTypes.h" #include "CCTextureCache.h" -#include "CCTextureAtlas.h" +#include "2d/CCTextureAtlas.h" #include "base64.h" -#include "platform/CCFileUtils.h" -#include "platform/CCImage.h" +#include "2d/platform/CCFileUtils.h" +#include "2d/platform/CCImage.h" #include "ZipUtils.h" -#include "CCDirector.h" +#include "2d/CCDirector.h" #include "CCProfiling.h" // opengl #include "CCGL.h" diff --git a/cocos/2d/CCParticleSystem.h b/cocos/2d/CCParticleSystem.h index 7e474259d9..5b3a305e46 100644 --- a/cocos/2d/CCParticleSystem.h +++ b/cocos/2d/CCParticleSystem.h @@ -27,8 +27,8 @@ THE SOFTWARE. #ifndef __CCPARTICLE_SYSTEM_H__ #define __CCPARTICLE_SYSTEM_H__ -#include "CCProtocols.h" -#include "CCNode.h" +#include "2d/CCProtocols.h" +#include "2d/CCNode.h" #include "CCValue.h" #include "deprecated/CCString.h" diff --git a/cocos/2d/CCParticleSystemQuad.cpp b/cocos/2d/CCParticleSystemQuad.cpp index 5c32853e95..c5054db348 100644 --- a/cocos/2d/CCParticleSystemQuad.cpp +++ b/cocos/2d/CCParticleSystemQuad.cpp @@ -27,24 +27,24 @@ THE SOFTWARE. ****************************************************************************/ #include "CCGL.h" -#include "CCParticleSystemQuad.h" -#include "CCSpriteFrame.h" -#include "CCDirector.h" +#include "2d/CCParticleSystemQuad.h" +#include "2d/CCSpriteFrame.h" +#include "2d/CCDirector.h" #include "CCParticleBatchNode.h" -#include "CCTextureAtlas.h" +#include "2d/CCTextureAtlas.h" #include "CCShaderCache.h" #include "ccGLStateCache.h" -#include "CCGLProgram.h" +#include "2d/CCGLProgram.h" #include "TransformUtils.h" -#include "CCEventType.h" +#include "2d/CCEventType.h" #include "CCConfiguration.h" -#include "renderer/CCRenderer.h" -#include "renderer/CCQuadCommand.h" -#include "renderer/CCCustomCommand.h" +#include "2d/renderer/CCRenderer.h" +#include "2d/renderer/CCQuadCommand.h" +#include "2d/renderer/CCCustomCommand.h" // extern -#include "CCEventListenerCustom.h" -#include "CCEventDispatcher.h" +#include "2d/CCEventListenerCustom.h" +#include "2d/CCEventDispatcher.h" NS_CC_BEGIN diff --git a/cocos/2d/CCParticleSystemQuad.h b/cocos/2d/CCParticleSystemQuad.h index c77ccb983a..10fd3ac036 100644 --- a/cocos/2d/CCParticleSystemQuad.h +++ b/cocos/2d/CCParticleSystemQuad.h @@ -29,7 +29,7 @@ THE SOFTWARE. #define __CC_PARTICLE_SYSTEM_QUAD_H__ #include "CCParticleSystem.h" -#include "renderer/CCQuadCommand.h" +#include "2d/renderer/CCQuadCommand.h" NS_CC_BEGIN diff --git a/cocos/2d/CCProfiling.h b/cocos/2d/CCProfiling.h index 0807d0dd86..5bbf3868fa 100644 --- a/cocos/2d/CCProfiling.h +++ b/cocos/2d/CCProfiling.h @@ -28,8 +28,8 @@ THE SOFTWARE. #include #include -#include "ccConfig.h" -#include "CCRef.h" +#include "2d/ccConfig.h" +#include "base/CCRef.h" #include "CCMap.h" NS_CC_BEGIN diff --git a/cocos/2d/CCProgressTimer.cpp b/cocos/2d/CCProgressTimer.cpp index 2e24ce04e4..5bf625d3f1 100644 --- a/cocos/2d/CCProgressTimer.cpp +++ b/cocos/2d/CCProgressTimer.cpp @@ -23,18 +23,18 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCProgressTimer.h" +#include "2d/CCProgressTimer.h" -#include "ccMacros.h" +#include "2d/ccMacros.h" #include "CCTextureCache.h" -#include "CCGLProgram.h" +#include "2d/CCGLProgram.h" #include "CCShaderCache.h" #include "ccGLStateCache.h" -#include "CCDirector.h" +#include "2d/CCDirector.h" #include "TransformUtils.h" #include "CCDrawingPrimitives.h" -#include "renderer/CCRenderer.h" -#include "renderer/CCCustomCommand.h" +#include "2d/renderer/CCRenderer.h" +#include "2d/renderer/CCCustomCommand.h" // extern #include diff --git a/cocos/2d/CCProgressTimer.h b/cocos/2d/CCProgressTimer.h index 08f9d0a307..0e1c75f0eb 100644 --- a/cocos/2d/CCProgressTimer.h +++ b/cocos/2d/CCProgressTimer.h @@ -26,8 +26,8 @@ THE SOFTWARE. #ifndef __MISC_NODE_CCPROGRESS_TIMER_H__ #define __MISC_NODE_CCPROGRESS_TIMER_H__ -#include "CCSprite.h" -#include "renderer/CCCustomCommand.h" +#include "2d/CCSprite.h" +#include "2d/renderer/CCCustomCommand.h" #ifdef EMSCRIPTEN #include "CCGLBufferedNode.h" #endif // EMSCRIPTEN diff --git a/cocos/2d/CCProtocols.h b/cocos/2d/CCProtocols.h index 0e93f8328c..daf9bd3cd3 100644 --- a/cocos/2d/CCProtocols.h +++ b/cocos/2d/CCProtocols.h @@ -27,8 +27,8 @@ THE SOFTWARE. #ifndef __CCPROTOCOLS_H__ #define __CCPROTOCOLS_H__ -#include "ccTypes.h" -#include "CCTexture2D.h" +#include "2d/ccTypes.h" +#include "2d/CCTexture2D.h" #include NS_CC_BEGIN diff --git a/cocos/2d/CCRenderTexture.cpp b/cocos/2d/CCRenderTexture.cpp index 14298f7835..158a5642cb 100644 --- a/cocos/2d/CCRenderTexture.cpp +++ b/cocos/2d/CCRenderTexture.cpp @@ -26,25 +26,25 @@ THE SOFTWARE. #include "CCConfiguration.h" #include "CCRenderTexture.h" -#include "CCDirector.h" -#include "platform/CCImage.h" -#include "CCGLProgram.h" +#include "2d/CCDirector.h" +#include "2d/platform/CCImage.h" +#include "2d/CCGLProgram.h" #include "ccGLStateCache.h" #include "CCConfiguration.h" #include "ccUtils.h" #include "CCTextureCache.h" -#include "platform/CCFileUtils.h" +#include "2d/platform/CCFileUtils.h" #include "CCGL.h" -#include "CCEventType.h" +#include "2d/CCEventType.h" #include "CCGrid.h" -#include "renderer/CCRenderer.h" -#include "renderer/CCGroupCommand.h" -#include "renderer/CCCustomCommand.h" +#include "2d/renderer/CCRenderer.h" +#include "2d/renderer/CCGroupCommand.h" +#include "2d/renderer/CCCustomCommand.h" // extern -#include "CCEventListenerCustom.h" -#include "CCEventDispatcher.h" +#include "2d/CCEventListenerCustom.h" +#include "2d/CCEventDispatcher.h" NS_CC_BEGIN diff --git a/cocos/2d/CCRenderTexture.h b/cocos/2d/CCRenderTexture.h index 3100d6df1d..def3fe1213 100644 --- a/cocos/2d/CCRenderTexture.h +++ b/cocos/2d/CCRenderTexture.h @@ -26,11 +26,11 @@ THE SOFTWARE. #ifndef __CCRENDER_TEXTURE_H__ #define __CCRENDER_TEXTURE_H__ -#include "CCNode.h" -#include "CCSprite.h" -#include "platform/CCImage.h" -#include "renderer/CCGroupCommand.h" -#include "renderer/CCCustomCommand.h" +#include "2d/CCNode.h" +#include "2d/CCSprite.h" +#include "2d/platform/CCImage.h" +#include "2d/renderer/CCGroupCommand.h" +#include "2d/renderer/CCCustomCommand.h" NS_CC_BEGIN diff --git a/cocos/2d/CCScene.cpp b/cocos/2d/CCScene.cpp index 8f043e338f..c4295bd1a3 100644 --- a/cocos/2d/CCScene.cpp +++ b/cocos/2d/CCScene.cpp @@ -26,10 +26,10 @@ THE SOFTWARE. ****************************************************************************/ #include "CCScene.h" -#include "CCDirector.h" -#include "CCLayer.h" -#include "CCSprite.h" -#include "CCSpriteBatchNode.h" +#include "2d/CCDirector.h" +#include "2d/CCLayer.h" +#include "2d/CCSprite.h" +#include "2d/CCSpriteBatchNode.h" #include "CCPhysicsWorld.h" #include "deprecated/CCString.h" diff --git a/cocos/2d/CCScene.h b/cocos/2d/CCScene.h index e1f6037fb1..5418a35015 100644 --- a/cocos/2d/CCScene.h +++ b/cocos/2d/CCScene.h @@ -28,7 +28,7 @@ THE SOFTWARE. #ifndef __CCSCENE_H__ #define __CCSCENE_H__ -#include "CCNode.h" +#include "2d/CCNode.h" #include "CCPhysicsWorld.h" NS_CC_BEGIN diff --git a/cocos/2d/CCScheduler.cpp b/cocos/2d/CCScheduler.cpp index 8369088b7d..f6191f56ab 100644 --- a/cocos/2d/CCScheduler.cpp +++ b/cocos/2d/CCScheduler.cpp @@ -26,10 +26,10 @@ THE SOFTWARE. ****************************************************************************/ #include "CCScheduler.h" -#include "ccMacros.h" -#include "CCDirector.h" +#include "2d/ccMacros.h" +#include "2d/CCDirector.h" #include "utlist.h" -#include "ccCArray.h" +#include "2d/ccCArray.h" #include "CCScriptSupport.h" NS_CC_BEGIN diff --git a/cocos/2d/CCScheduler.h b/cocos/2d/CCScheduler.h index 2eada09cd6..22fbdb5541 100644 --- a/cocos/2d/CCScheduler.h +++ b/cocos/2d/CCScheduler.h @@ -32,9 +32,9 @@ THE SOFTWARE. #include #include -#include "CCRef.h" +#include "base/CCRef.h" #include "CCVector.h" -#include "uthash.h" +#include "2d/uthash.h" NS_CC_BEGIN diff --git a/cocos/2d/CCScriptSupport.h b/cocos/2d/CCScriptSupport.h index feebdde34d..8a3476da03 100644 --- a/cocos/2d/CCScriptSupport.h +++ b/cocos/2d/CCScriptSupport.h @@ -26,13 +26,13 @@ #ifndef __SCRIPT_SUPPORT_H__ #define __SCRIPT_SUPPORT_H__ -#include "ccConfig.h" +#include "2d/ccConfig.h" #if CC_ENABLE_SCRIPT_BINDING -#include "platform/CCCommon.h" -#include "CCTouch.h" -#include "CCEventTouch.h" -#include "CCEventKeyboard.h" +#include "2d/platform/CCCommon.h" +#include "2d/CCTouch.h" +#include "2d/CCEventTouch.h" +#include "2d/CCEventKeyboard.h" #include #include #include diff --git a/cocos/2d/CCShaderCache.cpp b/cocos/2d/CCShaderCache.cpp index d8c3131834..598b787a31 100644 --- a/cocos/2d/CCShaderCache.cpp +++ b/cocos/2d/CCShaderCache.cpp @@ -26,8 +26,8 @@ THE SOFTWARE. ****************************************************************************/ #include "CCShaderCache.h" -#include "CCGLProgram.h" -#include "ccMacros.h" +#include "2d/CCGLProgram.h" +#include "2d/ccMacros.h" #include "ccShaders.h" NS_CC_BEGIN diff --git a/cocos/2d/CCShaderCache.h b/cocos/2d/CCShaderCache.h index 67126238f0..9c0cf198b2 100644 --- a/cocos/2d/CCShaderCache.h +++ b/cocos/2d/CCShaderCache.h @@ -28,7 +28,7 @@ THE SOFTWARE. #ifndef __CCSHADERCACHE_H__ #define __CCSHADERCACHE_H__ -#include "CCRef.h" +#include "base/CCRef.h" #include #include diff --git a/cocos/2d/CCSprite.cpp b/cocos/2d/CCSprite.cpp index ddeb17e7cf..4b60812862 100644 --- a/cocos/2d/CCSprite.cpp +++ b/cocos/2d/CCSprite.cpp @@ -24,26 +24,26 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCSprite.h" -#include "CCSpriteBatchNode.h" +#include "2d/CCSprite.h" +#include "2d/CCSpriteBatchNode.h" #include "CCAnimation.h" #include "CCAnimationCache.h" -#include "ccConfig.h" -#include "CCSpriteFrame.h" -#include "CCSpriteFrameCache.h" +#include "2d/ccConfig.h" +#include "2d/CCSpriteFrame.h" +#include "2d/CCSpriteFrameCache.h" #include "CCTextureCache.h" #include "CCDrawingPrimitives.h" #include "CCShaderCache.h" #include "ccGLStateCache.h" -#include "CCGLProgram.h" -#include "CCDirector.h" -#include "CCGeometry.h" -#include "CCTexture2D.h" +#include "2d/CCGLProgram.h" +#include "2d/CCDirector.h" +#include "base/CCGeometry.h" +#include "2d/CCTexture2D.h" #include "CCAffineTransform.h" #include "TransformUtils.h" #include "CCProfiling.h" -#include "CCDirector.h" -#include "renderer/CCRenderer.h" +#include "2d/CCDirector.h" +#include "2d/renderer/CCRenderer.h" #include "deprecated/CCString.h" diff --git a/cocos/2d/CCSprite.h b/cocos/2d/CCSprite.h index ed662d325c..04b5486df9 100644 --- a/cocos/2d/CCSprite.h +++ b/cocos/2d/CCSprite.h @@ -28,17 +28,17 @@ THE SOFTWARE. #ifndef __SPRITE_NODE_CCSPRITE_H__ #define __SPRITE_NODE_CCSPRITE_H__ -#include "CCNode.h" -#include "CCProtocols.h" -#include "CCTextureAtlas.h" -#include "ccTypes.h" +#include "2d/CCNode.h" +#include "2d/CCProtocols.h" +#include "2d/CCTextureAtlas.h" +#include "2d/ccTypes.h" #include #ifdef EMSCRIPTEN #include "CCGLBufferedNode.h" #endif // EMSCRIPTEN #include "CCPhysicsBody.h" -#include "renderer/CCQuadCommand.h" -#include "renderer/CCCustomCommand.h" +#include "2d/renderer/CCQuadCommand.h" +#include "2d/renderer/CCCustomCommand.h" NS_CC_BEGIN diff --git a/cocos/2d/CCSpriteBatchNode.cpp b/cocos/2d/CCSpriteBatchNode.cpp index 24e1ac1e12..b03d1432de 100644 --- a/cocos/2d/CCSpriteBatchNode.cpp +++ b/cocos/2d/CCSpriteBatchNode.cpp @@ -26,22 +26,22 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCSpriteBatchNode.h" -#include "ccConfig.h" -#include "CCSprite.h" +#include "2d/CCSpriteBatchNode.h" +#include "2d/ccConfig.h" +#include "2d/CCSprite.h" #include "CCGrid.h" #include "CCDrawingPrimitives.h" #include "CCTextureCache.h" #include "CCShaderCache.h" -#include "CCGLProgram.h" +#include "2d/CCGLProgram.h" #include "ccGLStateCache.h" -#include "CCDirector.h" +#include "2d/CCDirector.h" #include "TransformUtils.h" #include "CCProfiling.h" -#include "CCLayer.h" +#include "2d/CCLayer.h" #include "CCScene.h" -#include "renderer/CCRenderer.h" -#include "renderer/CCQuadCommand.h" +#include "2d/renderer/CCRenderer.h" +#include "2d/renderer/CCQuadCommand.h" // external #include "deprecated/CCString.h" // For StringUtils::format diff --git a/cocos/2d/CCSpriteBatchNode.h b/cocos/2d/CCSpriteBatchNode.h index f11ab9d8af..0ca1cc7467 100644 --- a/cocos/2d/CCSpriteBatchNode.h +++ b/cocos/2d/CCSpriteBatchNode.h @@ -31,11 +31,11 @@ THE SOFTWARE. #include -#include "CCNode.h" -#include "CCProtocols.h" -#include "CCTextureAtlas.h" -#include "ccMacros.h" -#include "renderer/CCBatchCommand.h" +#include "2d/CCNode.h" +#include "2d/CCProtocols.h" +#include "2d/CCTextureAtlas.h" +#include "2d/ccMacros.h" +#include "2d/renderer/CCBatchCommand.h" NS_CC_BEGIN diff --git a/cocos/2d/CCSpriteFrame.cpp b/cocos/2d/CCSpriteFrame.cpp index 1fcf42e27d..1b5554f77d 100644 --- a/cocos/2d/CCSpriteFrame.cpp +++ b/cocos/2d/CCSpriteFrame.cpp @@ -25,8 +25,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ #include "CCTextureCache.h" -#include "CCSpriteFrame.h" -#include "CCDirector.h" +#include "2d/CCSpriteFrame.h" +#include "2d/CCDirector.h" NS_CC_BEGIN diff --git a/cocos/2d/CCSpriteFrame.h b/cocos/2d/CCSpriteFrame.h index 6df7a2486e..c315524804 100644 --- a/cocos/2d/CCSpriteFrame.h +++ b/cocos/2d/CCSpriteFrame.h @@ -28,10 +28,10 @@ THE SOFTWARE. #ifndef __SPRITE_CCSPRITE_FRAME_H__ #define __SPRITE_CCSPRITE_FRAME_H__ -#include "CCNode.h" -#include "CCProtocols.h" -#include "CCRef.h" -#include "CCGeometry.h" +#include "2d/CCNode.h" +#include "2d/CCProtocols.h" +#include "base/CCRef.h" +#include "base/CCGeometry.h" NS_CC_BEGIN diff --git a/cocos/2d/CCSpriteFrameCache.cpp b/cocos/2d/CCSpriteFrameCache.cpp index 0a4eda0eae..daffe5a529 100644 --- a/cocos/2d/CCSpriteFrameCache.cpp +++ b/cocos/2d/CCSpriteFrameCache.cpp @@ -28,15 +28,15 @@ THE SOFTWARE. ****************************************************************************/ #include "CCNS.h" -#include "ccMacros.h" +#include "2d/ccMacros.h" #include "CCTextureCache.h" -#include "CCSpriteFrameCache.h" -#include "CCSpriteFrame.h" -#include "CCSprite.h" +#include "2d/CCSpriteFrameCache.h" +#include "2d/CCSpriteFrame.h" +#include "2d/CCSprite.h" #include "TransformUtils.h" -#include "platform/CCFileUtils.h" +#include "2d/platform/CCFileUtils.h" #include "deprecated/CCString.h" -#include "CCDirector.h" +#include "2d/CCDirector.h" #include using namespace std; diff --git a/cocos/2d/CCSpriteFrameCache.h b/cocos/2d/CCSpriteFrameCache.h index 3ec85bf659..78997f6559 100644 --- a/cocos/2d/CCSpriteFrameCache.h +++ b/cocos/2d/CCSpriteFrameCache.h @@ -35,9 +35,9 @@ THE SOFTWARE. * http://zwoptex.zwopple.com/ */ -#include "CCSpriteFrame.h" -#include "CCTexture2D.h" -#include "CCRef.h" +#include "2d/CCSpriteFrame.h" +#include "2d/CCTexture2D.h" +#include "base/CCRef.h" #include "CCValue.h" #include "CCMap.h" diff --git a/cocos/2d/CCTMXLayer.cpp b/cocos/2d/CCTMXLayer.cpp index a460f8c1e9..315174ce7f 100644 --- a/cocos/2d/CCTMXLayer.cpp +++ b/cocos/2d/CCTMXLayer.cpp @@ -27,12 +27,12 @@ THE SOFTWARE. #include "CCTMXLayer.h" #include "CCTMXXMLParser.h" #include "CCTMXTiledMap.h" -#include "CCSprite.h" +#include "2d/CCSprite.h" #include "CCTextureCache.h" #include "CCShaderCache.h" -#include "CCGLProgram.h" -#include "ccCArray.h" -#include "CCDirector.h" +#include "2d/CCGLProgram.h" +#include "2d/ccCArray.h" +#include "2d/CCDirector.h" #include "deprecated/CCString.h" // For StringUtils::format diff --git a/cocos/2d/CCTMXLayer.h b/cocos/2d/CCTMXLayer.h index 53168596f1..a59e228d03 100644 --- a/cocos/2d/CCTMXLayer.h +++ b/cocos/2d/CCTMXLayer.h @@ -29,9 +29,9 @@ THE SOFTWARE. #include "CCTMXObjectGroup.h" #include "CCAtlasNode.h" -#include "CCSpriteBatchNode.h" +#include "2d/CCSpriteBatchNode.h" #include "CCTMXXMLParser.h" -#include "ccCArray.h" +#include "2d/ccCArray.h" NS_CC_BEGIN class TMXMapInfo; diff --git a/cocos/2d/CCTMXObjectGroup.cpp b/cocos/2d/CCTMXObjectGroup.cpp index daa0c69942..c039dd9da4 100644 --- a/cocos/2d/CCTMXObjectGroup.cpp +++ b/cocos/2d/CCTMXObjectGroup.cpp @@ -26,7 +26,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ #include "CCTMXObjectGroup.h" -#include "ccMacros.h" +#include "2d/ccMacros.h" NS_CC_BEGIN diff --git a/cocos/2d/CCTMXObjectGroup.h b/cocos/2d/CCTMXObjectGroup.h index 5707c5d309..091f6f39b5 100644 --- a/cocos/2d/CCTMXObjectGroup.h +++ b/cocos/2d/CCTMXObjectGroup.h @@ -28,9 +28,9 @@ THE SOFTWARE. #ifndef __CCTMX_OBJECT_GROUP_H__ #define __CCTMX_OBJECT_GROUP_H__ -#include "CCGeometry.h" +#include "base/CCGeometry.h" #include "CCValue.h" -#include "CCRef.h" +#include "base/CCRef.h" NS_CC_BEGIN diff --git a/cocos/2d/CCTMXTiledMap.cpp b/cocos/2d/CCTMXTiledMap.cpp index 19a909de31..5f8378d731 100644 --- a/cocos/2d/CCTMXTiledMap.cpp +++ b/cocos/2d/CCTMXTiledMap.cpp @@ -27,7 +27,7 @@ THE SOFTWARE. #include "CCTMXTiledMap.h" #include "CCTMXXMLParser.h" #include "CCTMXLayer.h" -#include "CCSprite.h" +#include "2d/CCSprite.h" #include "deprecated/CCString.h" // For StringUtils::format #include diff --git a/cocos/2d/CCTMXTiledMap.h b/cocos/2d/CCTMXTiledMap.h index b5a3e606d3..5bd3cf8022 100644 --- a/cocos/2d/CCTMXTiledMap.h +++ b/cocos/2d/CCTMXTiledMap.h @@ -27,7 +27,7 @@ THE SOFTWARE. #ifndef __CCTMX_TILE_MAP_H__ #define __CCTMX_TILE_MAP_H__ -#include "CCNode.h" +#include "2d/CCNode.h" #include "CCTMXObjectGroup.h" #include "CCValue.h" diff --git a/cocos/2d/CCTMXXMLParser.cpp b/cocos/2d/CCTMXXMLParser.cpp index f35343dd22..94fe28d804 100644 --- a/cocos/2d/CCTMXXMLParser.cpp +++ b/cocos/2d/CCTMXXMLParser.cpp @@ -30,11 +30,11 @@ THE SOFTWARE. #include #include "CCTMXXMLParser.h" #include "CCTMXTiledMap.h" -#include "ccMacros.h" -#include "platform/CCFileUtils.h" +#include "2d/ccMacros.h" +#include "2d/platform/CCFileUtils.h" #include "ZipUtils.h" #include "base64.h" -#include "CCDirector.h" +#include "2d/CCDirector.h" using namespace std; diff --git a/cocos/2d/CCTMXXMLParser.h b/cocos/2d/CCTMXXMLParser.h index d121ff5f23..d1fa1aa435 100644 --- a/cocos/2d/CCTMXXMLParser.h +++ b/cocos/2d/CCTMXXMLParser.h @@ -29,8 +29,8 @@ THE SOFTWARE. #ifndef __CC_TM_XML_PARSER__ #define __CC_TM_XML_PARSER__ -#include "CCGeometry.h" -#include "platform/CCSAXParser.h" +#include "base/CCGeometry.h" +#include "2d/platform/CCSAXParser.h" #include "CCVector.h" #include "CCValue.h" diff --git a/cocos/2d/CCTextFieldTTF.cpp b/cocos/2d/CCTextFieldTTF.cpp index f8c72fca1d..b01ffdd12c 100644 --- a/cocos/2d/CCTextFieldTTF.cpp +++ b/cocos/2d/CCTextFieldTTF.cpp @@ -25,7 +25,7 @@ THE SOFTWARE. #include "CCTextFieldTTF.h" -#include "CCDirector.h" +#include "2d/CCDirector.h" #include "CCGLView.h" NS_CC_BEGIN diff --git a/cocos/2d/CCTextFieldTTF.h b/cocos/2d/CCTextFieldTTF.h index a39cbe6d24..722e3143cb 100644 --- a/cocos/2d/CCTextFieldTTF.h +++ b/cocos/2d/CCTextFieldTTF.h @@ -26,8 +26,8 @@ THE SOFTWARE. #ifndef __CC_TEXT_FIELD_H__ #define __CC_TEXT_FIELD_H__ -#include "CCLabel.h" -#include "CCIMEDelegate.h" +#include "2d/CCLabel.h" +#include "2d/CCIMEDelegate.h" NS_CC_BEGIN diff --git a/cocos/2d/CCTexture2D.cpp b/cocos/2d/CCTexture2D.cpp index c51899058d..6e63b18d0f 100644 --- a/cocos/2d/CCTexture2D.cpp +++ b/cocos/2d/CCTexture2D.cpp @@ -31,19 +31,19 @@ THE SOFTWARE. * https://devforums.apple.com/message/37855#37855 by a1studmuffin */ -#include "CCTexture2D.h" -#include "ccConfig.h" -#include "ccMacros.h" +#include "2d/CCTexture2D.h" +#include "2d/ccConfig.h" +#include "2d/ccMacros.h" #include "CCConfiguration.h" -#include "platform/CCImage.h" +#include "2d/platform/CCImage.h" #include "CCGL.h" #include "ccUtils.h" -#include "CCPlatformMacros.h" -#include "CCDirector.h" -#include "CCGLProgram.h" +#include "base/CCPlatformMacros.h" +#include "2d/CCDirector.h" +#include "2d/CCGLProgram.h" #include "ccGLStateCache.h" #include "CCShaderCache.h" -#include "platform/CCDevice.h" +#include "2d/platform/CCDevice.h" #include "deprecated/CCString.h" #if CC_ENABLE_CACHE_TEXTURE_DATA diff --git a/cocos/2d/CCTexture2D.h b/cocos/2d/CCTexture2D.h index b230fc6823..20d92f3b1d 100644 --- a/cocos/2d/CCTexture2D.h +++ b/cocos/2d/CCTexture2D.h @@ -31,9 +31,9 @@ THE SOFTWARE. #include #include -#include "CCRef.h" -#include "CCGeometry.h" -#include "ccTypes.h" +#include "base/CCRef.h" +#include "base/CCGeometry.h" +#include "2d/ccTypes.h" #ifdef EMSCRIPTEN #include "CCGLBufferedNode.h" #endif // EMSCRIPTEN diff --git a/cocos/2d/CCTextureAtlas.cpp b/cocos/2d/CCTextureAtlas.cpp index ed091744c1..3adeb53a97 100644 --- a/cocos/2d/CCTextureAtlas.cpp +++ b/cocos/2d/CCTextureAtlas.cpp @@ -26,23 +26,23 @@ THE SOFTWARE. ****************************************************************************/ // cocos2d -#include "CCTextureAtlas.h" +#include "2d/CCTextureAtlas.h" #include "CCTextureCache.h" -#include "ccMacros.h" -#include "CCGLProgram.h" +#include "2d/ccMacros.h" +#include "2d/CCGLProgram.h" #include "ccGLStateCache.h" -#include "CCEventType.h" -#include "CCDirector.h" +#include "2d/CCEventType.h" +#include "2d/CCDirector.h" #include "CCGL.h" #include "CCConfiguration.h" -#include "renderer/CCRenderer.h" +#include "2d/renderer/CCRenderer.h" // support -#include "CCTexture2D.h" +#include "2d/CCTexture2D.h" #include "deprecated/CCString.h" #include -#include "CCEventDispatcher.h" -#include "CCEventListenerCustom.h" +#include "2d/CCEventDispatcher.h" +#include "2d/CCEventListenerCustom.h" //According to some tests GL_TRIANGLE_STRIP is slower, MUCH slower. Probably I'm doing something very wrong diff --git a/cocos/2d/CCTextureAtlas.h b/cocos/2d/CCTextureAtlas.h index fb08de5096..53ec1a9f5e 100644 --- a/cocos/2d/CCTextureAtlas.h +++ b/cocos/2d/CCTextureAtlas.h @@ -28,9 +28,9 @@ THE SOFTWARE. #ifndef __CCTEXTURE_ATLAS_H__ #define __CCTEXTURE_ATLAS_H__ -#include "ccTypes.h" -#include "CCRef.h" -#include "ccConfig.h" +#include "2d/ccTypes.h" +#include "base/CCRef.h" +#include "2d/ccConfig.h" #include NS_CC_BEGIN diff --git a/cocos/2d/CCTextureCache.cpp b/cocos/2d/CCTextureCache.cpp index d384a1da30..9240176903 100644 --- a/cocos/2d/CCTextureCache.cpp +++ b/cocos/2d/CCTextureCache.cpp @@ -31,10 +31,10 @@ THE SOFTWARE. #include #include "CCTextureCache.h" -#include "CCTexture2D.h" -#include "ccMacros.h" -#include "CCDirector.h" -#include "platform/CCFileUtils.h" +#include "2d/CCTexture2D.h" +#include "2d/ccMacros.h" +#include "2d/CCDirector.h" +#include "2d/platform/CCFileUtils.h" #include "ccUtils.h" #include "CCScheduler.h" #include "deprecated/CCString.h" @@ -42,7 +42,7 @@ THE SOFTWARE. #ifdef EMSCRIPTEN #include -#include "platform/emscripten/CCTextureCacheEmscripten.h" +#include "2d/platform/emscripten/CCTextureCacheEmscripten.h" #endif // EMSCRIPTEN using namespace std; diff --git a/cocos/2d/CCTextureCache.h b/cocos/2d/CCTextureCache.h index 7f3cfb86f1..e3e3437a19 100644 --- a/cocos/2d/CCTextureCache.h +++ b/cocos/2d/CCTextureCache.h @@ -37,12 +37,12 @@ THE SOFTWARE. #include #include -#include "CCRef.h" -#include "CCTexture2D.h" -#include "platform/CCImage.h" +#include "base/CCRef.h" +#include "2d/CCTexture2D.h" +#include "2d/platform/CCImage.h" #if CC_ENABLE_CACHE_TEXTURE_DATA - #include "platform/CCImage.h" + #include "2d/platform/CCImage.h" #include #endif diff --git a/cocos/2d/CCTileMapAtlas.cpp b/cocos/2d/CCTileMapAtlas.cpp index a2f7884c06..502592c7e4 100644 --- a/cocos/2d/CCTileMapAtlas.cpp +++ b/cocos/2d/CCTileMapAtlas.cpp @@ -25,11 +25,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ #include "CCTileMapAtlas.h" -#include "platform/CCFileUtils.h" -#include "CCTextureAtlas.h" +#include "2d/platform/CCFileUtils.h" +#include "2d/CCTextureAtlas.h" #include "TGAlib.h" -#include "ccConfig.h" -#include "CCDirector.h" +#include "2d/ccConfig.h" +#include "2d/CCDirector.h" #include "deprecated/CCString.h" #include diff --git a/cocos/2d/CCTouch.cpp b/cocos/2d/CCTouch.cpp index 8c8e7a780e..774491b925 100644 --- a/cocos/2d/CCTouch.cpp +++ b/cocos/2d/CCTouch.cpp @@ -23,8 +23,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCTouch.h" -#include "CCDirector.h" +#include "2d/CCTouch.h" +#include "2d/CCDirector.h" NS_CC_BEGIN diff --git a/cocos/2d/CCTouch.h b/cocos/2d/CCTouch.h index 9ee2a98064..9f002008ed 100644 --- a/cocos/2d/CCTouch.h +++ b/cocos/2d/CCTouch.h @@ -26,8 +26,8 @@ THE SOFTWARE. #ifndef __CC_TOUCH_H__ #define __CC_TOUCH_H__ -#include "CCRef.h" -#include "CCGeometry.h" +#include "base/CCRef.h" +#include "base/CCGeometry.h" NS_CC_BEGIN diff --git a/cocos/2d/CCTransition.cpp b/cocos/2d/CCTransition.cpp index 5b29f88d5f..0e61d8f9cf 100644 --- a/cocos/2d/CCTransition.cpp +++ b/cocos/2d/CCTransition.cpp @@ -26,14 +26,14 @@ THE SOFTWARE. ****************************************************************************/ #include "CCTransition.h" -#include "CCDirector.h" -#include "CCActionInterval.h" -#include "CCActionInstant.h" -#include "CCActionEase.h" -#include "CCActionCamera.h" -#include "CCActionTiledGrid.h" -#include "CCActionGrid.h" -#include "CCLayer.h" +#include "2d/CCDirector.h" +#include "2d/CCActionInterval.h" +#include "2d/CCActionInstant.h" +#include "2d/CCActionEase.h" +#include "2d/CCActionCamera.h" +#include "2d/CCActionTiledGrid.h" +#include "2d/CCActionGrid.h" +#include "2d/CCLayer.h" #include "CCRenderTexture.h" #include "CCNodeGrid.h" diff --git a/cocos/2d/CCTransition.h b/cocos/2d/CCTransition.h index 04547c0266..63d5208405 100644 --- a/cocos/2d/CCTransition.h +++ b/cocos/2d/CCTransition.h @@ -29,7 +29,7 @@ THE SOFTWARE. #define __CCTRANSITION_H__ #include "CCScene.h" -#include "ccTypes.h" +#include "2d/ccTypes.h" NS_CC_BEGIN diff --git a/cocos/2d/CCTransitionPageTurn.cpp b/cocos/2d/CCTransitionPageTurn.cpp index bcf0a83fc1..df04c77bc2 100644 --- a/cocos/2d/CCTransitionPageTurn.cpp +++ b/cocos/2d/CCTransitionPageTurn.cpp @@ -25,13 +25,13 @@ THE SOFTWARE. ****************************************************************************/ #include "CCTransitionPageTurn.h" -#include "CCDirector.h" -#include "CCActionInterval.h" -#include "CCActionInstant.h" -#include "CCActionGrid.h" -#include "CCActionPageTurn3D.h" +#include "2d/CCDirector.h" +#include "2d/CCActionInterval.h" +#include "2d/CCActionInstant.h" +#include "2d/CCActionGrid.h" +#include "2d/CCActionPageTurn3D.h" #include "CCNodeGrid.h" -#include "renderer/CCRenderer.h" +#include "2d/renderer/CCRenderer.h" NS_CC_BEGIN diff --git a/cocos/2d/CCTransitionPageTurn.h b/cocos/2d/CCTransitionPageTurn.h index 8f85d8d328..15b31a23bd 100644 --- a/cocos/2d/CCTransitionPageTurn.h +++ b/cocos/2d/CCTransitionPageTurn.h @@ -28,7 +28,7 @@ THE SOFTWARE. #define __CCPAGE_TURN_TRANSITION_H__ #include "CCTransition.h" -#include "renderer/CCCustomCommand.h" +#include "2d/renderer/CCCustomCommand.h" NS_CC_BEGIN diff --git a/cocos/2d/CCTransitionProgress.cpp b/cocos/2d/CCTransitionProgress.cpp index 9a42d64057..acd6b8da3d 100644 --- a/cocos/2d/CCTransitionProgress.cpp +++ b/cocos/2d/CCTransitionProgress.cpp @@ -27,12 +27,12 @@ THE SOFTWARE. #include "CCTransitionProgress.h" -#include "CCDirector.h" +#include "2d/CCDirector.h" #include "CCRenderTexture.h" -#include "CCProgressTimer.h" -#include "CCLayer.h" -#include "CCActionInstant.h" -#include "CCActionProgressTimer.h" +#include "2d/CCProgressTimer.h" +#include "2d/CCLayer.h" +#include "2d/CCActionInstant.h" +#include "2d/CCActionProgressTimer.h" NS_CC_BEGIN diff --git a/cocos/2d/CCTweenFunction.cpp b/cocos/2d/CCTweenFunction.cpp index bb9bf4ccd3..36cdf66d68 100644 --- a/cocos/2d/CCTweenFunction.cpp +++ b/cocos/2d/CCTweenFunction.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCTweenFunction.h" +#include "2d/CCTweenFunction.h" NS_CC_BEGIN diff --git a/cocos/2d/CCTweenFunction.h b/cocos/2d/CCTweenFunction.h index 85e3ba0070..b4b97a0c56 100644 --- a/cocos/2d/CCTweenFunction.h +++ b/cocos/2d/CCTweenFunction.h @@ -25,8 +25,8 @@ THE SOFTWARE. #ifndef __CCTWEENFUNCTION_H__ #define __CCTWEENFUNCTION_H__ -#include "CCPlatformMacros.h" -#include "ccMacros.h" +#include "base/CCPlatformMacros.h" +#include "2d/ccMacros.h" #include NS_CC_BEGIN diff --git a/cocos/2d/CCUserDefault.cpp b/cocos/2d/CCUserDefault.cpp index 536d4c1584..4dc184a50f 100644 --- a/cocos/2d/CCUserDefault.cpp +++ b/cocos/2d/CCUserDefault.cpp @@ -23,8 +23,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ #include "CCUserDefault.h" -#include "platform/CCCommon.h" -#include "platform/CCFileUtils.h" +#include "2d/platform/CCCommon.h" +#include "2d/platform/CCFileUtils.h" #include "tinyxml2.h" #include "base64.h" diff --git a/cocos/2d/CCUserDefault.h b/cocos/2d/CCUserDefault.h index 82bd6ef565..e28edc99f1 100644 --- a/cocos/2d/CCUserDefault.h +++ b/cocos/2d/CCUserDefault.h @@ -25,7 +25,7 @@ THE SOFTWARE. #ifndef __SUPPORT_CCUSERDEFAULT_H__ #define __SUPPORT_CCUSERDEFAULT_H__ -#include "CCPlatformMacros.h" +#include "base/CCPlatformMacros.h" #include #include "CCData.h" diff --git a/cocos/2d/CCUserDefaultAndroid.cpp b/cocos/2d/CCUserDefaultAndroid.cpp index 639aa0e702..56272516f3 100644 --- a/cocos/2d/CCUserDefaultAndroid.cpp +++ b/cocos/2d/CCUserDefaultAndroid.cpp @@ -24,11 +24,11 @@ THE SOFTWARE. ****************************************************************************/ #include "CCUserDefault.h" #include "CCPlatformConfig.h" -#include "platform/CCCommon.h" +#include "2d/platform/CCCommon.h" #include "base64.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) -#include "platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h" +#include "2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h" // root name of xml #define USERDEFAULT_ROOT_NAME "userDefaultRoot" @@ -38,7 +38,7 @@ THE SOFTWARE. #define XML_FILE_NAME "UserDefault.xml" #ifdef KEEP_COMPATABILITY -#include "platform/CCFileUtils.h" +#include "2d/platform/CCFileUtils.h" #include "../tinyxml2/tinyxml2.h" #endif diff --git a/cocos/2d/CCVertex.cpp b/cocos/2d/CCVertex.cpp index cd252be223..da9b584218 100644 --- a/cocos/2d/CCVertex.cpp +++ b/cocos/2d/CCVertex.cpp @@ -25,7 +25,7 @@ ****************************************************************************/ #include "CCVertex.h" -#include "ccMacros.h" +#include "2d/ccMacros.h" NS_CC_BEGIN diff --git a/cocos/2d/CCVertex.h b/cocos/2d/CCVertex.h index 84292f8ffb..9178cfaba8 100644 --- a/cocos/2d/CCVertex.h +++ b/cocos/2d/CCVertex.h @@ -26,7 +26,7 @@ #ifndef __CCVERTEX_H__ #define __CCVERTEX_H__ -#include "ccTypes.h" +#include "2d/ccTypes.h" NS_CC_BEGIN diff --git a/cocos/2d/TGAlib.cpp b/cocos/2d/TGAlib.cpp index d37529efb3..fdd725382f 100644 --- a/cocos/2d/TGAlib.cpp +++ b/cocos/2d/TGAlib.cpp @@ -28,7 +28,7 @@ THE SOFTWARE. #include "TGAlib.h" #include "CCData.h" -#include "platform/CCFileUtils.h" +#include "2d/platform/CCFileUtils.h" NS_CC_BEGIN diff --git a/cocos/2d/ZipUtils.cpp b/cocos/2d/ZipUtils.cpp index 79c0fac4dd..96156056e0 100644 --- a/cocos/2d/ZipUtils.cpp +++ b/cocos/2d/ZipUtils.cpp @@ -28,8 +28,8 @@ #include "ZipUtils.h" #include "CCData.h" -#include "ccMacros.h" -#include "platform/CCFileUtils.h" +#include "2d/ccMacros.h" +#include "2d/platform/CCFileUtils.h" #include "unzip.h" #include diff --git a/cocos/2d/ZipUtils.h b/cocos/2d/ZipUtils.h index 8a342d9ac5..7afab06b7f 100644 --- a/cocos/2d/ZipUtils.h +++ b/cocos/2d/ZipUtils.h @@ -28,10 +28,10 @@ THE SOFTWARE. #include #include "CCPlatformConfig.h" #include "CCPlatformDefine.h" -#include "CCPlatformMacros.h" +#include "base/CCPlatformMacros.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) -#include "platform/android/CCFileUtilsAndroid.h" +#include "2d/platform/android/CCFileUtilsAndroid.h" #elif(CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) || (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) // for import ssize_t on win32 platform #include "CCStdC.h" diff --git a/cocos/2d/ccCArray.cpp b/cocos/2d/ccCArray.cpp index 560da53d51..faa80e60c1 100644 --- a/cocos/2d/ccCArray.cpp +++ b/cocos/2d/ccCArray.cpp @@ -24,9 +24,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "ccCArray.h" -#include "CCRef.h" -#include "ccTypes.h" +#include "2d/ccCArray.h" +#include "base/CCRef.h" +#include "2d/ccTypes.h" NS_CC_BEGIN diff --git a/cocos/2d/ccCArray.h b/cocos/2d/ccCArray.h index 1e7541df72..b64a39e309 100644 --- a/cocos/2d/ccCArray.h +++ b/cocos/2d/ccCArray.h @@ -43,8 +43,8 @@ THE SOFTWARE. #ifndef CC_ARRAY_H #define CC_ARRAY_H -#include "ccMacros.h" -#include "CCRef.h" +#include "2d/ccMacros.h" +#include "base/CCRef.h" #include #include diff --git a/cocos/2d/ccGLStateCache.cpp b/cocos/2d/ccGLStateCache.cpp index 31fa1cafcc..8c74f3cc5c 100644 --- a/cocos/2d/ccGLStateCache.cpp +++ b/cocos/2d/ccGLStateCache.cpp @@ -26,9 +26,9 @@ THE SOFTWARE. ****************************************************************************/ #include "ccGLStateCache.h" -#include "CCGLProgram.h" -#include "CCDirector.h" -#include "ccConfig.h" +#include "2d/CCGLProgram.h" +#include "2d/CCDirector.h" +#include "2d/ccConfig.h" #include "CCConfiguration.h" NS_CC_BEGIN diff --git a/cocos/2d/ccGLStateCache.h b/cocos/2d/ccGLStateCache.h index 5b8b30c254..9709032c67 100644 --- a/cocos/2d/ccGLStateCache.h +++ b/cocos/2d/ccGLStateCache.h @@ -29,7 +29,7 @@ THE SOFTWARE. #define __CCGLSTATE_H__ #include "CCGL.h" -#include "CCPlatformMacros.h" +#include "base/CCPlatformMacros.h" NS_CC_BEGIN diff --git a/cocos/2d/ccMacros.h b/cocos/2d/ccMacros.h index 07b3945a3c..25d9b19bf5 100644 --- a/cocos/2d/ccMacros.h +++ b/cocos/2d/ccMacros.h @@ -59,7 +59,7 @@ THE SOFTWARE. #define CCAssert CCASSERT #endif // CCASSERT -#include "ccConfig.h" +#include "2d/ccConfig.h" /** @def CC_SWAP simple macro that swaps 2 variables diff --git a/cocos/2d/ccShaders.h b/cocos/2d/ccShaders.h index 24d330df77..77784deba4 100644 --- a/cocos/2d/ccShaders.h +++ b/cocos/2d/ccShaders.h @@ -27,7 +27,7 @@ THE SOFTWARE. #define __CCSHADER_H__ #include "CCGL.h" -#include "CCPlatformMacros.h" +#include "base/CCPlatformMacros.h" NS_CC_BEGIN diff --git a/cocos/2d/ccTypes.cpp b/cocos/2d/ccTypes.cpp index 10b0efd5d2..85de621d05 100644 --- a/cocos/2d/ccTypes.cpp +++ b/cocos/2d/ccTypes.cpp @@ -25,7 +25,7 @@ Copyright (c) 2013-2014 Chukong Technologies Inc. THE SOFTWARE. ****************************************************************************/ -#include "ccTypes.h" +#include "2d/ccTypes.h" NS_CC_BEGIN diff --git a/cocos/2d/ccTypes.h b/cocos/2d/ccTypes.h index 7e30bae81b..6580c034d5 100644 --- a/cocos/2d/ccTypes.h +++ b/cocos/2d/ccTypes.h @@ -29,7 +29,7 @@ THE SOFTWARE. #define __CCTYPES_H__ #include -#include "CCGeometry.h" +#include "base/CCGeometry.h" #include "CCGL.h" #include "math/CCMath.h" diff --git a/cocos/2d/ccUTF8.cpp b/cocos/2d/ccUTF8.cpp index 33543ba8b1..6d49871775 100644 --- a/cocos/2d/ccUTF8.cpp +++ b/cocos/2d/ccUTF8.cpp @@ -24,7 +24,7 @@ */ #include "ccUTF8.h" -#include "platform/CCCommon.h" +#include "2d/platform/CCCommon.h" #include "CCConsole.h" NS_CC_BEGIN diff --git a/cocos/2d/ccUTF8.h b/cocos/2d/ccUTF8.h index e3e16da3c7..17c5dd0cc2 100644 --- a/cocos/2d/ccUTF8.h +++ b/cocos/2d/ccUTF8.h @@ -22,7 +22,7 @@ #ifndef __cocos2dx__ccUTF8__ #define __cocos2dx__ccUTF8__ -#include "CCPlatformMacros.h" +#include "base/CCPlatformMacros.h" #include NS_CC_BEGIN diff --git a/cocos/2d/cocos2d.h b/cocos/2d/cocos2d.h deleted file mode 100644 index a335a619b0..0000000000 --- a/cocos/2d/cocos2d.h +++ /dev/null @@ -1,286 +0,0 @@ -/**************************************************************************** -Copyright (c) 2008-2010 Ricardo Quesada -Copyright (c) 2010-2012 cocos2d-x.org -Copyright (c) 2011 Zynga Inc. -Copyright (c) 2013-2014 Chukong Technologies Inc. - -http://www.cocos2d-x.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -****************************************************************************/ - -#ifndef __COCOS2D_H__ -#define __COCOS2D_H__ - -// 0x00 HI ME LO -// 00 03 01 00 -#define COCOS2D_VERSION 0x00030100 - -// -// all cocos2d include files -// -#include "ccConfig.h" - -// actions -#include "CCAction.h" -#include "CCActionInterval.h" -#include "CCActionCamera.h" -#include "CCActionManager.h" -#include "CCActionEase.h" -#include "CCActionPageTurn3D.h" -#include "CCActionGrid.h" -#include "CCActionProgressTimer.h" -#include "CCActionGrid3D.h" -#include "CCActionTiledGrid.h" -#include "CCActionInstant.h" -#include "CCActionTween.h" -#include "CCActionCatmullRom.h" -#include "CCTweenFunction.h" - -// base_nodes -#include "CCNode.h" -#include "CCAtlasNode.h" - -// cocoa -#include "CCAffineTransform.h" -#include "CCRef.h" -#include "CCVector.h" -#include "CCMap.h" -#include "CCGeometry.h" -#include "CCAutoreleasePool.h" -#include "CCNS.h" -#include "CCData.h" -#include "CCValue.h" - -// draw nodes -#include "CCDrawingPrimitives.h" -#include "CCDrawNode.h" - -// effects -#include "CCGrabber.h" -#include "CCGrid.h" - -// include -#include "CCEventType.h" -#include "CCProtocols.h" -#include "ccConfig.h" -#include "ccMacros.h" -#include "ccTypes.h" - -// label_nodes -#include "CCLabelAtlas.h" -#include "CCLabelTTF.h" -#include "CCLabelBMFont.h" -#include "CCLabel.h" -#include "CCFontFNT.h" - -// layers_scenes_transitions_nodes -#include "CCLayer.h" -#include "CCScene.h" -#include "CCTransition.h" -#include "CCTransitionPageTurn.h" -#include "CCTransitionProgress.h" - -// menu_nodes -#include "CCMenu.h" -#include "CCMenuItem.h" - -// misc_nodes -#include "CCClippingNode.h" -#include "CCMotionStreak.h" -#include "CCProgressTimer.h" -#include "CCRenderTexture.h" -#include "CCNodeGrid.h" - -// particle_nodes -#include "CCParticleBatchNode.h" -#include "CCParticleSystem.h" -#include "CCParticleExamples.h" -#include "CCParticleSystemQuad.h" - -// new renderer -#include "renderer/CCCustomCommand.h" -#include "renderer/CCGroupCommand.h" -#include "renderer/CCMaterialManager.h" -#include "renderer/CCQuadCommand.h" -#include "renderer/CCRenderCommand.h" -#include "renderer/CCRenderCommandPool.h" -#include "renderer/CCRenderMaterial.h" -#include "renderer/CCRenderer.h" - -// physics -#include "CCPhysicsBody.h" -#include "CCPhysicsContact.h" -#include "CCPhysicsShape.h" -#include "CCPhysicsJoint.h" -#include "CCPhysicsWorld.h" - -// platform -#include "platform/CCDevice.h" -#include "platform/CCCommon.h" -#include "platform/CCFileUtils.h" -#include "platform/CCImage.h" -#include "platform/CCSAXParser.h" -#include "platform/CCThread.h" -#include "CCPlatformConfig.h" -#include "CCPlatformMacros.h" - -#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) - #include "platform/ios/CCApplication.h" - #include "platform/ios/CCGLView.h" - #include "platform/ios/CCGL.h" - #include "platform/ios/CCStdC.h" -#endif // CC_TARGET_PLATFORM == CC_PLATFORM_IOS - -#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) - #include "platform/android/CCApplication.h" - #include "platform/android/CCGLView.h" - #include "platform/android/CCGL.h" - #include "platform/android/CCStdC.h" -#endif // CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID - -#if (CC_TARGET_PLATFORM == CC_PLATFORM_BLACKBERRY) - #include "platform/blackberry/CCApplication.h" - #include "platform/blackberry/CCGLView.h" - #include "platform/blackberry/CCGL.h" - #include "platform/blackberry/CCStdC.h" -#endif // CC_TARGET_PLATFORM == CC_PLATFORM_BLACKBERRY - -#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) - #include "platform/win32/CCApplication.h" - #include "platform/desktop/CCGLView.h" - #include "platform/win32/CCGL.h" - #include "platform/win32/CCStdC.h" -#endif // CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 - -#if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) - #include "platform/mac/CCApplication.h" - #include "platform/desktop/CCGLView.h" - #include "platform/mac/CCGL.h" - #include "platform/mac/CCStdC.h" -#endif // CC_TARGET_PLATFORM == CC_PLATFORM_MAC - -#if (CC_TARGET_PLATFORM == CC_PLATFORM_LINUX) - #include "platform/linux/CCApplication.h" - #include "platform/desktop/CCGLView.h" - #include "platform/linux/CCGL.h" - #include "platform/linux/CCStdC.h" -#endif // CC_TARGET_PLATFORM == CC_PLATFORM_LINUX - -#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) - #include "platform/winrt/CCApplication.h" - #include "platform/winrt/CCGLView.h" - #include "platform/winrt/CCGL.h" - #include "platform/winrt/CCStdC.h" - #include "platform/winrt/CCPrecompiledShaders.h" -#endif // CC_TARGET_PLATFORM == CC_PLATFORM_WINRT - -#if (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) - #include "platform/winrt/CCApplication.h" - #include "platform/wp8/CCGLView.h" - #include "platform/winrt/CCGL.h" - #include "platform/winrt/CCStdC.h" - #include "platform/winrt/CCPrecompiledShaders.h" -#endif // CC_TARGET_PLATFORM == CC_PLATFORM_WP8 - -// script_support -#include "CCScriptSupport.h" - -// shaders -#include "CCGLProgram.h" -#include "ccGLStateCache.h" -#include "CCShaderCache.h" -#include "ccShaders.h" - -// sprite_nodes -#include "CCAnimation.h" -#include "CCAnimationCache.h" -#include "CCSprite.h" -#include "CCSpriteBatchNode.h" -#include "CCSpriteFrame.h" -#include "CCSpriteFrameCache.h" - -// support -#include "ccUTF8.h" -#include "CCProfiling.h" -#include "CCConsole.h" -#include "CCUserDefault.h" -#include "CCVertex.h" - -// text_input_node -#include "CCIMEDelegate.h" -#include "CCIMEDispatcher.h" -#include "CCTextFieldTTF.h" - -// textures -#include "CCTexture2D.h" -#include "CCTextureAtlas.h" -#include "CCTextureCache.h" - -// tilemap_parallax_nodes -#include "CCParallaxNode.h" -#include "CCTMXLayer.h" -#include "CCTMXObjectGroup.h" -#include "CCTMXTiledMap.h" -#include "CCTMXXMLParser.h" -#include "CCTileMapAtlas.h" - -// EventDispatcher -#include "CCEventDispatcher.h" -#include "CCEventListenerTouch.h" -#include "CCEventTouch.h" -#include "CCEventListenerKeyboard.h" -#include "CCEventKeyboard.h" -#include "CCEventListenerMouse.h" -#include "CCEventMouse.h" -#include "CCEventAcceleration.h" -#include "CCEventListenerAcceleration.h" -#include "CCEventCustom.h" -#include "CCEventListenerCustom.h" - -// root -#include "CCConfiguration.h" -#include "CCDirector.h" -#include "CCScheduler.h" - -// component -#include "CCComponent.h" -#include "CCComponentContainer.h" - -// Deprecated include -#include "deprecated/CCDictionary.h" -#include "deprecated/CCArray.h" -#include "deprecated/CCSet.h" -#include "deprecated/CCInteger.h" -#include "deprecated/CCFloat.h" -#include "deprecated/CCDouble.h" -#include "deprecated/CCBool.h" -#include "deprecated/CCString.h" -#include "deprecated/CCNotificationCenter.h" -// CCDeprecated.h must be included at the end -#include "deprecated/CCDeprecated.h" - - -NS_CC_BEGIN - -CC_DLL const char* cocos2dVersion(); - -NS_CC_END - -#endif // __COCOS2D_H__ diff --git a/cocos/2d/cocos2d.vcxproj b/cocos/2d/cocos2d.vcxproj index 98409e4641..6408c05bf7 100644 --- a/cocos/2d/cocos2d.vcxproj +++ b/cocos/2d/cocos2d.vcxproj @@ -181,6 +181,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + @@ -300,7 +301,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - @@ -346,6 +346,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + @@ -494,7 +495,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - diff --git a/cocos/2d/cocos2d.vcxproj.filters b/cocos/2d/cocos2d.vcxproj.filters index be200a0522..5c002b3c6f 100644 --- a/cocos/2d/cocos2d.vcxproj.filters +++ b/cocos/2d/cocos2d.vcxproj.filters @@ -398,7 +398,6 @@ - support @@ -571,6 +570,7 @@ math + @@ -654,9 +654,6 @@ include - - include - layers_scenes_transitions_nodes @@ -1157,6 +1154,7 @@ math + diff --git a/cocos/2d/cocos2d.vcxproj.user b/cocos/2d/cocos2d.vcxproj.user deleted file mode 100644 index ace9a86acb..0000000000 --- a/cocos/2d/cocos2d.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/cocos/2d/platform/CCApplicationProtocol.h b/cocos/2d/platform/CCApplicationProtocol.h index ed948ebff5..bf040c059d 100644 --- a/cocos/2d/platform/CCApplicationProtocol.h +++ b/cocos/2d/platform/CCApplicationProtocol.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __CC_APPLICATION_PROTOCOL_H__ #define __CC_APPLICATION_PROTOCOL_H__ -#include "CCPlatformMacros.h" +#include "base/CCPlatformMacros.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/CCCommon.h b/cocos/2d/platform/CCCommon.h index fcd28b4997..91c932c9df 100644 --- a/cocos/2d/platform/CCCommon.h +++ b/cocos/2d/platform/CCCommon.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __CC_COMMON_H__ #define __CC_COMMON_H__ -#include "CCPlatformMacros.h" +#include "base/CCPlatformMacros.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/CCDevice.h b/cocos/2d/platform/CCDevice.h index acbdd7a885..2fb32c6c24 100644 --- a/cocos/2d/platform/CCDevice.h +++ b/cocos/2d/platform/CCDevice.h @@ -26,8 +26,8 @@ THE SOFTWARE. #ifndef __CCDEVICE_H__ #define __CCDEVICE_H__ -#include "CCPlatformMacros.h" -#include "ccMacros.h" +#include "base/CCPlatformMacros.h" +#include "2d/ccMacros.h" #include "CCData.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/CCFileUtils.cpp b/cocos/2d/platform/CCFileUtils.cpp index 225b713989..c5c59c2e01 100644 --- a/cocos/2d/platform/CCFileUtils.cpp +++ b/cocos/2d/platform/CCFileUtils.cpp @@ -25,8 +25,8 @@ THE SOFTWARE. #include "CCFileUtils.h" #include "CCData.h" -#include "ccMacros.h" -#include "CCDirector.h" +#include "2d/ccMacros.h" +#include "2d/CCDirector.h" #include "CCSAXParser.h" #include "tinyxml2.h" #include "unzip.h" diff --git a/cocos/2d/platform/CCFileUtils.h b/cocos/2d/platform/CCFileUtils.h index 3f432fd650..ffc63cdc3f 100644 --- a/cocos/2d/platform/CCFileUtils.h +++ b/cocos/2d/platform/CCFileUtils.h @@ -25,8 +25,8 @@ THE SOFTWARE. #ifndef __CC_FILEUTILS_H__ #define __CC_FILEUTILS_H__ -#include "CCPlatformMacros.h" -#include "ccTypes.h" +#include "base/CCPlatformMacros.h" +#include "2d/ccTypes.h" #include "CCValue.h" #include "CCData.h" diff --git a/cocos/2d/platform/CCGLViewProtocol.cpp b/cocos/2d/platform/CCGLViewProtocol.cpp index b7f64f4a2f..2021b3fda3 100644 --- a/cocos/2d/platform/CCGLViewProtocol.cpp +++ b/cocos/2d/platform/CCGLViewProtocol.cpp @@ -24,9 +24,9 @@ THE SOFTWARE. ****************************************************************************/ #include "CCGLViewProtocol.h" -#include "CCTouch.h" -#include "CCDirector.h" -#include "CCEventDispatcher.h" +#include "2d/CCTouch.h" +#include "2d/CCDirector.h" +#include "2d/CCEventDispatcher.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/CCGLViewProtocol.h b/cocos/2d/platform/CCGLViewProtocol.h index 22f0981bf6..217f568f77 100644 --- a/cocos/2d/platform/CCGLViewProtocol.h +++ b/cocos/2d/platform/CCGLViewProtocol.h @@ -26,8 +26,8 @@ THE SOFTWARE. #ifndef __CCGLVIEWPROTOCOL_H__ #define __CCGLVIEWPROTOCOL_H__ -#include "ccTypes.h" -#include "CCEventTouch.h" +#include "2d/ccTypes.h" +#include "2d/CCEventTouch.h" #include diff --git a/cocos/2d/platform/CCImage.cpp b/cocos/2d/platform/CCImage.cpp index 0b6e21874e..a562dd9a9e 100644 --- a/cocos/2d/platform/CCImage.cpp +++ b/cocos/2d/platform/CCImage.cpp @@ -50,7 +50,7 @@ extern "C" #include "decode.h" #endif -#include "ccMacros.h" +#include "2d/ccMacros.h" #include "CCCommon.h" #include "CCStdC.h" #include "CCFileUtils.h" diff --git a/cocos/2d/platform/CCImage.h b/cocos/2d/platform/CCImage.h index 2f0be6d8fa..000beace1a 100644 --- a/cocos/2d/platform/CCImage.h +++ b/cocos/2d/platform/CCImage.h @@ -26,8 +26,8 @@ THE SOFTWARE. #ifndef __CC_IMAGE_H__ #define __CC_IMAGE_H__ -#include "CCRef.h" -#include "CCTexture2D.h" +#include "base/CCRef.h" +#include "2d/CCTexture2D.h" // premultiply alpha, or the effect will wrong when want to use other pixel format in Texture2D, // such as RGB888, RGB5A1 diff --git a/cocos/2d/platform/CCSAXParser.h b/cocos/2d/platform/CCSAXParser.h index 230572e306..297ff95c7e 100644 --- a/cocos/2d/platform/CCSAXParser.h +++ b/cocos/2d/platform/CCSAXParser.h @@ -25,7 +25,7 @@ #define __CCSAXPARSER_H__ #include "CCPlatformConfig.h" -#include "platform/CCCommon.h" +#include "2d/platform/CCCommon.h" #include NS_CC_BEGIN diff --git a/cocos/2d/platform/CCThread.h b/cocos/2d/platform/CCThread.h index 6f5ae244f0..76c788c8ce 100644 --- a/cocos/2d/platform/CCThread.h +++ b/cocos/2d/platform/CCThread.h @@ -29,9 +29,9 @@ THE SOFTWARE. #include #include #include -#include "platform/CCCommon.h" -#include "CCPlatformMacros.h" -#include "CCDirector.h" +#include "2d/platform/CCCommon.h" +#include "base/CCPlatformMacros.h" +#include "2d/CCDirector.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/android/CCApplication.cpp b/cocos/2d/platform/android/CCApplication.cpp index d940c6890e..e70d4d0ee7 100644 --- a/cocos/2d/platform/android/CCApplication.cpp +++ b/cocos/2d/platform/android/CCApplication.cpp @@ -29,7 +29,7 @@ THE SOFTWARE. #include "jni/JniHelper.h" #include "jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h" #include "CCApplication.h" -#include "CCDirector.h" +#include "2d/CCDirector.h" #include "CCGLView.h" #include #include diff --git a/cocos/2d/platform/android/CCApplication.h b/cocos/2d/platform/android/CCApplication.h index 4d664cc9f3..12ab7f05c1 100644 --- a/cocos/2d/platform/android/CCApplication.h +++ b/cocos/2d/platform/android/CCApplication.h @@ -29,8 +29,8 @@ THE SOFTWARE. #include "CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID -#include "platform/CCCommon.h" -#include "platform/CCApplicationProtocol.h" +#include "2d/platform/CCCommon.h" +#include "2d/platform/CCApplicationProtocol.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/android/CCCommon.cpp b/cocos/2d/platform/android/CCCommon.cpp index 5a0b77605a..780be37459 100644 --- a/cocos/2d/platform/android/CCCommon.cpp +++ b/cocos/2d/platform/android/CCCommon.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID -#include "platform/CCCommon.h" +#include "2d/platform/CCCommon.h" #include "jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h" #include #include diff --git a/cocos/2d/platform/android/CCDevice.cpp b/cocos/2d/platform/android/CCDevice.cpp index 9d441995c9..2557f06472 100644 --- a/cocos/2d/platform/android/CCDevice.cpp +++ b/cocos/2d/platform/android/CCDevice.cpp @@ -26,15 +26,15 @@ THE SOFTWARE. #include "CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID -#include "platform/CCDevice.h" +#include "2d/platform/CCDevice.h" #include #include #include -#include "ccTypes.h" +#include "2d/ccTypes.h" #include "jni/DPIJni.h" #include "jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h" #include "jni/JniHelper.h" -#include "platform/CCFileUtils.h" +#include "2d/platform/CCFileUtils.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/android/CCFileUtilsAndroid.cpp b/cocos/2d/platform/android/CCFileUtilsAndroid.cpp index ad9518fc91..c9f2602fb4 100644 --- a/cocos/2d/platform/android/CCFileUtilsAndroid.cpp +++ b/cocos/2d/platform/android/CCFileUtilsAndroid.cpp @@ -27,7 +27,7 @@ THE SOFTWARE. #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID #include "CCFileUtilsAndroid.h" -#include "platform/CCCommon.h" +#include "2d/platform/CCCommon.h" #include "jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h" #include "android/asset_manager.h" #include "android/asset_manager_jni.h" diff --git a/cocos/2d/platform/android/CCFileUtilsAndroid.h b/cocos/2d/platform/android/CCFileUtilsAndroid.h index 5a58a00b60..5edd9a3673 100644 --- a/cocos/2d/platform/android/CCFileUtilsAndroid.h +++ b/cocos/2d/platform/android/CCFileUtilsAndroid.h @@ -28,9 +28,9 @@ Copyright (c) 2013-2014 Chukong Technologies Inc. #include "CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID -#include "platform/CCFileUtils.h" -#include "CCPlatformMacros.h" -#include "ccTypes.h" +#include "2d/platform/CCFileUtils.h" +#include "base/CCPlatformMacros.h" +#include "2d/ccTypes.h" #include #include #include "jni.h" diff --git a/cocos/2d/platform/android/CCGLView.cpp b/cocos/2d/platform/android/CCGLView.cpp index 3015993c0b..8aad073848 100644 --- a/cocos/2d/platform/android/CCGLView.cpp +++ b/cocos/2d/platform/android/CCGLView.cpp @@ -27,8 +27,8 @@ THE SOFTWARE. #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID #include "CCGLView.h" -#include "CCDirector.h" -#include "ccMacros.h" +#include "2d/CCDirector.h" +#include "2d/ccMacros.h" #include "jni/IMEJni.h" #include "jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h" #include "CCGL.h" diff --git a/cocos/2d/platform/android/CCGLView.h b/cocos/2d/platform/android/CCGLView.h index 63d681a787..fe44f8cf8d 100644 --- a/cocos/2d/platform/android/CCGLView.h +++ b/cocos/2d/platform/android/CCGLView.h @@ -29,9 +29,9 @@ THE SOFTWARE. #include "CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID -#include "CCRef.h" -#include "CCGeometry.h" -#include "platform/CCGLViewProtocol.h" +#include "base/CCRef.h" +#include "base/CCGeometry.h" +#include "2d/platform/CCGLViewProtocol.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/android/CCStdC.h b/cocos/2d/platform/android/CCStdC.h index 7074b12469..2ecc4ca60a 100644 --- a/cocos/2d/platform/android/CCStdC.h +++ b/cocos/2d/platform/android/CCStdC.h @@ -29,7 +29,7 @@ THE SOFTWARE. #include "CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID -#include "CCPlatformMacros.h" +#include "base/CCPlatformMacros.h" #include #include #include diff --git a/cocos/2d/platform/apple/CCFileUtilsApple.h b/cocos/2d/platform/apple/CCFileUtilsApple.h index e706bd2a7d..f94ae04b5f 100644 --- a/cocos/2d/platform/apple/CCFileUtilsApple.h +++ b/cocos/2d/platform/apple/CCFileUtilsApple.h @@ -29,8 +29,8 @@ #include "CCFileUtils.h" #include #include -#include "CCPlatformMacros.h" -#include "ccTypes.h" +#include "base/CCPlatformMacros.h" +#include "2d/ccTypes.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/apple/CCFileUtilsApple.mm b/cocos/2d/platform/apple/CCFileUtilsApple.mm index 23fe27f883..23c19825c5 100644 --- a/cocos/2d/platform/apple/CCFileUtilsApple.mm +++ b/cocos/2d/platform/apple/CCFileUtilsApple.mm @@ -29,7 +29,7 @@ THE SOFTWARE. #include #include "deprecated/CCString.h" #include "CCFileUtils.h" -#include "CCDirector.h" +#include "2d/CCDirector.h" #include "CCSAXParser.h" #include "CCDictionary.h" #include "unzip.h" diff --git a/cocos/2d/platform/apple/CCLock.h b/cocos/2d/platform/apple/CCLock.h index db573603bb..94868a92c1 100644 --- a/cocos/2d/platform/apple/CCLock.h +++ b/cocos/2d/platform/apple/CCLock.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __PLATFORM_IPHONE_PLATFORM_CCLOCK_H__ #define __PLATFORM_IPHONE_PLATFORM_CCLOCK_H__ -#include "CCPlatformMacros.h" +#include "base/CCPlatformMacros.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/desktop/CCGLView.cpp b/cocos/2d/platform/desktop/CCGLView.cpp index 935dd260fb..ac9ba351a4 100644 --- a/cocos/2d/platform/desktop/CCGLView.cpp +++ b/cocos/2d/platform/desktop/CCGLView.cpp @@ -24,11 +24,11 @@ THE SOFTWARE. ****************************************************************************/ #include "CCGLView.h" -#include "CCDirector.h" -#include "CCTouch.h" -#include "CCEventDispatcher.h" -#include "CCEventKeyboard.h" -#include "CCEventMouse.h" +#include "2d/CCDirector.h" +#include "2d/CCTouch.h" +#include "2d/CCEventDispatcher.h" +#include "2d/CCEventKeyboard.h" +#include "2d/CCEventMouse.h" #include "CCIMEDispatcher.h" #include diff --git a/cocos/2d/platform/desktop/CCGLView.h b/cocos/2d/platform/desktop/CCGLView.h index 2db232e724..8160855ea8 100644 --- a/cocos/2d/platform/desktop/CCGLView.h +++ b/cocos/2d/platform/desktop/CCGLView.h @@ -26,9 +26,9 @@ THE SOFTWARE. #ifndef __CC_EGLVIEW_DESKTOP_H__ #define __CC_EGLVIEW_DESKTOP_H__ -#include "CCRef.h" -#include "platform/CCCommon.h" -#include "platform/CCGLViewProtocol.h" +#include "base/CCRef.h" +#include "2d/platform/CCCommon.h" +#include "2d/platform/CCGLViewProtocol.h" #include "glfw3.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/ios/CCApplication.h b/cocos/2d/platform/ios/CCApplication.h index 6d7fe1aafd..f5cf51e0f0 100644 --- a/cocos/2d/platform/ios/CCApplication.h +++ b/cocos/2d/platform/ios/CCApplication.h @@ -29,8 +29,8 @@ THE SOFTWARE. #include "CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS -#include "platform/CCCommon.h" -#include "platform/CCApplicationProtocol.h" +#include "2d/platform/CCCommon.h" +#include "2d/platform/CCApplicationProtocol.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/ios/CCCommon.mm b/cocos/2d/platform/ios/CCCommon.mm index 83012c3569..68589a79b0 100644 --- a/cocos/2d/platform/ios/CCCommon.mm +++ b/cocos/2d/platform/ios/CCCommon.mm @@ -26,13 +26,13 @@ #include "CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS -#include "platform/CCCommon.h" +#include "2d/platform/CCCommon.h" #include #include #import -#include "CCDirector.h" +#include "2d/CCDirector.h" #include "CCConsole.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/ios/CCDevice.mm b/cocos/2d/platform/ios/CCDevice.mm index e33dac7914..42b943d0ab 100644 --- a/cocos/2d/platform/ios/CCDevice.mm +++ b/cocos/2d/platform/ios/CCDevice.mm @@ -28,10 +28,10 @@ #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS #include "CCDevice.h" -#include "ccTypes.h" -#include "CCEventDispatcher.h" -#include "CCEventAcceleration.h" -#include "CCDirector.h" +#include "2d/ccTypes.h" +#include "2d/CCEventDispatcher.h" +#include "2d/CCEventAcceleration.h" +#include "2d/CCDirector.h" #import // Accelerometer diff --git a/cocos/2d/platform/ios/CCESRenderer.h b/cocos/2d/platform/ios/CCESRenderer.h index dd331a49d5..c6b9fde8fc 100644 --- a/cocos/2d/platform/ios/CCESRenderer.h +++ b/cocos/2d/platform/ios/CCESRenderer.h @@ -31,7 +31,7 @@ #include "CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS -#include "CCPlatformMacros.h" +#include "base/CCPlatformMacros.h" #import #import diff --git a/cocos/2d/platform/ios/CCGLView.h b/cocos/2d/platform/ios/CCGLView.h index 76653045b7..983d47297f 100644 --- a/cocos/2d/platform/ios/CCGLView.h +++ b/cocos/2d/platform/ios/CCGLView.h @@ -29,9 +29,9 @@ #include "CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS -#include "CCRef.h" -#include "platform/CCCommon.h" -#include "platform/CCGLViewProtocol.h" +#include "base/CCRef.h" +#include "2d/platform/CCCommon.h" +#include "2d/platform/CCGLViewProtocol.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/ios/CCGLView.mm b/cocos/2d/platform/ios/CCGLView.mm index 87062f4f21..360dd20ab7 100644 --- a/cocos/2d/platform/ios/CCGLView.mm +++ b/cocos/2d/platform/ios/CCGLView.mm @@ -33,7 +33,7 @@ #include "CCDirectorCaller.h" #include "CCGLView.h" #include "CCSet.h" -#include "CCTouch.h" +#include "2d/CCTouch.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/ios/CCImage.mm b/cocos/2d/platform/ios/CCImage.mm index fe18e668d7..d6a415c50a 100644 --- a/cocos/2d/platform/ios/CCImage.mm +++ b/cocos/2d/platform/ios/CCImage.mm @@ -26,8 +26,8 @@ THE SOFTWARE. #include "CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS -#import "CCImage.h" -#import "platform/CCCommon.h" +#import "2d/platform/CCImage.h" +#import "2d/platform/CCCommon.h" #import #import diff --git a/cocos/2d/platform/ios/CCStdC.h b/cocos/2d/platform/ios/CCStdC.h index af440f0e6e..2c66142046 100644 --- a/cocos/2d/platform/ios/CCStdC.h +++ b/cocos/2d/platform/ios/CCStdC.h @@ -29,7 +29,7 @@ THE SOFTWARE. #include "CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS -#include "CCPlatformMacros.h" +#include "base/CCPlatformMacros.h" #include #include #include diff --git a/cocos/2d/platform/linux/CCApplication.cpp b/cocos/2d/platform/linux/CCApplication.cpp index 789d544bcb..3c7f5626bf 100644 --- a/cocos/2d/platform/linux/CCApplication.cpp +++ b/cocos/2d/platform/linux/CCApplication.cpp @@ -30,8 +30,8 @@ THE SOFTWARE. #include #include #include -#include "CCDirector.h" -#include "platform/CCFileUtils.h" +#include "2d/CCDirector.h" +#include "2d/platform/CCFileUtils.h" #include "CCGLView.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/linux/CCApplication.h b/cocos/2d/platform/linux/CCApplication.h index b799c7a009..2295ce14ef 100644 --- a/cocos/2d/platform/linux/CCApplication.h +++ b/cocos/2d/platform/linux/CCApplication.h @@ -29,8 +29,8 @@ THE SOFTWARE. #include "CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_LINUX -#include "platform/CCCommon.h" -#include "platform/CCApplicationProtocol.h" +#include "2d/platform/CCCommon.h" +#include "2d/platform/CCApplicationProtocol.h" #include NS_CC_BEGIN diff --git a/cocos/2d/platform/linux/CCCommon.cpp b/cocos/2d/platform/linux/CCCommon.cpp index 8ef40e072c..89443b8cc4 100644 --- a/cocos/2d/platform/linux/CCCommon.cpp +++ b/cocos/2d/platform/linux/CCCommon.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_LINUX -#include "platform/CCCommon.h" +#include "2d/platform/CCCommon.h" #include "CCStdC.h" #include "CCConsole.h" diff --git a/cocos/2d/platform/linux/CCDevice.cpp b/cocos/2d/platform/linux/CCDevice.cpp index a12d2ebc0c..9cb3c47317 100644 --- a/cocos/2d/platform/linux/CCDevice.cpp +++ b/cocos/2d/platform/linux/CCDevice.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_LINUX -#include "platform/CCDevice.h" +#include "2d/platform/CCDevice.h" #include #include @@ -36,7 +36,7 @@ THE SOFTWARE. #include #include #include -#include "platform/CCFileUtils.h" +#include "2d/platform/CCFileUtils.h" #include "ft2build.h" #include FT_FREETYPE_H diff --git a/cocos/2d/platform/linux/CCFileUtilsLinux.cpp b/cocos/2d/platform/linux/CCFileUtilsLinux.cpp index 8bfd43534b..717dd0e49b 100644 --- a/cocos/2d/platform/linux/CCFileUtilsLinux.cpp +++ b/cocos/2d/platform/linux/CCFileUtilsLinux.cpp @@ -27,8 +27,8 @@ THE SOFTWARE. #if CC_TARGET_PLATFORM == CC_PLATFORM_LINUX #include "CCFileUtilsLinux.h" -#include "platform/CCCommon.h" -#include "ccMacros.h" +#include "2d/platform/CCCommon.h" +#include "2d/ccMacros.h" #include "CCApplication.h" #include "deprecated/CCString.h" #include diff --git a/cocos/2d/platform/linux/CCFileUtilsLinux.h b/cocos/2d/platform/linux/CCFileUtilsLinux.h index 5f819c947c..1227d248f9 100644 --- a/cocos/2d/platform/linux/CCFileUtilsLinux.h +++ b/cocos/2d/platform/linux/CCFileUtilsLinux.h @@ -28,9 +28,9 @@ THE SOFTWARE. #include "CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_LINUX -#include "platform/CCFileUtils.h" -#include "CCPlatformMacros.h" -#include "ccTypes.h" +#include "2d/platform/CCFileUtils.h" +#include "base/CCPlatformMacros.h" +#include "2d/ccTypes.h" #include #include diff --git a/cocos/2d/platform/linux/CCStdC.h b/cocos/2d/platform/linux/CCStdC.h index 8a33ef8ec4..2b3a9c7bdf 100644 --- a/cocos/2d/platform/linux/CCStdC.h +++ b/cocos/2d/platform/linux/CCStdC.h @@ -29,7 +29,7 @@ THE SOFTWARE. #include "CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_LINUX -#include "CCPlatformMacros.h" +#include "base/CCPlatformMacros.h" #include #include diff --git a/cocos/2d/platform/mac/CCApplication.h b/cocos/2d/platform/mac/CCApplication.h index d85428a9a3..e6d65f4fc3 100644 --- a/cocos/2d/platform/mac/CCApplication.h +++ b/cocos/2d/platform/mac/CCApplication.h @@ -29,8 +29,8 @@ THE SOFTWARE. #include "CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC -#include "platform/CCCommon.h" -#include "platform/CCApplicationProtocol.h" +#include "2d/platform/CCCommon.h" +#include "2d/platform/CCApplicationProtocol.h" #include NS_CC_BEGIN diff --git a/cocos/2d/platform/mac/CCApplication.mm b/cocos/2d/platform/mac/CCApplication.mm index 55ea168dbd..caaab22837 100644 --- a/cocos/2d/platform/mac/CCApplication.mm +++ b/cocos/2d/platform/mac/CCApplication.mm @@ -29,9 +29,9 @@ THE SOFTWARE. #import "CCApplication.h" #import #include -#include "platform/CCFileUtils.h" -#include "CCGeometry.h" -#include "CCDirector.h" +#include "2d/platform/CCFileUtils.h" +#include "base/CCGeometry.h" +#include "2d/CCDirector.h" #import "CCDirectorCaller.h" #include "CCGLView.h" diff --git a/cocos/2d/platform/mac/CCCommon.mm b/cocos/2d/platform/mac/CCCommon.mm index 5ff43269cd..399b8212cf 100644 --- a/cocos/2d/platform/mac/CCCommon.mm +++ b/cocos/2d/platform/mac/CCCommon.mm @@ -26,9 +26,9 @@ THE SOFTWARE. #include "CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC -#include "platform/CCCommon.h" +#include "2d/platform/CCCommon.h" -#include "CCDirector.h" +#include "2d/CCDirector.h" #include "CCGLView.h" #define GLFW_EXPOSE_NATIVE_NSGL diff --git a/cocos/2d/platform/mac/CCDevice.mm b/cocos/2d/platform/mac/CCDevice.mm index 5b83ee2e38..b1cd59a2bd 100644 --- a/cocos/2d/platform/mac/CCDevice.mm +++ b/cocos/2d/platform/mac/CCDevice.mm @@ -26,11 +26,11 @@ THE SOFTWARE. #include "CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC -#include "platform/CCDevice.h" +#include "2d/platform/CCDevice.h" #include #include #include -#include "ccTypes.h" +#include "2d/ccTypes.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/mac/CCStdC.h b/cocos/2d/platform/mac/CCStdC.h index 4f639579b5..ffa1dbbe6c 100644 --- a/cocos/2d/platform/mac/CCStdC.h +++ b/cocos/2d/platform/mac/CCStdC.h @@ -29,7 +29,7 @@ THE SOFTWARE. #include "CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC -#include "CCPlatformMacros.h" +#include "base/CCPlatformMacros.h" #include #include #include diff --git a/cocos/2d/platform/win32/CCApplication.cpp b/cocos/2d/platform/win32/CCApplication.cpp index 0d13650263..a4d306f809 100644 --- a/cocos/2d/platform/win32/CCApplication.cpp +++ b/cocos/2d/platform/win32/CCApplication.cpp @@ -28,9 +28,9 @@ THE SOFTWARE. #include "CCApplication.h" #include "CCGLView.h" -#include "CCDirector.h" +#include "2d/CCDirector.h" #include -#include "platform/CCFileUtils.h" +#include "2d/platform/CCFileUtils.h" /** @brief This function change the PVRFrame show/hide setting in register. @param bEnable If true show the PVRFrame window, otherwise hide. diff --git a/cocos/2d/platform/win32/CCApplication.h b/cocos/2d/platform/win32/CCApplication.h index 0a02e9d020..085ff88935 100644 --- a/cocos/2d/platform/win32/CCApplication.h +++ b/cocos/2d/platform/win32/CCApplication.h @@ -29,8 +29,8 @@ THE SOFTWARE. #if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 #include "CCStdC.h" -#include "platform/CCCommon.h" -#include "platform/CCApplicationProtocol.h" +#include "2d/platform/CCCommon.h" +#include "2d/platform/CCApplicationProtocol.h" #include NS_CC_BEGIN diff --git a/cocos/2d/platform/win32/CCCommon.cpp b/cocos/2d/platform/win32/CCCommon.cpp index 86aa90f293..74cefffe0b 100644 --- a/cocos/2d/platform/win32/CCCommon.cpp +++ b/cocos/2d/platform/win32/CCCommon.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 -#include "platform/CCCommon.h" +#include "2d/platform/CCCommon.h" #include "CCStdC.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/win32/CCDevice.cpp b/cocos/2d/platform/win32/CCDevice.cpp index d10cfa559f..2676d0eb37 100644 --- a/cocos/2d/platform/win32/CCDevice.cpp +++ b/cocos/2d/platform/win32/CCDevice.cpp @@ -26,8 +26,8 @@ THE SOFTWARE. #include "CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 -#include "platform/CCDevice.h" -#include "platform/CCFileUtils.h" +#include "2d/platform/CCDevice.h" +#include "2d/platform/CCFileUtils.h" #include "CCStdC.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/win32/CCFileUtilsWin32.cpp b/cocos/2d/platform/win32/CCFileUtilsWin32.cpp index f978fecc32..ed614e5331 100644 --- a/cocos/2d/platform/win32/CCFileUtilsWin32.cpp +++ b/cocos/2d/platform/win32/CCFileUtilsWin32.cpp @@ -27,7 +27,7 @@ THE SOFTWARE. #if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 #include "CCFileUtilsWin32.h" -#include "platform/CCCommon.h" +#include "2d/platform/CCCommon.h" #include using namespace std; diff --git a/cocos/2d/platform/win32/CCFileUtilsWin32.h b/cocos/2d/platform/win32/CCFileUtilsWin32.h index a0bb847dfc..256ee25932 100644 --- a/cocos/2d/platform/win32/CCFileUtilsWin32.h +++ b/cocos/2d/platform/win32/CCFileUtilsWin32.h @@ -28,9 +28,9 @@ THE SOFTWARE. #include "CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 -#include "platform/CCFileUtils.h" -#include "CCPlatformMacros.h" -#include "ccTypes.h" +#include "2d/platform/CCFileUtils.h" +#include "base/CCPlatformMacros.h" +#include "2d/ccTypes.h" #include #include diff --git a/cocos/2d/platform/win32/CCStdC.h b/cocos/2d/platform/win32/CCStdC.h index 9121c3d3de..8fc664ad53 100644 --- a/cocos/2d/platform/win32/CCStdC.h +++ b/cocos/2d/platform/win32/CCStdC.h @@ -35,7 +35,7 @@ THE SOFTWARE. typedef SSIZE_T ssize_t; #endif // __SSIZE_T -#include "CCPlatformMacros.h" +#include "base/CCPlatformMacros.h" #include // for math.h on win32 platform diff --git a/cocos/2d/renderer/CCBatchCommand.cpp b/cocos/2d/renderer/CCBatchCommand.cpp index ca55c5b55f..3b5a287fba 100644 --- a/cocos/2d/renderer/CCBatchCommand.cpp +++ b/cocos/2d/renderer/CCBatchCommand.cpp @@ -23,10 +23,10 @@ ****************************************************************************/ -#include "renderer/CCBatchCommand.h" +#include "2d/renderer/CCBatchCommand.h" #include "ccGLStateCache.h" -#include "CCTextureAtlas.h" -#include "CCTexture2D.h" +#include "2d/CCTextureAtlas.h" +#include "2d/CCTexture2D.h" NS_CC_BEGIN diff --git a/cocos/2d/renderer/CCBatchCommand.h b/cocos/2d/renderer/CCBatchCommand.h index d005e50c08..31e3394493 100644 --- a/cocos/2d/renderer/CCBatchCommand.h +++ b/cocos/2d/renderer/CCBatchCommand.h @@ -26,7 +26,7 @@ #define _CC_BATCHCOMMAND_H_ #include "CCRenderCommand.h" -#include "CCGLProgram.h" +#include "2d/CCGLProgram.h" #include "CCRenderCommandPool.h" NS_CC_BEGIN diff --git a/cocos/2d/renderer/CCCustomCommand.cpp b/cocos/2d/renderer/CCCustomCommand.cpp index c324032116..dcb5bd12ec 100644 --- a/cocos/2d/renderer/CCCustomCommand.cpp +++ b/cocos/2d/renderer/CCCustomCommand.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "renderer/CCCustomCommand.h" +#include "2d/renderer/CCCustomCommand.h" NS_CC_BEGIN diff --git a/cocos/2d/renderer/CCGroupCommand.cpp b/cocos/2d/renderer/CCGroupCommand.cpp index b848b6b2fb..711bedd41d 100644 --- a/cocos/2d/renderer/CCGroupCommand.cpp +++ b/cocos/2d/renderer/CCGroupCommand.cpp @@ -23,9 +23,9 @@ ****************************************************************************/ -#include "renderer/CCGroupCommand.h" -#include "renderer/CCRenderer.h" -#include "CCDirector.h" +#include "2d/renderer/CCGroupCommand.h" +#include "2d/renderer/CCRenderer.h" +#include "2d/CCDirector.h" NS_CC_BEGIN diff --git a/cocos/2d/renderer/CCGroupCommand.h b/cocos/2d/renderer/CCGroupCommand.h index af1429672e..2fe829a8e7 100644 --- a/cocos/2d/renderer/CCGroupCommand.h +++ b/cocos/2d/renderer/CCGroupCommand.h @@ -26,7 +26,7 @@ #ifndef _CC_GROUPCOMMAND_H_ #define _CC_GROUPCOMMAND_H_ -#include "CCRef.h" +#include "base/CCRef.h" #include "CCRenderCommand.h" #include "CCRenderCommandPool.h" diff --git a/cocos/2d/renderer/CCMaterialManager.h b/cocos/2d/renderer/CCMaterialManager.h index 23737ed977..0c2b82180f 100644 --- a/cocos/2d/renderer/CCMaterialManager.h +++ b/cocos/2d/renderer/CCMaterialManager.h @@ -26,9 +26,9 @@ #ifndef _CC_MATERIALMANAGER_H_ #define _CC_MATERIALMANAGER_H_ -#include "CCPlatformMacros.h" -#include "CCRef.h" -#include "ccTypes.h" +#include "base/CCPlatformMacros.h" +#include "base/CCRef.h" +#include "2d/ccTypes.h" #include NS_CC_BEGIN diff --git a/cocos/2d/renderer/CCQuadCommand.cpp b/cocos/2d/renderer/CCQuadCommand.cpp index 7dba97d869..97d6cfde81 100644 --- a/cocos/2d/renderer/CCQuadCommand.cpp +++ b/cocos/2d/renderer/CCQuadCommand.cpp @@ -23,7 +23,7 @@ ****************************************************************************/ -#include "renderer/CCQuadCommand.h" +#include "2d/renderer/CCQuadCommand.h" #include "ccGLStateCache.h" #include "xxhash.h" diff --git a/cocos/2d/renderer/CCQuadCommand.h b/cocos/2d/renderer/CCQuadCommand.h index b1127f56dc..c1c37e700c 100644 --- a/cocos/2d/renderer/CCQuadCommand.h +++ b/cocos/2d/renderer/CCQuadCommand.h @@ -26,7 +26,7 @@ #define _CC_QUADCOMMAND_H_ #include "CCRenderCommand.h" -#include "CCGLProgram.h" +#include "2d/CCGLProgram.h" #include "CCRenderCommandPool.h" NS_CC_BEGIN diff --git a/cocos/2d/renderer/CCRenderCommand.h b/cocos/2d/renderer/CCRenderCommand.h index fcaf31854a..5c33ec5366 100644 --- a/cocos/2d/renderer/CCRenderCommand.h +++ b/cocos/2d/renderer/CCRenderCommand.h @@ -26,9 +26,9 @@ #ifndef __CCRENDERCOMMAND_H_ #define __CCRENDERCOMMAND_H_ -#include "CCPlatformMacros.h" +#include "base/CCPlatformMacros.h" #include -#include "ccTypes.h" +#include "2d/ccTypes.h" NS_CC_BEGIN diff --git a/cocos/2d/renderer/CCRenderCommandPool.h b/cocos/2d/renderer/CCRenderCommandPool.h index 21415039f1..cfc52ab416 100644 --- a/cocos/2d/renderer/CCRenderCommandPool.h +++ b/cocos/2d/renderer/CCRenderCommandPool.h @@ -28,7 +28,7 @@ #include #include -#include "CCPlatformMacros.h" +#include "base/CCPlatformMacros.h" NS_CC_BEGIN template diff --git a/cocos/2d/renderer/CCRenderer.cpp b/cocos/2d/renderer/CCRenderer.cpp index e24916bba9..c93056ba3b 100644 --- a/cocos/2d/renderer/CCRenderer.cpp +++ b/cocos/2d/renderer/CCRenderer.cpp @@ -22,21 +22,21 @@ THE SOFTWARE. ****************************************************************************/ -#include "renderer/CCRenderer.h" +#include "2d/renderer/CCRenderer.h" #include -#include "renderer/CCQuadCommand.h" -#include "renderer/CCBatchCommand.h" -#include "renderer/CCCustomCommand.h" -#include "renderer/CCGroupCommand.h" +#include "2d/renderer/CCQuadCommand.h" +#include "2d/renderer/CCBatchCommand.h" +#include "2d/renderer/CCCustomCommand.h" +#include "2d/renderer/CCGroupCommand.h" #include "CCShaderCache.h" #include "ccGLStateCache.h" #include "CCConfiguration.h" -#include "CCDirector.h" -#include "CCEventDispatcher.h" -#include "CCEventListenerCustom.h" -#include "CCEventType.h" +#include "2d/CCDirector.h" +#include "2d/CCEventDispatcher.h" +#include "2d/CCEventListenerCustom.h" +#include "2d/CCEventType.h" NS_CC_BEGIN diff --git a/cocos/2d/renderer/CCRenderer.h b/cocos/2d/renderer/CCRenderer.h index a371921f51..02bcff345a 100644 --- a/cocos/2d/renderer/CCRenderer.h +++ b/cocos/2d/renderer/CCRenderer.h @@ -26,9 +26,9 @@ #ifndef __CC_RENDERER_H_ #define __CC_RENDERER_H_ -#include "CCPlatformMacros.h" +#include "base/CCPlatformMacros.h" #include "CCRenderCommand.h" -#include "CCGLProgram.h" +#include "2d/CCGLProgram.h" #include "CCGL.h" #include #include diff --git a/cocos/base/CCAffineTransform.h b/cocos/base/CCAffineTransform.h index 622158e05f..032577bfcb 100644 --- a/cocos/base/CCAffineTransform.h +++ b/cocos/base/CCAffineTransform.h @@ -26,8 +26,8 @@ THE SOFTWARE. #ifndef __COCOA_CGAFFINETRANSFORM_H__ #define __COCOA_CGAFFINETRANSFORM_H__ -#include "CCGeometry.h" -#include "CCPlatformMacros.h" +#include "base/CCGeometry.h" +#include "base/CCPlatformMacros.h" #include "math/CCMath.h" NS_CC_BEGIN diff --git a/cocos/base/CCAutoreleasePool.cpp b/cocos/base/CCAutoreleasePool.cpp index eeceee152d..fbadd4f3ba 100644 --- a/cocos/base/CCAutoreleasePool.cpp +++ b/cocos/base/CCAutoreleasePool.cpp @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ #include "CCAutoreleasePool.h" -#include "ccMacros.h" +#include "2d/ccMacros.h" NS_CC_BEGIN diff --git a/cocos/base/CCAutoreleasePool.h b/cocos/base/CCAutoreleasePool.h index 99d11255c2..8ceaa5c879 100644 --- a/cocos/base/CCAutoreleasePool.h +++ b/cocos/base/CCAutoreleasePool.h @@ -28,7 +28,7 @@ THE SOFTWARE. #include #include #include -#include "CCRef.h" +#include "base/CCRef.h" NS_CC_BEGIN diff --git a/cocos/base/CCConsole.cpp b/cocos/base/CCConsole.cpp index d8ea246170..49a5014074 100644 --- a/cocos/base/CCConsole.cpp +++ b/cocos/base/CCConsole.cpp @@ -54,11 +54,11 @@ #include #endif -#include "CCDirector.h" +#include "2d/CCDirector.h" #include "CCScheduler.h" #include "CCScene.h" #include "CCPlatformConfig.h" -#include "platform/CCFileUtils.h" +#include "2d/platform/CCFileUtils.h" #include "CCConfiguration.h" #include "CCTextureCache.h" #include "CCGLView.h" diff --git a/cocos/base/CCConsole.h b/cocos/base/CCConsole.h index 62a7948513..1528f24c0d 100644 --- a/cocos/base/CCConsole.h +++ b/cocos/base/CCConsole.h @@ -47,8 +47,8 @@ typedef SSIZE_T ssize_t; #include #include -#include "ccMacros.h" -#include "CCPlatformMacros.h" +#include "2d/ccMacros.h" +#include "base/CCPlatformMacros.h" NS_CC_BEGIN diff --git a/cocos/base/CCData.cpp b/cocos/base/CCData.cpp index 0e3fcd4c26..5f315df238 100644 --- a/cocos/base/CCData.cpp +++ b/cocos/base/CCData.cpp @@ -24,8 +24,8 @@ ****************************************************************************/ #include "CCData.h" -#include "platform/CCCommon.h" -#include "ccMacros.h" +#include "2d/platform/CCCommon.h" +#include "2d/ccMacros.h" #include diff --git a/cocos/base/CCData.h b/cocos/base/CCData.h index ad259bc723..8a9ec870e2 100644 --- a/cocos/base/CCData.h +++ b/cocos/base/CCData.h @@ -26,7 +26,7 @@ #ifndef __CCDATA_H__ #define __CCDATA_H__ -#include "CCPlatformMacros.h" +#include "base/CCPlatformMacros.h" #include // for ssize_t on android #include // for ssize_t on linux #include "CCStdC.h" // for ssize_t on window diff --git a/cocos/base/CCDataVisitor.cpp b/cocos/base/CCDataVisitor.cpp index e0073cdea4..62fcdf14b9 100644 --- a/cocos/base/CCDataVisitor.cpp +++ b/cocos/base/CCDataVisitor.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCRef.h" +#include "base/CCRef.h" #include "deprecated/CCBool.h" #include "deprecated/CCInteger.h" #include "deprecated/CCFloat.h" diff --git a/cocos/base/CCDataVisitor.h b/cocos/base/CCDataVisitor.h index 42b3de1e68..e40620e1f9 100644 --- a/cocos/base/CCDataVisitor.h +++ b/cocos/base/CCDataVisitor.h @@ -25,7 +25,7 @@ #ifndef __CCDATAVISITOR_H__ #define __CCDATAVISITOR_H__ -#include "CCPlatformMacros.h" +#include "base/CCPlatformMacros.h" #include NS_CC_BEGIN diff --git a/cocos/base/CCGeometry.cpp b/cocos/base/CCGeometry.cpp index b5b2878653..89a90b5948 100644 --- a/cocos/base/CCGeometry.cpp +++ b/cocos/base/CCGeometry.cpp @@ -23,8 +23,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCGeometry.h" -#include "ccMacros.h" +#include "base/CCGeometry.h" +#include "2d/ccMacros.h" #include // implementation of Vector2 diff --git a/cocos/base/CCGeometry.h b/cocos/base/CCGeometry.h index e4e5b6ea5e..23cb8725a1 100644 --- a/cocos/base/CCGeometry.h +++ b/cocos/base/CCGeometry.h @@ -29,8 +29,8 @@ THE SOFTWARE. #include #include -#include "CCPlatformMacros.h" -#include "ccMacros.h" +#include "base/CCPlatformMacros.h" +#include "2d/ccMacros.h" #include "math/CCMath.h" NS_CC_BEGIN diff --git a/cocos/base/CCMap.h b/cocos/base/CCMap.h index 218de15024..a579d8f07e 100644 --- a/cocos/base/CCMap.h +++ b/cocos/base/CCMap.h @@ -27,8 +27,8 @@ #define USE_STD_UNORDERED_MAP 1 -#include "ccMacros.h" -#include "CCRef.h" +#include "2d/ccMacros.h" +#include "base/CCRef.h" #include #if USE_STD_UNORDERED_MAP diff --git a/cocos/base/CCNS.h b/cocos/base/CCNS.h index c019907011..bf2aaf3693 100644 --- a/cocos/base/CCNS.h +++ b/cocos/base/CCNS.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __PLATFOMR_CCNS_H__ #define __PLATFOMR_CCNS_H__ -#include "CCGeometry.h" +#include "base/CCGeometry.h" NS_CC_BEGIN diff --git a/cocos/base/CCPlatformMacros.h b/cocos/base/CCPlatformMacros.h index f711cbfdee..f1898d7145 100644 --- a/cocos/base/CCPlatformMacros.h +++ b/cocos/base/CCPlatformMacros.h @@ -28,7 +28,7 @@ Copyright (c) 2013-2014 Chukong Technologies /** * define some platform specific macros */ -#include "ccConfig.h" +#include "2d/ccConfig.h" #include "CCPlatformConfig.h" #include "CCPlatformDefine.h" diff --git a/cocos/base/CCRef.cpp b/cocos/base/CCRef.cpp index 24a220f104..e60726e632 100644 --- a/cocos/base/CCRef.cpp +++ b/cocos/base/CCRef.cpp @@ -23,9 +23,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCRef.h" +#include "base/CCRef.h" #include "CCAutoreleasePool.h" -#include "ccMacros.h" +#include "2d/ccMacros.h" #include "CCScriptSupport.h" NS_CC_BEGIN diff --git a/cocos/base/CCRef.h b/cocos/base/CCRef.h index 5117e619d7..5462a18e8a 100644 --- a/cocos/base/CCRef.h +++ b/cocos/base/CCRef.h @@ -26,8 +26,8 @@ THE SOFTWARE. #ifndef __CCREF_H__ #define __CCREF_H__ -#include "CCPlatformMacros.h" -#include "ccConfig.h" +#include "base/CCPlatformMacros.h" +#include "2d/ccConfig.h" NS_CC_BEGIN diff --git a/cocos/base/CCRefPtr.h b/cocos/base/CCRefPtr.h index 2a082fb173..8f0ea957cb 100644 --- a/cocos/base/CCRefPtr.h +++ b/cocos/base/CCRefPtr.h @@ -26,7 +26,7 @@ #ifndef __CC_REF_PTR_H__ #define __CC_REF_PTR_H__ -#include "CCRef.h" +#include "base/CCRef.h" #include NS_CC_BEGIN diff --git a/cocos/base/CCValue.h b/cocos/base/CCValue.h index c710a64cb7..0a171b30ec 100644 --- a/cocos/base/CCValue.h +++ b/cocos/base/CCValue.h @@ -25,8 +25,8 @@ #ifndef __cocos2d_libs__CCValue__ #define __cocos2d_libs__CCValue__ -#include "CCPlatformMacros.h" -#include "ccMacros.h" +#include "base/CCPlatformMacros.h" +#include "2d/ccMacros.h" #include #include #include diff --git a/cocos/base/CCVector.h b/cocos/base/CCVector.h index 5ab37d8963..dd643fac80 100644 --- a/cocos/base/CCVector.h +++ b/cocos/base/CCVector.h @@ -26,8 +26,8 @@ THE SOFTWARE. #ifndef __CCVECTOR_H__ #define __CCVECTOR_H__ -#include "ccMacros.h" -#include "CCRef.h" +#include "2d/ccMacros.h" +#include "base/CCRef.h" #include #include #include // for std::find diff --git a/cocos/2d/cocos2d.cpp b/cocos/cocos2d.cpp similarity index 97% rename from cocos/2d/cocos2d.cpp rename to cocos/cocos2d.cpp index 1f34bb905e..513fc4796e 100644 --- a/cocos/2d/cocos2d.cpp +++ b/cocos/cocos2d.cpp @@ -25,7 +25,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCPlatformMacros.h" +#include "base/CCPlatformMacros.h" NS_CC_BEGIN diff --git a/cocos/cocos2d.h b/cocos/cocos2d.h new file mode 100644 index 0000000000..811a476a0e --- /dev/null +++ b/cocos/cocos2d.h @@ -0,0 +1,293 @@ +/**************************************************************************** +Copyright (c) 2008-2010 Ricardo Quesada +Copyright (c) 2010-2012 cocos2d-x.org +Copyright (c) 2011 Zynga Inc. +Copyright (c) 2013-2014 Chukong Technologies Inc. + +http://www.cocos2d-x.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +****************************************************************************/ + +#ifndef __COCOS2D_H__ +#define __COCOS2D_H__ + +// 0x00 HI ME LO +// 00 03 01 00 +#define COCOS2D_VERSION 0x00030100 + +// +// all cocos2d include files +// +#include "2d/ccConfig.h" + +// actions +#include "2d/CCAction.h" +#include "2d/CCActionInterval.h" +#include "2d/CCActionCamera.h" +#include "2d/CCActionManager.h" +#include "2d/CCActionEase.h" +#include "2d/CCActionPageTurn3D.h" +#include "2d/CCActionGrid.h" +#include "2d/CCActionProgressTimer.h" +#include "2d/CCActionGrid3D.h" +#include "2d/CCActionTiledGrid.h" +#include "2d/CCActionInstant.h" +#include "2d/CCActionTween.h" +#include "2d/CCActionCatmullRom.h" +#include "2d/CCTweenFunction.h" + +// base_nodes +#include "2d/CCNode.h" +#include "2d/CCAtlasNode.h" + +// cocoa +#include "base/CCAffineTransform.h" +#include "base/CCRef.h" +#include "base/CCVector.h" +#include "base/CCMap.h" +#include "base/CCGeometry.h" +#include "base/CCAutoreleasePool.h" +#include "base/CCNS.h" +#include "base/CCData.h" +#include "base/CCValue.h" + +// draw nodes +#include "2d/CCDrawingPrimitives.h" +#include "2d/CCDrawNode.h" + +// effects +#include "2d/CCGrabber.h" +#include "2d/CCGrid.h" + +// include +#include "2d/CCEventType.h" +#include "2d/CCProtocols.h" +#include "2d/ccConfig.h" +#include "2d/ccMacros.h" +#include "2d/ccTypes.h" + +// label_nodes +#include "2d/CCLabelAtlas.h" +#include "2d/CCLabelTTF.h" +#include "2d/CCLabelBMFont.h" +#include "2d/CCLabel.h" +#include "2d/CCFontFNT.h" + +// layers_scenes_transitions_nodes +#include "2d/CCLayer.h" +#include "2d/CCScene.h" +#include "2d/CCTransition.h" +#include "2d/CCTransitionPageTurn.h" +#include "2d/CCTransitionProgress.h" + +// menu_nodes +#include "2d/CCMenu.h" +#include "2d/CCMenuItem.h" + +// misc_nodes +#include "2d/CCClippingNode.h" +#include "2d/CCMotionStreak.h" +#include "2d/CCProgressTimer.h" +#include "2d/CCRenderTexture.h" +#include "2d/CCNodeGrid.h" + +// particle_nodes +#include "2d/CCParticleBatchNode.h" +#include "2d/CCParticleSystem.h" +#include "2d/CCParticleExamples.h" +#include "2d/CCParticleSystemQuad.h" + +// new renderer +#include "2d/renderer/CCCustomCommand.h" +#include "2d/renderer/CCGroupCommand.h" +#include "2d/renderer/CCMaterialManager.h" +#include "2d/renderer/CCQuadCommand.h" +#include "2d/renderer/CCRenderCommand.h" +#include "2d/renderer/CCRenderCommandPool.h" +#include "2d/renderer/CCRenderMaterial.h" +#include "2d/renderer/CCRenderer.h" + +// physics +#include "physics/CCPhysicsBody.h" +#include "physics/CCPhysicsContact.h" +#include "physics/CCPhysicsShape.h" +#include "physics/CCPhysicsJoint.h" +#include "physics/CCPhysicsWorld.h" + +// platform +#include "2d/platform/CCDevice.h" +#include "2d/platform/CCCommon.h" +#include "2d/platform/CCFileUtils.h" +#include "2d/platform/CCImage.h" +#include "2d/platform/CCSAXParser.h" +#include "2d/platform/CCThread.h" +#include "base/CCPlatformConfig.h" +#include "base/CCPlatformMacros.h" + +#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) + #include "2d/platform/ios/CCApplication.h" + #include "2d/platform/ios/CCGLView.h" + #include "2d/platform/ios/CCGL.h" + #include "2d/platform/ios/CCStdC.h" +#endif // CC_TARGET_PLATFORM == CC_PLATFORM_IOS + +#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) + #include "2d/platform/android/CCApplication.h" + #include "2d/platform/android/CCGLView.h" + #include "2d/platform/android/CCGL.h" + #include "2d/platform/android/CCStdC.h" +#endif // CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID + +#if (CC_TARGET_PLATFORM == CC_PLATFORM_BLACKBERRY) + #include "2d/platform/blackberry/CCApplication.h" + #include "2d/platform/blackberry/CCGLView.h" + #include "2d/platform/blackberry/CCGL.h" + #include "2d/platform/blackberry/CCStdC.h" +#endif // CC_TARGET_PLATFORM == CC_PLATFORM_BLACKBERRY + +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) + #include "2d/platform/win32/CCApplication.h" + #include "2d/platform/desktop/CCGLView.h" + #include "2d/platform/win32/CCGL.h" + #include "2d/platform/win32/CCStdC.h" +#endif // CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 + +#if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) + #include "2d/platform/mac/CCApplication.h" + #include "2d/platform/desktop/CCGLView.h" + #include "2d/platform/mac/CCGL.h" + #include "2d/platform/mac/CCStdC.h" +#endif // CC_TARGET_PLATFORM == CC_PLATFORM_MAC + +#if (CC_TARGET_PLATFORM == CC_PLATFORM_LINUX) + #include "2d/platform/linux/CCApplication.h" + #include "2d/platform/desktop/CCGLView.h" + #include "2d/platform/linux/CCGL.h" + #include "2d/platform/linux/CCStdC.h" +#endif // CC_TARGET_PLATFORM == CC_PLATFORM_LINUX + +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) + #include "2d/platform/winrt/CCApplication.h" + #include "2d/platform/winrt/CCGLView.h" + #include "2d/platform/winrt/CCGL.h" + #include "2d/platform/winrt/CCStdC.h" + #include "2d/platform/winrt/CCPrecompiledShaders.h" +#endif // CC_TARGET_PLATFORM == CC_PLATFORM_WINRT + +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) + #include "2d/platform/winrt/CCApplication.h" + #include "2d/platform/wp8/CCGLView.h" + #include "2d/platform/winrt/CCGL.h" + #include "2d/platform/winrt/CCStdC.h" + #include "2d/platform/winrt/CCPrecompiledShaders.h" +#endif // CC_TARGET_PLATFORM == CC_PLATFORM_WP8 + +// script_support +#include "2d/CCScriptSupport.h" + +// shaders +#include "2d/CCGLProgram.h" +#include "2d/ccGLStateCache.h" +#include "2d/CCShaderCache.h" +#include "2d/ccShaders.h" + +// sprite_nodes +#include "2d/CCAnimation.h" +#include "2d/CCAnimationCache.h" +#include "2d/CCSprite.h" +#include "2d/CCSpriteBatchNode.h" +#include "2d/CCSpriteFrame.h" +#include "2d/CCSpriteFrameCache.h" + +// support +#include "2d/ccUTF8.h" +#include "2d/CCProfiling.h" +#include "base/CCConsole.h" +#include "2d/CCUserDefault.h" +#include "2d/CCVertex.h" + +// text_input_node +#include "2d/CCIMEDelegate.h" +#include "2d/CCIMEDispatcher.h" +#include "2d/CCTextFieldTTF.h" + +// textures +#include "2d/CCTexture2D.h" +#include "2d/CCTextureAtlas.h" +#include "2d/CCTextureCache.h" + +// tilemap_parallax_nodes +#include "2d/CCParallaxNode.h" +#include "2d/CCTMXLayer.h" +#include "2d/CCTMXObjectGroup.h" +#include "2d/CCTMXTiledMap.h" +#include "2d/CCTMXXMLParser.h" +#include "2d/CCTileMapAtlas.h" + +// EventDispatcher +#include "2d/CCEventDispatcher.h" +#include "2d/CCEventListenerTouch.h" +#include "2d/CCEventTouch.h" +#include "2d/CCEventListenerKeyboard.h" +#include "2d/CCEventKeyboard.h" +#include "2d/CCEventListenerMouse.h" +#include "2d/CCEventMouse.h" +#include "2d/CCEventAcceleration.h" +#include "2d/CCEventListenerAcceleration.h" +#include "2d/CCEventCustom.h" +#include "2d/CCEventListenerCustom.h" + +// root +#include "2d/CCConfiguration.h" +#include "2d/CCDirector.h" +#include "2d/CCScheduler.h" + +// component +#include "2d/CCComponent.h" +#include "2d/CCComponentContainer.h" + +// Extras +#include "2d/base64.h" +#include "2d/ZipUtils.h" + +// Audio +#include "audio/include/SimpleAudioEngine.h" + +// Deprecated include +#include "deprecated/CCDictionary.h" +#include "deprecated/CCArray.h" +#include "deprecated/CCSet.h" +#include "deprecated/CCInteger.h" +#include "deprecated/CCFloat.h" +#include "deprecated/CCDouble.h" +#include "deprecated/CCBool.h" +#include "deprecated/CCString.h" +#include "deprecated/CCNotificationCenter.h" +// CCDeprecated.h must be included at the end +#include "deprecated/CCDeprecated.h" + + +NS_CC_BEGIN + +CC_DLL const char* cocos2dVersion(); + +NS_CC_END + +#endif // __COCOS2D_H__ diff --git a/cocos/deprecated/CCArray.cpp b/cocos/deprecated/CCArray.cpp index 80118faa74..a3778e19fc 100644 --- a/cocos/deprecated/CCArray.cpp +++ b/cocos/deprecated/CCArray.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "CCArray.h" #include "deprecated/CCString.h" -#include "platform/CCFileUtils.h" +#include "2d/platform/CCFileUtils.h" NS_CC_BEGIN diff --git a/cocos/deprecated/CCArray.h b/cocos/deprecated/CCArray.h index 57d32b4d3c..45a6eff889 100644 --- a/cocos/deprecated/CCArray.h +++ b/cocos/deprecated/CCArray.h @@ -31,13 +31,13 @@ THE SOFTWARE. #if CC_USE_ARRAY_VECTOR #include #include -#include "CCRef.h" -#include "ccMacros.h" +#include "base/CCRef.h" +#include "2d/ccMacros.h" #else -#include "ccCArray.h" +#include "2d/ccCArray.h" #endif -#include "CCDataVisitor.h" +#include "base/CCDataVisitor.h" #if CC_USE_ARRAY_VECTOR /** diff --git a/cocos/deprecated/CCBool.h b/cocos/deprecated/CCBool.h index 3149e06c8d..641466d8a2 100644 --- a/cocos/deprecated/CCBool.h +++ b/cocos/deprecated/CCBool.h @@ -26,8 +26,8 @@ Copyright (c) 2013-2014 Chukong Technologies Inc. #ifndef __CCBOOL_H__ #define __CCBOOL_H__ -#include "CCRef.h" -#include "CCDataVisitor.h" +#include "base/CCRef.h" +#include "base/CCDataVisitor.h" NS_CC_BEGIN diff --git a/cocos/deprecated/CCDeprecated.h b/cocos/deprecated/CCDeprecated.h index 1498c294ea..4f9b081354 100644 --- a/cocos/deprecated/CCDeprecated.h +++ b/cocos/deprecated/CCDeprecated.h @@ -30,8 +30,8 @@ #define __COCOS2D_CCDEPRECATED_H__ #include -#include "CCGeometry.h" -#include "ccTypes.h" +#include "base/CCGeometry.h" +#include "2d/ccTypes.h" NS_CC_BEGIN diff --git a/cocos/deprecated/CCDictionary.cpp b/cocos/deprecated/CCDictionary.cpp index 96ae7dcc7a..7552d9285b 100644 --- a/cocos/deprecated/CCDictionary.cpp +++ b/cocos/deprecated/CCDictionary.cpp @@ -26,7 +26,7 @@ #include "CCDictionary.h" #include "deprecated/CCString.h" #include "CCInteger.h" -#include "platform/CCFileUtils.h" +#include "2d/platform/CCFileUtils.h" #include "deprecated/CCString.h" #include "CCBool.h" #include "CCInteger.h" diff --git a/cocos/deprecated/CCDictionary.h b/cocos/deprecated/CCDictionary.h index e105c295ed..1993a81d56 100644 --- a/cocos/deprecated/CCDictionary.h +++ b/cocos/deprecated/CCDictionary.h @@ -26,8 +26,8 @@ THE SOFTWARE. #ifndef __CCDICTIONARY_H__ #define __CCDICTIONARY_H__ -#include "uthash.h" -#include "CCRef.h" +#include "2d/uthash.h" +#include "base/CCRef.h" #include "CCArray.h" #include "deprecated/CCString.h" diff --git a/cocos/deprecated/CCDouble.h b/cocos/deprecated/CCDouble.h index d042450837..cb0742487c 100644 --- a/cocos/deprecated/CCDouble.h +++ b/cocos/deprecated/CCDouble.h @@ -25,8 +25,8 @@ #ifndef __CCDOUBLE_H__ #define __CCDOUBLE_H__ -#include "CCRef.h" -#include "CCDataVisitor.h" +#include "base/CCRef.h" +#include "base/CCDataVisitor.h" NS_CC_BEGIN diff --git a/cocos/deprecated/CCFloat.h b/cocos/deprecated/CCFloat.h index ce0d695347..f467acfbe5 100644 --- a/cocos/deprecated/CCFloat.h +++ b/cocos/deprecated/CCFloat.h @@ -25,8 +25,8 @@ #ifndef __CCFLOAT_H__ #define __CCFLOAT_H__ -#include "CCRef.h" -#include "CCDataVisitor.h" +#include "base/CCRef.h" +#include "base/CCDataVisitor.h" NS_CC_BEGIN diff --git a/cocos/deprecated/CCInteger.h b/cocos/deprecated/CCInteger.h index 1b77cd51a7..c78d5eba74 100644 --- a/cocos/deprecated/CCInteger.h +++ b/cocos/deprecated/CCInteger.h @@ -25,9 +25,9 @@ #ifndef __CCINTEGER_H__ #define __CCINTEGER_H__ -#include "CCRef.h" -#include "CCDataVisitor.h" -#include "platform/CCCommon.h" +#include "base/CCRef.h" +#include "base/CCDataVisitor.h" +#include "2d/platform/CCCommon.h" NS_CC_BEGIN diff --git a/cocos/deprecated/CCNotificationCenter.h b/cocos/deprecated/CCNotificationCenter.h index fa763b7969..376a07bcd7 100644 --- a/cocos/deprecated/CCNotificationCenter.h +++ b/cocos/deprecated/CCNotificationCenter.h @@ -27,8 +27,8 @@ THE SOFTWARE. #ifndef __CCNOTIFICATIONCENTER_H__ #define __CCNOTIFICATIONCENTER_H__ -#include "CCRef.h" -#include "ccTypes.h" +#include "base/CCRef.h" +#include "2d/ccTypes.h" NS_CC_BEGIN diff --git a/cocos/deprecated/CCSet.h b/cocos/deprecated/CCSet.h index dc7e27ddbb..838f59ff20 100644 --- a/cocos/deprecated/CCSet.h +++ b/cocos/deprecated/CCSet.h @@ -27,8 +27,8 @@ THE SOFTWARE. #define __CC_SET_H__ #include -#include "CCRef.h" -#include "CCDataVisitor.h" +#include "base/CCRef.h" +#include "base/CCDataVisitor.h" NS_CC_BEGIN diff --git a/cocos/deprecated/CCString.cpp b/cocos/deprecated/CCString.cpp index 34194426e7..db836b7609 100644 --- a/cocos/deprecated/CCString.cpp +++ b/cocos/deprecated/CCString.cpp @@ -24,8 +24,8 @@ Copyright (c) 2013-2014 Chukong Technologies ****************************************************************************/ #include "deprecated/CCString.h" -#include "platform/CCFileUtils.h" -#include "ccMacros.h" +#include "2d/platform/CCFileUtils.h" +#include "2d/ccMacros.h" #include #include #include "CCArray.h" diff --git a/cocos/deprecated/CCString.h b/cocos/deprecated/CCString.h index 225527bda4..d4917fb9ef 100644 --- a/cocos/deprecated/CCString.h +++ b/cocos/deprecated/CCString.h @@ -34,7 +34,7 @@ THE SOFTWARE. #include #include #include "CCArray.h" -#include "CCRef.h" +#include "base/CCRef.h" NS_CC_BEGIN diff --git a/cocos/editor-support/cocosbuilder/CCBAnimationManager.h b/cocos/editor-support/cocosbuilder/CCBAnimationManager.h index 73babb1a47..8c65d35134 100644 --- a/cocos/editor-support/cocosbuilder/CCBAnimationManager.h +++ b/cocos/editor-support/cocosbuilder/CCBAnimationManager.h @@ -2,9 +2,9 @@ #define __CCB_CCBANIMATION_MANAGER_H__ #include "CCMap.h" -#include "CCActionInterval.h" -#include "CCActionInstant.h" -#include "CCActionEase.h" +#include "2d/CCActionInterval.h" +#include "2d/CCActionInstant.h" +#include "2d/CCActionEase.h" #include "extensions/ExtensionMacros.h" #include "CCBSequence.h" diff --git a/cocos/editor-support/cocosbuilder/CCBKeyframe.h b/cocos/editor-support/cocosbuilder/CCBKeyframe.h index e05a22be92..62dd5d62e2 100644 --- a/cocos/editor-support/cocosbuilder/CCBKeyframe.h +++ b/cocos/editor-support/cocosbuilder/CCBKeyframe.h @@ -1,7 +1,7 @@ #ifndef __CCB_KEYFRAME_H__ #define __CCB_KEYFRAME_H__ -#include "CCRef.h" +#include "base/CCRef.h" #include "CCValue.h" diff --git a/cocos/editor-support/cocosbuilder/CCBReader.cpp b/cocos/editor-support/cocosbuilder/CCBReader.cpp index ff535a213c..b8c5a41a42 100644 --- a/cocos/editor-support/cocosbuilder/CCBReader.cpp +++ b/cocos/editor-support/cocosbuilder/CCBReader.cpp @@ -1,11 +1,11 @@ #include #include -#include "CCDirector.h" -#include "platform/CCFileUtils.h" +#include "2d/CCDirector.h" +#include "2d/platform/CCFileUtils.h" #include "CCScene.h" #include "CCTextureCache.h" -#include "CCSpriteFrameCache.h" +#include "2d/CCSpriteFrameCache.h" #include "CCBReader.h" #include "CCNodeLoader.h" diff --git a/cocos/editor-support/cocosbuilder/CCBReader.h b/cocos/editor-support/cocosbuilder/CCBReader.h index 6fbcb3ef19..aaac8d315e 100644 --- a/cocos/editor-support/cocosbuilder/CCBReader.h +++ b/cocos/editor-support/cocosbuilder/CCBReader.h @@ -3,7 +3,7 @@ #include #include -#include "CCNode.h" +#include "2d/CCNode.h" #include "CCData.h" #include "CCMap.h" #include "CCBSequence.h" diff --git a/cocos/editor-support/cocosbuilder/CCBSequence.h b/cocos/editor-support/cocosbuilder/CCBSequence.h index 2a020c96d8..abe70b1874 100644 --- a/cocos/editor-support/cocosbuilder/CCBSequence.h +++ b/cocos/editor-support/cocosbuilder/CCBSequence.h @@ -3,7 +3,7 @@ #include -#include "CCRef.h" +#include "base/CCRef.h" #include "CCBSequenceProperty.h" namespace cocosbuilder { diff --git a/cocos/editor-support/cocosbuilder/CCBSequenceProperty.h b/cocos/editor-support/cocosbuilder/CCBSequenceProperty.h index 40be11e94a..c2c8e4199e 100644 --- a/cocos/editor-support/cocosbuilder/CCBSequenceProperty.h +++ b/cocos/editor-support/cocosbuilder/CCBSequenceProperty.h @@ -1,7 +1,7 @@ #ifndef __CCB_SEQUENCE_PROPERTY_H__ #define __CCB_SEQUENCE_PROPERTY_H__ -#include "CCRef.h" +#include "base/CCRef.h" #include "CCVector.h" #include "CCBKeyframe.h" diff --git a/cocos/editor-support/cocosbuilder/CCLabelBMFontLoader.h b/cocos/editor-support/cocosbuilder/CCLabelBMFontLoader.h index 9ccc13f2a1..c6fb6808c2 100644 --- a/cocos/editor-support/cocosbuilder/CCLabelBMFontLoader.h +++ b/cocos/editor-support/cocosbuilder/CCLabelBMFontLoader.h @@ -1,8 +1,8 @@ #ifndef _CCB_CCLABELBMFONTLOADER_H_ #define _CCB_CCLABELBMFONTLOADER_H_ -#include "CCRef.h" -#include "CCLabel.h" +#include "base/CCRef.h" +#include "2d/CCLabel.h" #include "CCNodeLoader.h" diff --git a/cocos/editor-support/cocosbuilder/CCLabelTTFLoader.h b/cocos/editor-support/cocosbuilder/CCLabelTTFLoader.h index 029db06f99..86408e1e78 100644 --- a/cocos/editor-support/cocosbuilder/CCLabelTTFLoader.h +++ b/cocos/editor-support/cocosbuilder/CCLabelTTFLoader.h @@ -1,8 +1,8 @@ #ifndef _CCB_CCLABELTTFLOADER_H_ #define _CCB_CCLABELTTFLOADER_H_ -#include "CCRef.h" -#include "CCLabel.h" +#include "base/CCRef.h" +#include "2d/CCLabel.h" #include "CCNodeLoader.h" diff --git a/cocos/editor-support/cocosbuilder/CCMenuItemLoader.h b/cocos/editor-support/cocosbuilder/CCMenuItemLoader.h index ba3424b49c..4b8a5b5893 100644 --- a/cocos/editor-support/cocosbuilder/CCMenuItemLoader.h +++ b/cocos/editor-support/cocosbuilder/CCMenuItemLoader.h @@ -1,8 +1,8 @@ #ifndef _CCB_CCMENUITEMLOADER_H_ #define _CCB_CCMENUITEMLOADER_H_ -#include "CCRef.h" -#include "CCMenuItem.h" +#include "base/CCRef.h" +#include "2d/CCMenuItem.h" #include "CCLayerLoader.h" diff --git a/cocos/editor-support/cocosbuilder/CCMenuLoader.h b/cocos/editor-support/cocosbuilder/CCMenuLoader.h index 2dd3dae922..18bf22aba0 100644 --- a/cocos/editor-support/cocosbuilder/CCMenuLoader.h +++ b/cocos/editor-support/cocosbuilder/CCMenuLoader.h @@ -2,8 +2,8 @@ #define _CCB_CCMENULOADER_H_ #include "CCLayerLoader.h" -#include "CCRef.h" -#include "CCMenu.h" +#include "base/CCRef.h" +#include "2d/CCMenu.h" namespace cocosbuilder { diff --git a/cocos/editor-support/cocosbuilder/CCParticleSystemQuadLoader.h b/cocos/editor-support/cocosbuilder/CCParticleSystemQuadLoader.h index 2860eb642c..a3ce7c1265 100644 --- a/cocos/editor-support/cocosbuilder/CCParticleSystemQuadLoader.h +++ b/cocos/editor-support/cocosbuilder/CCParticleSystemQuadLoader.h @@ -1,8 +1,8 @@ #ifndef _CCB_CCPARTICLESYSTEMQUADLOADER_H_ #define _CCB_CCPARTICLESYSTEMQUADLOADER_H_ -#include "CCRef.h" -#include "CCParticleSystemQuad.h" +#include "base/CCRef.h" +#include "2d/CCParticleSystemQuad.h" #include "CCNodeLoader.h" diff --git a/cocos/editor-support/cocostudio/CCActionFrame.cpp b/cocos/editor-support/cocostudio/CCActionFrame.cpp index 3417eea604..327ca65ddd 100644 --- a/cocos/editor-support/cocostudio/CCActionFrame.cpp +++ b/cocos/editor-support/cocostudio/CCActionFrame.cpp @@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCActionFrame.h" -#include "CCActionEase.h" +#include "cocostudio/CCActionFrame.h" +#include "2d/CCActionEase.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCActionFrame.h b/cocos/editor-support/cocostudio/CCActionFrame.h index eae4404276..65afc2ca13 100644 --- a/cocos/editor-support/cocostudio/CCActionFrame.h +++ b/cocos/editor-support/cocostudio/CCActionFrame.h @@ -25,8 +25,8 @@ THE SOFTWARE. #ifndef __ActionFRAME_H__ #define __ActionFRAME_H__ -#include "CCGeometry.h" -#include "CCActionInterval.h" +#include "base/CCGeometry.h" +#include "2d/CCActionInterval.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCActionFrameEasing.h b/cocos/editor-support/cocostudio/CCActionFrameEasing.h index 4ccee0de99..122f2dd219 100644 --- a/cocos/editor-support/cocostudio/CCActionFrameEasing.h +++ b/cocos/editor-support/cocostudio/CCActionFrameEasing.h @@ -25,7 +25,7 @@ THE SOFTWARE. #ifndef __ActionFrameEasing_H__ #define __ActionFrameEasing_H__ -#include "CCRef.h" +#include "base/CCRef.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCActionObject.cpp b/cocos/editor-support/cocostudio/CCActionObject.cpp index aaeac50af9..bedeebc6d6 100644 --- a/cocos/editor-support/cocostudio/CCActionObject.cpp +++ b/cocos/editor-support/cocostudio/CCActionObject.cpp @@ -25,9 +25,9 @@ THE SOFTWARE. #include "cocostudio/CCActionObject.h" #include "cocostudio/DictionaryHelper.h" -#include "CCDirector.h" +#include "2d/CCDirector.h" #include "CCScheduler.h" -#include "CCActionInstant.h" +#include "2d/CCActionInstant.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCActionObject.h b/cocos/editor-support/cocostudio/CCActionObject.h index f3a51fa033..5f50750c10 100644 --- a/cocos/editor-support/cocostudio/CCActionObject.h +++ b/cocos/editor-support/cocostudio/CCActionObject.h @@ -25,8 +25,8 @@ THE SOFTWARE. #ifndef __ActionObject_H__ #define __ActionObject_H__ -#include "CCActionNode.h" -#include "CCActionInstant.h" +#include "cocostudio/CCActionNode.h" +#include "2d/CCActionInstant.h" #include "cocostudio/DictionaryHelper.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCArmature.cpp b/cocos/editor-support/cocostudio/CCArmature.cpp index 966e447d5a..204fe840c9 100644 --- a/cocos/editor-support/cocostudio/CCArmature.cpp +++ b/cocos/editor-support/cocostudio/CCArmature.cpp @@ -29,11 +29,11 @@ THE SOFTWARE. #include "cocostudio/CCDatas.h" #include "cocostudio/CCSkin.h" -#include "renderer/CCRenderer.h" -#include "renderer/CCGroupCommand.h" +#include "2d/renderer/CCRenderer.h" +#include "2d/renderer/CCGroupCommand.h" #include "CCShaderCache.h" #include "CCDrawingPrimitives.h" -#include "CCDirector.h" +#include "2d/CCDirector.h" #if ENABLE_PHYSICS_BOX2D_DETECT #include "Box2D/Box2D.h" diff --git a/cocos/editor-support/cocostudio/CCArmatureDataManager.cpp b/cocos/editor-support/cocostudio/CCArmatureDataManager.cpp index 8f2953da2e..ecfba79479 100644 --- a/cocos/editor-support/cocostudio/CCArmatureDataManager.cpp +++ b/cocos/editor-support/cocostudio/CCArmatureDataManager.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCSpriteFrameCache.h" +#include "2d/CCSpriteFrameCache.h" #include "cocostudio/CCArmatureDataManager.h" #include "cocostudio/CCTransformHelp.h" diff --git a/cocos/editor-support/cocostudio/CCBatchNode.cpp b/cocos/editor-support/cocostudio/CCBatchNode.cpp index 3b19bd050c..94a2160e3f 100644 --- a/cocos/editor-support/cocostudio/CCBatchNode.cpp +++ b/cocos/editor-support/cocostudio/CCBatchNode.cpp @@ -27,10 +27,10 @@ THE SOFTWARE. #include "cocostudio/CCArmature.h" #include "cocostudio/CCSkin.h" -#include "renderer/CCRenderer.h" -#include "renderer/CCGroupCommand.h" +#include "2d/renderer/CCRenderer.h" +#include "2d/renderer/CCGroupCommand.h" #include "CCShaderCache.h" -#include "CCDirector.h" +#include "2d/CCDirector.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCBatchNode.h b/cocos/editor-support/cocostudio/CCBatchNode.h index a22ccaf832..cfd6d69e9d 100644 --- a/cocos/editor-support/cocostudio/CCBatchNode.h +++ b/cocos/editor-support/cocostudio/CCBatchNode.h @@ -25,7 +25,7 @@ THE SOFTWARE. #ifndef __CCBATCHNODE_H__ #define __CCBATCHNODE_H__ -#include "CCNode.h" +#include "2d/CCNode.h" #include "cocostudio/CCArmatureDefine.h" namespace cocos2d { diff --git a/cocos/editor-support/cocostudio/CCBone.h b/cocos/editor-support/cocostudio/CCBone.h index 8c45785ae9..18eb0a566a 100644 --- a/cocos/editor-support/cocostudio/CCBone.h +++ b/cocos/editor-support/cocostudio/CCBone.h @@ -30,7 +30,7 @@ THE SOFTWARE. #include "cocostudio/CCTween.h" #include "cocostudio/CCDecorativeDisplay.h" #include "cocostudio/CCDisplayManager.h" -#include "CCNode.h" +#include "2d/CCNode.h" #include "math/CCMath.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCDataReaderHelper.cpp b/cocos/editor-support/cocostudio/CCDataReaderHelper.cpp index 28524a1837..9dde44c7fb 100644 --- a/cocos/editor-support/cocostudio/CCDataReaderHelper.cpp +++ b/cocos/editor-support/cocostudio/CCDataReaderHelper.cpp @@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "platform/CCFileUtils.h" -#include "CCDirector.h" +#include "2d/platform/CCFileUtils.h" +#include "2d/CCDirector.h" #include "CCScheduler.h" #include "tinyxml2.h" diff --git a/cocos/editor-support/cocostudio/CCDatas.h b/cocos/editor-support/cocostudio/CCDatas.h index 9f2a349e8f..ce1efe733b 100644 --- a/cocos/editor-support/cocostudio/CCDatas.h +++ b/cocos/editor-support/cocostudio/CCDatas.h @@ -25,14 +25,14 @@ THE SOFTWARE. #ifndef __CCARMATURE_DATAS_H__ #define __CCARMATURE_DATAS_H__ -#include "CCRef.h" -#include "ccTypes.h" +#include "base/CCRef.h" +#include "2d/ccTypes.h" #include "CCVector.h" #include "CCMap.h" #include "CCAffineTransform.h" #include "cocostudio/CCArmatureDefine.h" -#include "CCTweenFunction.h" +#include "2d/CCTweenFunction.h" #define CC_CREATE_NO_PARAM_NO_INIT(varType)\ diff --git a/cocos/editor-support/cocostudio/CCDecorativeDisplay.cpp b/cocos/editor-support/cocostudio/CCDecorativeDisplay.cpp index 14d724f91d..0e50d4ec7b 100644 --- a/cocos/editor-support/cocostudio/CCDecorativeDisplay.cpp +++ b/cocos/editor-support/cocostudio/CCDecorativeDisplay.cpp @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ #include "cocostudio/CCDecorativeDisplay.h" -#include "CCNode.h" +#include "2d/CCNode.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCDisplayFactory.cpp b/cocos/editor-support/cocostudio/CCDisplayFactory.cpp index ded11bae46..7feec445e0 100644 --- a/cocos/editor-support/cocostudio/CCDisplayFactory.cpp +++ b/cocos/editor-support/cocostudio/CCDisplayFactory.cpp @@ -30,7 +30,7 @@ THE SOFTWARE. #include "cocostudio/CCArmatureDataManager.h" #include "cocostudio/CCTransformHelp.h" -#include "CCParticleSystemQuad.h" +#include "2d/CCParticleSystemQuad.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCDisplayManager.cpp b/cocos/editor-support/cocostudio/CCDisplayManager.cpp index f1f4b96dfb..dc23678a64 100644 --- a/cocos/editor-support/cocostudio/CCDisplayManager.cpp +++ b/cocos/editor-support/cocostudio/CCDisplayManager.cpp @@ -28,7 +28,7 @@ THE SOFTWARE. #include "cocostudio/CCUtilMath.h" #include "cocostudio/CCSkin.h" -#include "CCParticleSystemQuad.h" +#include "2d/CCParticleSystemQuad.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCInputDelegate.cpp b/cocos/editor-support/cocostudio/CCInputDelegate.cpp index 1bafbe42f2..5c607a68e7 100644 --- a/cocos/editor-support/cocostudio/CCInputDelegate.cpp +++ b/cocos/editor-support/cocostudio/CCInputDelegate.cpp @@ -23,11 +23,11 @@ THE SOFTWARE. ****************************************************************************/ #include "cocostudio/CCInputDelegate.h" -#include "CCDirector.h" -#include "platform/CCDevice.h" -#include "CCEventListenerTouch.h" -#include "CCEventListenerAcceleration.h" -#include "CCEventListenerKeyboard.h" +#include "2d/CCDirector.h" +#include "2d/platform/CCDevice.h" +#include "2d/CCEventListenerTouch.h" +#include "2d/CCEventListenerAcceleration.h" +#include "2d/CCEventListenerKeyboard.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCInputDelegate.h b/cocos/editor-support/cocostudio/CCInputDelegate.h index a17440b96c..42721b1ccd 100644 --- a/cocos/editor-support/cocostudio/CCInputDelegate.h +++ b/cocos/editor-support/cocostudio/CCInputDelegate.h @@ -25,12 +25,12 @@ THE SOFTWARE. #ifndef __CC_EXTENTIONS_CCINPUTDELEGATE_H__ #define __CC_EXTENTIONS_CCINPUTDELEGATE_H__ -#include "CCPlatformMacros.h" -#include "CCTouch.h" -#include "CCEvent.h" -#include "ccTypes.h" -#include "CCEventKeyboard.h" -#include "CCEventListener.h" +#include "base/CCPlatformMacros.h" +#include "2d/CCTouch.h" +#include "2d/CCEvent.h" +#include "2d/ccTypes.h" +#include "2d/CCEventKeyboard.h" +#include "2d/CCEventListener.h" namespace cocos2d { class __Set; diff --git a/cocos/editor-support/cocostudio/CCSkin.cpp b/cocos/editor-support/cocostudio/CCSkin.cpp index 43cf03d827..655726717c 100644 --- a/cocos/editor-support/cocostudio/CCSkin.cpp +++ b/cocos/editor-support/cocostudio/CCSkin.cpp @@ -22,10 +22,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCSpriteFrame.h" -#include "CCSpriteFrameCache.h" -#include "CCDirector.h" -#include "renderer/CCRenderer.h" +#include "2d/CCSpriteFrame.h" +#include "2d/CCSpriteFrameCache.h" +#include "2d/CCDirector.h" +#include "2d/renderer/CCRenderer.h" #include "cocostudio/CCSkin.h" #include "cocostudio/CCTransformHelp.h" diff --git a/cocos/editor-support/cocostudio/CCSkin.h b/cocos/editor-support/cocostudio/CCSkin.h index dba784f70c..aec6ab31e0 100644 --- a/cocos/editor-support/cocostudio/CCSkin.h +++ b/cocos/editor-support/cocostudio/CCSkin.h @@ -25,8 +25,8 @@ THE SOFTWARE. #ifndef __CCSKIN_H__ #define __CCSKIN_H__ -#include "CCSprite.h" -#include "renderer/CCQuadCommand.h" +#include "2d/CCSprite.h" +#include "2d/renderer/CCQuadCommand.h" #include "cocostudio/CCArmatureDefine.h" #include "cocostudio/CCBone.h" diff --git a/cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.cpp b/cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.cpp index 1c226668db..1775d0fd6b 100644 --- a/cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.cpp +++ b/cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.cpp @@ -24,7 +24,7 @@ THE SOFTWARE. #include "cocostudio/CCSpriteFrameCacheHelper.h" -#include "CCSpriteFrameCache.h" +#include "2d/CCSpriteFrameCache.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.h b/cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.h index 452666a67d..3c50ae7e4b 100644 --- a/cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.h +++ b/cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.h @@ -24,7 +24,7 @@ THE SOFTWARE. #ifndef __CCSPRITEFRAMECACHEHELPER_H__ #define __CCSPRITEFRAMECACHEHELPER_H__ -#include "CCPlatformMacros.h" +#include "base/CCPlatformMacros.h" #include "cocostudio/CCArmatureDefine.h" #include #include diff --git a/cocos/editor-support/cocostudio/CCTween.h b/cocos/editor-support/cocostudio/CCTween.h index 41ef3a2651..c12f9c7b46 100644 --- a/cocos/editor-support/cocostudio/CCTween.h +++ b/cocos/editor-support/cocostudio/CCTween.h @@ -27,7 +27,7 @@ THE SOFTWARE. #define __CCTWEEN_H__ #include "cocostudio/CCProcessBase.h" -#include "CCTweenFunction.h" +#include "2d/CCTweenFunction.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCUtilMath.h b/cocos/editor-support/cocostudio/CCUtilMath.h index ff28f8a8cf..3b1760f0b4 100644 --- a/cocos/editor-support/cocostudio/CCUtilMath.h +++ b/cocos/editor-support/cocostudio/CCUtilMath.h @@ -25,7 +25,7 @@ THE SOFTWARE. #ifndef __CCUTILMATH_H__ #define __CCUTILMATH_H__ -#include "CCSprite.h" +#include "2d/CCSprite.h" #include "cocostudio/CCArmatureDefine.h" #include diff --git a/cocos/editor-support/cocostudio/DictionaryHelper.cpp b/cocos/editor-support/cocostudio/DictionaryHelper.cpp index 436c345d0c..f6d8a5bbb3 100644 --- a/cocos/editor-support/cocostudio/DictionaryHelper.cpp +++ b/cocos/editor-support/cocostudio/DictionaryHelper.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCPlatformMacros.h" +#include "base/CCPlatformMacros.h" #include "cocostudio/DictionaryHelper.h" namespace cocostudio { diff --git a/cocos/editor-support/spine/CCSkeleton.h b/cocos/editor-support/spine/CCSkeleton.h index f10fd76df8..7bd38d15ef 100644 --- a/cocos/editor-support/spine/CCSkeleton.h +++ b/cocos/editor-support/spine/CCSkeleton.h @@ -36,10 +36,10 @@ #include -#include "CCNode.h" -#include "CCProtocols.h" -#include "CCTextureAtlas.h" -#include "renderer/CCCustomCommand.h" +#include "2d/CCNode.h" +#include "2d/CCProtocols.h" +#include "2d/CCTextureAtlas.h" +#include "2d/renderer/CCCustomCommand.h" namespace spine { diff --git a/cocos/math/MathUtil.cpp b/cocos/math/MathUtil.cpp index 2ed4cc315f..98199d3513 100644 --- a/cocos/math/MathUtil.cpp +++ b/cocos/math/MathUtil.cpp @@ -1,5 +1,5 @@ #include "MathUtil.h" -#include "ccMacros.h" +#include "2d/ccMacros.h" NS_CC_MATH_BEGIN diff --git a/cocos/math/Matrix.cpp b/cocos/math/Matrix.cpp index 875b2d9571..5865789f12 100644 --- a/cocos/math/Matrix.cpp +++ b/cocos/math/Matrix.cpp @@ -1,7 +1,7 @@ #include "Matrix.h" #include "Quaternion.h" #include "MathUtil.h" -#include "ccMacros.h" +#include "2d/ccMacros.h" NS_CC_MATH_BEGIN diff --git a/cocos/math/Quaternion.cpp b/cocos/math/Quaternion.cpp index 80b60cbe5d..5f596c3f05 100644 --- a/cocos/math/Quaternion.cpp +++ b/cocos/math/Quaternion.cpp @@ -1,5 +1,5 @@ #include "Quaternion.h" -#include "ccMacros.h" +#include "2d/ccMacros.h" NS_CC_MATH_BEGIN diff --git a/cocos/math/Vector2.cpp b/cocos/math/Vector2.cpp index 541c7a8aed..2aa199d1f9 100644 --- a/cocos/math/Vector2.cpp +++ b/cocos/math/Vector2.cpp @@ -1,5 +1,5 @@ #include "Vector2.h" -#include "ccMacros.h" +#include "2d/ccMacros.h" #include "MathUtil.h" NS_CC_MATH_BEGIN diff --git a/cocos/math/Vector2.h b/cocos/math/Vector2.h index 9c09c09b5d..10fb3c8b4a 100644 --- a/cocos/math/Vector2.h +++ b/cocos/math/Vector2.h @@ -2,8 +2,8 @@ #define VECTOR2_H_ #include "CCMathBase.h" -#include "CCPlatformMacros.h" -#include "ccMacros.h" +#include "base/CCPlatformMacros.h" +#include "2d/ccMacros.h" NS_CC_MATH_BEGIN diff --git a/cocos/math/Vector3.cpp b/cocos/math/Vector3.cpp index 9859b71da0..c8dfeb0f29 100644 --- a/cocos/math/Vector3.cpp +++ b/cocos/math/Vector3.cpp @@ -1,6 +1,6 @@ #include "Vector3.h" #include "MathUtil.h" -#include "ccMacros.h" +#include "2d/ccMacros.h" NS_CC_MATH_BEGIN diff --git a/cocos/math/Vector4.cpp b/cocos/math/Vector4.cpp index 72144dd53d..816bb3b0bc 100644 --- a/cocos/math/Vector4.cpp +++ b/cocos/math/Vector4.cpp @@ -1,6 +1,6 @@ #include "Vector4.h" #include "MathUtil.h" -#include "ccMacros.h" +#include "2d/ccMacros.h" NS_CC_MATH_BEGIN diff --git a/cocos/network/HttpClient.cpp b/cocos/network/HttpClient.cpp index 0327cdee17..90e6aecedc 100644 --- a/cocos/network/HttpClient.cpp +++ b/cocos/network/HttpClient.cpp @@ -33,12 +33,12 @@ #include #include "CCVector.h" -#include "CCDirector.h" +#include "2d/CCDirector.h" #include "CCScheduler.h" #include "curl/curl.h" -#include "platform/CCFileUtils.h" +#include "2d/platform/CCFileUtils.h" NS_CC_BEGIN diff --git a/cocos/network/HttpRequest.h b/cocos/network/HttpRequest.h index af48e0af54..9b246bc81a 100644 --- a/cocos/network/HttpRequest.h +++ b/cocos/network/HttpRequest.h @@ -28,8 +28,8 @@ #include #include -#include "CCRef.h" -#include "ccMacros.h" +#include "base/CCRef.h" +#include "2d/ccMacros.h" NS_CC_BEGIN diff --git a/cocos/network/SocketIO.cpp b/cocos/network/SocketIO.cpp index 628d0751f6..ea15bfafde 100644 --- a/cocos/network/SocketIO.cpp +++ b/cocos/network/SocketIO.cpp @@ -28,7 +28,7 @@ ****************************************************************************/ #include "SocketIO.h" -#include "CCDirector.h" +#include "2d/CCDirector.h" #include "CCScheduler.h" #include "WebSocket.h" #include "HttpClient.h" diff --git a/cocos/network/SocketIO.h b/cocos/network/SocketIO.h index 5a3d73f9c1..4782193b0e 100644 --- a/cocos/network/SocketIO.h +++ b/cocos/network/SocketIO.h @@ -59,7 +59,7 @@ in the onClose method the pointer should be set to NULL or used to connect to a #ifndef __CC_SOCKETIO_H__ #define __CC_SOCKETIO_H__ -#include "CCPlatformMacros.h" +#include "base/CCPlatformMacros.h" #include "CCMap.h" #include diff --git a/cocos/network/WebSocket.cpp b/cocos/network/WebSocket.cpp index 4e98591d24..5d4460ec8c 100644 --- a/cocos/network/WebSocket.cpp +++ b/cocos/network/WebSocket.cpp @@ -28,7 +28,7 @@ ****************************************************************************/ #include "WebSocket.h" -#include "CCDirector.h" +#include "2d/CCDirector.h" #include "CCScheduler.h" #include diff --git a/cocos/network/WebSocket.h b/cocos/network/WebSocket.h index afd34721ea..c2d98a567f 100644 --- a/cocos/network/WebSocket.h +++ b/cocos/network/WebSocket.h @@ -30,7 +30,7 @@ #ifndef __CC_WEBSOCKET_H__ #define __CC_WEBSOCKET_H__ -#include "CCPlatformMacros.h" +#include "base/CCPlatformMacros.h" #include "CCStdC.h" #include #include diff --git a/cocos/physics/CCPhysicsBody.cpp b/cocos/physics/CCPhysicsBody.cpp index b81897f167..dfb98a0f40 100644 --- a/cocos/physics/CCPhysicsBody.cpp +++ b/cocos/physics/CCPhysicsBody.cpp @@ -30,7 +30,7 @@ #include "chipmunk.h" -#include "CCLayer.h" +#include "2d/CCLayer.h" #include "CCPhysicsShape.h" #include "CCPhysicsJoint.h" diff --git a/cocos/physics/CCPhysicsBody.h b/cocos/physics/CCPhysicsBody.h index 6f954a17f2..e10ee4139a 100644 --- a/cocos/physics/CCPhysicsBody.h +++ b/cocos/physics/CCPhysicsBody.h @@ -25,11 +25,11 @@ #ifndef __CCPHYSICS_BODY_H__ #define __CCPHYSICS_BODY_H__ -#include "ccConfig.h" +#include "2d/ccConfig.h" #if CC_USE_PHYSICS -#include "CCRef.h" -#include "CCGeometry.h" +#include "base/CCRef.h" +#include "base/CCGeometry.h" #include "CCPhysicsShape.h" #include "CCVector.h" diff --git a/cocos/physics/CCPhysicsContact.cpp b/cocos/physics/CCPhysicsContact.cpp index 53f223369f..0e4bfb47ad 100644 --- a/cocos/physics/CCPhysicsContact.cpp +++ b/cocos/physics/CCPhysicsContact.cpp @@ -30,7 +30,7 @@ #include "chipmunk/CCPhysicsContactInfo_chipmunk.h" #include "chipmunk/CCPhysicsHelper_chipmunk.h" -#include "CCEventCustom.h" +#include "2d/CCEventCustom.h" NS_CC_BEGIN diff --git a/cocos/physics/CCPhysicsContact.h b/cocos/physics/CCPhysicsContact.h index 3d7ff8b888..d6d4e41a33 100644 --- a/cocos/physics/CCPhysicsContact.h +++ b/cocos/physics/CCPhysicsContact.h @@ -25,14 +25,14 @@ #ifndef __CCPHYSICS_CONTACT_H__ #define __CCPHYSICS_CONTACT_H__ -#include "ccConfig.h" +#include "2d/ccConfig.h" #if CC_USE_PHYSICS -#include "CCRef.h" -#include "CCGeometry.h" -#include "CCEventListenerCustom.h" -#include "CCEvent.h" -#include "CCEventCustom.h" +#include "base/CCRef.h" +#include "base/CCGeometry.h" +#include "2d/CCEventListenerCustom.h" +#include "2d/CCEvent.h" +#include "2d/CCEventCustom.h" NS_CC_BEGIN diff --git a/cocos/physics/CCPhysicsJoint.cpp b/cocos/physics/CCPhysicsJoint.cpp index feb24cc5b0..71cf975c53 100644 --- a/cocos/physics/CCPhysicsJoint.cpp +++ b/cocos/physics/CCPhysicsJoint.cpp @@ -33,7 +33,7 @@ #include "chipmunk/CCPhysicsBodyInfo_chipmunk.h" #include "chipmunk/CCPhysicsShapeInfo_chipmunk.h" #include "chipmunk/CCPhysicsHelper_chipmunk.h" -#include "CCNode.h" +#include "2d/CCNode.h" NS_CC_BEGIN diff --git a/cocos/physics/CCPhysicsJoint.h b/cocos/physics/CCPhysicsJoint.h index d448332a6e..044c2e4c84 100644 --- a/cocos/physics/CCPhysicsJoint.h +++ b/cocos/physics/CCPhysicsJoint.h @@ -25,11 +25,11 @@ #ifndef __CCPHYSICS_JOINT_H__ #define __CCPHYSICS_JOINT_H__ -#include "ccConfig.h" +#include "2d/ccConfig.h" #if CC_USE_PHYSICS -#include "CCRef.h" -#include "CCGeometry.h" +#include "base/CCRef.h" +#include "base/CCGeometry.h" NS_CC_BEGIN diff --git a/cocos/physics/CCPhysicsShape.h b/cocos/physics/CCPhysicsShape.h index 6107ef63f2..93e80b2d23 100644 --- a/cocos/physics/CCPhysicsShape.h +++ b/cocos/physics/CCPhysicsShape.h @@ -25,11 +25,11 @@ #ifndef __CCPHYSICS_SHAPE_H__ #define __CCPHYSICS_SHAPE_H__ -#include "ccConfig.h" +#include "2d/ccConfig.h" #if CC_USE_PHYSICS -#include "CCRef.h" -#include "CCGeometry.h" +#include "base/CCRef.h" +#include "base/CCGeometry.h" NS_CC_BEGIN diff --git a/cocos/physics/CCPhysicsWorld.cpp b/cocos/physics/CCPhysicsWorld.cpp index 2531aa116f..234310dc1d 100644 --- a/cocos/physics/CCPhysicsWorld.cpp +++ b/cocos/physics/CCPhysicsWorld.cpp @@ -42,11 +42,11 @@ #include "chipmunk/CCPhysicsJointInfo_chipmunk.h" #include "chipmunk/CCPhysicsHelper_chipmunk.h" -#include "CCDrawNode.h" -#include "CCLayer.h" -#include "CCDirector.h" -#include "CCEventDispatcher.h" -#include "CCEventCustom.h" +#include "2d/CCDrawNode.h" +#include "2d/CCLayer.h" +#include "2d/CCDirector.h" +#include "2d/CCEventDispatcher.h" +#include "2d/CCEventCustom.h" #include diff --git a/cocos/physics/CCPhysicsWorld.h b/cocos/physics/CCPhysicsWorld.h index e7b01347bf..766be47939 100644 --- a/cocos/physics/CCPhysicsWorld.h +++ b/cocos/physics/CCPhysicsWorld.h @@ -25,12 +25,12 @@ #ifndef __CCPHYSICS_WORLD_H__ #define __CCPHYSICS_WORLD_H__ -#include "ccConfig.h" +#include "2d/ccConfig.h" #if CC_USE_PHYSICS #include "CCVector.h" -#include "CCRef.h" -#include "CCGeometry.h" +#include "base/CCRef.h" +#include "base/CCGeometry.h" #include diff --git a/cocos/physics/chipmunk/CCPhysicsBodyInfo_chipmunk.h b/cocos/physics/chipmunk/CCPhysicsBodyInfo_chipmunk.h index 3cbade4a7b..33d94fa40f 100644 --- a/cocos/physics/chipmunk/CCPhysicsBodyInfo_chipmunk.h +++ b/cocos/physics/chipmunk/CCPhysicsBodyInfo_chipmunk.h @@ -25,12 +25,12 @@ #ifndef __CCPHYSICS_BODY_INFO_CHIPMUNK_H__ #define __CCPHYSICS_BODY_INFO_CHIPMUNK_H__ -#include "ccConfig.h" +#include "2d/ccConfig.h" #if CC_USE_PHYSICS #include "chipmunk.h" -#include "CCPlatformMacros.h" -#include "CCRef.h" +#include "base/CCPlatformMacros.h" +#include "base/CCRef.h" NS_CC_BEGIN diff --git a/cocos/physics/chipmunk/CCPhysicsContactInfo_chipmunk.h b/cocos/physics/chipmunk/CCPhysicsContactInfo_chipmunk.h index f6c63fceda..4cc7970cc4 100644 --- a/cocos/physics/chipmunk/CCPhysicsContactInfo_chipmunk.h +++ b/cocos/physics/chipmunk/CCPhysicsContactInfo_chipmunk.h @@ -25,11 +25,11 @@ #ifndef __CCPHYSICS_CONTACT_INFO_CHIPMUNK_H__ #define __CCPHYSICS_CONTACT_INFO_CHIPMUNK_H__ -#include "ccConfig.h" +#include "2d/ccConfig.h" #if CC_USE_PHYSICS #include "chipmunk.h" -#include "CCPlatformMacros.h" +#include "base/CCPlatformMacros.h" NS_CC_BEGIN class PhysicsContact; diff --git a/cocos/physics/chipmunk/CCPhysicsHelper_chipmunk.h b/cocos/physics/chipmunk/CCPhysicsHelper_chipmunk.h index c9c672171a..8ca47aed64 100644 --- a/cocos/physics/chipmunk/CCPhysicsHelper_chipmunk.h +++ b/cocos/physics/chipmunk/CCPhysicsHelper_chipmunk.h @@ -25,12 +25,12 @@ #ifndef __CCPHYSICS_HELPER_CHIPMUNK_H__ #define __CCPHYSICS_HELPER_CHIPMUNK_H__ -#include "ccConfig.h" +#include "2d/ccConfig.h" #if CC_USE_PHYSICS #include "chipmunk.h" -#include "CCPlatformMacros.h" -#include "CCGeometry.h" +#include "base/CCPlatformMacros.h" +#include "base/CCGeometry.h" NS_CC_BEGIN diff --git a/cocos/physics/chipmunk/CCPhysicsJointInfo_chipmunk.h b/cocos/physics/chipmunk/CCPhysicsJointInfo_chipmunk.h index 30817b66f0..ab43e9774b 100644 --- a/cocos/physics/chipmunk/CCPhysicsJointInfo_chipmunk.h +++ b/cocos/physics/chipmunk/CCPhysicsJointInfo_chipmunk.h @@ -25,11 +25,11 @@ #ifndef __CCPHYSICS_JOINT_INFO_CHIPMUNK_H__ #define __CCPHYSICS_JOINT_INFO_CHIPMUNK_H__ -#include "ccConfig.h" +#include "2d/ccConfig.h" #if CC_USE_PHYSICS #include "chipmunk.h" -#include "CCPlatformMacros.h" +#include "base/CCPlatformMacros.h" #include #include NS_CC_BEGIN diff --git a/cocos/physics/chipmunk/CCPhysicsShapeInfo_chipmunk.h b/cocos/physics/chipmunk/CCPhysicsShapeInfo_chipmunk.h index cbdaca53b1..aaaaa6a79d 100644 --- a/cocos/physics/chipmunk/CCPhysicsShapeInfo_chipmunk.h +++ b/cocos/physics/chipmunk/CCPhysicsShapeInfo_chipmunk.h @@ -25,13 +25,13 @@ #ifndef __CCPHYSICS_SHAPE_INFO_CHIPMUNK_H__ #define __CCPHYSICS_SHAPE_INFO_CHIPMUNK_H__ -#include "ccConfig.h" +#include "2d/ccConfig.h" #if CC_USE_PHYSICS #include #include #include "chipmunk.h" -#include "CCPlatformMacros.h" +#include "base/CCPlatformMacros.h" NS_CC_BEGIN diff --git a/cocos/physics/chipmunk/CCPhysicsWorldInfo_chipmunk.h b/cocos/physics/chipmunk/CCPhysicsWorldInfo_chipmunk.h index 77950b3ee1..fa72749166 100644 --- a/cocos/physics/chipmunk/CCPhysicsWorldInfo_chipmunk.h +++ b/cocos/physics/chipmunk/CCPhysicsWorldInfo_chipmunk.h @@ -25,13 +25,13 @@ #ifndef __CCPHYSICS_WORLD_INFO_CHIPMUNK_H__ #define __CCPHYSICS_WORLD_INFO_CHIPMUNK_H__ -#include "ccConfig.h" +#include "2d/ccConfig.h" #if CC_USE_PHYSICS #include #include "chipmunk.h" -#include "CCPlatformMacros.h" -#include "CCGeometry.h" +#include "base/CCPlatformMacros.h" +#include "base/CCGeometry.h" NS_CC_BEGIN typedef Vector2 Vect; class PhysicsBodyInfo; diff --git a/cocos/scripting/lua-bindings/manual/CCLuaStack.cpp b/cocos/scripting/lua-bindings/manual/CCLuaStack.cpp index 75a5ecf941..e56416c671 100644 --- a/cocos/scripting/lua-bindings/manual/CCLuaStack.cpp +++ b/cocos/scripting/lua-bindings/manual/CCLuaStack.cpp @@ -38,11 +38,11 @@ extern "C" { #include "Cocos2dxLuaLoader.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC) -#include "platform/ios/CCLuaObjcBridge.h" +#include "2d/platform/ios/CCLuaObjcBridge.h" #endif #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) -#include "platform/android/CCLuaJavaBridge.h" +#include "2d/platform/android/CCLuaJavaBridge.h" #endif #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) diff --git a/cocos/scripting/lua-bindings/manual/CCLuaValue.h b/cocos/scripting/lua-bindings/manual/CCLuaValue.h index 16d757822c..3388354511 100644 --- a/cocos/scripting/lua-bindings/manual/CCLuaValue.h +++ b/cocos/scripting/lua-bindings/manual/CCLuaValue.h @@ -34,8 +34,8 @@ extern "C" { #include "lua.h" } -#include "ccTypes.h" -#include "CCRef.h" +#include "2d/ccTypes.h" +#include "base/CCRef.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_BLACKBERRY using std::memset; diff --git a/cocos/scripting/lua-bindings/manual/LuaOpengl.h b/cocos/scripting/lua-bindings/manual/LuaOpengl.h index 86b29b0e12..06dbe4858a 100644 --- a/cocos/scripting/lua-bindings/manual/LuaOpengl.h +++ b/cocos/scripting/lua-bindings/manual/LuaOpengl.h @@ -32,8 +32,8 @@ extern "C" { } #endif -#include "CCNode.h" -#include "renderer/CCCustomCommand.h" +#include "2d/CCNode.h" +#include "2d/renderer/CCCustomCommand.h" class GLNode:public cocos2d::Node { diff --git a/cocos/scripting/lua-bindings/manual/LuaScriptHandlerMgr.h b/cocos/scripting/lua-bindings/manual/LuaScriptHandlerMgr.h index aab6f716ae..456a855874 100644 --- a/cocos/scripting/lua-bindings/manual/LuaScriptHandlerMgr.h +++ b/cocos/scripting/lua-bindings/manual/LuaScriptHandlerMgr.h @@ -30,9 +30,9 @@ extern "C" { } -#include "CCRef.h" -#include "ccMacros.h" -#include "CCActionInstant.h" +#include "base/CCRef.h" +#include "2d/ccMacros.h" +#include "2d/CCActionInstant.h" #include #include diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_coco_studio_manual.hpp b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_coco_studio_manual.hpp index 33146f254a..74cea4e691 100644 --- a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_coco_studio_manual.hpp +++ b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_coco_studio_manual.hpp @@ -32,7 +32,7 @@ extern "C" { } #endif -#include "CCRef.h" +#include "base/CCRef.h" #include TOLUA_API int register_all_cocos2dx_coco_studio_manual(lua_State* L); diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_spine_manual.hpp b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_spine_manual.hpp index 8bda268aea..e54075519b 100644 --- a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_spine_manual.hpp +++ b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_spine_manual.hpp @@ -32,7 +32,7 @@ extern "C" { } #endif -#include "CCRef.h" +#include "base/CCRef.h" TOLUA_API int register_all_cocos2dx_spine_manual(lua_State* L); diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_ui_manual.hpp b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_ui_manual.hpp index a1846cb815..1be9dea77b 100644 --- a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_ui_manual.hpp +++ b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_ui_manual.hpp @@ -32,7 +32,7 @@ extern "C" { } #endif -#include "CCRef.h" +#include "base/CCRef.h" TOLUA_API int register_all_cocos2dx_ui_manual(lua_State* L); diff --git a/cocos/scripting/lua-bindings/manual/tolua_fix.cpp b/cocos/scripting/lua-bindings/manual/tolua_fix.cpp index bd72d5dad5..a6cfd5f53e 100644 --- a/cocos/scripting/lua-bindings/manual/tolua_fix.cpp +++ b/cocos/scripting/lua-bindings/manual/tolua_fix.cpp @@ -1,6 +1,6 @@ #include "tolua_fix.h" -#include "CCRef.h" +#include "base/CCRef.h" #include "LuaBasicConversions.h" #include diff --git a/cocos/storage/local-storage/LocalStorage.cpp b/cocos/storage/local-storage/LocalStorage.cpp index a3ca1c70ad..3c485fa226 100644 --- a/cocos/storage/local-storage/LocalStorage.cpp +++ b/cocos/storage/local-storage/LocalStorage.cpp @@ -28,7 +28,7 @@ */ #include "LocalStorage.h" -#include "CCPlatformMacros.h" +#include "base/CCPlatformMacros.h" #if (CC_TARGET_PLATFORM != CC_PLATFORM_ANDROID) diff --git a/cocos/storage/local-storage/LocalStorageAndroid.cpp b/cocos/storage/local-storage/LocalStorageAndroid.cpp index e95d40cf71..352a80ef5d 100644 --- a/cocos/storage/local-storage/LocalStorageAndroid.cpp +++ b/cocos/storage/local-storage/LocalStorageAndroid.cpp @@ -29,7 +29,7 @@ */ #include "LocalStorage.h" -#include "CCPlatformMacros.h" +#include "base/CCPlatformMacros.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) diff --git a/cocos/ui/CCProtectedNode.cpp b/cocos/ui/CCProtectedNode.cpp index b21ead55e9..d241abb8dd 100644 --- a/cocos/ui/CCProtectedNode.cpp +++ b/cocos/ui/CCProtectedNode.cpp @@ -28,12 +28,12 @@ #include "CCProtectedNode.h" -#include "CCDirector.h" +#include "2d/CCDirector.h" #if CC_USE_PHYSICS #include "CCPhysicsBody.h" #endif -#include "CCLayer.h" +#include "2d/CCLayer.h" NS_CC_BEGIN diff --git a/cocos/ui/CCProtectedNode.h b/cocos/ui/CCProtectedNode.h index b46c4b6452..22fbc8e10a 100644 --- a/cocos/ui/CCProtectedNode.h +++ b/cocos/ui/CCProtectedNode.h @@ -30,7 +30,7 @@ #define __CPROTECTEDCNODE_H__ -#include "CCNode.h" +#include "2d/CCNode.h" NS_CC_BEGIN diff --git a/cocos/ui/UILayout.cpp b/cocos/ui/UILayout.cpp index e46eac86c7..781580e7a1 100644 --- a/cocos/ui/UILayout.cpp +++ b/cocos/ui/UILayout.cpp @@ -25,13 +25,13 @@ THE SOFTWARE. #include "ui/UILayout.h" #include "ui/UIHelper.h" #include "extensions/GUI/CCControlExtension/CCScale9Sprite.h" -#include "CCGLProgram.h" +#include "2d/CCGLProgram.h" #include "CCShaderCache.h" -#include "CCDirector.h" +#include "2d/CCDirector.h" #include "CCDrawingPrimitives.h" -#include "renderer/CCRenderer.h" -#include "renderer/CCGroupCommand.h" -#include "renderer/CCCustomCommand.h" +#include "2d/renderer/CCRenderer.h" +#include "2d/renderer/CCGroupCommand.h" +#include "2d/renderer/CCCustomCommand.h" NS_CC_BEGIN diff --git a/extensions/GUI/CCControlExtension/CCControl.cpp b/extensions/GUI/CCControlExtension/CCControl.cpp index c70db155fd..902a1ed062 100644 --- a/extensions/GUI/CCControlExtension/CCControl.cpp +++ b/extensions/GUI/CCControlExtension/CCControl.cpp @@ -28,12 +28,12 @@ */ #include "CCControl.h" -#include "CCDirector.h" -#include "CCMenu.h" -#include "CCTouch.h" +#include "2d/CCDirector.h" +#include "2d/CCMenu.h" +#include "2d/CCTouch.h" #include "CCInvocation.h" -#include "CCEventDispatcher.h" -#include "CCEventListenerTouch.h" +#include "2d/CCEventDispatcher.h" +#include "2d/CCEventListenerTouch.h" NS_CC_EXT_BEGIN diff --git a/extensions/GUI/CCControlExtension/CCControl.h b/extensions/GUI/CCControlExtension/CCControl.h index 6a535a7241..e81a94e7e9 100644 --- a/extensions/GUI/CCControlExtension/CCControl.h +++ b/extensions/GUI/CCControlExtension/CCControl.h @@ -31,7 +31,7 @@ #define __CCCONTROL_H__ #include "CCControlUtils.h" -#include "CCLayer.h" +#include "2d/CCLayer.h" NS_CC_EXT_BEGIN diff --git a/extensions/GUI/CCControlExtension/CCControlButton.cpp b/extensions/GUI/CCControlExtension/CCControlButton.cpp index 22956047d4..c3754aaa18 100644 --- a/extensions/GUI/CCControlExtension/CCControlButton.cpp +++ b/extensions/GUI/CCControlExtension/CCControlButton.cpp @@ -27,9 +27,9 @@ #include "CCControlButton.h" #include "CCScale9Sprite.h" -#include "CCLabel.h" -#include "CCAction.h" -#include "CCActionInterval.h" +#include "2d/CCLabel.h" +#include "2d/CCAction.h" +#include "2d/CCActionInterval.h" using namespace std; diff --git a/extensions/GUI/CCControlExtension/CCControlColourPicker.cpp b/extensions/GUI/CCControlExtension/CCControlColourPicker.cpp index 74c47faa56..e4d0076717 100644 --- a/extensions/GUI/CCControlExtension/CCControlColourPicker.cpp +++ b/extensions/GUI/CCControlExtension/CCControlColourPicker.cpp @@ -30,8 +30,8 @@ */ #include "CCControlColourPicker.h" -#include "CCSpriteFrameCache.h" -#include "CCSpriteBatchNode.h" +#include "2d/CCSpriteFrameCache.h" +#include "2d/CCSpriteBatchNode.h" NS_CC_EXT_BEGIN diff --git a/extensions/GUI/CCControlExtension/CCControlPotentiometer.h b/extensions/GUI/CCControlExtension/CCControlPotentiometer.h index 4b94cd1de5..bf238ac2c0 100644 --- a/extensions/GUI/CCControlExtension/CCControlPotentiometer.h +++ b/extensions/GUI/CCControlExtension/CCControlPotentiometer.h @@ -28,7 +28,7 @@ #define __CCCONTROLPOTENTIOMETER_H__ #include "CCControl.h" -#include "CCProgressTimer.h" +#include "2d/CCProgressTimer.h" NS_CC_EXT_BEGIN diff --git a/extensions/GUI/CCControlExtension/CCControlSlider.cpp b/extensions/GUI/CCControlExtension/CCControlSlider.cpp index fff83fc19e..ee1a1f4237 100644 --- a/extensions/GUI/CCControlExtension/CCControlSlider.cpp +++ b/extensions/GUI/CCControlExtension/CCControlSlider.cpp @@ -28,8 +28,8 @@ */ #include "CCControlSlider.h" -#include "CCTouch.h" -#include "CCDirector.h" +#include "2d/CCTouch.h" +#include "2d/CCDirector.h" NS_CC_EXT_BEGIN diff --git a/extensions/GUI/CCControlExtension/CCControlStepper.h b/extensions/GUI/CCControlExtension/CCControlStepper.h index 9f3596e61f..92b4009794 100644 --- a/extensions/GUI/CCControlExtension/CCControlStepper.h +++ b/extensions/GUI/CCControlExtension/CCControlStepper.h @@ -29,7 +29,7 @@ #define __CCCONTROLSTEPPER_H__ #include "CCControl.h" -#include "CCLabel.h" +#include "2d/CCLabel.h" NS_CC_EXT_BEGIN diff --git a/extensions/GUI/CCControlExtension/CCControlSwitch.cpp b/extensions/GUI/CCControlExtension/CCControlSwitch.cpp index 31f2fadc03..83dbb78e8c 100644 --- a/extensions/GUI/CCControlExtension/CCControlSwitch.cpp +++ b/extensions/GUI/CCControlExtension/CCControlSwitch.cpp @@ -26,9 +26,9 @@ */ #include "CCControlSwitch.h" -#include "CCSprite.h" -#include "CCActionTween.h" -#include "CCLabel.h" +#include "2d/CCSprite.h" +#include "2d/CCActionTween.h" +#include "2d/CCLabel.h" #include "CCClippingNode.h" #include "ccShaders.h" #include "CCRenderTexture.h" diff --git a/extensions/GUI/CCControlExtension/CCControlUtils.h b/extensions/GUI/CCControlExtension/CCControlUtils.h index c26082d5cf..078ed505b7 100644 --- a/extensions/GUI/CCControlExtension/CCControlUtils.h +++ b/extensions/GUI/CCControlExtension/CCControlUtils.h @@ -34,7 +34,7 @@ #ifndef __CCCONTROL_UTILS_H__ #define __CCCONTROL_UTILS_H__ -#include "CCSprite.h" +#include "2d/CCSprite.h" #include "../../ExtensionMacros.h" NS_CC_EXT_BEGIN diff --git a/extensions/GUI/CCControlExtension/CCInvocation.h b/extensions/GUI/CCControlExtension/CCInvocation.h index d99e69bec3..15fa41920d 100644 --- a/extensions/GUI/CCControlExtension/CCInvocation.h +++ b/extensions/GUI/CCControlExtension/CCInvocation.h @@ -30,7 +30,7 @@ #ifndef __CCINVOCATION_H__ #define __CCINVOCATION_H__ -#include "CCRef.h" +#include "base/CCRef.h" #include "../../ExtensionMacros.h" #include "CCControl.h" diff --git a/extensions/GUI/CCControlExtension/CCScale9Sprite.cpp b/extensions/GUI/CCControlExtension/CCScale9Sprite.cpp index 7cdfc8302c..32398db39b 100644 --- a/extensions/GUI/CCControlExtension/CCScale9Sprite.cpp +++ b/extensions/GUI/CCControlExtension/CCScale9Sprite.cpp @@ -26,9 +26,9 @@ THE SOFTWARE. ****************************************************************************/ #include "CCScale9Sprite.h" -#include "CCPlatformMacros.h" -#include "CCSprite.h" -#include "CCSpriteFrameCache.h" +#include "base/CCPlatformMacros.h" +#include "2d/CCSprite.h" +#include "2d/CCSpriteFrameCache.h" NS_CC_EXT_BEGIN diff --git a/extensions/GUI/CCControlExtension/CCScale9Sprite.h b/extensions/GUI/CCControlExtension/CCScale9Sprite.h index 25a126868f..9497d932ae 100644 --- a/extensions/GUI/CCControlExtension/CCScale9Sprite.h +++ b/extensions/GUI/CCControlExtension/CCScale9Sprite.h @@ -28,9 +28,9 @@ THE SOFTWARE. #ifndef __CCScale9Sprite_H__ #define __CCScale9Sprite_H__ -#include "CCNode.h" -#include "CCSpriteFrame.h" -#include "CCSpriteBatchNode.h" +#include "2d/CCNode.h" +#include "2d/CCSpriteFrame.h" +#include "2d/CCSpriteBatchNode.h" #include "../../ExtensionMacros.h" diff --git a/extensions/GUI/CCEditBox/CCEditBox.h b/extensions/GUI/CCEditBox/CCEditBox.h index 695c94face..48bab4d589 100644 --- a/extensions/GUI/CCEditBox/CCEditBox.h +++ b/extensions/GUI/CCEditBox/CCEditBox.h @@ -26,7 +26,7 @@ #ifndef __CCEDITTEXT_H__ #define __CCEDITTEXT_H__ -#include "CCIMEDelegate.h" +#include "2d/CCIMEDelegate.h" #include "extensions/ExtensionMacros.h" #include "../CCControlExtension/CCControlExtensions.h" diff --git a/extensions/GUI/CCEditBox/CCEditBoxImplMac.mm b/extensions/GUI/CCEditBox/CCEditBoxImplMac.mm index 502d38072b..ab95b83ac8 100644 --- a/extensions/GUI/CCEditBox/CCEditBoxImplMac.mm +++ b/extensions/GUI/CCEditBox/CCEditBoxImplMac.mm @@ -24,7 +24,7 @@ ****************************************************************************/ #include "CCEditBoxImplMac.h" -#include "CCDirector.h" +#include "2d/CCDirector.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) diff --git a/extensions/GUI/CCScrollView/CCScrollView.cpp b/extensions/GUI/CCScrollView/CCScrollView.cpp index 550dce9fc9..f87650ddd5 100644 --- a/extensions/GUI/CCScrollView/CCScrollView.cpp +++ b/extensions/GUI/CCScrollView/CCScrollView.cpp @@ -25,12 +25,12 @@ #include "CCScrollView.h" #include "CCGLView.h" -#include "platform/CCDevice.h" -#include "CCActionInstant.h" -#include "CCActionInterval.h" -#include "CCActionTween.h" -#include "CCDirector.h" -#include "renderer/CCRenderer.h" +#include "2d/platform/CCDevice.h" +#include "2d/CCActionInstant.h" +#include "2d/CCActionInterval.h" +#include "2d/CCActionTween.h" +#include "2d/CCDirector.h" +#include "2d/renderer/CCRenderer.h" #include diff --git a/extensions/GUI/CCScrollView/CCScrollView.h b/extensions/GUI/CCScrollView/CCScrollView.h index f3cbe60a15..82964b363d 100644 --- a/extensions/GUI/CCScrollView/CCScrollView.h +++ b/extensions/GUI/CCScrollView/CCScrollView.h @@ -26,9 +26,9 @@ #ifndef __CCSCROLLVIEW_H__ #define __CCSCROLLVIEW_H__ -#include "CCLayer.h" -#include "CCEventListenerTouch.h" -#include "CCActionTween.h" +#include "2d/CCLayer.h" +#include "2d/CCEventListenerTouch.h" +#include "2d/CCActionTween.h" #include "extensions/ExtensionMacros.h" NS_CC_EXT_BEGIN diff --git a/extensions/GUI/CCScrollView/CCTableViewCell.cpp b/extensions/GUI/CCScrollView/CCTableViewCell.cpp index aa1cf70bca..8965bb036b 100644 --- a/extensions/GUI/CCScrollView/CCTableViewCell.cpp +++ b/extensions/GUI/CCScrollView/CCTableViewCell.cpp @@ -24,7 +24,7 @@ ****************************************************************************/ #include "CCTableViewCell.h" -#include "ccCArray.h" +#include "2d/ccCArray.h" NS_CC_EXT_BEGIN diff --git a/extensions/GUI/CCScrollView/CCTableViewCell.h b/extensions/GUI/CCScrollView/CCTableViewCell.h index fb0a509df1..9d45d665d8 100644 --- a/extensions/GUI/CCScrollView/CCTableViewCell.h +++ b/extensions/GUI/CCScrollView/CCTableViewCell.h @@ -27,7 +27,7 @@ #define __CCTABLEVIEWCELL_H__ #include "extensions/ExtensionMacros.h" -#include "CCNode.h" +#include "2d/CCNode.h" NS_CC_EXT_BEGIN diff --git a/extensions/physics-nodes/CCPhysicsDebugNode.cpp b/extensions/physics-nodes/CCPhysicsDebugNode.cpp index 309b01d26f..7b2e56c569 100644 --- a/extensions/physics-nodes/CCPhysicsDebugNode.cpp +++ b/extensions/physics-nodes/CCPhysicsDebugNode.cpp @@ -25,8 +25,8 @@ #include "chipmunk.h" #endif -#include "ccTypes.h" -#include "CCGeometry.h" +#include "2d/ccTypes.h" +#include "base/CCGeometry.h" #include diff --git a/extensions/physics-nodes/CCPhysicsDebugNode.h b/extensions/physics-nodes/CCPhysicsDebugNode.h index 4bd118e3b0..8981cd8ff9 100644 --- a/extensions/physics-nodes/CCPhysicsDebugNode.h +++ b/extensions/physics-nodes/CCPhysicsDebugNode.h @@ -24,7 +24,7 @@ #define __PHYSICSNODES_DEBUGNODE_H__ #include "extensions/ExtensionMacros.h" -#include "CCDrawNode.h" +#include "2d/CCDrawNode.h" struct cpSpace; diff --git a/extensions/physics-nodes/CCPhysicsSprite.h b/extensions/physics-nodes/CCPhysicsSprite.h index c884b9e84e..51b488d16b 100644 --- a/extensions/physics-nodes/CCPhysicsSprite.h +++ b/extensions/physics-nodes/CCPhysicsSprite.h @@ -23,7 +23,7 @@ #ifndef __PHYSICSNODES_CCPHYSICSSPRITE_H__ #define __PHYSICSNODES_CCPHYSICSSPRITE_H__ -#include "CCSprite.h" +#include "2d/CCSprite.h" #include "extensions/ExtensionMacros.h" struct cpBody; diff --git a/external/tinyxml2/tinyxml2.h b/external/tinyxml2/tinyxml2.h index b188feb1f5..f5b4f83ee8 100644 --- a/external/tinyxml2/tinyxml2.h +++ b/external/tinyxml2/tinyxml2.h @@ -25,7 +25,7 @@ distribution. #define TINYXML2_INCLUDED #include "CCPlatformConfig.h" -#include "CCPlatformMacros.h" +#include "base/CCPlatformMacros.h" #if defined(ANDROID_NDK) || defined(__BORLANDC__) || (CC_TARGET_PLATFORM == CC_PLATFORM_BLACKBERRY) # include diff --git a/templates/cocos2dx_files.json.REMOVED.git-id b/templates/cocos2dx_files.json.REMOVED.git-id index c6fa81c26e..7a67f468c6 100644 --- a/templates/cocos2dx_files.json.REMOVED.git-id +++ b/templates/cocos2dx_files.json.REMOVED.git-id @@ -1 +1 @@ -b9fa33247e32879e50ca51bc36eac3c1f6253e69 \ No newline at end of file +ef6267bf4d38c797f059c8ca14eecd90e2c2c981 \ No newline at end of file diff --git a/tests/cpp-tests/Classes/ActionsTest/ActionsTest.cpp b/tests/cpp-tests/Classes/ActionsTest/ActionsTest.cpp index 92fc0405ea..8a94c788b2 100644 --- a/tests/cpp-tests/Classes/ActionsTest/ActionsTest.cpp +++ b/tests/cpp-tests/Classes/ActionsTest/ActionsTest.cpp @@ -27,9 +27,9 @@ #include "../testResource.h" #include "cocos2d.h" -#include "renderer/CCRenderer.h" -#include "renderer/CCCustomCommand.h" -#include "renderer/CCGroupCommand.h" +#include "2d/renderer/CCRenderer.h" +#include "2d/renderer/CCCustomCommand.h" +#include "2d/renderer/CCGroupCommand.h" static std::function createFunctions[] = { diff --git a/tests/cpp-tests/Classes/Box2DTest/Box2dTest.cpp b/tests/cpp-tests/Classes/Box2DTest/Box2dTest.cpp index 44cb115fd5..b303212cba 100644 --- a/tests/cpp-tests/Classes/Box2DTest/Box2dTest.cpp +++ b/tests/cpp-tests/Classes/Box2DTest/Box2dTest.cpp @@ -1,8 +1,8 @@ #include "Box2dTest.h" #include "../testResource.h" #include "extensions/cocos-ext.h" -#include "renderer/CCRenderer.h" -#include "renderer/CCCustomCommand.h" +#include "2d/renderer/CCRenderer.h" +#include "2d/renderer/CCCustomCommand.h" USING_NS_CC_EXT; diff --git a/tests/cpp-tests/Classes/Box2DTestBed/Box2dView.cpp b/tests/cpp-tests/Classes/Box2DTestBed/Box2dView.cpp index b27a9996d8..a60a571bca 100644 --- a/tests/cpp-tests/Classes/Box2DTestBed/Box2dView.cpp +++ b/tests/cpp-tests/Classes/Box2DTestBed/Box2dView.cpp @@ -1,7 +1,7 @@ #include "Box2dView.h" #include "GLES-Render.h" #include "Test.h" -#include "renderer/CCRenderer.h" +#include "2d/renderer/CCRenderer.h" #define kAccelerometerFrequency 30 #define FRAMES_BETWEEN_PRESSES_FOR_DOUBLE_CLICK 10 diff --git a/tests/cpp-tests/Classes/Box2DTestBed/Box2dView.h b/tests/cpp-tests/Classes/Box2DTestBed/Box2dView.h index 8c1b4470ce..32584d9d39 100644 --- a/tests/cpp-tests/Classes/Box2DTestBed/Box2dView.h +++ b/tests/cpp-tests/Classes/Box2DTestBed/Box2dView.h @@ -3,7 +3,7 @@ //#include "cocos2d.h" #include "../testBasic.h" -#include "renderer/CCCustomCommand.h" +#include "2d/renderer/CCCustomCommand.h" class MenuLayer : public Layer { diff --git a/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp b/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp index a0e09f2e05..fba771400a 100644 --- a/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp +++ b/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp @@ -7,7 +7,7 @@ #include "ClippingNodeTest.h" #include "../testResource.h" -#include "renderer/CCRenderer.h" +#include "2d/renderer/CCRenderer.h" enum { kTagTitleLabel = 1, diff --git a/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.h b/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.h index f5b7dcbb8a..b25847f3ec 100644 --- a/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.h +++ b/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.h @@ -3,7 +3,7 @@ #include "../testBasic.h" #include "../BaseTest.h" -#include "renderer/CCCustomCommand.h" +#include "2d/renderer/CCCustomCommand.h" #include class BaseClippingNodeTest : public BaseTest diff --git a/tests/cpp-tests/Classes/ConsoleTest/ConsoleTest.cpp b/tests/cpp-tests/Classes/ConsoleTest/ConsoleTest.cpp index 7c86174069..579ac9f61f 100644 --- a/tests/cpp-tests/Classes/ConsoleTest/ConsoleTest.cpp +++ b/tests/cpp-tests/Classes/ConsoleTest/ConsoleTest.cpp @@ -35,7 +35,6 @@ #include #include #endif -#include "base64.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_WP8 #include "CCWinRTUtils.h" diff --git a/tests/cpp-tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp b/tests/cpp-tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp index 4e5e4a100c..6d6ca1a8d2 100644 --- a/tests/cpp-tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp +++ b/tests/cpp-tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp @@ -1,6 +1,6 @@ #include "DrawPrimitivesTest.h" -#include "renderer/CCRenderer.h" -#include "renderer/CCCustomCommand.h" +#include "2d/renderer/CCRenderer.h" +#include "2d/renderer/CCCustomCommand.h" using namespace std; diff --git a/tests/cpp-tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp b/tests/cpp-tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp index 849df4d9bf..7af5898df7 100644 --- a/tests/cpp-tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp +++ b/tests/cpp-tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp @@ -1,5 +1,4 @@ #include "EffectsAdvancedTest.h" -#include "CCNodeGrid.h" enum { diff --git a/tests/cpp-tests/Classes/EffectsTest/EffectsTest.cpp b/tests/cpp-tests/Classes/EffectsTest/EffectsTest.cpp index 3e178c3c49..ec12291ef7 100644 --- a/tests/cpp-tests/Classes/EffectsTest/EffectsTest.cpp +++ b/tests/cpp-tests/Classes/EffectsTest/EffectsTest.cpp @@ -1,6 +1,6 @@ #include "EffectsTest.h" #include "../testResource.h" -#include "CCNodeGrid.h" + enum { kTagTextLayer = 1, diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp index c811533078..0e523849ab 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp @@ -1,9 +1,6 @@ #include "ArmatureScene.h" #include "../../testResource.h" #include "cocostudio/CocoStudio.h" -#include "CCNodeGrid.h" -#include "renderer/CCRenderer.h" -#include "renderer/CCCustomCommand.h" using namespace cocos2d; diff --git a/tests/cpp-tests/Classes/LabelTest/LabelTest.cpp b/tests/cpp-tests/Classes/LabelTest/LabelTest.cpp index 6bfaeb05a2..adc2c1d67d 100644 --- a/tests/cpp-tests/Classes/LabelTest/LabelTest.cpp +++ b/tests/cpp-tests/Classes/LabelTest/LabelTest.cpp @@ -1,7 +1,7 @@ #include "LabelTest.h" #include "../testResource.h" -#include "renderer/CCRenderer.h" -#include "renderer/CCCustomCommand.h" +#include "2d/renderer/CCRenderer.h" +#include "2d/renderer/CCCustomCommand.h" #if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1))) #pragma GCC diagnostic ignored "-Wdeprecated-declarations" diff --git a/tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp b/tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp index 9cd87d3db2..25522d48b9 100644 --- a/tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp +++ b/tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp @@ -1,6 +1,6 @@ #include "LabelTestNew.h" #include "../testResource.h" -#include "renderer/CCRenderer.h" +#include "2d/renderer/CCRenderer.h" using namespace ui; diff --git a/tests/cpp-tests/Classes/LabelTest/LabelTestNew.h b/tests/cpp-tests/Classes/LabelTest/LabelTestNew.h index 5d19c0e3fe..c76fbd7019 100644 --- a/tests/cpp-tests/Classes/LabelTest/LabelTestNew.h +++ b/tests/cpp-tests/Classes/LabelTest/LabelTestNew.h @@ -3,7 +3,7 @@ #include "../testBasic.h" #include "../BaseTest.h" -#include "renderer/CCCustomCommand.h" +#include "2d/renderer/CCCustomCommand.h" #include "ui/CocosGUI.h" diff --git a/tests/cpp-tests/Classes/PerformanceTest/PerformanceAllocTest.h b/tests/cpp-tests/Classes/PerformanceTest/PerformanceAllocTest.h index fe208308ee..f495cf2486 100644 --- a/tests/cpp-tests/Classes/PerformanceTest/PerformanceAllocTest.h +++ b/tests/cpp-tests/Classes/PerformanceTest/PerformanceAllocTest.h @@ -5,7 +5,6 @@ #define __PERFORMANCE_ALLOC_TEST_H__ #include "PerformanceTest.h" -#include "CCProfiling.h" class AllocBasicLayer : public PerformBasicLayer { diff --git a/tests/cpp-tests/Classes/PerformanceTest/PerformanceCallbackTest.h b/tests/cpp-tests/Classes/PerformanceTest/PerformanceCallbackTest.h index 4abb20f58a..dc4b989496 100644 --- a/tests/cpp-tests/Classes/PerformanceTest/PerformanceCallbackTest.h +++ b/tests/cpp-tests/Classes/PerformanceTest/PerformanceCallbackTest.h @@ -5,7 +5,6 @@ #define __PERFORMANCE_CALLBACK_TEST_H__ #include "PerformanceTest.h" -#include "CCProfiling.h" class CallbackBasicLayer : public PerformBasicLayer { diff --git a/tests/cpp-tests/Classes/PerformanceTest/PerformanceContainerTest.h b/tests/cpp-tests/Classes/PerformanceTest/PerformanceContainerTest.h index 603c759f76..26d78e4c5e 100644 --- a/tests/cpp-tests/Classes/PerformanceTest/PerformanceContainerTest.h +++ b/tests/cpp-tests/Classes/PerformanceTest/PerformanceContainerTest.h @@ -5,7 +5,6 @@ #define __PERFORMANCE_CONTAINER_TEST_H__ #include "PerformanceTest.h" -#include "CCProfiling.h" class ContainerBasicLayer : public PerformBasicLayer { diff --git a/tests/cpp-tests/Classes/PerformanceTest/PerformanceEventDispatcherTest.h b/tests/cpp-tests/Classes/PerformanceTest/PerformanceEventDispatcherTest.h index b8b6022b62..66ed484c6f 100644 --- a/tests/cpp-tests/Classes/PerformanceTest/PerformanceEventDispatcherTest.h +++ b/tests/cpp-tests/Classes/PerformanceTest/PerformanceEventDispatcherTest.h @@ -5,7 +5,6 @@ #define __PERFORMANCE_EVENTDISPATCHER_TEST_H__ #include "PerformanceTest.h" -#include "CCProfiling.h" class EventDispatcherBasicLayer : public PerformBasicLayer { diff --git a/tests/cpp-tests/Classes/PerformanceTest/PerformanceNodeChildrenTest.h b/tests/cpp-tests/Classes/PerformanceTest/PerformanceNodeChildrenTest.h index bd641cc232..be10919204 100644 --- a/tests/cpp-tests/Classes/PerformanceTest/PerformanceNodeChildrenTest.h +++ b/tests/cpp-tests/Classes/PerformanceTest/PerformanceNodeChildrenTest.h @@ -2,7 +2,6 @@ #define __PERFORMANCE_NODE_CHILDREN_TEST_H__ #include "PerformanceTest.h" -#include "CCProfiling.h" class NodeChildrenMenuLayer : public PerformBasicLayer { diff --git a/tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.cpp b/tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.cpp index 1b034a06f4..898f3f06a4 100644 --- a/tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.cpp +++ b/tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.cpp @@ -1,8 +1,5 @@ -#include "CCConfiguration.h" #include "RenderTextureTest.h" #include "../testBasic.h" -#include "renderer/CCRenderer.h" -#include "renderer/CCCustomCommand.h" // Test #1 by Jason Booth (slipster216) // Test #3 by David Deaco (ddeaco) diff --git a/tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h b/tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h index 118c269dda..4c9f689fc2 100644 --- a/tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h +++ b/tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h @@ -4,7 +4,7 @@ #include "cocos2d.h" #include "../testBasic.h" #include "../BaseTest.h" -#include "renderer/CCCustomCommand.h" +#include "2d/renderer/CCCustomCommand.h" class RenderTextureTest : public BaseTest { diff --git a/tests/cpp-tests/Classes/ShaderTest/ShaderTest.cpp b/tests/cpp-tests/Classes/ShaderTest/ShaderTest.cpp index 7fa1bd644c..298d8479a4 100644 --- a/tests/cpp-tests/Classes/ShaderTest/ShaderTest.cpp +++ b/tests/cpp-tests/Classes/ShaderTest/ShaderTest.cpp @@ -1,8 +1,8 @@ #include "ShaderTest.h" #include "../testResource.h" #include "cocos2d.h" -#include "renderer/CCCustomCommand.h" -#include "renderer/CCRenderer.h" +#include "2d/renderer/CCCustomCommand.h" +#include "2d/renderer/CCRenderer.h" static int sceneIdx = -1; diff --git a/tests/cpp-tests/Classes/ShaderTest/ShaderTest2.cpp b/tests/cpp-tests/Classes/ShaderTest/ShaderTest2.cpp index adf291e01b..8a4f685d41 100644 --- a/tests/cpp-tests/Classes/ShaderTest/ShaderTest2.cpp +++ b/tests/cpp-tests/Classes/ShaderTest/ShaderTest2.cpp @@ -2,8 +2,8 @@ #include "ShaderTest.h" #include "../testResource.h" #include "cocos2d.h" -#include "renderer/CCRenderCommand.h" -#include "renderer/CCCustomCommand.h" +#include "2d/renderer/CCRenderCommand.h" +#include "2d/renderer/CCCustomCommand.h" namespace ShaderTest2 { diff --git a/tests/cpp-tests/Classes/Texture2dTest/Texture2dTest.cpp b/tests/cpp-tests/Classes/Texture2dTest/Texture2dTest.cpp index 851f5e4d5f..d25f5ea704 100644 --- a/tests/cpp-tests/Classes/Texture2dTest/Texture2dTest.cpp +++ b/tests/cpp-tests/Classes/Texture2dTest/Texture2dTest.cpp @@ -26,7 +26,7 @@ // local import #include "Texture2dTest.h" #include "../testResource.h" -#include "renderer/CCRenderer.h" +#include "2d/renderer/CCRenderer.h" enum { kTagLabel = 1, diff --git a/tests/cpp-tests/Classes/Texture2dTest/Texture2dTest.h b/tests/cpp-tests/Classes/Texture2dTest/Texture2dTest.h index e22241799d..ed20466a0a 100644 --- a/tests/cpp-tests/Classes/Texture2dTest/Texture2dTest.h +++ b/tests/cpp-tests/Classes/Texture2dTest/Texture2dTest.h @@ -28,7 +28,7 @@ #include "../testBasic.h" #include "../BaseTest.h" -#include "renderer/CCCustomCommand.h" +#include "2d/renderer/CCCustomCommand.h" class TextureDemo : public BaseTest diff --git a/tests/cpp-tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp b/tests/cpp-tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp index 38fe809ef3..aa5579a850 100644 --- a/tests/cpp-tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp +++ b/tests/cpp-tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp @@ -1,6 +1,5 @@ #include "TextureAtlasEncryptionTest.h" #include "../testResource.h" -#include "ZipUtils.h" std::string TextureAtlasEncryptionDemo::title() const { diff --git a/tests/cpp-tests/Classes/TileMapTest/TileMapTest.cpp b/tests/cpp-tests/Classes/TileMapTest/TileMapTest.cpp index 9584635b12..5e5786b7e7 100644 --- a/tests/cpp-tests/Classes/TileMapTest/TileMapTest.cpp +++ b/tests/cpp-tests/Classes/TileMapTest/TileMapTest.cpp @@ -1,7 +1,7 @@ #include "TileMapTest.h" #include "../testResource.h" -#include "renderer/CCRenderer.h" -#include "renderer/CCCustomCommand.h" +#include "2d/renderer/CCRenderer.h" +#include "2d/renderer/CCCustomCommand.h" enum { diff --git a/tests/cpp-tests/Classes/TileMapTest/TileMapTest.h b/tests/cpp-tests/Classes/TileMapTest/TileMapTest.h index 3e407bf48c..d1c6f87839 100644 --- a/tests/cpp-tests/Classes/TileMapTest/TileMapTest.h +++ b/tests/cpp-tests/Classes/TileMapTest/TileMapTest.h @@ -3,7 +3,7 @@ #include "../testBasic.h" #include "../BaseTest.h" -#include "renderer/CCCustomCommand.h" +#include "2d/renderer/CCCustomCommand.h" class TileDemo : public BaseTest { diff --git a/tests/cpp-tests/Classes/TransitionsTest/TransitionsTest.cpp b/tests/cpp-tests/Classes/TransitionsTest/TransitionsTest.cpp index d42c49db90..6050745eb9 100644 --- a/tests/cpp-tests/Classes/TransitionsTest/TransitionsTest.cpp +++ b/tests/cpp-tests/Classes/TransitionsTest/TransitionsTest.cpp @@ -25,7 +25,6 @@ #include "TransitionsTest.h" #include "../testResource.h" -#include "CCConfiguration.h" #define TRANSITION_DURATION (1.2f)