From 90456d29badb81bd093803a8bc5103c1307d1e2b Mon Sep 17 00:00:00 2001 From: Xpol Wan Date: Sun, 20 Mar 2016 21:53:44 +0800 Subject: [PATCH] Fixes 1605 include path in 541 files using the tools/coding-style/include-linter.py with -f options. --- cocos/2d/CCAtlasNode.cpp | 2 +- cocos/2d/CCAutoPolygon.cpp | 2 +- cocos/2d/CCClippingRectangleNode.cpp | 4 +- cocos/2d/CCFastTMXTiledMap.h | 4 +- cocos/2d/CCFontAtlas.cpp | 2 +- cocos/2d/CCFontFNT.h | 2 +- cocos/2d/CCFontFreeType.cpp | 2 +- cocos/2d/CCFontFreeType.h | 2 +- cocos/2d/CCGLBufferedNode.cpp | 2 +- cocos/2d/CCGrabber.cpp | 2 +- cocos/2d/CCLabelAtlas.h | 2 +- cocos/2d/CCProtectedNode.cpp | 2 +- cocos/3d/CCAnimationCurve.h | 2 +- cocos/3d/CCBundle3D.cpp | 2 +- cocos/3d/CCBundleReader.cpp | 2 +- cocos/3d/CCOBB.h | 2 +- cocos/3d/CCObjLoader.cpp | 2 +- cocos/3d/CCPlane.cpp | 2 +- cocos/3d/CCTerrain.cpp | 2 +- cocos/audio/AudioEngine.cpp | 10 +-- cocos/audio/android/AudioEngine-inl.cpp | 2 +- cocos/audio/android/ccdandroidUtils.cpp | 4 +- cocos/audio/android/cddSimpleAudioEngine.cpp | 6 +- .../jni/cddandroidAndroidJavaEngine.cpp | 2 +- .../android/jni/cddandroidAndroidJavaEngine.h | 2 +- cocos/audio/apple/AudioCache.h | 2 +- cocos/audio/apple/AudioEngine-inl.h | 4 +- cocos/audio/apple/AudioPlayer.h | 2 +- cocos/audio/include/AudioEngine.h | 2 +- cocos/audio/include/SimpleAudioEngine.h | 2 +- cocos/audio/linux/AudioEngine-linux.cpp | 2 +- cocos/audio/linux/AudioEngine-linux.h | 2 +- cocos/audio/linux/SimpleAudioEngine.cpp | 4 +- cocos/audio/openal/OpenALDecoder.cpp | 2 +- .../audio/openal/SimpleAudioEngineOpenAL.cpp | 4 +- cocos/audio/win32/AudioCache.cpp | 2 +- cocos/audio/win32/AudioCache.h | 2 +- cocos/audio/win32/AudioEngine-win32.cpp | 2 +- cocos/audio/win32/AudioEngine-win32.h | 4 +- cocos/audio/win32/AudioPlayer.cpp | 4 +- cocos/audio/win32/AudioPlayer.h | 4 +- cocos/audio/win32/MciPlayer.cpp | 2 +- cocos/audio/win32/SimpleAudioEngine.cpp | 4 +- cocos/audio/winrt/Audio.cpp | 6 +- cocos/audio/winrt/AudioCachePlayer.cpp | 2 +- cocos/audio/winrt/AudioCachePlayer.h | 2 +- cocos/audio/winrt/AudioEngine-winrt.cpp | 2 +- cocos/audio/winrt/AudioEngine-winrt.h | 4 +- cocos/audio/winrt/AudioSourceReader.cpp | 4 +- cocos/audio/winrt/AudioSourceReader.h | 2 +- cocos/audio/winrt/MediaStreamer.cpp | 2 +- cocos/audio/winrt/SimpleAudioEngine.cpp | 6 +- cocos/base/CCConsole.cpp | 6 +- cocos/base/CCController-android.cpp | 8 +- cocos/base/CCDirector.cpp | 2 +- cocos/base/CCEventController.cpp | 2 +- cocos/base/CCNinePatchImageParser.cpp | 2 +- cocos/base/CCProperties.cpp | 2 +- cocos/base/CCStencilStateManager.cpp | 2 +- cocos/base/CCUserDefault-winrt.cpp | 2 +- cocos/base/TGAlib.cpp | 2 +- .../base/allocator/CCAllocatorDiagnostics.cpp | 4 +- cocos/base/atitc.cpp | 2 +- cocos/base/ccRandom.cpp | 2 +- cocos/base/pvr.cpp | 2 +- cocos/base/s3tc.cpp | 2 +- cocos/deprecated/CCArray.cpp | 2 +- cocos/deprecated/CCDictionary.cpp | 14 ++-- cocos/deprecated/CCDictionary.h | 2 +- cocos/deprecated/CCSet.cpp | 2 +- cocos/deprecated/CCString.cpp | 2 +- cocos/deprecated/CCString.h | 2 +- .../cocosbuilder/CCBAnimationManager.cpp | 8 +- .../cocosbuilder/CCBAnimationManager.h | 6 +- .../cocosbuilder/CCBFileLoader.cpp | 2 +- .../cocosbuilder/CCBFileLoader.h | 2 +- .../cocosbuilder/CCBKeyframe.cpp | 2 +- .../editor-support/cocosbuilder/CCBReader.cpp | 18 ++-- cocos/editor-support/cocosbuilder/CCBReader.h | 4 +- .../cocosbuilder/CCBSequence.cpp | 2 +- .../editor-support/cocosbuilder/CCBSequence.h | 2 +- .../cocosbuilder/CCBSequenceProperty.cpp | 2 +- .../cocosbuilder/CCBSequenceProperty.h | 2 +- .../cocosbuilder/CCControlButtonLoader.cpp | 2 +- .../cocosbuilder/CCControlButtonLoader.h | 2 +- .../cocosbuilder/CCControlLoader.cpp | 2 +- .../cocosbuilder/CCControlLoader.h | 2 +- .../cocosbuilder/CCLabelBMFontLoader.cpp | 2 +- .../cocosbuilder/CCLabelBMFontLoader.h | 2 +- .../cocosbuilder/CCLabelTTFLoader.cpp | 2 +- .../cocosbuilder/CCLabelTTFLoader.h | 2 +- .../cocosbuilder/CCLayerColorLoader.cpp | 2 +- .../cocosbuilder/CCLayerColorLoader.h | 2 +- .../cocosbuilder/CCLayerGradientLoader.cpp | 2 +- .../cocosbuilder/CCLayerGradientLoader.h | 2 +- .../cocosbuilder/CCLayerLoader.cpp | 2 +- .../cocosbuilder/CCLayerLoader.h | 2 +- .../cocosbuilder/CCMenuItemImageLoader.cpp | 2 +- .../cocosbuilder/CCMenuItemImageLoader.h | 2 +- .../cocosbuilder/CCMenuItemLoader.cpp | 2 +- .../cocosbuilder/CCMenuItemLoader.h | 2 +- .../cocosbuilder/CCMenuLoader.h | 2 +- .../CCNode+CCBRelativePositioning.cpp | 4 +- .../CCNode+CCBRelativePositioning.h | 2 +- .../cocosbuilder/CCNodeLoader.cpp | 10 +-- .../cocosbuilder/CCNodeLoader.h | 2 +- .../cocosbuilder/CCNodeLoaderLibrary.cpp | 30 +++---- .../cocosbuilder/CCNodeLoaderLibrary.h | 2 +- .../CCParticleSystemQuadLoader.cpp | 2 +- .../cocosbuilder/CCParticleSystemQuadLoader.h | 2 +- .../cocosbuilder/CCScale9SpriteLoader.cpp | 2 +- .../cocosbuilder/CCScale9SpriteLoader.h | 4 +- .../cocosbuilder/CCScrollViewLoader.cpp | 2 +- .../cocosbuilder/CCScrollViewLoader.h | 2 +- .../cocosbuilder/CCSpriteLoader.cpp | 2 +- .../cocosbuilder/CCSpriteLoader.h | 2 +- .../cocosbuilder/CocosBuilder.h | 52 ++++++------ .../ActionTimeline/CCActionTimeline.cpp | 4 +- .../ActionTimeline/CCActionTimeline.h | 4 +- .../ActionTimeline/CCActionTimelineCache.cpp | 14 ++-- .../ActionTimeline/CCActionTimelineCache.h | 6 +- .../ActionTimeline/CCActionTimelineNode.cpp | 4 +- .../ActionTimeline/CCActionTimelineNode.h | 6 +- .../cocostudio/ActionTimeline/CCBoneNode.cpp | 4 +- .../cocostudio/ActionTimeline/CCBoneNode.h | 6 +- .../cocostudio/ActionTimeline/CCFrame.cpp | 6 +- .../cocostudio/ActionTimeline/CCFrame.h | 4 +- .../ActionTimeline/CCSkeletonNode.cpp | 2 +- .../ActionTimeline/CCSkeletonNode.h | 6 +- .../cocostudio/ActionTimeline/CCSkinNode.cpp | 2 +- .../cocostudio/ActionTimeline/CCSkinNode.h | 2 +- .../cocostudio/ActionTimeline/CCTimeLine.cpp | 4 +- .../cocostudio/ActionTimeline/CCTimeLine.h | 6 +- .../cocostudio/ActionTimeline/CSLoader.cpp | 84 +++++++++---------- .../cocostudio/ActionTimeline/CSLoader.h | 4 +- .../cocostudio/CCActionFrame.cpp | 2 +- .../editor-support/cocostudio/CCActionFrame.h | 2 +- .../cocostudio/CCActionFrameEasing.cpp | 4 +- .../cocostudio/CCActionFrameEasing.h | 2 +- .../cocostudio/CCActionManagerEx.cpp | 4 +- .../cocostudio/CCActionManagerEx.h | 6 +- .../cocostudio/CCActionNode.cpp | 6 +- .../editor-support/cocostudio/CCActionNode.h | 6 +- .../cocostudio/CCActionObject.cpp | 4 +- .../cocostudio/CCActionObject.h | 6 +- .../editor-support/cocostudio/CCArmature.cpp | 12 +-- cocos/editor-support/cocostudio/CCArmature.h | 14 ++-- .../cocostudio/CCArmatureAnimation.cpp | 12 +-- .../cocostudio/CCArmatureAnimation.h | 6 +- .../cocostudio/CCArmatureDataManager.cpp | 8 +- .../cocostudio/CCArmatureDataManager.h | 6 +- .../cocostudio/CCArmatureDefine.cpp | 2 +- .../editor-support/cocostudio/CCBatchNode.cpp | 6 +- cocos/editor-support/cocostudio/CCBatchNode.h | 4 +- cocos/editor-support/cocostudio/CCBone.cpp | 12 +-- cocos/editor-support/cocostudio/CCBone.h | 12 +-- .../cocostudio/CCColliderDetector.cpp | 6 +- .../cocostudio/CCColliderDetector.h | 6 +- .../cocostudio/CCComAttribute.cpp | 2 +- .../cocostudio/CCComAttribute.h | 4 +- .../editor-support/cocostudio/CCComAudio.cpp | 2 +- cocos/editor-support/cocostudio/CCComAudio.h | 4 +- cocos/editor-support/cocostudio/CCComBase.h | 6 +- .../cocostudio/CCComController.cpp | 2 +- .../cocostudio/CCComController.h | 6 +- .../cocostudio/CCComExtensionData.cpp | 4 +- .../cocostudio/CCComExtensionData.h | 4 +- .../editor-support/cocostudio/CCComRender.cpp | 4 +- cocos/editor-support/cocostudio/CCComRender.h | 4 +- .../cocostudio/CCDataReaderHelper.cpp | 14 ++-- .../cocostudio/CCDataReaderHelper.h | 12 +-- cocos/editor-support/cocostudio/CCDatas.cpp | 6 +- cocos/editor-support/cocostudio/CCDatas.h | 4 +- .../cocostudio/CCDecorativeDisplay.cpp | 2 +- .../cocostudio/CCDecorativeDisplay.h | 10 +-- .../cocostudio/CCDisplayFactory.cpp | 12 +-- .../cocostudio/CCDisplayFactory.h | 8 +- .../cocostudio/CCDisplayManager.cpp | 10 +-- .../cocostudio/CCDisplayManager.h | 8 +- .../cocostudio/CCInputDelegate.cpp | 2 +- .../cocostudio/CCInputDelegate.h | 2 +- .../cocostudio/CCProcessBase.cpp | 4 +- .../editor-support/cocostudio/CCProcessBase.h | 6 +- .../cocostudio/CCSGUIReader.cpp | 32 +++---- .../editor-support/cocostudio/CCSGUIReader.h | 6 +- .../cocostudio/CCSSceneReader.cpp | 2 +- .../cocostudio/CCSSceneReader.h | 4 +- cocos/editor-support/cocostudio/CCSkin.cpp | 6 +- cocos/editor-support/cocostudio/CCSkin.h | 6 +- .../cocostudio/CCSpriteFrameCacheHelper.cpp | 2 +- .../cocostudio/CCSpriteFrameCacheHelper.h | 4 +- .../cocostudio/CCTransformHelp.cpp | 4 +- .../cocostudio/CCTransformHelp.h | 6 +- cocos/editor-support/cocostudio/CCTween.cpp | 12 +-- cocos/editor-support/cocostudio/CCTween.h | 4 +- .../editor-support/cocostudio/CCUtilMath.cpp | 2 +- cocos/editor-support/cocostudio/CCUtilMath.h | 4 +- .../editor-support/cocostudio/CocoLoader.cpp | 2 +- cocos/editor-support/cocostudio/CocoLoader.h | 2 +- .../editor-support/cocostudio/CocoStudio.cpp | 52 ++++++------ cocos/editor-support/cocostudio/CocoStudio.h | 84 +++++++++---------- .../cocostudio/CocosStudioExtension.cpp | 2 +- .../cocostudio/DictionaryHelper.cpp | 2 +- .../cocostudio/DictionaryHelper.h | 2 +- .../cocostudio/FlatBuffersSerialize.cpp | 52 ++++++------ .../cocostudio/FlatBuffersSerialize.h | 2 +- .../cocostudio/LocalizationManager.cpp | 4 +- .../cocostudio/LocalizationManager.h | 2 +- .../editor-support/cocostudio/TriggerBase.cpp | 2 +- cocos/editor-support/cocostudio/TriggerBase.h | 8 +- .../editor-support/cocostudio/TriggerMng.cpp | 2 +- cocos/editor-support/cocostudio/TriggerMng.h | 2 +- .../editor-support/cocostudio/TriggerObj.cpp | 2 +- cocos/editor-support/cocostudio/TriggerObj.h | 2 +- .../WidgetCallBackHandlerProtocol.cpp | 2 +- .../WidgetCallBackHandlerProtocol.h | 2 +- .../ArmatureNodeReader/ArmatureNodeReader.cpp | 10 +-- .../ArmatureNodeReader/ArmatureNodeReader.h | 4 +- .../ButtonReader/ButtonReader.cpp | 10 +-- .../WidgetReader/ButtonReader/ButtonReader.h | 4 +- .../CheckBoxReader/CheckBoxReader.cpp | 8 +- .../CheckBoxReader/CheckBoxReader.h | 4 +- .../ComAudioReader/ComAudioReader.cpp | 8 +- .../ComAudioReader/ComAudioReader.h | 4 +- .../GameMapReader/GameMapReader.cpp | 6 +- .../GameMapReader/GameMapReader.h | 6 +- .../GameNode3DReader/GameNode3DReader.cpp | 12 +-- .../GameNode3DReader/GameNode3DReader.h | 6 +- .../ImageViewReader/ImageViewReader.cpp | 8 +- .../ImageViewReader/ImageViewReader.h | 4 +- .../LayoutReader/LayoutReader.cpp | 8 +- .../WidgetReader/LayoutReader/LayoutReader.h | 4 +- .../Light3DReader/Light3DReader.cpp | 10 +-- .../Light3DReader/Light3DReader.h | 6 +- .../ListViewReader/ListViewReader.cpp | 8 +- .../ListViewReader/ListViewReader.h | 4 +- .../LoadingBarReader/LoadingBarReader.cpp | 8 +- .../LoadingBarReader/LoadingBarReader.h | 4 +- .../Node3DReader/Node3DReader.cpp | 10 +-- .../WidgetReader/Node3DReader/Node3DReader.h | 6 +- .../WidgetReader/NodeReader/NodeReader.cpp | 8 +- .../WidgetReader/NodeReader/NodeReader.h | 6 +- .../WidgetReader/NodeReaderDefine.cpp | 2 +- .../WidgetReader/NodeReaderProtocol.cpp | 2 +- .../WidgetReader/NodeReaderProtocol.h | 2 +- .../PageViewReader/PageViewReader.cpp | 8 +- .../PageViewReader/PageViewReader.h | 4 +- .../Particle3DReader/Particle3DReader.cpp | 10 +-- .../Particle3DReader/Particle3DReader.h | 6 +- .../ParticleReader/ParticleReader.cpp | 6 +- .../ParticleReader/ParticleReader.h | 6 +- .../ProjectNodeReader/ProjectNodeReader.cpp | 6 +- .../ProjectNodeReader/ProjectNodeReader.h | 4 +- .../ScrollViewReader/ScrollViewReader.cpp | 8 +- .../ScrollViewReader/ScrollViewReader.h | 4 +- .../SingleNodeReader/SingleNodeReader.cpp | 8 +- .../SingleNodeReader/SingleNodeReader.h | 6 +- .../SkeletonReader/BoneNodeReader.cpp | 10 +-- .../SkeletonReader/BoneNodeReader.h | 4 +- .../SkeletonReader/SkeletonNodeReader.cpp | 10 +-- .../SkeletonReader/SkeletonNodeReader.h | 2 +- .../SliderReader/SliderReader.cpp | 8 +- .../WidgetReader/SliderReader/SliderReader.h | 4 +- .../Sprite3DReader/Sprite3DReader.cpp | 10 +-- .../Sprite3DReader/Sprite3DReader.h | 6 +- .../SpriteReader/SpriteReader.cpp | 8 +- .../WidgetReader/SpriteReader/SpriteReader.h | 6 +- .../TabControlReader/TabControlReader.cpp | 12 +-- .../TabControlReader/TabControlReader.h | 6 +- .../TextAtlasReader/TextAtlasReader.cpp | 8 +- .../TextAtlasReader/TextAtlasReader.h | 4 +- .../TextBMFontReader/TextBMFontReader.cpp | 8 +- .../TextBMFontReader/TextBMFontReader.h | 4 +- .../TextFieldReader/TextFieldReader.cpp | 8 +- .../TextFieldReader/TextFieldReader.h | 4 +- .../WidgetReader/TextReader/TextReader.cpp | 8 +- .../WidgetReader/TextReader/TextReader.h | 4 +- .../UserCameraReader/UserCameraReader.cpp | 12 +-- .../UserCameraReader/UserCameraReader.h | 6 +- .../cocostudio/WidgetReader/WidgetReader.cpp | 12 +-- .../cocostudio/WidgetReader/WidgetReader.h | 10 +-- .../WidgetReader/WidgetReaderProtocol.h | 4 +- cocos/editor-support/spine/Json.c | 2 +- cocos/editor-support/spine/SkeletonJson.c | 2 +- cocos/math/CCMath.h | 10 +-- cocos/math/MathUtil.cpp | 10 +-- cocos/math/MathUtil.h | 2 +- cocos/math/Quaternion.cpp | 2 +- cocos/math/Quaternion.h | 2 +- cocos/math/Quaternion.inl | 2 +- cocos/math/Vec2.h | 2 +- cocos/math/Vec3.h | 2 +- cocos/network/HttpClient-android.cpp | 2 +- cocos/network/HttpClient-winrt.cpp | 4 +- cocos/network/HttpClient.cpp | 2 +- cocos/network/HttpConnection-winrt.cpp | 2 +- cocos/network/HttpCookie.cpp | 4 +- cocos/network/SocketIO.cpp | 6 +- cocos/network/WebSocket.cpp | 2 +- cocos/physics/CCPhysicsContact.cpp | 6 +- cocos/physics/CCPhysicsJoint.cpp | 6 +- cocos/physics/CCPhysicsShape.cpp | 6 +- cocos/physics/CCPhysicsWorld.cpp | 12 +-- cocos/physics3d/CCPhysics3D.cpp | 2 +- cocos/physics3d/CCPhysics3D.h | 14 ++-- cocos/physics3d/CCPhysics3DComponent.cpp | 2 +- cocos/physics3d/CCPhysics3DConstraint.cpp | 2 +- cocos/physics3d/CCPhysics3DDebugDrawer.cpp | 2 +- cocos/physics3d/CCPhysics3DObject.cpp | 2 +- cocos/physics3d/CCPhysics3DShape.cpp | 2 +- cocos/physics3d/CCPhysics3DWorld.cpp | 2 +- cocos/physics3d/CCPhysicsSprite3D.cpp | 2 +- cocos/physics3d/CCPhysicsSprite3D.h | 4 +- cocos/platform/CCFileUtils.cpp | 2 +- cocos/platform/CCImage.cpp | 8 +- cocos/platform/CCImage.h | 2 +- .../platform/android/CCEnhanceAPI-android.cpp | 4 +- .../platform/android/CCFileUtils-android.cpp | 2 +- .../platform/android/CCGLViewImpl-android.cpp | 2 +- .../platform/android/javaactivity-android.cpp | 4 +- ...org_cocos2dx_lib_Cocos2dxAccelerometer.cpp | 2 +- .../Java_org_cocos2dx_lib_Cocos2dxHelper.cpp | 6 +- ...Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp | 2 +- cocos/platform/android/jni/JniHelper.cpp | 2 +- cocos/platform/apple/CCLock-apple.cpp | 2 +- .../platform/desktop/CCGLViewImpl-desktop.cpp | 2 +- cocos/platform/linux/CCApplication-linux.cpp | 2 +- cocos/platform/linux/CCCommon-linux.cpp | 2 +- cocos/platform/linux/CCFileUtils-linux.cpp | 4 +- cocos/platform/linux/CCStdC-linux.cpp | 2 +- cocos/platform/win32/CCFileUtils-win32.cpp | 2 +- cocos/platform/win32/CCStdC-win32.h | 2 +- cocos/platform/win32/compat/stdint.h | 2 +- cocos/platform/win32/inet_pton_mingw.cpp | 2 +- .../win8.1-universal/Cocos2dRenderer.cpp | 4 +- cocos/platform/win8.1-universal/OpenGLES.cpp | 2 +- .../win8.1-universal/OpenGLESPage.xaml.cpp | 2 +- .../win8.1-universal/OpenGLESPage.xaml.h | 4 +- cocos/platform/win8.1-universal/pch.cpp | 2 +- cocos/platform/winrt/CCApplication.cpp | 2 +- cocos/platform/winrt/CCCommon.cpp | 2 +- cocos/platform/winrt/CCFileUtilsWinRT.cpp | 4 +- cocos/platform/winrt/CCFreeTypeFont.cpp | 2 +- cocos/platform/winrt/CCGL.h | 2 +- cocos/platform/winrt/CCGLViewImpl-winrt.cpp | 6 +- cocos/platform/winrt/CCGLViewImpl-winrt.h | 4 +- cocos/platform/winrt/CCGLViewImpl.cpp | 6 +- cocos/platform/winrt/CCGLViewImpl.h | 6 +- cocos/platform/winrt/CCPThreadWinRT.cpp | 2 +- cocos/platform/winrt/CCPrecompiledShaders.cpp | 6 +- cocos/platform/winrt/CCPrecompiledShaders.h | 2 +- cocos/platform/winrt/CCWinRTUtils.cpp | 2 +- cocos/platform/winrt/InputEvent.cpp | 6 +- cocos/platform/winrt/InputEvent.h | 4 +- cocos/platform/winrt/Keyboard-winrt.cpp | 4 +- cocos/platform/winrt/Keyboard-winrt.h | 2 +- cocos/platform/winrt/WICImageLoader-winrt.cpp | 4 +- cocos/platform/winrt/WICImageLoader-winrt.h | 2 +- cocos/platform/winrt/inet_pton_winrt.cpp | 2 +- cocos/platform/winrt/pch.cpp | 2 +- cocos/platform/winrt/pch.h | 2 +- cocos/platform/winrt/sha1.cpp | 2 +- cocos/renderer/CCGroupCommand.h | 2 +- cocos/renderer/CCPass.cpp | 2 +- cocos/renderer/CCRenderState.cpp | 2 +- cocos/renderer/CCVertexAttribBinding.cpp | 2 +- cocos/renderer/ccShaders.cpp | 76 ++++++++--------- .../js_bindings_chipmunk_auto_classes.cpp | 10 +-- .../auto/js_bindings_chipmunk_auto_classes.h | 4 +- ...dings_chipmunk_auto_classes_registration.h | 4 +- .../auto/js_bindings_chipmunk_functions.cpp | 10 +-- .../auto/js_bindings_chipmunk_functions.h | 4 +- ...bindings_chipmunk_functions_registration.h | 4 +- .../js-bindings/auto/jsb_cocos2dx_3d_auto.cpp | 8 +- .../auto/jsb_cocos2dx_3d_extension_auto.cpp | 4 +- .../auto/jsb_cocos2dx_audioengine_auto.cpp | 6 +- .../js-bindings/auto/jsb_cocos2dx_auto.cpp | 12 +-- .../auto/jsb_cocos2dx_builder_auto.cpp | 6 +- .../jsb_cocos2dx_experimental_video_auto.cpp | 6 +- ...jsb_cocos2dx_experimental_webView_auto.cpp | 6 +- .../auto/jsb_cocos2dx_extension_auto.cpp | 4 +- .../auto/jsb_cocos2dx_navmesh_auto.cpp | 8 +- .../auto/jsb_cocos2dx_physics3d_auto.cpp | 8 +- .../auto/jsb_cocos2dx_spine_auto.cpp | 8 +- .../auto/jsb_cocos2dx_studio_auto.cpp | 10 +-- .../js-bindings/auto/jsb_cocos2dx_ui_auto.cpp | 8 +- .../manual/3d/jsb_cocos2dx_3d_manual.cpp | 6 +- .../js-bindings/manual/ScriptingCore.cpp | 12 +-- .../js-bindings/manual/ScriptingCore.h | 10 +-- .../chipmunk/js_bindings_chipmunk_manual.cpp | 8 +- .../chipmunk/js_bindings_chipmunk_manual.h | 8 +- .../js_bindings_chipmunk_registration.cpp | 14 ++-- .../js-bindings/manual/cocos2d_specifics.cpp | 10 +-- .../js-bindings/manual/cocos2d_specifics.hpp | 2 +- .../cocosbuilder/cocosbuilder_specifics.hpp | 2 +- .../cocosbuilder/js_bindings_ccbreader.cpp | 6 +- .../cocosbuilder/js_bindings_ccbreader.h | 4 +- .../jsb_cocos2dx_studio_conversions.cpp | 6 +- .../cocostudio/jsb_cocos2dx_studio_manual.cpp | 8 +- .../manual/component/CCComponentJS.cpp | 8 +- ...jsb_cocos2dx_experimental_video_manual.cpp | 8 +- ...b_cocos2dx_experimental_webView_manual.cpp | 8 +- .../jsb_cocos2dx_extension_manual.cpp | 8 +- .../extension/jsb_cocos2dx_extension_manual.h | 2 +- .../js-bindings/manual/js_bindings_core.cpp | 6 +- .../js-bindings/manual/js_bindings_opengl.cpp | 2 +- .../js-bindings/manual/js_bindings_opengl.h | 4 +- .../manual/js_manual_conversions.cpp | 8 +- .../manual/js_manual_conversions.h | 8 +- .../js-bindings/manual/js_module_register.cpp | 64 +++++++------- .../js-bindings/manual/js_module_register.h | 2 +- .../manual/jsb_event_dispatcher_manual.cpp | 6 +- .../manual/jsb_opengl_functions.cpp | 10 +-- .../js-bindings/manual/jsb_opengl_functions.h | 4 +- .../js-bindings/manual/jsb_opengl_manual.cpp | 10 +-- .../js-bindings/manual/jsb_opengl_manual.h | 2 +- .../manual/jsb_opengl_registration.cpp | 12 +-- .../manual/jsb_opengl_registration.h | 2 +- .../js_bindings_system_functions.cpp | 12 +-- .../js_bindings_system_functions.h | 2 +- ...s_bindings_system_functions_registration.h | 4 +- .../js_bindings_system_registration.cpp | 10 +-- .../jsb_cocos2dx_navmesh_conversions.cpp | 6 +- .../navmesh/jsb_cocos2dx_navmesh_manual.cpp | 8 +- .../manual/network/XMLHTTPRequest.cpp | 4 +- .../manual/network/XMLHTTPRequest.h | 6 +- .../manual/network/jsb_socketio.cpp | 10 +-- .../manual/network/jsb_websocket.cpp | 8 +- .../jsb_cocos2dx_physics3d_manual.cpp | 6 +- .../android/CCJavascriptJavaBridge.cpp | 8 +- .../platform/android/CCJavascriptJavaBridge.h | 4 +- .../platform/ios/JavaScriptObjCBridge.h | 4 +- .../spine/jsb_cocos2dx_spine_manual.cpp | 8 +- .../manual/spine/jsb_cocos2dx_spine_manual.h | 2 +- .../manual/ui/jsb_cocos2dx_ui_manual.cpp | 6 +- .../auto/lua_cocos2dx_3d_auto.cpp | 8 +- .../auto/lua_cocos2dx_audioengine_auto.cpp | 8 +- .../lua-bindings/auto/lua_cocos2dx_auto.cpp | 12 +-- .../auto/lua_cocos2dx_cocosbuilder_auto.cpp | 8 +- .../auto/lua_cocos2dx_cocosdenshion_auto.cpp | 8 +- .../auto/lua_cocos2dx_controller_auto.cpp | 8 +- .../auto/lua_cocos2dx_csloader_auto.cpp | 8 +- .../auto/lua_cocos2dx_experimental_auto.cpp | 10 +-- .../lua_cocos2dx_experimental_video_auto.cpp | 8 +- ...lua_cocos2dx_experimental_webview_auto.cpp | 8 +- .../auto/lua_cocos2dx_extension_auto.cpp | 6 +- .../auto/lua_cocos2dx_navmesh_auto.cpp | 10 +-- .../auto/lua_cocos2dx_physics3d_auto.cpp | 8 +- .../auto/lua_cocos2dx_physics_auto.cpp | 6 +- .../auto/lua_cocos2dx_spine_auto.cpp | 8 +- .../auto/lua_cocos2dx_studio_auto.cpp | 12 +-- .../auto/lua_cocos2dx_ui_auto.cpp | 8 +- .../manual/3d/lua_cocos2dx_3d_manual.cpp | 8 +- .../lua-bindings/manual/CCComponentLua.cpp | 6 +- .../lua-bindings/manual/CCLuaBridge.cpp | 2 +- .../lua-bindings/manual/CCLuaBridge.h | 2 +- .../lua-bindings/manual/CCLuaEngine.cpp | 14 ++-- .../lua-bindings/manual/CCLuaEngine.h | 8 +- .../lua-bindings/manual/CCLuaStack.cpp | 30 +++---- .../lua-bindings/manual/CCLuaStack.h | 2 +- .../lua-bindings/manual/CCLuaValue.cpp | 2 +- .../lua-bindings/manual/Cocos2dxLuaLoader.cpp | 6 +- .../manual/LuaBasicConversions.cpp | 4 +- .../lua-bindings/manual/LuaBasicConversions.h | 4 +- .../lua_cocos2dx_audioengine_manual.cpp | 12 +-- .../lua-bindings/manual/cocos2d/LuaOpengl.cpp | 14 ++-- .../manual/cocos2d/LuaScriptHandlerMgr.cpp | 12 +-- .../cocos2d/lua_cocos2dx_deprecated.cpp | 10 +-- .../lua_cocos2dx_experimental_manual.cpp | 10 +-- .../manual/cocos2d/lua_cocos2dx_manual.cpp | 10 +-- .../manual/cocos2d/lua_cocos2dx_manual.hpp | 2 +- .../cocos2d/lua_cocos2dx_physics_manual.cpp | 10 +-- .../cocos2d/lua_cocos2dx_physics_manual.hpp | 2 +- .../manual/cocosbuilder/CCBProxy.cpp | 4 +- .../manual/cocosbuilder/CCBProxy.h | 4 +- .../lua_cocos2dx_cocosbuilder_manual.cpp | 14 ++-- .../lua_cocos2dx_cocosdenshion_manual.cpp | 6 +- .../manual/cocostudio/CustomGUIReader.cpp | 4 +- .../manual/cocostudio/CustomGUIReader.h | 2 +- .../lua-cocos-studio-conversions.cpp | 4 +- .../cocostudio/lua-cocos-studio-conversions.h | 2 +- .../lua_cocos2dx_coco_studio_manual.cpp | 22 ++--- .../lua_cocos2dx_csloader_manual.cpp | 16 ++-- .../lua_cocos2dx_controller_manual.cpp | 12 +-- .../lua_cocos2dx_extension_manual.cpp | 14 ++-- .../manual/lua_module_register.cpp | 24 +++--- .../lua-bindings/manual/lua_module_register.h | 2 +- .../lua_cocos2dx_navmesh_conversions.cpp | 4 +- .../lua_cocos2dx_navmesh_conversions.h | 2 +- .../navmesh/lua_cocos2dx_navmesh_manual.cpp | 10 +-- .../manual/network/Lua_web_socket.cpp | 12 +-- .../network/lua_cocos2dx_network_manual.cpp | 10 +-- .../manual/network/lua_extensions.c | 2 +- .../manual/network/lua_xml_http_request.cpp | 12 +-- .../lua_cocos2dx_physics3d_manual.cpp | 10 +-- .../platform/android/CCLuaJavaBridge.cpp | 4 +- ...org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp | 4 +- .../manual/platform/ios/CCLuaObjcBridge.h | 2 +- .../manual/spine/LuaSkeletonAnimation.cpp | 8 +- .../manual/spine/LuaSkeletonAnimation.h | 2 +- .../spine/lua_cocos2dx_spine_manual.cpp | 20 ++--- .../lua-bindings/manual/tolua_fix.cpp | 4 +- ...lua_cocos2dx_experimental_video_manual.cpp | 12 +-- ...a_cocos2dx_experimental_webview_manual.cpp | 12 +-- .../manual/ui/lua_cocos2dx_ui_manual.cpp | 22 ++--- ...lua_cocos2dx_experimental_video_manual.cpp | 12 +-- .../local-storage/LocalStorage-android.cpp | 4 +- cocos/storage/local-storage/LocalStorage.cpp | 2 +- cocos/storage/local-storage/LocalStorage.h | 2 +- cocos/ui/UIEditBox/Mac/CCUIEditBoxMac.h | 4 +- .../ui/UIEditBox/Mac/CCUIMultilineTextField.h | 2 +- .../ui/UIEditBox/Mac/CCUIPasswordTextField.h | 2 +- .../UIEditBox/Mac/CCUISingleLineTextField.h | 2 +- cocos/ui/UIEditBox/UIEditBox.cpp | 4 +- cocos/ui/UIEditBox/UIEditBoxImpl-android.cpp | 4 +- cocos/ui/UIEditBox/UIEditBoxImpl-android.h | 2 +- cocos/ui/UIEditBox/UIEditBoxImpl-common.cpp | 4 +- cocos/ui/UIEditBox/UIEditBoxImpl-common.h | 2 +- cocos/ui/UIEditBox/UIEditBoxImpl-ios.h | 2 +- cocos/ui/UIEditBox/UIEditBoxImpl-linux.cpp | 4 +- cocos/ui/UIEditBox/UIEditBoxImpl-linux.h | 2 +- cocos/ui/UIEditBox/UIEditBoxImpl-mac.h | 2 +- cocos/ui/UIEditBox/UIEditBoxImpl-stub.cpp | 2 +- cocos/ui/UIEditBox/UIEditBoxImpl-win32.cpp | 4 +- cocos/ui/UIEditBox/UIEditBoxImpl-win32.h | 2 +- cocos/ui/UIEditBox/UIEditBoxImpl-winrt.cpp | 8 +- cocos/ui/UIEditBox/UIEditBoxImpl-winrt.h | 2 +- cocos/ui/UIEditBox/UIEditBoxImpl.h | 2 +- cocos/ui/UIEditBox/iOS/CCUIEditBoxIOS.h | 2 +- cocos/ui/UILayoutComponent.cpp | 8 +- cocos/ui/UILayoutManager.cpp | 4 +- cocos/ui/UIPageViewIndicator.cpp | 2 +- cocos/ui/UIPageViewIndicator.h | 2 +- cocos/ui/UIRichText.cpp | 2 +- cocos/ui/UIScale9Sprite.cpp | 2 +- cocos/ui/UIScrollViewBar.cpp | 4 +- cocos/ui/UITabControl.cpp | 2 +- cocos/ui/UIVideoPlayer-android.cpp | 2 +- cocos/ui/UIWebView-inl.h | 2 +- cocos/ui/UIWebView.cpp | 4 +- cocos/ui/UIWebViewImpl-android.cpp | 4 +- 541 files changed, 1605 insertions(+), 1605 deletions(-) diff --git a/cocos/2d/CCAtlasNode.cpp b/cocos/2d/CCAtlasNode.cpp index b94f8ed0e8..e182ad77d5 100644 --- a/cocos/2d/CCAtlasNode.cpp +++ b/cocos/2d/CCAtlasNode.cpp @@ -25,7 +25,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCAtlasNode.h" +#include "2d/CCAtlasNode.h" #include "renderer/CCTextureAtlas.h" #include "base/CCDirector.h" #include "base/CCDirector.h" diff --git a/cocos/2d/CCAutoPolygon.cpp b/cocos/2d/CCAutoPolygon.cpp index 85767489a5..aadbaf8e57 100644 --- a/cocos/2d/CCAutoPolygon.cpp +++ b/cocos/2d/CCAutoPolygon.cpp @@ -25,7 +25,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCAutoPolygon.h" +#include "2d/CCAutoPolygon.h" #include "poly2tri/poly2tri.h" #include "base/CCDirector.h" #include "renderer/CCTextureCache.h" diff --git a/cocos/2d/CCClippingRectangleNode.cpp b/cocos/2d/CCClippingRectangleNode.cpp index ce42e7ae52..f281394906 100644 --- a/cocos/2d/CCClippingRectangleNode.cpp +++ b/cocos/2d/CCClippingRectangleNode.cpp @@ -1,9 +1,9 @@ -#include "CCClippingRectangleNode.h" +#include "2d/CCClippingRectangleNode.h" #include "base/CCDirector.h" #include "renderer/CCRenderer.h" #include "math/Vec2.h" -#include "CCGLView.h" +#include "platform/CCGLView.h" NS_CC_BEGIN diff --git a/cocos/2d/CCFastTMXTiledMap.h b/cocos/2d/CCFastTMXTiledMap.h index 7df1e1586f..486b3188c9 100644 --- a/cocos/2d/CCFastTMXTiledMap.h +++ b/cocos/2d/CCFastTMXTiledMap.h @@ -27,8 +27,8 @@ THE SOFTWARE. #ifndef __CC_FAST_TMX_TILEMAP_H__ #define __CC_FAST_TMX_TILEMAP_H__ -#include "CCNode.h" -#include "CCTMXObjectGroup.h" +#include "2d/CCNode.h" +#include "2d/CCTMXObjectGroup.h" NS_CC_BEGIN diff --git a/cocos/2d/CCFontAtlas.cpp b/cocos/2d/CCFontAtlas.cpp index 7e926440da..db756f04bd 100644 --- a/cocos/2d/CCFontAtlas.cpp +++ b/cocos/2d/CCFontAtlas.cpp @@ -27,7 +27,7 @@ #if CC_TARGET_PLATFORM != CC_PLATFORM_WIN32 && CC_TARGET_PLATFORM != CC_PLATFORM_WINRT && CC_TARGET_PLATFORM != CC_PLATFORM_ANDROID #include #elif CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID -#include "android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h" +#include "platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h" #endif #include "2d/CCFontFreeType.h" #include "base/ccUTF8.h" diff --git a/cocos/2d/CCFontFNT.h b/cocos/2d/CCFontFNT.h index c38b2fbd23..62714264d2 100644 --- a/cocos/2d/CCFontFNT.h +++ b/cocos/2d/CCFontFNT.h @@ -28,7 +28,7 @@ /// @cond DO_NOT_SHOW -#include "CCFont.h" +#include "2d/CCFont.h" NS_CC_BEGIN diff --git a/cocos/2d/CCFontFreeType.cpp b/cocos/2d/CCFontFreeType.cpp index 581c74acee..b9c96b45b8 100644 --- a/cocos/2d/CCFontFreeType.cpp +++ b/cocos/2d/CCFontFreeType.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "2d/CCFontFreeType.h" #include FT_BBOX_H #include "edtaa3func.h" -#include "CCFontAtlas.h" +#include "2d/CCFontAtlas.h" #include "base/CCDirector.h" #include "base/ccUTF8.h" #include "platform/CCFileUtils.h" diff --git a/cocos/2d/CCFontFreeType.h b/cocos/2d/CCFontFreeType.h index b3406181c8..c16ef27d52 100644 --- a/cocos/2d/CCFontFreeType.h +++ b/cocos/2d/CCFontFreeType.h @@ -28,7 +28,7 @@ /// @cond DO_NOT_SHOW -#include "CCFont.h" +#include "2d/CCFont.h" #include #include diff --git a/cocos/2d/CCGLBufferedNode.cpp b/cocos/2d/CCGLBufferedNode.cpp index ec3484fcde..84fb1f1a67 100644 --- a/cocos/2d/CCGLBufferedNode.cpp +++ b/cocos/2d/CCGLBufferedNode.cpp @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCGLBufferedNode.h" +#include "2d/CCGLBufferedNode.h" GLBufferedNode::GLBufferedNode() { diff --git a/cocos/2d/CCGrabber.cpp b/cocos/2d/CCGrabber.cpp index 721e21b363..cd1ae092d1 100644 --- a/cocos/2d/CCGrabber.cpp +++ b/cocos/2d/CCGrabber.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 "CCGrabber.h" +#include "2d/CCGrabber.h" #include "base/ccMacros.h" #include "renderer/CCTexture2D.h" diff --git a/cocos/2d/CCLabelAtlas.h b/cocos/2d/CCLabelAtlas.h index 57c682bb4d..1bf128303c 100644 --- a/cocos/2d/CCLabelAtlas.h +++ b/cocos/2d/CCLabelAtlas.h @@ -27,7 +27,7 @@ THE SOFTWARE. #ifndef __CCLABEL_ATLAS_H__ #define __CCLABEL_ATLAS_H__ -#include "CCAtlasNode.h" +#include "2d/CCAtlasNode.h" #if CC_LABELATLAS_DEBUG_DRAW #include "renderer/CCCustomCommand.h" #include "2d/CCDrawNode.h" diff --git a/cocos/2d/CCProtectedNode.cpp b/cocos/2d/CCProtectedNode.cpp index bdefe1be5d..7172a1c205 100644 --- a/cocos/2d/CCProtectedNode.cpp +++ b/cocos/2d/CCProtectedNode.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCProtectedNode.h" +#include "2d/CCProtectedNode.h" #include "base/CCDirector.h" #include "2d/CCScene.h" diff --git a/cocos/3d/CCAnimationCurve.h b/cocos/3d/CCAnimationCurve.h index 78aa46bd5a..335cba6a6c 100644 --- a/cocos/3d/CCAnimationCurve.h +++ b/cocos/3d/CCAnimationCurve.h @@ -107,6 +107,6 @@ protected: NS_CC_END -#include "CCAnimationCurve.inl" +#include "3d/CCAnimationCurve.inl" #endif diff --git a/cocos/3d/CCBundle3D.cpp b/cocos/3d/CCBundle3D.cpp index 4f900690c7..3fd0374fba 100644 --- a/cocos/3d/CCBundle3D.cpp +++ b/cocos/3d/CCBundle3D.cpp @@ -28,7 +28,7 @@ THE SOFTWARE. #include "base/ccMacros.h" #include "platform/CCFileUtils.h" #include "renderer/CCGLProgram.h" -#include "CCBundleReader.h" +#include "3d/CCBundleReader.h" #include "base/CCData.h" #include "json/document.h" diff --git a/cocos/3d/CCBundleReader.cpp b/cocos/3d/CCBundleReader.cpp index 0a7eca9c43..c4360367d4 100644 --- a/cocos/3d/CCBundleReader.cpp +++ b/cocos/3d/CCBundleReader.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCBundleReader.h" +#include "3d/CCBundleReader.h" #include "platform/CCFileUtils.h" NS_CC_BEGIN diff --git a/cocos/3d/CCOBB.h b/cocos/3d/CCOBB.h index 7ea82fd2a3..48eeb0ca02 100644 --- a/cocos/3d/CCOBB.h +++ b/cocos/3d/CCOBB.h @@ -25,7 +25,7 @@ #ifndef __CC_OBB_H__ #define __CC_OBB_H__ -#include "CCAABB.h" +#include "3d/CCAABB.h" NS_CC_BEGIN diff --git a/cocos/3d/CCObjLoader.cpp b/cocos/3d/CCObjLoader.cpp index e6e83944c7..a131542bdb 100644 --- a/cocos/3d/CCObjLoader.cpp +++ b/cocos/3d/CCObjLoader.cpp @@ -38,7 +38,7 @@ #include "platform/CCFileUtils.h" #include "base/ccUtils.h" -#include "CCObjLoader.h" +#include "3d/CCObjLoader.h" namespace tinyobj { diff --git a/cocos/3d/CCPlane.cpp b/cocos/3d/CCPlane.cpp index 722ed2e91d..922d91d88c 100755 --- a/cocos/3d/CCPlane.cpp +++ b/cocos/3d/CCPlane.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCPlane.h" +#include "3d/CCPlane.h" NS_CC_BEGIN diff --git a/cocos/3d/CCTerrain.cpp b/cocos/3d/CCTerrain.cpp index 04ee8487f4..a473ca6c87 100644 --- a/cocos/3d/CCTerrain.cpp +++ b/cocos/3d/CCTerrain.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCTerrain.h" +#include "3d/CCTerrain.h" USING_NS_CC; #include diff --git a/cocos/audio/AudioEngine.cpp b/cocos/audio/AudioEngine.cpp index c224934198..f638b53554 100644 --- a/cocos/audio/AudioEngine.cpp +++ b/cocos/audio/AudioEngine.cpp @@ -31,15 +31,15 @@ #include "base/ccUtils.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID -#include "android/AudioEngine-inl.h" +#include "audio/android/AudioEngine-inl.h" #elif CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC -#include "apple/AudioEngine-inl.h" +#include "audio/apple/AudioEngine-inl.h" #elif CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 -#include "win32/AudioEngine-win32.h" +#include "audio/win32/AudioEngine-win32.h" #elif CC_TARGET_PLATFORM == CC_PLATFORM_WINRT -#include "winrt/AudioEngine-winrt.h" +#include "audio/winrt/AudioEngine-winrt.h" #elif CC_TARGET_PLATFORM == CC_PLATFORM_LINUX -#include "linux/AudioEngine-linux.h" +#include "audio/linux/AudioEngine-linux.h" #endif #define TIME_DELAY_PRECISION 0.0001 diff --git a/cocos/audio/android/AudioEngine-inl.cpp b/cocos/audio/android/AudioEngine-inl.cpp index c2930faf87..f5dbd3a64b 100644 --- a/cocos/audio/android/AudioEngine-inl.cpp +++ b/cocos/audio/android/AudioEngine-inl.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID -#include "AudioEngine-inl.h" +#include "audio/android/AudioEngine-inl.h" #include // for native asset manager diff --git a/cocos/audio/android/ccdandroidUtils.cpp b/cocos/audio/android/ccdandroidUtils.cpp index 9dbb3fe8ac..f948b74a8c 100644 --- a/cocos/audio/android/ccdandroidUtils.cpp +++ b/cocos/audio/android/ccdandroidUtils.cpp @@ -22,11 +22,11 @@ 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 "ccdandroidUtils.h" +#include "audio/android/ccdandroidUtils.h" #include #include -#include "jni/JniHelper.h" +#include "platform/android/jni/JniHelper.h" #include "platform/CCFileUtils.h" diff --git a/cocos/audio/android/cddSimpleAudioEngine.cpp b/cocos/audio/android/cddSimpleAudioEngine.cpp index c9a78fe6c4..78d5d1db4d 100644 --- a/cocos/audio/android/cddSimpleAudioEngine.cpp +++ b/cocos/audio/android/cddSimpleAudioEngine.cpp @@ -23,9 +23,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "SimpleAudioEngine.h" -#include "jni/cddandroidAndroidJavaEngine.h" -#include "ccdandroidUtils.h" +#include "audio/include/SimpleAudioEngine.h" +#include "audio/android/jni/cddandroidAndroidJavaEngine.h" +#include "audio/android/ccdandroidUtils.h" namespace CocosDenshion { diff --git a/cocos/audio/android/jni/cddandroidAndroidJavaEngine.cpp b/cocos/audio/android/jni/cddandroidAndroidJavaEngine.cpp index eb954a5eb5..ddc27202c4 100644 --- a/cocos/audio/android/jni/cddandroidAndroidJavaEngine.cpp +++ b/cocos/audio/android/jni/cddandroidAndroidJavaEngine.cpp @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "cddandroidAndroidJavaEngine.h" +#include "audio/android/jni/cddandroidAndroidJavaEngine.h" #include #include #include diff --git a/cocos/audio/android/jni/cddandroidAndroidJavaEngine.h b/cocos/audio/android/jni/cddandroidAndroidJavaEngine.h index 656399ea19..5f578d23db 100644 --- a/cocos/audio/android/jni/cddandroidAndroidJavaEngine.h +++ b/cocos/audio/android/jni/cddandroidAndroidJavaEngine.h @@ -25,7 +25,7 @@ THE SOFTWARE. #ifndef __CDDANDRIODANDROIDJAVAENGINE_H__ #define __CDDANDRIODANDROIDJAVAENGINE_H__ -#include "SimpleAudioEngine.h" +#include "audio/include/SimpleAudioEngine.h" #include "platform/android/jni/JniHelper.h" #include diff --git a/cocos/audio/apple/AudioCache.h b/cocos/audio/apple/AudioCache.h index a753ed2cda..be552f8c54 100644 --- a/cocos/audio/apple/AudioCache.h +++ b/cocos/audio/apple/AudioCache.h @@ -35,7 +35,7 @@ #include #include -#include "CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #define QUEUEBUFFER_NUM 3 #define QUEUEBUFFER_TIME_STEP 0.1 diff --git a/cocos/audio/apple/AudioEngine-inl.h b/cocos/audio/apple/AudioEngine-inl.h index 4429ebc60b..6a8c9257c1 100644 --- a/cocos/audio/apple/AudioEngine-inl.h +++ b/cocos/audio/apple/AudioEngine-inl.h @@ -31,8 +31,8 @@ #include #include "base/CCRef.h" -#include "AudioCache.h" -#include "AudioPlayer.h" +#include "audio/apple/AudioCache.h" +#include "audio/apple/AudioPlayer.h" NS_CC_BEGIN class Scheduler; diff --git a/cocos/audio/apple/AudioPlayer.h b/cocos/audio/apple/AudioPlayer.h index 0d5d2d4529..a9a4d77640 100644 --- a/cocos/audio/apple/AudioPlayer.h +++ b/cocos/audio/apple/AudioPlayer.h @@ -33,7 +33,7 @@ #include #include #import -#include "CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" NS_CC_BEGIN namespace experimental{ diff --git a/cocos/audio/include/AudioEngine.h b/cocos/audio/include/AudioEngine.h index db2e6d148f..009dba47c6 100644 --- a/cocos/audio/include/AudioEngine.h +++ b/cocos/audio/include/AudioEngine.h @@ -33,7 +33,7 @@ #include #include "platform/CCPlatformMacros.h" -#include "Export.h" +#include "audio/include/Export.h" #ifdef ERROR #undef ERROR diff --git a/cocos/audio/include/SimpleAudioEngine.h b/cocos/audio/include/SimpleAudioEngine.h index 805a9e53b3..be26e882f7 100644 --- a/cocos/audio/include/SimpleAudioEngine.h +++ b/cocos/audio/include/SimpleAudioEngine.h @@ -27,7 +27,7 @@ THE SOFTWARE. #ifndef _SIMPLE_AUDIO_ENGINE_H_ #define _SIMPLE_AUDIO_ENGINE_H_ -#include "Export.h" +#include "audio/include/Export.h" #if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1))) #define CC_DEPRECATED_ATTRIBUTE __attribute__((deprecated)) diff --git a/cocos/audio/linux/AudioEngine-linux.cpp b/cocos/audio/linux/AudioEngine-linux.cpp index 9fc54a58b4..60b4cf32c5 100644 --- a/cocos/audio/linux/AudioEngine-linux.cpp +++ b/cocos/audio/linux/AudioEngine-linux.cpp @@ -2,7 +2,7 @@ * @author cesarpachon */ #include -#include "AudioEngine-linux.h" +#include "audio/linux/AudioEngine-linux.h" #include "cocos2d.h" using namespace cocos2d; using namespace cocos2d::experimental; diff --git a/cocos/audio/linux/AudioEngine-linux.h b/cocos/audio/linux/AudioEngine-linux.h index c0625ad1f1..79d5d1595b 100644 --- a/cocos/audio/linux/AudioEngine-linux.h +++ b/cocos/audio/linux/AudioEngine-linux.h @@ -33,7 +33,7 @@ #include #include "fmod.hpp" #include "fmod_errors.h" -#include "AudioEngine.h" +#include "audio/include/AudioEngine.h" #include "base/CCRef.h" diff --git a/cocos/audio/linux/SimpleAudioEngine.cpp b/cocos/audio/linux/SimpleAudioEngine.cpp index 828271ff2f..e63f9a40d0 100644 --- a/cocos/audio/linux/SimpleAudioEngine.cpp +++ b/cocos/audio/linux/SimpleAudioEngine.cpp @@ -1,7 +1,7 @@ #include -#include "../include/SimpleAudioEngine.h" -#include "../include/AudioEngine.h" +#include "audio/include/SimpleAudioEngine.h" +#include "audio/include/AudioEngine.h" using namespace CocosDenshion; using namespace cocos2d; diff --git a/cocos/audio/openal/OpenALDecoder.cpp b/cocos/audio/openal/OpenALDecoder.cpp index 9e98cf520c..6a3091d062 100644 --- a/cocos/audio/openal/OpenALDecoder.cpp +++ b/cocos/audio/openal/OpenALDecoder.cpp @@ -1,4 +1,4 @@ -#include "OpenALDecoder.h" +#include "audio/openal/OpenALDecoder.h" #include #include #include diff --git a/cocos/audio/openal/SimpleAudioEngineOpenAL.cpp b/cocos/audio/openal/SimpleAudioEngineOpenAL.cpp index 16d95c1412..ce23af17d5 100644 --- a/cocos/audio/openal/SimpleAudioEngineOpenAL.cpp +++ b/cocos/audio/openal/SimpleAudioEngineOpenAL.cpp @@ -22,7 +22,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 "SimpleAudioEngine.h" +#include "audio/include/SimpleAudioEngine.h" #include #include @@ -39,7 +39,7 @@ THE SOFTWARE. #include #include #endif -#include "OpenALDecoder.h" +#include "audio/openal/OpenALDecoder.h" #ifdef ENABLE_MPG123 #include diff --git a/cocos/audio/win32/AudioCache.cpp b/cocos/audio/win32/AudioCache.cpp index 2ebe6e9b45..076b4913d2 100644 --- a/cocos/audio/win32/AudioCache.cpp +++ b/cocos/audio/win32/AudioCache.cpp @@ -25,7 +25,7 @@ #if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 -#include "AudioCache.h" +#include "audio/win32/AudioCache.h" #include #include #include "vorbis/codec.h" diff --git a/cocos/audio/win32/AudioCache.h b/cocos/audio/win32/AudioCache.h index 69dc96e7cc..9380c669e4 100644 --- a/cocos/audio/win32/AudioCache.h +++ b/cocos/audio/win32/AudioCache.h @@ -36,7 +36,7 @@ #else #include #endif -#include "CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" #define QUEUEBUFFER_NUM 5 #define QUEUEBUFFER_TIME_STEP 0.1f diff --git a/cocos/audio/win32/AudioEngine-win32.cpp b/cocos/audio/win32/AudioEngine-win32.cpp index ad0e851bc3..699d14c437 100644 --- a/cocos/audio/win32/AudioEngine-win32.cpp +++ b/cocos/audio/win32/AudioEngine-win32.cpp @@ -25,7 +25,7 @@ #if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 -#include "AudioEngine-win32.h" +#include "audio/win32/AudioEngine-win32.h" #ifdef OPENAL_PLAIN_INCLUDES #include "alc.h" diff --git a/cocos/audio/win32/AudioEngine-win32.h b/cocos/audio/win32/AudioEngine-win32.h index ba585e4729..8f6244e753 100644 --- a/cocos/audio/win32/AudioEngine-win32.h +++ b/cocos/audio/win32/AudioEngine-win32.h @@ -31,8 +31,8 @@ #include #include "base/CCRef.h" -#include "AudioCache.h" -#include "AudioPlayer.h" +#include "audio/win32/AudioCache.h" +#include "audio/win32/AudioPlayer.h" NS_CC_BEGIN namespace experimental{ diff --git a/cocos/audio/win32/AudioPlayer.cpp b/cocos/audio/win32/AudioPlayer.cpp index 03a6552acf..ba8ed8f063 100644 --- a/cocos/audio/win32/AudioPlayer.cpp +++ b/cocos/audio/win32/AudioPlayer.cpp @@ -24,8 +24,8 @@ #include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 -#include "AudioPlayer.h" -#include "AudioCache.h" +#include "audio/win32/AudioPlayer.h" +#include "audio/win32/AudioCache.h" #include "base/CCConsole.h" #include "platform/CCFileUtils.h" #include "mpg123.h" diff --git a/cocos/audio/win32/AudioPlayer.h b/cocos/audio/win32/AudioPlayer.h index 21ad5222a2..ed641eb360 100644 --- a/cocos/audio/win32/AudioPlayer.h +++ b/cocos/audio/win32/AudioPlayer.h @@ -36,8 +36,8 @@ #else #include #endif -#include "CCPlatformMacros.h" -#include "AudioCache.h" +#include "platform/CCPlatformMacros.h" +#include "audio/win32/AudioCache.h" NS_CC_BEGIN namespace experimental{ diff --git a/cocos/audio/win32/MciPlayer.cpp b/cocos/audio/win32/MciPlayer.cpp index 2c6be99463..e970f5b16f 100644 --- a/cocos/audio/win32/MciPlayer.cpp +++ b/cocos/audio/win32/MciPlayer.cpp @@ -1,4 +1,4 @@ -#include "MciPlayer.h" +#include "audio/win32/MciPlayer.h" #include #include "platform/CCFileUtils.h" diff --git a/cocos/audio/win32/SimpleAudioEngine.cpp b/cocos/audio/win32/SimpleAudioEngine.cpp index fed1de067f..c96394108a 100644 --- a/cocos/audio/win32/SimpleAudioEngine.cpp +++ b/cocos/audio/win32/SimpleAudioEngine.cpp @@ -22,12 +22,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 "SimpleAudioEngine.h" +#include "audio/include/SimpleAudioEngine.h" #include #include -#include "MciPlayer.h" +#include "audio/win32/MciPlayer.h" #include "cocos2d.h" USING_NS_CC; diff --git a/cocos/audio/winrt/Audio.cpp b/cocos/audio/winrt/Audio.cpp index 5da8a06272..6f6f7ea9da 100644 --- a/cocos/audio/winrt/Audio.cpp +++ b/cocos/audio/winrt/Audio.cpp @@ -16,9 +16,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -#include "Audio.h" -#include "CCCommon.h" -#include "AudioSourceReader.h" +#include "audio/winrt/Audio.h" +#include "platform/CCCommon.h" +#include "audio/winrt/AudioSourceReader.h" inline void ThrowIfFailed(HRESULT hr) { diff --git a/cocos/audio/winrt/AudioCachePlayer.cpp b/cocos/audio/winrt/AudioCachePlayer.cpp index eb479d6641..6cf24ff05e 100644 --- a/cocos/audio/winrt/AudioCachePlayer.cpp +++ b/cocos/audio/winrt/AudioCachePlayer.cpp @@ -20,7 +20,7 @@ #if CC_TARGET_PLATFORM == CC_PLATFORM_WINRT -#include "AudioCachePlayer.h" +#include "audio/winrt/AudioCachePlayer.h" #include "base/CCDirector.h" #include "base/CCScheduler.h" diff --git a/cocos/audio/winrt/AudioCachePlayer.h b/cocos/audio/winrt/AudioCachePlayer.h index 3c75a30ee8..f7e01709e7 100644 --- a/cocos/audio/winrt/AudioCachePlayer.h +++ b/cocos/audio/winrt/AudioCachePlayer.h @@ -23,7 +23,7 @@ #ifndef __AUDIO_CACHE_PLAYER_H_ #define __AUDIO_CACHE_PLAYER_H_ -#include "AudioSourceReader.h" +#include "audio/winrt/AudioSourceReader.h" NS_CC_BEGIN namespace experimental{ diff --git a/cocos/audio/winrt/AudioEngine-winrt.cpp b/cocos/audio/winrt/AudioEngine-winrt.cpp index 5242775dfe..4732031d79 100644 --- a/cocos/audio/winrt/AudioEngine-winrt.cpp +++ b/cocos/audio/winrt/AudioEngine-winrt.cpp @@ -21,7 +21,7 @@ #if CC_TARGET_PLATFORM == CC_PLATFORM_WINRT -#include "AudioEngine-winrt.h" +#include "audio/winrt/AudioEngine-winrt.h" #include "platform/CCFileUtils.h" #include "base/CCDirector.h" #include "base/CCScheduler.h" diff --git a/cocos/audio/winrt/AudioEngine-winrt.h b/cocos/audio/winrt/AudioEngine-winrt.h index bf10daf4d5..d139d0cae6 100644 --- a/cocos/audio/winrt/AudioEngine-winrt.h +++ b/cocos/audio/winrt/AudioEngine-winrt.h @@ -28,8 +28,8 @@ #include #include "base/CCRef.h" -#include "AudioEngine.h" -#include "AudioCachePlayer.h" +#include "audio/include/AudioEngine.h" +#include "audio/winrt/AudioCachePlayer.h" NS_CC_BEGIN namespace experimental{ diff --git a/cocos/audio/winrt/AudioSourceReader.cpp b/cocos/audio/winrt/AudioSourceReader.cpp index 6d05b6dee3..163d383f4a 100644 --- a/cocos/audio/winrt/AudioSourceReader.cpp +++ b/cocos/audio/winrt/AudioSourceReader.cpp @@ -23,8 +23,8 @@ #if CC_TARGET_PLATFORM == CC_PLATFORM_WINRT -#include "CCWinRTUtils.h" -#include "AudioSourceReader.h" +#include "platform/winrt/CCWinRTUtils.h" +#include "audio/winrt/AudioSourceReader.h" using namespace cocos2d; using namespace cocos2d::experimental; diff --git a/cocos/audio/winrt/AudioSourceReader.h b/cocos/audio/winrt/AudioSourceReader.h index 895f7e65c0..bd9e09aecf 100644 --- a/cocos/audio/winrt/AudioSourceReader.h +++ b/cocos/audio/winrt/AudioSourceReader.h @@ -30,7 +30,7 @@ #include #include #include -#include "MediaStreamer.h" +#include "audio/winrt/MediaStreamer.h" #include "ogg/ogg.h" #include "vorbis/vorbisfile.h" diff --git a/cocos/audio/winrt/MediaStreamer.cpp b/cocos/audio/winrt/MediaStreamer.cpp index b50091634c..886feac2c0 100644 --- a/cocos/audio/winrt/MediaStreamer.cpp +++ b/cocos/audio/winrt/MediaStreamer.cpp @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -#include "MediaStreamer.h" +#include "audio/winrt/MediaStreamer.h" #include #include diff --git a/cocos/audio/winrt/SimpleAudioEngine.cpp b/cocos/audio/winrt/SimpleAudioEngine.cpp index df69cf263c..bb39bd5a85 100644 --- a/cocos/audio/winrt/SimpleAudioEngine.cpp +++ b/cocos/audio/winrt/SimpleAudioEngine.cpp @@ -16,12 +16,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -#include "SimpleAudioEngine.h" -#include "Audio.h" +#include "audio/include/SimpleAudioEngine.h" +#include "audio/winrt/Audio.h" #include "cocos2d.h" #include -//#include "CCCommon.h" +//#include "platform/CCCommon.h" using namespace std; USING_NS_CC; diff --git a/cocos/base/CCConsole.cpp b/cocos/base/CCConsole.cpp index f0decd1552..41e16b05c1 100644 --- a/cocos/base/CCConsole.cpp +++ b/cocos/base/CCConsole.cpp @@ -44,9 +44,9 @@ #endif #define bzero(a, b) memset(a, 0, b); #if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) -#include "inet_ntop_winrt.h" -#include "inet_pton_winrt.h" -#include "CCWinRTUtils.h" +#include "platform/winrt/inet_ntop_winrt.h" +#include "platform/winrt/inet_pton_winrt.h" +#include "platform/winrt/CCWinRTUtils.h" #endif #else #include diff --git a/cocos/base/CCController-android.cpp b/cocos/base/CCController-android.cpp index 73111e1d1a..e7444a58ed 100644 --- a/cocos/base/CCController-android.cpp +++ b/cocos/base/CCController-android.cpp @@ -23,13 +23,13 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCController.h" +#include "base/CCController.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) #include -#include "ccMacros.h" -#include "CCDirector.h" -#include "jni/JniHelper.h" +#include "base/ccMacros.h" +#include "base/CCDirector.h" +#include "platform/android/jni/JniHelper.h" #include "base/CCEventController.h" NS_CC_BEGIN diff --git a/cocos/base/CCDirector.cpp b/cocos/base/CCDirector.cpp index 4699969f07..a4f6797d47 100644 --- a/cocos/base/CCDirector.cpp +++ b/cocos/base/CCDirector.cpp @@ -63,7 +63,7 @@ THE SOFTWARE. #include "platform/CCApplication.h" #if CC_ENABLE_SCRIPT_BINDING -#include "CCScriptSupport.h" +#include "base/CCScriptSupport.h" #endif /** diff --git a/cocos/base/CCEventController.cpp b/cocos/base/CCEventController.cpp index 1c0eebb1e1..4cd641479c 100644 --- a/cocos/base/CCEventController.cpp +++ b/cocos/base/CCEventController.cpp @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCEventController.h" +#include "base/CCEventController.h" NS_CC_BEGIN diff --git a/cocos/base/CCNinePatchImageParser.cpp b/cocos/base/CCNinePatchImageParser.cpp index 9a33d7081b..eaa72d288e 100644 --- a/cocos/base/CCNinePatchImageParser.cpp +++ b/cocos/base/CCNinePatchImageParser.cpp @@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCNinePatchImageParser.h" +#include "base/CCNinePatchImageParser.h" #include "platform/CCImage.h" #include "base/CCDirector.h" diff --git a/cocos/base/CCProperties.cpp b/cocos/base/CCProperties.cpp index 0af10fbab1..232eadf45e 100644 --- a/cocos/base/CCProperties.cpp +++ b/cocos/base/CCProperties.cpp @@ -20,7 +20,7 @@ */ -#include "CCProperties.h" +#include "base/CCProperties.h" #include diff --git a/cocos/base/CCStencilStateManager.cpp b/cocos/base/CCStencilStateManager.cpp index 0525054780..3150a16efb 100644 --- a/cocos/base/CCStencilStateManager.cpp +++ b/cocos/base/CCStencilStateManager.cpp @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCStencilStateManager.hpp" +#include "base/CCStencilStateManager.hpp" #include "base/CCDirector.h" #include "renderer/CCGLProgramCache.h" #include "renderer/ccGLStateCache.h" diff --git a/cocos/base/CCUserDefault-winrt.cpp b/cocos/base/CCUserDefault-winrt.cpp index 01f1f915bc..f065d9902c 100644 --- a/cocos/base/CCUserDefault-winrt.cpp +++ b/cocos/base/CCUserDefault-winrt.cpp @@ -29,7 +29,7 @@ THE SOFTWARE. #include "platform/CCFileUtils.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) -#include "CCWinRTUtils.h" +#include "platform/winrt/CCWinRTUtils.h" using namespace Windows::Storage; using namespace Windows::Foundation; diff --git a/cocos/base/TGAlib.cpp b/cocos/base/TGAlib.cpp index 16462d5a60..5f41b84b13 100644 --- a/cocos/base/TGAlib.cpp +++ b/cocos/base/TGAlib.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include #include -#include "TGAlib.h" +#include "base/TGAlib.h" #include "base/CCData.h" #include "platform/CCFileUtils.h" diff --git a/cocos/base/allocator/CCAllocatorDiagnostics.cpp b/cocos/base/allocator/CCAllocatorDiagnostics.cpp index 66d53554c9..4268949ca4 100644 --- a/cocos/base/allocator/CCAllocatorDiagnostics.cpp +++ b/cocos/base/allocator/CCAllocatorDiagnostics.cpp @@ -24,8 +24,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCAllocatorDiagnostics.h" -#include "CCAllocatorGlobal.h" +#include "base/allocator/CCAllocatorDiagnostics.h" +#include "base/allocator/CCAllocatorGlobal.h" NS_CC_BEGIN NS_CC_ALLOCATOR_BEGIN diff --git a/cocos/base/atitc.cpp b/cocos/base/atitc.cpp index d098b084bf..b234d40dc6 100644 --- a/cocos/base/atitc.cpp +++ b/cocos/base/atitc.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "atitc.h" +#include "base/atitc.h" //Decode ATITC encode block to 4x4 RGB32 pixels static void atitc_decode_block(uint8_t **blockData, diff --git a/cocos/base/ccRandom.cpp b/cocos/base/ccRandom.cpp index b14783f2e9..3f78ac2c50 100644 --- a/cocos/base/ccRandom.cpp +++ b/cocos/base/ccRandom.cpp @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "ccRandom.h" +#include "base/ccRandom.h" std::mt19937 &cocos2d::RandomHelper::getEngine() { static std::random_device seed_gen; diff --git a/cocos/base/pvr.cpp b/cocos/base/pvr.cpp index 3a59860c6f..dd2926a7d6 100644 --- a/cocos/base/pvr.cpp +++ b/cocos/base/pvr.cpp @@ -18,7 +18,7 @@ #include #include #include -#include "pvr.h" +#include "base/pvr.h" #define PVRT_MIN(a,b) (((a) < (b)) ? (a) : (b)) #define PVRT_MAX(a,b) (((a) > (b)) ? (a) : (b)) diff --git a/cocos/base/s3tc.cpp b/cocos/base/s3tc.cpp index 067c00aa11..60abf65e9e 100644 --- a/cocos/base/s3tc.cpp +++ b/cocos/base/s3tc.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "s3tc.h" +#include "base/s3tc.h" //Decode S3TC encode block to 4x4 RGB32 pixels static void s3tc_decode_block(uint8_t **blockData, diff --git a/cocos/deprecated/CCArray.cpp b/cocos/deprecated/CCArray.cpp index c6174987ce..14d3fa2dbb 100644 --- a/cocos/deprecated/CCArray.cpp +++ b/cocos/deprecated/CCArray.cpp @@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCArray.h" +#include "deprecated/CCArray.h" #include "deprecated/CCString.h" #include "platform/CCFileUtils.h" diff --git a/cocos/deprecated/CCDictionary.cpp b/cocos/deprecated/CCDictionary.cpp index 7141eb3a63..43d18e023f 100644 --- a/cocos/deprecated/CCDictionary.cpp +++ b/cocos/deprecated/CCDictionary.cpp @@ -23,16 +23,16 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCDictionary.h" +#include "deprecated/CCDictionary.h" #include "deprecated/CCString.h" -#include "CCInteger.h" +#include "deprecated/CCInteger.h" #include "platform/CCFileUtils.h" #include "deprecated/CCString.h" -#include "CCBool.h" -#include "CCInteger.h" -#include "CCFloat.h" -#include "CCDouble.h" -#include "CCArray.h" +#include "deprecated/CCBool.h" +#include "deprecated/CCInteger.h" +#include "deprecated/CCFloat.h" +#include "deprecated/CCDouble.h" +#include "deprecated/CCArray.h" using namespace std; diff --git a/cocos/deprecated/CCDictionary.h b/cocos/deprecated/CCDictionary.h index 40243aa374..ecbdbadc43 100644 --- a/cocos/deprecated/CCDictionary.h +++ b/cocos/deprecated/CCDictionary.h @@ -29,7 +29,7 @@ THE SOFTWARE. #include "base/uthash.h" #include "base/CCRef.h" -#include "CCArray.h" +#include "deprecated/CCArray.h" #include "deprecated/CCString.h" NS_CC_BEGIN diff --git a/cocos/deprecated/CCSet.cpp b/cocos/deprecated/CCSet.cpp index 1fe59c66ad..67313397b3 100644 --- a/cocos/deprecated/CCSet.cpp +++ b/cocos/deprecated/CCSet.cpp @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCSet.h" +#include "deprecated/CCSet.h" using namespace std; diff --git a/cocos/deprecated/CCString.cpp b/cocos/deprecated/CCString.cpp index ba548d77c0..3381a96cb9 100644 --- a/cocos/deprecated/CCString.cpp +++ b/cocos/deprecated/CCString.cpp @@ -28,7 +28,7 @@ Copyright (c) 2013-2014 Chukong Technologies #include "base/ccMacros.h" #include #include -#include "CCArray.h" +#include "deprecated/CCArray.h" #include "base/ccUtils.h" NS_CC_BEGIN diff --git a/cocos/deprecated/CCString.h b/cocos/deprecated/CCString.h index d9f1e8861a..02da8330d9 100644 --- a/cocos/deprecated/CCString.h +++ b/cocos/deprecated/CCString.h @@ -35,7 +35,7 @@ THE SOFTWARE. #include #include #include -#include "CCArray.h" +#include "deprecated/CCArray.h" #include "base/CCRef.h" NS_CC_BEGIN diff --git a/cocos/editor-support/cocosbuilder/CCBAnimationManager.cpp b/cocos/editor-support/cocosbuilder/CCBAnimationManager.cpp index f3d0806fe7..69ffd21fff 100644 --- a/cocos/editor-support/cocosbuilder/CCBAnimationManager.cpp +++ b/cocos/editor-support/cocosbuilder/CCBAnimationManager.cpp @@ -1,9 +1,9 @@ -#include "CCBAnimationManager.h" +#include "editor-support/cocosbuilder/CCBAnimationManager.h" -#include "CCBReader.h" -#include "CCNode+CCBRelativePositioning.h" +#include "editor-support/cocosbuilder/CCBReader.h" +#include "editor-support/cocosbuilder/CCNode+CCBRelativePositioning.h" #include "audio/include/SimpleAudioEngine.h" -#include "CCBSelectorResolver.h" +#include "editor-support/cocosbuilder/CCBSelectorResolver.h" #include #include diff --git a/cocos/editor-support/cocosbuilder/CCBAnimationManager.h b/cocos/editor-support/cocosbuilder/CCBAnimationManager.h index 59138066e9..34978e62fc 100644 --- a/cocos/editor-support/cocosbuilder/CCBAnimationManager.h +++ b/cocos/editor-support/cocosbuilder/CCBAnimationManager.h @@ -7,9 +7,9 @@ #include "2d/CCActionEase.h" #include "extensions/ExtensionMacros.h" -#include "CCBSequence.h" -#include "CCBKeyframe.h" -#include "CCBSequenceProperty.h" +#include "editor-support/cocosbuilder/CCBSequence.h" +#include "editor-support/cocosbuilder/CCBKeyframe.h" +#include "editor-support/cocosbuilder/CCBSequenceProperty.h" #include "extensions/GUI/CCControlExtension/CCControl.h" namespace cocosbuilder { diff --git a/cocos/editor-support/cocosbuilder/CCBFileLoader.cpp b/cocos/editor-support/cocosbuilder/CCBFileLoader.cpp index 549b369f4e..fca7a59a2a 100644 --- a/cocos/editor-support/cocosbuilder/CCBFileLoader.cpp +++ b/cocos/editor-support/cocosbuilder/CCBFileLoader.cpp @@ -1,4 +1,4 @@ -#include "CCBFileLoader.h" +#include "editor-support/cocosbuilder/CCBFileLoader.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocosbuilder/CCBFileLoader.h b/cocos/editor-support/cocosbuilder/CCBFileLoader.h index 1c5c9c87a5..cd4d3229c5 100644 --- a/cocos/editor-support/cocosbuilder/CCBFileLoader.h +++ b/cocos/editor-support/cocosbuilder/CCBFileLoader.h @@ -1,7 +1,7 @@ #ifndef _CCB_CCBFILELOADER_H_ #define _CCB_CCBFILELOADER_H_ -#include "CCNodeLoader.h" +#include "editor-support/cocosbuilder/CCNodeLoader.h" namespace cocosbuilder { diff --git a/cocos/editor-support/cocosbuilder/CCBKeyframe.cpp b/cocos/editor-support/cocosbuilder/CCBKeyframe.cpp index bd4040bbde..6c3e508110 100644 --- a/cocos/editor-support/cocosbuilder/CCBKeyframe.cpp +++ b/cocos/editor-support/cocosbuilder/CCBKeyframe.cpp @@ -1,4 +1,4 @@ -#include "CCBKeyframe.h" +#include "editor-support/cocosbuilder/CCBKeyframe.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocosbuilder/CCBReader.cpp b/cocos/editor-support/cocosbuilder/CCBReader.cpp index 0c37e1b00b..55de0e8a36 100644 --- a/cocos/editor-support/cocosbuilder/CCBReader.cpp +++ b/cocos/editor-support/cocosbuilder/CCBReader.cpp @@ -7,15 +7,15 @@ #include "2d/CCSpriteFrameCache.h" #include "renderer/CCTextureCache.h" -#include "CCBReader.h" -#include "CCNodeLoader.h" -#include "CCNodeLoaderLibrary.h" -#include "CCNodeLoaderListener.h" -#include "CCBMemberVariableAssigner.h" -#include "CCBSelectorResolver.h" -#include "CCBAnimationManager.h" -#include "CCBSequenceProperty.h" -#include "CCBKeyframe.h" +#include "editor-support/cocosbuilder/CCBReader.h" +#include "editor-support/cocosbuilder/CCNodeLoader.h" +#include "editor-support/cocosbuilder/CCNodeLoaderLibrary.h" +#include "editor-support/cocosbuilder/CCNodeLoaderListener.h" +#include "editor-support/cocosbuilder/CCBMemberVariableAssigner.h" +#include "editor-support/cocosbuilder/CCBSelectorResolver.h" +#include "editor-support/cocosbuilder/CCBAnimationManager.h" +#include "editor-support/cocosbuilder/CCBSequenceProperty.h" +#include "editor-support/cocosbuilder/CCBKeyframe.h" #include using namespace cocos2d; diff --git a/cocos/editor-support/cocosbuilder/CCBReader.h b/cocos/editor-support/cocosbuilder/CCBReader.h index 771e677e7a..4b93f946d2 100644 --- a/cocos/editor-support/cocosbuilder/CCBReader.h +++ b/cocos/editor-support/cocosbuilder/CCBReader.h @@ -7,9 +7,9 @@ #include "2d/CCNode.h" #include "base/CCData.h" #include "base/CCMap.h" -#include "CCBSequence.h" +#include "editor-support/cocosbuilder/CCBSequence.h" #include "extensions/GUI/CCControlExtension/CCControl.h" -#include "cocosbuilder/CCBAnimationManager.h" +#include "editor-support/cocosbuilder/CCBAnimationManager.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) #ifdef ABSOLUTE diff --git a/cocos/editor-support/cocosbuilder/CCBSequence.cpp b/cocos/editor-support/cocosbuilder/CCBSequence.cpp index 8e1659f5b0..7c3d8711fc 100644 --- a/cocos/editor-support/cocosbuilder/CCBSequence.cpp +++ b/cocos/editor-support/cocosbuilder/CCBSequence.cpp @@ -1,4 +1,4 @@ -#include "CCBSequence.h" +#include "editor-support/cocosbuilder/CCBSequence.h" using namespace cocos2d; using namespace std; diff --git a/cocos/editor-support/cocosbuilder/CCBSequence.h b/cocos/editor-support/cocosbuilder/CCBSequence.h index 514b38a712..7ccadd4960 100644 --- a/cocos/editor-support/cocosbuilder/CCBSequence.h +++ b/cocos/editor-support/cocosbuilder/CCBSequence.h @@ -4,7 +4,7 @@ #include #include "base/CCRef.h" -#include "CCBSequenceProperty.h" +#include "editor-support/cocosbuilder/CCBSequenceProperty.h" namespace cocosbuilder { diff --git a/cocos/editor-support/cocosbuilder/CCBSequenceProperty.cpp b/cocos/editor-support/cocosbuilder/CCBSequenceProperty.cpp index fa74e33881..57d7aea23d 100644 --- a/cocos/editor-support/cocosbuilder/CCBSequenceProperty.cpp +++ b/cocos/editor-support/cocosbuilder/CCBSequenceProperty.cpp @@ -1,4 +1,4 @@ -#include "CCBSequenceProperty.h" +#include "editor-support/cocosbuilder/CCBSequenceProperty.h" using namespace cocos2d; using namespace std; diff --git a/cocos/editor-support/cocosbuilder/CCBSequenceProperty.h b/cocos/editor-support/cocosbuilder/CCBSequenceProperty.h index b01c722bea..1a6ae4dda0 100644 --- a/cocos/editor-support/cocosbuilder/CCBSequenceProperty.h +++ b/cocos/editor-support/cocosbuilder/CCBSequenceProperty.h @@ -3,7 +3,7 @@ #include "base/CCRef.h" #include "base/CCVector.h" -#include "CCBKeyframe.h" +#include "editor-support/cocosbuilder/CCBKeyframe.h" namespace cocosbuilder { diff --git a/cocos/editor-support/cocosbuilder/CCControlButtonLoader.cpp b/cocos/editor-support/cocosbuilder/CCControlButtonLoader.cpp index ba2d530f87..b876f83448 100644 --- a/cocos/editor-support/cocosbuilder/CCControlButtonLoader.cpp +++ b/cocos/editor-support/cocosbuilder/CCControlButtonLoader.cpp @@ -1,4 +1,4 @@ -#include "CCControlButtonLoader.h" +#include "editor-support/cocosbuilder/CCControlButtonLoader.h" using namespace cocos2d; using namespace cocos2d::extension; diff --git a/cocos/editor-support/cocosbuilder/CCControlButtonLoader.h b/cocos/editor-support/cocosbuilder/CCControlButtonLoader.h index 5a0962ead8..a4ff2e95f9 100644 --- a/cocos/editor-support/cocosbuilder/CCControlButtonLoader.h +++ b/cocos/editor-support/cocosbuilder/CCControlButtonLoader.h @@ -1,7 +1,7 @@ #ifndef _CCB_CCCONTROLBUTTONLOADER_H_ #define _CCB_CCCONTROLBUTTONLOADER_H_ -#include "CCControlLoader.h" +#include "editor-support/cocosbuilder/CCControlLoader.h" #include "extensions//GUI/CCControlExtension/CCControlButton.h" namespace cocosbuilder { diff --git a/cocos/editor-support/cocosbuilder/CCControlLoader.cpp b/cocos/editor-support/cocosbuilder/CCControlLoader.cpp index 9d65768562..5fae57d61d 100644 --- a/cocos/editor-support/cocosbuilder/CCControlLoader.cpp +++ b/cocos/editor-support/cocosbuilder/CCControlLoader.cpp @@ -1,4 +1,4 @@ -#include "CCControlLoader.h" +#include "editor-support/cocosbuilder/CCControlLoader.h" using namespace cocos2d; using namespace cocos2d::extension; diff --git a/cocos/editor-support/cocosbuilder/CCControlLoader.h b/cocos/editor-support/cocosbuilder/CCControlLoader.h index 2330cf3025..03b537162a 100644 --- a/cocos/editor-support/cocosbuilder/CCControlLoader.h +++ b/cocos/editor-support/cocosbuilder/CCControlLoader.h @@ -1,7 +1,7 @@ #ifndef _CCB_CCCONTROLLOADER_H_ #define _CCB_CCCONTROLLOADER_H_ -#include "CCNodeLoader.h" +#include "editor-support/cocosbuilder/CCNodeLoader.h" #include "extensions/GUI/CCControlExtension/CCControl.h" namespace cocosbuilder { diff --git a/cocos/editor-support/cocosbuilder/CCLabelBMFontLoader.cpp b/cocos/editor-support/cocosbuilder/CCLabelBMFontLoader.cpp index 2eec094dd5..b9a5539fa4 100644 --- a/cocos/editor-support/cocosbuilder/CCLabelBMFontLoader.cpp +++ b/cocos/editor-support/cocosbuilder/CCLabelBMFontLoader.cpp @@ -1,4 +1,4 @@ -#include "CCLabelBMFontLoader.h" +#include "editor-support/cocosbuilder/CCLabelBMFontLoader.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocosbuilder/CCLabelBMFontLoader.h b/cocos/editor-support/cocosbuilder/CCLabelBMFontLoader.h index a063f3ab8f..c11bebfbdd 100644 --- a/cocos/editor-support/cocosbuilder/CCLabelBMFontLoader.h +++ b/cocos/editor-support/cocosbuilder/CCLabelBMFontLoader.h @@ -4,7 +4,7 @@ #include "base/CCRef.h" #include "2d/CCLabel.h" -#include "CCNodeLoader.h" +#include "editor-support/cocosbuilder/CCNodeLoader.h" namespace cocosbuilder { diff --git a/cocos/editor-support/cocosbuilder/CCLabelTTFLoader.cpp b/cocos/editor-support/cocosbuilder/CCLabelTTFLoader.cpp index 53c11df6f3..ea6ed65325 100644 --- a/cocos/editor-support/cocosbuilder/CCLabelTTFLoader.cpp +++ b/cocos/editor-support/cocosbuilder/CCLabelTTFLoader.cpp @@ -1,4 +1,4 @@ -#include "CCLabelTTFLoader.h" +#include "editor-support/cocosbuilder/CCLabelTTFLoader.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocosbuilder/CCLabelTTFLoader.h b/cocos/editor-support/cocosbuilder/CCLabelTTFLoader.h index f58789d9a8..0b6ae52357 100644 --- a/cocos/editor-support/cocosbuilder/CCLabelTTFLoader.h +++ b/cocos/editor-support/cocosbuilder/CCLabelTTFLoader.h @@ -4,7 +4,7 @@ #include "base/CCRef.h" #include "2d/CCLabel.h" -#include "CCNodeLoader.h" +#include "editor-support/cocosbuilder/CCNodeLoader.h" namespace cocosbuilder { diff --git a/cocos/editor-support/cocosbuilder/CCLayerColorLoader.cpp b/cocos/editor-support/cocosbuilder/CCLayerColorLoader.cpp index 8c5d20860e..137172633c 100644 --- a/cocos/editor-support/cocosbuilder/CCLayerColorLoader.cpp +++ b/cocos/editor-support/cocosbuilder/CCLayerColorLoader.cpp @@ -1,4 +1,4 @@ -#include "CCLayerColorLoader.h" +#include "editor-support/cocosbuilder/CCLayerColorLoader.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocosbuilder/CCLayerColorLoader.h b/cocos/editor-support/cocosbuilder/CCLayerColorLoader.h index 6eb0b73061..0f1404b47c 100644 --- a/cocos/editor-support/cocosbuilder/CCLayerColorLoader.h +++ b/cocos/editor-support/cocosbuilder/CCLayerColorLoader.h @@ -1,7 +1,7 @@ #ifndef _CCB_CCLAYERCOLORLOADER_H_ #define _CCB_CCLAYERCOLORLOADER_H_ -#include "CCLayerLoader.h" +#include "editor-support/cocosbuilder/CCLayerLoader.h" namespace cocosbuilder { diff --git a/cocos/editor-support/cocosbuilder/CCLayerGradientLoader.cpp b/cocos/editor-support/cocosbuilder/CCLayerGradientLoader.cpp index 3886e46fc8..bf9af1edcf 100644 --- a/cocos/editor-support/cocosbuilder/CCLayerGradientLoader.cpp +++ b/cocos/editor-support/cocosbuilder/CCLayerGradientLoader.cpp @@ -1,4 +1,4 @@ -#include "CCLayerGradientLoader.h" +#include "editor-support/cocosbuilder/CCLayerGradientLoader.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocosbuilder/CCLayerGradientLoader.h b/cocos/editor-support/cocosbuilder/CCLayerGradientLoader.h index ffa82d35ef..e590f211ce 100644 --- a/cocos/editor-support/cocosbuilder/CCLayerGradientLoader.h +++ b/cocos/editor-support/cocosbuilder/CCLayerGradientLoader.h @@ -1,7 +1,7 @@ #ifndef _CCB_CCLAYERGRADIENTLOADER_H_ #define _CCB_CCLAYERGRADIENTLOADER_H_ -#include "CCLayerLoader.h" +#include "editor-support/cocosbuilder/CCLayerLoader.h" namespace cocosbuilder { diff --git a/cocos/editor-support/cocosbuilder/CCLayerLoader.cpp b/cocos/editor-support/cocosbuilder/CCLayerLoader.cpp index 9cea820ede..bf14d5270d 100644 --- a/cocos/editor-support/cocosbuilder/CCLayerLoader.cpp +++ b/cocos/editor-support/cocosbuilder/CCLayerLoader.cpp @@ -1,4 +1,4 @@ -#include "CCLayerLoader.h" +#include "editor-support/cocosbuilder/CCLayerLoader.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocosbuilder/CCLayerLoader.h b/cocos/editor-support/cocosbuilder/CCLayerLoader.h index 1a98cf0a51..3658681a23 100644 --- a/cocos/editor-support/cocosbuilder/CCLayerLoader.h +++ b/cocos/editor-support/cocosbuilder/CCLayerLoader.h @@ -1,7 +1,7 @@ #ifndef _CCB_CCLAYERLOADER_H_ #define _CCB_CCLAYERLOADER_H_ -#include "CCNodeLoader.h" +#include "editor-support/cocosbuilder/CCNodeLoader.h" namespace cocosbuilder { diff --git a/cocos/editor-support/cocosbuilder/CCMenuItemImageLoader.cpp b/cocos/editor-support/cocosbuilder/CCMenuItemImageLoader.cpp index cd093fdb59..6caefb605e 100644 --- a/cocos/editor-support/cocosbuilder/CCMenuItemImageLoader.cpp +++ b/cocos/editor-support/cocosbuilder/CCMenuItemImageLoader.cpp @@ -1,4 +1,4 @@ -#include "CCMenuItemImageLoader.h" +#include "editor-support/cocosbuilder/CCMenuItemImageLoader.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocosbuilder/CCMenuItemImageLoader.h b/cocos/editor-support/cocosbuilder/CCMenuItemImageLoader.h index 1ebfbee1d5..593fded533 100644 --- a/cocos/editor-support/cocosbuilder/CCMenuItemImageLoader.h +++ b/cocos/editor-support/cocosbuilder/CCMenuItemImageLoader.h @@ -1,7 +1,7 @@ #ifndef _CCB_CCMENUITEMIMAGELOADER_H_ #define _CCB_CCMENUITEMIMAGELOADER_H_ -#include "CCMenuItemLoader.h" +#include "editor-support/cocosbuilder/CCMenuItemLoader.h" namespace cocosbuilder { diff --git a/cocos/editor-support/cocosbuilder/CCMenuItemLoader.cpp b/cocos/editor-support/cocosbuilder/CCMenuItemLoader.cpp index 6afd3304e2..5fbd4f2a52 100644 --- a/cocos/editor-support/cocosbuilder/CCMenuItemLoader.cpp +++ b/cocos/editor-support/cocosbuilder/CCMenuItemLoader.cpp @@ -1,4 +1,4 @@ -#include "CCMenuItemLoader.h" +#include "editor-support/cocosbuilder/CCMenuItemLoader.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocosbuilder/CCMenuItemLoader.h b/cocos/editor-support/cocosbuilder/CCMenuItemLoader.h index c24df2db6a..45007d02e7 100644 --- a/cocos/editor-support/cocosbuilder/CCMenuItemLoader.h +++ b/cocos/editor-support/cocosbuilder/CCMenuItemLoader.h @@ -4,7 +4,7 @@ #include "base/CCRef.h" #include "2d/CCMenuItem.h" -#include "CCLayerLoader.h" +#include "editor-support/cocosbuilder/CCLayerLoader.h" namespace cocosbuilder { diff --git a/cocos/editor-support/cocosbuilder/CCMenuLoader.h b/cocos/editor-support/cocosbuilder/CCMenuLoader.h index e0c70d6907..f825cb5e56 100644 --- a/cocos/editor-support/cocosbuilder/CCMenuLoader.h +++ b/cocos/editor-support/cocosbuilder/CCMenuLoader.h @@ -1,7 +1,7 @@ #ifndef _CCB_CCMENULOADER_H_ #define _CCB_CCMENULOADER_H_ -#include "CCLayerLoader.h" +#include "editor-support/cocosbuilder/CCLayerLoader.h" #include "base/CCRef.h" #include "2d/CCMenu.h" diff --git a/cocos/editor-support/cocosbuilder/CCNode+CCBRelativePositioning.cpp b/cocos/editor-support/cocosbuilder/CCNode+CCBRelativePositioning.cpp index d3a844591d..9114923e7d 100644 --- a/cocos/editor-support/cocosbuilder/CCNode+CCBRelativePositioning.cpp +++ b/cocos/editor-support/cocosbuilder/CCNode+CCBRelativePositioning.cpp @@ -1,5 +1,5 @@ -#include "CCNode+CCBRelativePositioning.h" -#include "CCBReader.h" +#include "editor-support/cocosbuilder/CCNode+CCBRelativePositioning.h" +#include "editor-support/cocosbuilder/CCBReader.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocosbuilder/CCNode+CCBRelativePositioning.h b/cocos/editor-support/cocosbuilder/CCNode+CCBRelativePositioning.h index 37eaadc918..3330b02bf8 100644 --- a/cocos/editor-support/cocosbuilder/CCNode+CCBRelativePositioning.h +++ b/cocos/editor-support/cocosbuilder/CCNode+CCBRelativePositioning.h @@ -1,7 +1,7 @@ #ifndef __CCB_CCNODE_RELATIVEPOSITIONING_H__ #define __CCB_CCNODE_RELATIVEPOSITIONING_H__ -#include "CCBReader.h" +#include "editor-support/cocosbuilder/CCBReader.h" namespace cocosbuilder { diff --git a/cocos/editor-support/cocosbuilder/CCNodeLoader.cpp b/cocos/editor-support/cocosbuilder/CCNodeLoader.cpp index 3dbb92507a..548ecb399c 100644 --- a/cocos/editor-support/cocosbuilder/CCNodeLoader.cpp +++ b/cocos/editor-support/cocosbuilder/CCNodeLoader.cpp @@ -1,8 +1,8 @@ -#include "CCNodeLoader.h" -#include "CCBSelectorResolver.h" -#include "CCBMemberVariableAssigner.h" -#include "CCBAnimationManager.h" -#include "CCNode+CCBRelativePositioning.h" +#include "editor-support/cocosbuilder/CCNodeLoader.h" +#include "editor-support/cocosbuilder/CCBSelectorResolver.h" +#include "editor-support/cocosbuilder/CCBMemberVariableAssigner.h" +#include "editor-support/cocosbuilder/CCBAnimationManager.h" +#include "editor-support/cocosbuilder/CCNode+CCBRelativePositioning.h" #include "deprecated/CCArray.h" #include "deprecated/CCString.h" #include "base/CCDirector.h" diff --git a/cocos/editor-support/cocosbuilder/CCNodeLoader.h b/cocos/editor-support/cocosbuilder/CCNodeLoader.h index 979ee210c8..afe28e2238 100644 --- a/cocos/editor-support/cocosbuilder/CCNodeLoader.h +++ b/cocos/editor-support/cocosbuilder/CCNodeLoader.h @@ -2,7 +2,7 @@ #define _CCB_CCNODELOADER_H_ #include "extensions/GUI/CCControlExtension/CCInvocation.h" -#include "CCBReader.h" +#include "editor-support/cocosbuilder/CCBReader.h" #include "extensions/GUI/CCControlExtension/CCControl.h" namespace cocosbuilder { diff --git a/cocos/editor-support/cocosbuilder/CCNodeLoaderLibrary.cpp b/cocos/editor-support/cocosbuilder/CCNodeLoaderLibrary.cpp index 14186d2f49..21cd51061e 100644 --- a/cocos/editor-support/cocosbuilder/CCNodeLoaderLibrary.cpp +++ b/cocos/editor-support/cocosbuilder/CCNodeLoaderLibrary.cpp @@ -1,19 +1,19 @@ -#include "CCNodeLoaderLibrary.h" +#include "editor-support/cocosbuilder/CCNodeLoaderLibrary.h" -#include "CCLayerLoader.h" -#include "CCLayerColorLoader.h" -#include "CCLayerGradientLoader.h" -#include "CCLabelBMFontLoader.h" -#include "CCLabelTTFLoader.h" -#include "CCSpriteLoader.h" -#include "CCScale9SpriteLoader.h" -#include "CCBFileLoader.h" -#include "CCMenuLoader.h" -#include "CCMenuItemLoader.h" -#include "CCMenuItemImageLoader.h" -#include "CCControlButtonLoader.h" -#include "CCParticleSystemQuadLoader.h" -#include "CCScrollViewLoader.h" +#include "editor-support/cocosbuilder/CCLayerLoader.h" +#include "editor-support/cocosbuilder/CCLayerColorLoader.h" +#include "editor-support/cocosbuilder/CCLayerGradientLoader.h" +#include "editor-support/cocosbuilder/CCLabelBMFontLoader.h" +#include "editor-support/cocosbuilder/CCLabelTTFLoader.h" +#include "editor-support/cocosbuilder/CCSpriteLoader.h" +#include "editor-support/cocosbuilder/CCScale9SpriteLoader.h" +#include "editor-support/cocosbuilder/CCBFileLoader.h" +#include "editor-support/cocosbuilder/CCMenuLoader.h" +#include "editor-support/cocosbuilder/CCMenuItemLoader.h" +#include "editor-support/cocosbuilder/CCMenuItemImageLoader.h" +#include "editor-support/cocosbuilder/CCControlButtonLoader.h" +#include "editor-support/cocosbuilder/CCParticleSystemQuadLoader.h" +#include "editor-support/cocosbuilder/CCScrollViewLoader.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocosbuilder/CCNodeLoaderLibrary.h b/cocos/editor-support/cocosbuilder/CCNodeLoaderLibrary.h index a64917d838..9f836c819c 100644 --- a/cocos/editor-support/cocosbuilder/CCNodeLoaderLibrary.h +++ b/cocos/editor-support/cocosbuilder/CCNodeLoaderLibrary.h @@ -1,7 +1,7 @@ #ifndef _CCB_CCNODELOADERLIBRARY_H_ #define _CCB_CCNODELOADERLIBRARY_H_ -#include "CCBReader.h" +#include "editor-support/cocosbuilder/CCBReader.h" namespace cocosbuilder { diff --git a/cocos/editor-support/cocosbuilder/CCParticleSystemQuadLoader.cpp b/cocos/editor-support/cocosbuilder/CCParticleSystemQuadLoader.cpp index fd8918cbf5..ee36c487df 100644 --- a/cocos/editor-support/cocosbuilder/CCParticleSystemQuadLoader.cpp +++ b/cocos/editor-support/cocosbuilder/CCParticleSystemQuadLoader.cpp @@ -1,4 +1,4 @@ -#include "CCParticleSystemQuadLoader.h" +#include "editor-support/cocosbuilder/CCParticleSystemQuadLoader.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocosbuilder/CCParticleSystemQuadLoader.h b/cocos/editor-support/cocosbuilder/CCParticleSystemQuadLoader.h index 51f463a4e0..6f22eb7f21 100644 --- a/cocos/editor-support/cocosbuilder/CCParticleSystemQuadLoader.h +++ b/cocos/editor-support/cocosbuilder/CCParticleSystemQuadLoader.h @@ -4,7 +4,7 @@ #include "base/CCRef.h" #include "2d/CCParticleSystemQuad.h" -#include "CCNodeLoader.h" +#include "editor-support/cocosbuilder/CCNodeLoader.h" namespace cocosbuilder { diff --git a/cocos/editor-support/cocosbuilder/CCScale9SpriteLoader.cpp b/cocos/editor-support/cocosbuilder/CCScale9SpriteLoader.cpp index 186708fc34..e05b25c7a3 100644 --- a/cocos/editor-support/cocosbuilder/CCScale9SpriteLoader.cpp +++ b/cocos/editor-support/cocosbuilder/CCScale9SpriteLoader.cpp @@ -1,4 +1,4 @@ -#include "CCScale9SpriteLoader.h" +#include "editor-support/cocosbuilder/CCScale9SpriteLoader.h" using namespace cocos2d; using namespace cocos2d::extension; diff --git a/cocos/editor-support/cocosbuilder/CCScale9SpriteLoader.h b/cocos/editor-support/cocosbuilder/CCScale9SpriteLoader.h index 35bf229776..1235c9ec5f 100644 --- a/cocos/editor-support/cocosbuilder/CCScale9SpriteLoader.h +++ b/cocos/editor-support/cocosbuilder/CCScale9SpriteLoader.h @@ -1,8 +1,8 @@ #ifndef _CCB_CCSCALE9SPRITELOADER_H_ #define _CCB_CCSCALE9SPRITELOADER_H_ -#include "CCNodeLoader.h" -#include "CCScale9SpriteLoader.h" +#include "editor-support/cocosbuilder/CCNodeLoader.h" +#include "editor-support/cocosbuilder/CCScale9SpriteLoader.h" #include "ui/UIScale9Sprite.h" namespace cocosbuilder { diff --git a/cocos/editor-support/cocosbuilder/CCScrollViewLoader.cpp b/cocos/editor-support/cocosbuilder/CCScrollViewLoader.cpp index e021a861ed..fe2a2be49f 100644 --- a/cocos/editor-support/cocosbuilder/CCScrollViewLoader.cpp +++ b/cocos/editor-support/cocosbuilder/CCScrollViewLoader.cpp @@ -1,4 +1,4 @@ -#include "CCScrollViewLoader.h" +#include "editor-support/cocosbuilder/CCScrollViewLoader.h" using namespace cocos2d; using namespace cocos2d::extension; diff --git a/cocos/editor-support/cocosbuilder/CCScrollViewLoader.h b/cocos/editor-support/cocosbuilder/CCScrollViewLoader.h index d9167f37dd..0a894eb6a9 100644 --- a/cocos/editor-support/cocosbuilder/CCScrollViewLoader.h +++ b/cocos/editor-support/cocosbuilder/CCScrollViewLoader.h @@ -1,7 +1,7 @@ #ifndef _CCB_CCSCROLLVIEWLOADER_H_ #define _CCB_CCSCROLLVIEWLOADER_H_ -#include "CCNodeLoader.h" +#include "editor-support/cocosbuilder/CCNodeLoader.h" #include "extensions/GUI/CCScrollView/CCScrollView.h" namespace cocosbuilder { diff --git a/cocos/editor-support/cocosbuilder/CCSpriteLoader.cpp b/cocos/editor-support/cocosbuilder/CCSpriteLoader.cpp index ab6df19a96..ef2b295ba1 100644 --- a/cocos/editor-support/cocosbuilder/CCSpriteLoader.cpp +++ b/cocos/editor-support/cocosbuilder/CCSpriteLoader.cpp @@ -1,4 +1,4 @@ -#include "CCSpriteLoader.h" +#include "editor-support/cocosbuilder/CCSpriteLoader.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocosbuilder/CCSpriteLoader.h b/cocos/editor-support/cocosbuilder/CCSpriteLoader.h index 41a402bdbd..31036d6d2c 100644 --- a/cocos/editor-support/cocosbuilder/CCSpriteLoader.h +++ b/cocos/editor-support/cocosbuilder/CCSpriteLoader.h @@ -1,7 +1,7 @@ #ifndef _CCB_CCSPRITELOADER_H_ #define _CCB_CCSPRITELOADER_H_ -#include "CCNodeLoader.h" +#include "editor-support/cocosbuilder/CCNodeLoader.h" namespace cocosbuilder { diff --git a/cocos/editor-support/cocosbuilder/CocosBuilder.h b/cocos/editor-support/cocosbuilder/CocosBuilder.h index ffbb45d069..d8fbb1f6b8 100644 --- a/cocos/editor-support/cocosbuilder/CocosBuilder.h +++ b/cocos/editor-support/cocosbuilder/CocosBuilder.h @@ -1,31 +1,31 @@ #ifndef __EDITOR_SUPPORT_COCOSBUILDER_H__ #define __EDITOR_SUPPORT_COCOSBUILDER_H__ -#include "cocosbuilder/CCBAnimationManager.h" -#include "cocosbuilder/CCBFileLoader.h" -#include "cocosbuilder/CCBKeyframe.h" -#include "cocosbuilder/CCBMemberVariableAssigner.h" -#include "cocosbuilder/CCBReader.h" -#include "cocosbuilder/CCBSelectorResolver.h" -#include "cocosbuilder/CCBSequence.h" -#include "cocosbuilder/CCBSequenceProperty.h" -#include "cocosbuilder/CCControlButtonLoader.h" -#include "cocosbuilder/CCControlLoader.h" -#include "cocosbuilder/CCLabelBMFontLoader.h" -#include "cocosbuilder/CCLabelTTFLoader.h" -#include "cocosbuilder/CCLayerColorLoader.h" -#include "cocosbuilder/CCLayerGradientLoader.h" -#include "cocosbuilder/CCLayerLoader.h" -#include "cocosbuilder/CCMenuItemImageLoader.h" -#include "cocosbuilder/CCMenuItemLoader.h" -#include "cocosbuilder/CCMenuLoader.h" -#include "cocosbuilder/CCNode+CCBRelativePositioning.h" -#include "cocosbuilder/CCNodeLoader.h" -#include "cocosbuilder/CCNodeLoaderLibrary.h" -#include "cocosbuilder/CCNodeLoaderListener.h" -#include "cocosbuilder/CCParticleSystemQuadLoader.h" -#include "cocosbuilder/CCScale9SpriteLoader.h" -#include "cocosbuilder/CCScrollViewLoader.h" -#include "cocosbuilder/CCSpriteLoader.h" +#include "editor-support/cocosbuilder/CCBAnimationManager.h" +#include "editor-support/cocosbuilder/CCBFileLoader.h" +#include "editor-support/cocosbuilder/CCBKeyframe.h" +#include "editor-support/cocosbuilder/CCBMemberVariableAssigner.h" +#include "editor-support/cocosbuilder/CCBReader.h" +#include "editor-support/cocosbuilder/CCBSelectorResolver.h" +#include "editor-support/cocosbuilder/CCBSequence.h" +#include "editor-support/cocosbuilder/CCBSequenceProperty.h" +#include "editor-support/cocosbuilder/CCControlButtonLoader.h" +#include "editor-support/cocosbuilder/CCControlLoader.h" +#include "editor-support/cocosbuilder/CCLabelBMFontLoader.h" +#include "editor-support/cocosbuilder/CCLabelTTFLoader.h" +#include "editor-support/cocosbuilder/CCLayerColorLoader.h" +#include "editor-support/cocosbuilder/CCLayerGradientLoader.h" +#include "editor-support/cocosbuilder/CCLayerLoader.h" +#include "editor-support/cocosbuilder/CCMenuItemImageLoader.h" +#include "editor-support/cocosbuilder/CCMenuItemLoader.h" +#include "editor-support/cocosbuilder/CCMenuLoader.h" +#include "editor-support/cocosbuilder/CCNode+CCBRelativePositioning.h" +#include "editor-support/cocosbuilder/CCNodeLoader.h" +#include "editor-support/cocosbuilder/CCNodeLoaderLibrary.h" +#include "editor-support/cocosbuilder/CCNodeLoaderListener.h" +#include "editor-support/cocosbuilder/CCParticleSystemQuadLoader.h" +#include "editor-support/cocosbuilder/CCScale9SpriteLoader.h" +#include "editor-support/cocosbuilder/CCScrollViewLoader.h" +#include "editor-support/cocosbuilder/CCSpriteLoader.h" #endif // __EDITOR_SUPPORT_COCOSBUILDER_H__ diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.cpp b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.cpp index 31af4f4c81..bc98233c02 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.cpp +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.cpp @@ -22,9 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCActionTimeline.h" +#include "editor-support/cocostudio/ActionTimeline/CCActionTimeline.h" -#include "cocostudio/CCComExtensionData.h" +#include "editor-support/cocostudio/CCComExtensionData.h" USING_NS_CC; diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.h b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.h index 3ccab6d4cf..060a63a9db 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.h +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.h @@ -25,9 +25,9 @@ THE SOFTWARE. #ifndef __CCTIMELINE_ACTION_H__ #define __CCTIMELINE_ACTION_H__ -#include "CCTimeLine.h" +#include "editor-support/cocostudio/ActionTimeline/CCTimeLine.h" #include "base/CCProtocols.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CocosStudioExport.h" #include "2d/CCAction.h" NS_TIMELINE_BEGIN diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.cpp b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.cpp index 882d5db109..4ff1eab257 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.cpp +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.cpp @@ -22,22 +22,22 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCActionTimelineCache.h" -#include "CSLoader.h" -#include "CCFrame.h" -#include "CCTimeLine.h" -#include "CCActionTimeline.h" +#include "editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.h" +#include "editor-support/cocostudio/ActionTimeline/CSLoader.h" +#include "editor-support/cocostudio/ActionTimeline/CCFrame.h" +#include "editor-support/cocostudio/ActionTimeline/CCTimeLine.h" +#include "editor-support/cocostudio/ActionTimeline/CCActionTimeline.h" #include "platform/CCFileUtils.h" #include "2d/CCSpriteFrameCache.h" #include "2d/CCSpriteFrame.h" -#include "cocostudio/CSParseBinary_generated.h" +#include "editor-support/cocostudio/CSParseBinary_generated.h" #include "tinyxml2.h" #include "flatbuffers/flatbuffers.h" #include "flatbuffers/util.h" -#include "cocostudio/FlatBuffersSerialize.h" +#include "editor-support/cocostudio/FlatBuffersSerialize.h" #include diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.h b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.h index 2329a75081..fc190a47d5 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.h +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.h @@ -28,9 +28,9 @@ THE SOFTWARE. #include #include "base/CCMap.h" -#include "cocostudio/DictionaryHelper.h" -#include "CCTimelineMacro.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/DictionaryHelper.h" +#include "editor-support/cocostudio/ActionTimeline/CCTimelineMacro.h" +#include "editor-support/cocostudio/CocosStudioExport.h" #include "cocos2d.h" namespace flatbuffers diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineNode.cpp b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineNode.cpp index a1e423ee8a..a7813e91b2 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineNode.cpp +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineNode.cpp @@ -22,8 +22,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCActionTimelineNode.h" -#include "CSLoader.h" +#include "editor-support/cocostudio/ActionTimeline/CCActionTimelineNode.h" +#include "editor-support/cocostudio/ActionTimeline/CSLoader.h" USING_NS_CC; diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineNode.h b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineNode.h index f225dd57a0..b5a18e6509 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineNode.h +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineNode.h @@ -25,9 +25,9 @@ #ifndef __COCOSSTUDIO_CCACTIONTIMELINENODE_H__ #define __COCOSSTUDIO_CCACTIONTIMELINENODE_H__ -#include "CCActionTimeline.h" -#include "CCTimelineMacro.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/ActionTimeline/CCActionTimeline.h" +#include "editor-support/cocostudio/ActionTimeline/CCTimelineMacro.h" +#include "editor-support/cocostudio/CocosStudioExport.h" NS_TIMELINE_BEGIN diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCBoneNode.cpp b/cocos/editor-support/cocostudio/ActionTimeline/CCBoneNode.cpp index 2254781a22..c8eaaa98c8 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCBoneNode.cpp +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCBoneNode.cpp @@ -28,8 +28,8 @@ THE SOFTWARE. #include "renderer/CCGLProgram.h" #include "renderer/CCGLProgramState.h" -#include "CCBoneNode.h" -#include "CCSkeletonNode.h" +#include "editor-support/cocostudio/ActionTimeline/CCBoneNode.h" +#include "editor-support/cocostudio/ActionTimeline/CCSkeletonNode.h" NS_TIMELINE_BEGIN diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCBoneNode.h b/cocos/editor-support/cocostudio/ActionTimeline/CCBoneNode.h index 2677fb4fab..5d552d63d6 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCBoneNode.h +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCBoneNode.h @@ -29,9 +29,9 @@ THE SOFTWARE. #include "base/CCProtocols.h" #include "2d/CCNode.h" #include "renderer/CCCustomCommand.h" -#include "CCTimelineMacro.h" -#include "cocostudio/CocosStudioExport.h" -#include "CCSkinNode.h" +#include "editor-support/cocostudio/ActionTimeline/CCTimelineMacro.h" +#include "editor-support/cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/ActionTimeline/CCSkinNode.h" NS_TIMELINE_BEGIN diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp b/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp index adac9447c7..b8c206ac44 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp @@ -22,9 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCFrame.h" -#include "CCTimeLine.h" -#include "CCActionTimeline.h" +#include "editor-support/cocostudio/ActionTimeline/CCFrame.h" +#include "editor-support/cocostudio/ActionTimeline/CCTimeLine.h" +#include "editor-support/cocostudio/ActionTimeline/CCActionTimeline.h" #include "2d/CCSpriteFrameCache.h" #include "2d/CCSpriteFrame.h" #include diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.h b/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.h index 2a409d388e..15759bded6 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.h +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.h @@ -31,8 +31,8 @@ THE SOFTWARE. #include "2d/CCNode.h" #include "2d/CCSprite.h" #include "2d/CCTweenFunction.h" -#include "CCTimelineMacro.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/ActionTimeline/CCTimelineMacro.h" +#include "editor-support/cocostudio/CocosStudioExport.h" NS_TIMELINE_BEGIN diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCSkeletonNode.cpp b/cocos/editor-support/cocostudio/ActionTimeline/CCSkeletonNode.cpp index dd27b88776..4e138b0452 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCSkeletonNode.cpp +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCSkeletonNode.cpp @@ -21,7 +21,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 "CCSkeletonNode.h" +#include "editor-support/cocostudio/ActionTimeline/CCSkeletonNode.h" #include "base/CCDirector.h" #include "math/TransformUtils.h" diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCSkeletonNode.h b/cocos/editor-support/cocostudio/ActionTimeline/CCSkeletonNode.h index 83446da36d..fa7c7a3f38 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCSkeletonNode.h +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCSkeletonNode.h @@ -25,12 +25,12 @@ THE SOFTWARE. #ifndef __CCSKELETONNODE_H__ #define __CCSKELETONNODE_H__ -#include "CCTimelineMacro.h" +#include "editor-support/cocostudio/ActionTimeline/CCTimelineMacro.h" #include "renderer/CCRenderer.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CocosStudioExport.h" #include "base/CCMap.h" -#include "CCBoneNode.h" +#include "editor-support/cocostudio/ActionTimeline/CCBoneNode.h" NS_TIMELINE_BEGIN diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCSkinNode.cpp b/cocos/editor-support/cocostudio/ActionTimeline/CCSkinNode.cpp index 94d30011b4..e95ce35da4 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCSkinNode.cpp +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCSkinNode.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCSkinNode.h" +#include "editor-support/cocostudio/ActionTimeline/CCSkinNode.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCSkinNode.h b/cocos/editor-support/cocostudio/ActionTimeline/CCSkinNode.h index a34c1af511..3683250929 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCSkinNode.h +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCSkinNode.h @@ -26,7 +26,7 @@ THE SOFTWARE. #define __CCSKINNODE_H__ #include "2d/CCNode.h" -#include "CCTimelineMacro.h" +#include "editor-support/cocostudio/ActionTimeline/CCTimelineMacro.h" NS_TIMELINE_BEGIN diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.cpp b/cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.cpp index e22ac766ba..05c6e8c813 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.cpp +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.cpp @@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCTimeLine.h" -#include "CCActionTimeline.h" +#include "editor-support/cocostudio/ActionTimeline/CCTimeLine.h" +#include "editor-support/cocostudio/ActionTimeline/CCActionTimeline.h" USING_NS_CC; diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.h b/cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.h index 27bf766886..915ee66ee7 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.h +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.h @@ -25,9 +25,9 @@ THE SOFTWARE. #ifndef __CCTIMELINE_H__ #define __CCTIMELINE_H__ -#include "CCFrame.h" -#include "CCTimelineMacro.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/ActionTimeline/CCFrame.h" +#include "editor-support/cocostudio/ActionTimeline/CCTimelineMacro.h" +#include "editor-support/cocostudio/CocosStudioExport.h" NS_TIMELINE_BEGIN diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp b/cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp index 3d1bb22ced..e9be61e2d2 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp +++ b/cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp @@ -22,59 +22,59 @@ THE SOFTWARE. ****************************************************************************/ -#include "CSLoader.h" +#include "editor-support/cocostudio/ActionTimeline/CSLoader.h" #include "base/ObjectFactory.h" -#include "../../cocos/ui/CocosGUI.h" -#include "CCActionTimelineCache.h" -#include "CCActionTimeline.h" -#include "CCActionTimelineNode.h" -#include "../CCSGUIReader.h" -#include "cocostudio/CocoStudio.h" -#include "cocostudio/CSParseBinary_generated.h" +#include "ui/CocosGUI.h" +#include "editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.h" +#include "editor-support/cocostudio/ActionTimeline/CCActionTimeline.h" +#include "editor-support/cocostudio/ActionTimeline/CCActionTimelineNode.h" +#include "editor-support/cocostudio/CCSGUIReader.h" +#include "editor-support/cocostudio/CocoStudio.h" +#include "editor-support/cocostudio/CSParseBinary_generated.h" -#include "cocostudio/WidgetReader/NodeReaderProtocol.h" -#include "cocostudio/WidgetReader/NodeReaderDefine.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" -#include "cocostudio/WidgetReader/NodeReader/NodeReader.h" -#include "cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.h" -#include "cocostudio/WidgetReader/SpriteReader/SpriteReader.h" -#include "cocostudio/WidgetReader/ParticleReader/ParticleReader.h" -#include "cocostudio/WidgetReader/GameMapReader/GameMapReader.h" -#include "cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.h" -#include "cocostudio/WidgetReader/ComAudioReader/ComAudioReader.h" +#include "editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.h" +#include "editor-support/cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.h" +#include "editor-support/cocostudio/WidgetReader/SpriteReader/SpriteReader.h" +#include "editor-support/cocostudio/WidgetReader/ParticleReader/ParticleReader.h" +#include "editor-support/cocostudio/WidgetReader/GameMapReader/GameMapReader.h" +#include "editor-support/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.h" +#include "editor-support/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.h" -#include "cocostudio/WidgetReader/ButtonReader/ButtonReader.h" -#include "cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.h" -#include "cocostudio/WidgetReader/ImageViewReader/ImageViewReader.h" -#include "cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.h" -#include "cocostudio/WidgetReader/TextReader/TextReader.h" -#include "cocostudio/WidgetReader/TextFieldReader/TextFieldReader.h" -#include "cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.h" -#include "cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.h" -#include "cocostudio/WidgetReader/SliderReader/SliderReader.h" -#include "cocostudio/WidgetReader/LayoutReader/LayoutReader.h" -#include "cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.h" -#include "cocostudio/WidgetReader/PageViewReader/PageViewReader.h" -#include "cocostudio/WidgetReader/ListViewReader/ListViewReader.h" -#include "cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h" -#include "cocostudio/WidgetReader/Node3DReader/Node3DReader.h" -#include "cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.h" -#include "cocostudio/WidgetReader/UserCameraReader/UserCameraReader.h" -#include "cocostudio/WidgetReader/Particle3DReader/Particle3DReader.h" -#include "cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.h" -#include "cocostudio/WidgetReader/Light3DReader/Light3DReader.h" -#include "cocostudio/WidgetReader/TabControlReader/TabControlReader.h" +#include "editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.h" +#include "editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.h" +#include "editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.h" +#include "editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.h" +#include "editor-support/cocostudio/WidgetReader/TextReader/TextReader.h" +#include "editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.h" +#include "editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.h" +#include "editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.h" +#include "editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.h" +#include "editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.h" +#include "editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.h" +#include "editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.h" +#include "editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.h" +#include "editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h" +#include "editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.h" +#include "editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.h" +#include "editor-support/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.h" +#include "editor-support/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.h" +#include "editor-support/cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.h" +#include "editor-support/cocostudio/WidgetReader/Light3DReader/Light3DReader.h" +#include "editor-support/cocostudio/WidgetReader/TabControlReader/TabControlReader.h" -#include "cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.h" -#include "cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.h" +#include "editor-support/cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.h" +#include "editor-support/cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.h" #include "flatbuffers/flatbuffers.h" #include "flatbuffers/util.h" -#include "cocostudio/FlatBuffersSerialize.h" +#include "editor-support/cocostudio/FlatBuffersSerialize.h" -#include "cocostudio/WidgetCallBackHandlerProtocol.h" +#include "editor-support/cocostudio/WidgetCallBackHandlerProtocol.h" #include diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CSLoader.h b/cocos/editor-support/cocostudio/ActionTimeline/CSLoader.h index 3f217ef212..b242bc2b3a 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CSLoader.h +++ b/cocos/editor-support/cocostudio/ActionTimeline/CSLoader.h @@ -25,8 +25,8 @@ #ifndef __cocos2d_libs__CSLoader__ #define __cocos2d_libs__CSLoader__ -#include "cocostudio/DictionaryHelper.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/DictionaryHelper.h" +#include "editor-support/cocostudio/CocosStudioExport.h" #include "cocos2d.h" #include "base/ObjectFactory.h" diff --git a/cocos/editor-support/cocostudio/CCActionFrame.cpp b/cocos/editor-support/cocostudio/CCActionFrame.cpp index 6eb702c00e..818ba1a019 100644 --- a/cocos/editor-support/cocostudio/CCActionFrame.cpp +++ b/cocos/editor-support/cocostudio/CCActionFrame.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "cocostudio/CCActionFrame.h" +#include "editor-support/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 aea277979b..d4af87e8ef 100644 --- a/cocos/editor-support/cocostudio/CCActionFrame.h +++ b/cocos/editor-support/cocostudio/CCActionFrame.h @@ -27,7 +27,7 @@ THE SOFTWARE. #include "math/CCGeometry.h" #include "2d/CCActionInterval.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCActionFrameEasing.cpp b/cocos/editor-support/cocostudio/CCActionFrameEasing.cpp index 92d56854ca..a1daa6a296 100644 --- a/cocos/editor-support/cocostudio/CCActionFrameEasing.cpp +++ b/cocos/editor-support/cocostudio/CCActionFrameEasing.cpp @@ -23,8 +23,8 @@ THE SOFTWARE. ****************************************************************************/ #include -#include "cocostudio/CCActionFrameEasing.h" -#include "cocostudio/DictionaryHelper.h" +#include "editor-support/cocostudio/CCActionFrameEasing.h" +#include "editor-support/cocostudio/DictionaryHelper.h" #include "platform/CCStdC.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCActionFrameEasing.h b/cocos/editor-support/cocostudio/CCActionFrameEasing.h index 19fbf30ebd..7c6e5a682f 100644 --- a/cocos/editor-support/cocostudio/CCActionFrameEasing.h +++ b/cocos/editor-support/cocostudio/CCActionFrameEasing.h @@ -26,7 +26,7 @@ THE SOFTWARE. #define __ActionFrameEasing_H__ #include "base/CCRef.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCActionManagerEx.cpp b/cocos/editor-support/cocostudio/CCActionManagerEx.cpp index efcba92117..f36a9d3030 100644 --- a/cocos/editor-support/cocostudio/CCActionManagerEx.cpp +++ b/cocos/editor-support/cocostudio/CCActionManagerEx.cpp @@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "cocostudio/CCActionManagerEx.h" -#include "cocostudio/CocoLoader.h" +#include "editor-support/cocostudio/CCActionManagerEx.h" +#include "editor-support/cocostudio/CocoLoader.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCActionManagerEx.h b/cocos/editor-support/cocostudio/CCActionManagerEx.h index acf5f5f7f7..eec3ba75cd 100644 --- a/cocos/editor-support/cocostudio/CCActionManagerEx.h +++ b/cocos/editor-support/cocostudio/CCActionManagerEx.h @@ -25,9 +25,9 @@ THE SOFTWARE. #ifndef __ActionMANAGER_H__ #define __ActionMANAGER_H__ -#include "cocostudio/CCActionObject.h" -#include "cocostudio/DictionaryHelper.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CCActionObject.h" +#include "editor-support/cocostudio/DictionaryHelper.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCActionNode.cpp b/cocos/editor-support/cocostudio/CCActionNode.cpp index 25289e23d5..9000018a65 100644 --- a/cocos/editor-support/cocostudio/CCActionNode.cpp +++ b/cocos/editor-support/cocostudio/CCActionNode.cpp @@ -22,12 +22,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "cocostudio/CCActionNode.h" -#include "cocostudio/CCActionFrameEasing.h" +#include "editor-support/cocostudio/CCActionNode.h" +#include "editor-support/cocostudio/CCActionFrameEasing.h" #include "ui/UIWidget.h" #include "ui/UIHelper.h" #include "ui/UILayout.h" -#include "cocostudio/CocoLoader.h" +#include "editor-support/cocostudio/CocoLoader.h" #include "base/ccUtils.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCActionNode.h b/cocos/editor-support/cocostudio/CCActionNode.h index 1bbca3cd6a..2334731498 100644 --- a/cocos/editor-support/cocostudio/CCActionNode.h +++ b/cocos/editor-support/cocostudio/CCActionNode.h @@ -25,9 +25,9 @@ THE SOFTWARE. #ifndef __ActionNODE_H__ #define __ActionNODE_H__ -#include "cocostudio/CCActionFrame.h" -#include "cocostudio/DictionaryHelper.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CCActionFrame.h" +#include "editor-support/cocostudio/DictionaryHelper.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCActionObject.cpp b/cocos/editor-support/cocostudio/CCActionObject.cpp index 00806a4815..ae0bfcd376 100644 --- a/cocos/editor-support/cocostudio/CCActionObject.cpp +++ b/cocos/editor-support/cocostudio/CCActionObject.cpp @@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "cocostudio/CCActionObject.h" -#include "cocostudio/CocoLoader.h" +#include "editor-support/cocostudio/CCActionObject.h" +#include "editor-support/cocostudio/CocoLoader.h" #include "base/CCDirector.h" #include "base/CCScheduler.h" diff --git a/cocos/editor-support/cocostudio/CCActionObject.h b/cocos/editor-support/cocostudio/CCActionObject.h index 4a9b16baba..94ec25ad36 100644 --- a/cocos/editor-support/cocostudio/CCActionObject.h +++ b/cocos/editor-support/cocostudio/CCActionObject.h @@ -25,10 +25,10 @@ THE SOFTWARE. #ifndef __ActionObject_H__ #define __ActionObject_H__ -#include "cocostudio/CCActionNode.h" +#include "editor-support/cocostudio/CCActionNode.h" #include "2d/CCActionInstant.h" -#include "cocostudio/DictionaryHelper.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/DictionaryHelper.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCArmature.cpp b/cocos/editor-support/cocostudio/CCArmature.cpp index 04663fbb9b..bb6c2d1c2f 100644 --- a/cocos/editor-support/cocostudio/CCArmature.cpp +++ b/cocos/editor-support/cocostudio/CCArmature.cpp @@ -22,12 +22,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "cocostudio/CCArmature.h" -#include "cocostudio/CCArmatureDataManager.h" -#include "cocostudio/CCArmatureDefine.h" -#include "cocostudio/CCDataReaderHelper.h" -#include "cocostudio/CCDatas.h" -#include "cocostudio/CCSkin.h" +#include "editor-support/cocostudio/CCArmature.h" +#include "editor-support/cocostudio/CCArmatureDataManager.h" +#include "editor-support/cocostudio/CCArmatureDefine.h" +#include "editor-support/cocostudio/CCDataReaderHelper.h" +#include "editor-support/cocostudio/CCDatas.h" +#include "editor-support/cocostudio/CCSkin.h" #include "renderer/CCRenderer.h" #include "renderer/CCGroupCommand.h" diff --git a/cocos/editor-support/cocostudio/CCArmature.h b/cocos/editor-support/cocostudio/CCArmature.h index 43357449f3..a0fe254c44 100644 --- a/cocos/editor-support/cocostudio/CCArmature.h +++ b/cocos/editor-support/cocostudio/CCArmature.h @@ -25,13 +25,13 @@ THE SOFTWARE. #ifndef __CCARMATURE_H__ #define __CCARMATURE_H__ -#include "cocostudio/CCArmatureDefine.h" -#include "cocostudio/CCBone.h" -#include "cocostudio/CCBatchNode.h" -#include "cocostudio/CCArmatureAnimation.h" -#include "cocostudio/CCSpriteFrameCacheHelper.h" -#include "cocostudio/CCArmatureDataManager.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CCArmatureDefine.h" +#include "editor-support/cocostudio/CCBone.h" +#include "editor-support/cocostudio/CCBatchNode.h" +#include "editor-support/cocostudio/CCArmatureAnimation.h" +#include "editor-support/cocostudio/CCSpriteFrameCacheHelper.h" +#include "editor-support/cocostudio/CCArmatureDataManager.h" +#include "editor-support/cocostudio/CocosStudioExport.h" #include "math/CCMath.h" class b2Body; diff --git a/cocos/editor-support/cocostudio/CCArmatureAnimation.cpp b/cocos/editor-support/cocostudio/CCArmatureAnimation.cpp index a85284ce38..7a4bc181d1 100644 --- a/cocos/editor-support/cocostudio/CCArmatureAnimation.cpp +++ b/cocos/editor-support/cocostudio/CCArmatureAnimation.cpp @@ -22,12 +22,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "cocostudio/CCArmatureAnimation.h" -#include "cocostudio/CCArmature.h" -#include "cocostudio/CCBone.h" -#include "cocostudio/CCArmatureDefine.h" -#include "cocostudio/CCUtilMath.h" -#include "cocostudio/CCDatas.h" +#include "editor-support/cocostudio/CCArmatureAnimation.h" +#include "editor-support/cocostudio/CCArmature.h" +#include "editor-support/cocostudio/CCBone.h" +#include "editor-support/cocostudio/CCArmatureDefine.h" +#include "editor-support/cocostudio/CCUtilMath.h" +#include "editor-support/cocostudio/CCDatas.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCArmatureAnimation.h b/cocos/editor-support/cocostudio/CCArmatureAnimation.h index 5f0635c04b..fc0f7a27b2 100644 --- a/cocos/editor-support/cocostudio/CCArmatureAnimation.h +++ b/cocos/editor-support/cocostudio/CCArmatureAnimation.h @@ -26,9 +26,9 @@ THE SOFTWARE. #ifndef __CCANIMATION_H__ #define __CCANIMATION_H__ -#include "cocostudio/CCProcessBase.h" -#include "cocostudio/CCTween.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CCProcessBase.h" +#include "editor-support/cocostudio/CCTween.h" +#include "editor-support/cocostudio/CocosStudioExport.h" #include namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCArmatureDataManager.cpp b/cocos/editor-support/cocostudio/CCArmatureDataManager.cpp index 429d27d64b..c43649fac4 100644 --- a/cocos/editor-support/cocostudio/CCArmatureDataManager.cpp +++ b/cocos/editor-support/cocostudio/CCArmatureDataManager.cpp @@ -24,10 +24,10 @@ THE SOFTWARE. #include "2d/CCSpriteFrameCache.h" -#include "cocostudio/CCArmatureDataManager.h" -#include "cocostudio/CCTransformHelp.h" -#include "cocostudio/CCDataReaderHelper.h" -#include "cocostudio/CCSpriteFrameCacheHelper.h" +#include "editor-support/cocostudio/CCArmatureDataManager.h" +#include "editor-support/cocostudio/CCTransformHelp.h" +#include "editor-support/cocostudio/CCDataReaderHelper.h" +#include "editor-support/cocostudio/CCSpriteFrameCacheHelper.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCArmatureDataManager.h b/cocos/editor-support/cocostudio/CCArmatureDataManager.h index 4a0530fe84..7099f5ebf8 100644 --- a/cocos/editor-support/cocostudio/CCArmatureDataManager.h +++ b/cocos/editor-support/cocostudio/CCArmatureDataManager.h @@ -25,9 +25,9 @@ THE SOFTWARE. #ifndef __CCARMATUREDATAMANAGER_H__ #define __CCARMATUREDATAMANAGER_H__ -#include "cocostudio/CCArmatureDefine.h" -#include "cocostudio/CCDatas.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CCArmatureDefine.h" +#include "editor-support/cocostudio/CCDatas.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCArmatureDefine.cpp b/cocos/editor-support/cocostudio/CCArmatureDefine.cpp index 987711eb70..59161af7fd 100644 --- a/cocos/editor-support/cocostudio/CCArmatureDefine.cpp +++ b/cocos/editor-support/cocostudio/CCArmatureDefine.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "cocostudio/CCArmatureDefine.h" +#include "editor-support/cocostudio/CCArmatureDefine.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCBatchNode.cpp b/cocos/editor-support/cocostudio/CCBatchNode.cpp index 7824066aee..d7f13e7fd2 100644 --- a/cocos/editor-support/cocostudio/CCBatchNode.cpp +++ b/cocos/editor-support/cocostudio/CCBatchNode.cpp @@ -22,9 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "cocostudio/CCBatchNode.h" -#include "cocostudio/CCArmature.h" -#include "cocostudio/CCSkin.h" +#include "editor-support/cocostudio/CCBatchNode.h" +#include "editor-support/cocostudio/CCArmature.h" +#include "editor-support/cocostudio/CCSkin.h" #include "renderer/CCRenderer.h" #include "renderer/CCGroupCommand.h" diff --git a/cocos/editor-support/cocostudio/CCBatchNode.h b/cocos/editor-support/cocostudio/CCBatchNode.h index 44cb4632a4..c258f3b302 100644 --- a/cocos/editor-support/cocostudio/CCBatchNode.h +++ b/cocos/editor-support/cocostudio/CCBatchNode.h @@ -26,8 +26,8 @@ THE SOFTWARE. #define __CCBATCHNODE_H__ #include "2d/CCNode.h" -#include "cocostudio/CCArmatureDefine.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CCArmatureDefine.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace cocos2d { class GroupCommand; diff --git a/cocos/editor-support/cocostudio/CCBone.cpp b/cocos/editor-support/cocostudio/CCBone.cpp index 322e4815bd..b971eb4f09 100644 --- a/cocos/editor-support/cocostudio/CCBone.cpp +++ b/cocos/editor-support/cocostudio/CCBone.cpp @@ -22,12 +22,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "cocostudio/CCBone.h" -#include "cocostudio/CCArmature.h" -#include "cocostudio/CCUtilMath.h" -#include "cocostudio/CCArmatureDataManager.h" -#include "cocostudio/CCTransformHelp.h" -#include "cocostudio/CCDisplayManager.h" +#include "editor-support/cocostudio/CCBone.h" +#include "editor-support/cocostudio/CCArmature.h" +#include "editor-support/cocostudio/CCUtilMath.h" +#include "editor-support/cocostudio/CCArmatureDataManager.h" +#include "editor-support/cocostudio/CCTransformHelp.h" +#include "editor-support/cocostudio/CCDisplayManager.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCBone.h b/cocos/editor-support/cocostudio/CCBone.h index 12e637afe5..750da8b1a0 100644 --- a/cocos/editor-support/cocostudio/CCBone.h +++ b/cocos/editor-support/cocostudio/CCBone.h @@ -25,12 +25,12 @@ THE SOFTWARE. #ifndef __CCBONE_H__ #define __CCBONE_H__ -#include "cocostudio/CCArmatureDefine.h" -#include "cocostudio/CCDatas.h" -#include "cocostudio/CCTween.h" -#include "cocostudio/CCDecorativeDisplay.h" -#include "cocostudio/CCDisplayManager.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CCArmatureDefine.h" +#include "editor-support/cocostudio/CCDatas.h" +#include "editor-support/cocostudio/CCTween.h" +#include "editor-support/cocostudio/CCDecorativeDisplay.h" +#include "editor-support/cocostudio/CCDisplayManager.h" +#include "editor-support/cocostudio/CocosStudioExport.h" #include "2d/CCNode.h" #include "math/CCMath.h" diff --git a/cocos/editor-support/cocostudio/CCColliderDetector.cpp b/cocos/editor-support/cocostudio/CCColliderDetector.cpp index 3e10dd7abd..059cf69cd2 100644 --- a/cocos/editor-support/cocostudio/CCColliderDetector.cpp +++ b/cocos/editor-support/cocostudio/CCColliderDetector.cpp @@ -22,9 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "cocostudio/CCColliderDetector.h" -#include "cocostudio/CCBone.h" -#include "cocostudio/CCTransformHelp.h" +#include "editor-support/cocostudio/CCColliderDetector.h" +#include "editor-support/cocostudio/CCBone.h" +#include "editor-support/cocostudio/CCTransformHelp.h" diff --git a/cocos/editor-support/cocostudio/CCColliderDetector.h b/cocos/editor-support/cocostudio/CCColliderDetector.h index e7259dc50b..c6b1f94313 100644 --- a/cocos/editor-support/cocostudio/CCColliderDetector.h +++ b/cocos/editor-support/cocostudio/CCColliderDetector.h @@ -25,9 +25,9 @@ THE SOFTWARE. #ifndef __CCCOLLIDERDETECTOR_H__ #define __CCCOLLIDERDETECTOR_H__ -#include "cocostudio/CCArmatureDefine.h" -#include "cocostudio/CCDatas.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CCArmatureDefine.h" +#include "editor-support/cocostudio/CCDatas.h" +#include "editor-support/cocostudio/CocosStudioExport.h" #ifndef PT_RATIO #define PT_RATIO 32 diff --git a/cocos/editor-support/cocostudio/CCComAttribute.cpp b/cocos/editor-support/cocostudio/CCComAttribute.cpp index 11a410662a..e8e5651a36 100644 --- a/cocos/editor-support/cocostudio/CCComAttribute.cpp +++ b/cocos/editor-support/cocostudio/CCComAttribute.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "cocostudio/CCComAttribute.h" +#include "editor-support/cocostudio/CCComAttribute.h" #include "platform/CCFileUtils.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCComAttribute.h b/cocos/editor-support/cocostudio/CCComAttribute.h index a49a50b73b..ccc2585cab 100644 --- a/cocos/editor-support/cocostudio/CCComAttribute.h +++ b/cocos/editor-support/cocostudio/CCComAttribute.h @@ -25,10 +25,10 @@ THE SOFTWARE. #ifndef __CC_EXTENTIONS_CCCOMATTRIBUTE_H__ #define __CC_EXTENTIONS_CCCOMATTRIBUTE_H__ -#include "CCComBase.h" +#include "editor-support/cocostudio/CCComBase.h" #include "2d/CCComponent.h" #include "base/CCValue.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCComAudio.cpp b/cocos/editor-support/cocostudio/CCComAudio.cpp index 6b147f89d7..0741d1cd88 100644 --- a/cocos/editor-support/cocostudio/CCComAudio.cpp +++ b/cocos/editor-support/cocostudio/CCComAudio.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "cocostudio/CCComAudio.h" +#include "editor-support/cocostudio/CCComAudio.h" #include "audio/include/SimpleAudioEngine.h" #include "platform/CCFileUtils.h" diff --git a/cocos/editor-support/cocostudio/CCComAudio.h b/cocos/editor-support/cocostudio/CCComAudio.h index 4a4ce84796..a80d366c49 100644 --- a/cocos/editor-support/cocostudio/CCComAudio.h +++ b/cocos/editor-support/cocostudio/CCComAudio.h @@ -25,10 +25,10 @@ THE SOFTWARE. #ifndef __CC_EXTENTIONS_CCCOMAUDIO_H__ #define __CC_EXTENTIONS_CCCOMAUDIO_H__ -#include "CCComBase.h" +#include "editor-support/cocostudio/CCComBase.h" #include "base/CCProtocols.h" #include "2d/CCComponent.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCComBase.h b/cocos/editor-support/cocostudio/CCComBase.h index 744ab0aa79..9283b43368 100644 --- a/cocos/editor-support/cocostudio/CCComBase.h +++ b/cocos/editor-support/cocostudio/CCComBase.h @@ -26,10 +26,10 @@ THE SOFTWARE. #define __CC_EXTENTIONS_CCCOMBASE_H__ #include -#include "DictionaryHelper.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/DictionaryHelper.h" +#include "editor-support/cocostudio/CocosStudioExport.h" #include "base/ObjectFactory.h" -#include "CocoLoader.h" +#include "editor-support/cocostudio/CocoLoader.h" #define DECLARE_CLASS_COMPONENT_INFO \ diff --git a/cocos/editor-support/cocostudio/CCComController.cpp b/cocos/editor-support/cocostudio/CCComController.cpp index ec351738b9..0a62257ae7 100644 --- a/cocos/editor-support/cocostudio/CCComController.cpp +++ b/cocos/editor-support/cocostudio/CCComController.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "cocostudio/CCComController.h" +#include "editor-support/cocostudio/CCComController.h" #include "2d/CCNode.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCComController.h b/cocos/editor-support/cocostudio/CCComController.h index 957191508e..b3b4116d19 100644 --- a/cocos/editor-support/cocostudio/CCComController.h +++ b/cocos/editor-support/cocostudio/CCComController.h @@ -25,9 +25,9 @@ THE SOFTWARE. #ifndef __CC_EXTENTIONS_CCCOMCONTROLLER_H__ #define __CC_EXTENTIONS_CCCOMCONTROLLER_H__ -#include "CCComBase.h" -#include "cocostudio/CCInputDelegate.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CCComBase.h" +#include "editor-support/cocostudio/CCInputDelegate.h" +#include "editor-support/cocostudio/CocosStudioExport.h" #include "2d/CCComponent.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCComExtensionData.cpp b/cocos/editor-support/cocostudio/CCComExtensionData.cpp index affd56a324..7664027f8f 100644 --- a/cocos/editor-support/cocostudio/CCComExtensionData.cpp +++ b/cocos/editor-support/cocostudio/CCComExtensionData.cpp @@ -22,8 +22,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCComExtensionData.h" -#include "cocostudio/ActionTimeline/CCActionTimeline.h" +#include "editor-support/cocostudio/CCComExtensionData.h" +#include "editor-support/cocostudio/ActionTimeline/CCActionTimeline.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCComExtensionData.h b/cocos/editor-support/cocostudio/CCComExtensionData.h index aafe009f50..e5a9549b9a 100644 --- a/cocos/editor-support/cocostudio/CCComExtensionData.h +++ b/cocos/editor-support/cocostudio/CCComExtensionData.h @@ -26,9 +26,9 @@ #define __cocos2d_libs__CCObjectExtensionData__ #include -#include "CCComBase.h" +#include "editor-support/cocostudio/CCComBase.h" #include "2d/CCComponent.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCComRender.cpp b/cocos/editor-support/cocostudio/CCComRender.cpp index 34fa413b6a..4dd0fdf890 100644 --- a/cocos/editor-support/cocostudio/CCComRender.cpp +++ b/cocos/editor-support/cocostudio/CCComRender.cpp @@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "cocostudio/CCComRender.h" -#include "cocostudio/CocoStudio.h" +#include "editor-support/cocostudio/CCComRender.h" +#include "editor-support/cocostudio/CocoStudio.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCComRender.h b/cocos/editor-support/cocostudio/CCComRender.h index 1048e3742d..5f01d1ae6e 100644 --- a/cocos/editor-support/cocostudio/CCComRender.h +++ b/cocos/editor-support/cocostudio/CCComRender.h @@ -25,9 +25,9 @@ THE SOFTWARE. #ifndef __CC_EXTENTIONS_CCCOMRENDER_H__ #define __CC_EXTENTIONS_CCCOMRENDER_H__ -#include "CCComBase.h" +#include "editor-support/cocostudio/CCComBase.h" #include "2d/CCComponent.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCDataReaderHelper.cpp b/cocos/editor-support/cocostudio/CCDataReaderHelper.cpp index 50b0b19705..27a1e063c8 100644 --- a/cocos/editor-support/cocostudio/CCDataReaderHelper.cpp +++ b/cocos/editor-support/cocostudio/CCDataReaderHelper.cpp @@ -29,14 +29,14 @@ THE SOFTWARE. #include "tinyxml2.h" -#include "cocostudio/CCDataReaderHelper.h" -#include "cocostudio/CCArmatureDataManager.h" -#include "cocostudio/CCTransformHelp.h" -#include "cocostudio/CCUtilMath.h" -#include "cocostudio/CCArmatureDefine.h" -#include "cocostudio/CCDatas.h" +#include "editor-support/cocostudio/CCDataReaderHelper.h" +#include "editor-support/cocostudio/CCArmatureDataManager.h" +#include "editor-support/cocostudio/CCTransformHelp.h" +#include "editor-support/cocostudio/CCUtilMath.h" +#include "editor-support/cocostudio/CCArmatureDefine.h" +#include "editor-support/cocostudio/CCDatas.h" -#include "cocostudio/CocoLoader.h" +#include "editor-support/cocostudio/CocoLoader.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCDataReaderHelper.h b/cocos/editor-support/cocostudio/CCDataReaderHelper.h index ff3f1c2fc8..45ca45b3a0 100644 --- a/cocos/editor-support/cocostudio/CCDataReaderHelper.h +++ b/cocos/editor-support/cocostudio/CCDataReaderHelper.h @@ -25,14 +25,14 @@ THE SOFTWARE. #ifndef __CCDATAREADERHELPER_H__ #define __CCDATAREADERHELPER_H__ -#include "cocostudio/CCArmatureDefine.h" -#include "cocostudio/CCDatas.h" -#include "cocostudio/CCArmature.h" -#include "cocostudio/DictionaryHelper.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CCArmatureDefine.h" +#include "editor-support/cocostudio/CCDatas.h" +#include "editor-support/cocostudio/CCArmature.h" +#include "editor-support/cocostudio/DictionaryHelper.h" +#include "editor-support/cocostudio/CocosStudioExport.h" #include "json/document.h" -#include "DictionaryHelper.h" +#include "editor-support/cocostudio/DictionaryHelper.h" #include #include diff --git a/cocos/editor-support/cocostudio/CCDatas.cpp b/cocos/editor-support/cocostudio/CCDatas.cpp index e71fa38a6b..da715aa154 100644 --- a/cocos/editor-support/cocostudio/CCDatas.cpp +++ b/cocos/editor-support/cocostudio/CCDatas.cpp @@ -22,9 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "cocostudio/CCDatas.h" -#include "cocostudio/CCUtilMath.h" -#include "cocostudio/CCTransformHelp.h" +#include "editor-support/cocostudio/CCDatas.h" +#include "editor-support/cocostudio/CCUtilMath.h" +#include "editor-support/cocostudio/CCTransformHelp.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCDatas.h b/cocos/editor-support/cocostudio/CCDatas.h index a96d049af2..43e078a039 100644 --- a/cocos/editor-support/cocostudio/CCDatas.h +++ b/cocos/editor-support/cocostudio/CCDatas.h @@ -31,9 +31,9 @@ THE SOFTWARE. #include "base/CCMap.h" #include "math/CCAffineTransform.h" -#include "cocostudio/CCArmatureDefine.h" +#include "editor-support/cocostudio/CCArmatureDefine.h" #include "2d/CCTweenFunction.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CocosStudioExport.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 cddc953d17..833fe8a528 100644 --- a/cocos/editor-support/cocostudio/CCDecorativeDisplay.cpp +++ b/cocos/editor-support/cocostudio/CCDecorativeDisplay.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "cocostudio/CCDecorativeDisplay.h" +#include "editor-support/cocostudio/CCDecorativeDisplay.h" #include "2d/CCNode.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCDecorativeDisplay.h b/cocos/editor-support/cocostudio/CCDecorativeDisplay.h index 0b89b343e4..b2892a45fd 100644 --- a/cocos/editor-support/cocostudio/CCDecorativeDisplay.h +++ b/cocos/editor-support/cocostudio/CCDecorativeDisplay.h @@ -25,14 +25,14 @@ THE SOFTWARE. #ifndef __CCDECORATIVEDISPLAY_H__ #define __CCDECORATIVEDISPLAY_H__ -#include "cocostudio/CCArmatureDefine.h" -#include "cocostudio/CCDisplayFactory.h" -#include "cocostudio/CCDatas.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CCArmatureDefine.h" +#include "editor-support/cocostudio/CCDisplayFactory.h" +#include "editor-support/cocostudio/CCDatas.h" +#include "editor-support/cocostudio/CocosStudioExport.h" #if ENABLE_PHYSICS_BOX2D_DETECT || ENABLE_PHYSICS_CHIPMUNK_DETECT || ENABLE_PHYSICS_SAVE_CALCULATED_VERTEX -#include "cocostudio/CCColliderDetector.h" +#include "editor-support/cocostudio/CCColliderDetector.h" #endif namespace cocos2d { diff --git a/cocos/editor-support/cocostudio/CCDisplayFactory.cpp b/cocos/editor-support/cocostudio/CCDisplayFactory.cpp index 8e1205faf9..31935572e6 100644 --- a/cocos/editor-support/cocostudio/CCDisplayFactory.cpp +++ b/cocos/editor-support/cocostudio/CCDisplayFactory.cpp @@ -22,12 +22,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "cocostudio/CCDisplayFactory.h" -#include "cocostudio/CCBone.h" -#include "cocostudio/CCArmature.h" -#include "cocostudio/CCSkin.h" -#include "cocostudio/CCArmatureDataManager.h" -#include "cocostudio/CCTransformHelp.h" +#include "editor-support/cocostudio/CCDisplayFactory.h" +#include "editor-support/cocostudio/CCBone.h" +#include "editor-support/cocostudio/CCArmature.h" +#include "editor-support/cocostudio/CCSkin.h" +#include "editor-support/cocostudio/CCArmatureDataManager.h" +#include "editor-support/cocostudio/CCTransformHelp.h" #include "2d/CCParticleSystemQuad.h" diff --git a/cocos/editor-support/cocostudio/CCDisplayFactory.h b/cocos/editor-support/cocostudio/CCDisplayFactory.h index adab8b5212..f53cf1d982 100644 --- a/cocos/editor-support/cocostudio/CCDisplayFactory.h +++ b/cocos/editor-support/cocostudio/CCDisplayFactory.h @@ -25,10 +25,10 @@ THE SOFTWARE. #ifndef __CCDISPLAYFACTORY_H__ #define __CCDISPLAYFACTORY_H__ -#include "cocostudio/CCArmatureDefine.h" -#include "cocostudio/CCDatas.h" -#include "cocostudio/CocosStudioExport.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CCArmatureDefine.h" +#include "editor-support/cocostudio/CCDatas.h" +#include "editor-support/cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCDisplayManager.cpp b/cocos/editor-support/cocostudio/CCDisplayManager.cpp index 5a749f68d4..c89372bdb7 100644 --- a/cocos/editor-support/cocostudio/CCDisplayManager.cpp +++ b/cocos/editor-support/cocostudio/CCDisplayManager.cpp @@ -22,11 +22,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "cocostudio/CCDisplayManager.h" -#include "cocostudio/CCBone.h" -#include "cocostudio/CCArmature.h" -#include "cocostudio/CCUtilMath.h" -#include "cocostudio/CCSkin.h" +#include "editor-support/cocostudio/CCDisplayManager.h" +#include "editor-support/cocostudio/CCBone.h" +#include "editor-support/cocostudio/CCArmature.h" +#include "editor-support/cocostudio/CCUtilMath.h" +#include "editor-support/cocostudio/CCSkin.h" #include "2d/CCParticleSystemQuad.h" diff --git a/cocos/editor-support/cocostudio/CCDisplayManager.h b/cocos/editor-support/cocostudio/CCDisplayManager.h index ec86f85933..df11a3b365 100644 --- a/cocos/editor-support/cocostudio/CCDisplayManager.h +++ b/cocos/editor-support/cocostudio/CCDisplayManager.h @@ -25,10 +25,10 @@ THE SOFTWARE. #ifndef __CCDISPLAYMANAGER_H__ #define __CCDISPLAYMANAGER_H__ -#include "cocostudio/CCArmatureDefine.h" -#include "cocostudio/CCDecorativeDisplay.h" -#include "cocostudio/CCDatas.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CCArmatureDefine.h" +#include "editor-support/cocostudio/CCDecorativeDisplay.h" +#include "editor-support/cocostudio/CCDatas.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCInputDelegate.cpp b/cocos/editor-support/cocostudio/CCInputDelegate.cpp index 774588e284..d2e98069b1 100644 --- a/cocos/editor-support/cocostudio/CCInputDelegate.cpp +++ b/cocos/editor-support/cocostudio/CCInputDelegate.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "cocostudio/CCInputDelegate.h" +#include "editor-support/cocostudio/CCInputDelegate.h" #include "base/CCDirector.h" #include "platform/CCDevice.h" #include "base/CCEventListenerTouch.h" diff --git a/cocos/editor-support/cocostudio/CCInputDelegate.h b/cocos/editor-support/cocostudio/CCInputDelegate.h index 53e9cf5873..8954f122bb 100644 --- a/cocos/editor-support/cocostudio/CCInputDelegate.h +++ b/cocos/editor-support/cocostudio/CCInputDelegate.h @@ -31,7 +31,7 @@ THE SOFTWARE. #include "base/ccTypes.h" #include "base/CCEventKeyboard.h" #include "base/CCEventListener.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace cocos2d { class __Set; diff --git a/cocos/editor-support/cocostudio/CCProcessBase.cpp b/cocos/editor-support/cocostudio/CCProcessBase.cpp index 1c6db2abbb..74fe9b530c 100644 --- a/cocos/editor-support/cocostudio/CCProcessBase.cpp +++ b/cocos/editor-support/cocostudio/CCProcessBase.cpp @@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "cocostudio/CCProcessBase.h" -#include "cocostudio/CCUtilMath.h" +#include "editor-support/cocostudio/CCProcessBase.h" +#include "editor-support/cocostudio/CCUtilMath.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCProcessBase.h b/cocos/editor-support/cocostudio/CCProcessBase.h index 62b8ef3ce8..7a70f97d4b 100644 --- a/cocos/editor-support/cocostudio/CCProcessBase.h +++ b/cocos/editor-support/cocostudio/CCProcessBase.h @@ -25,9 +25,9 @@ THE SOFTWARE. #ifndef __CCPROCESSBASE_H__ #define __CCPROCESSBASE_H__ -#include "cocostudio/CCArmatureDefine.h" -#include "cocostudio/CCDatas.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CCArmatureDefine.h" +#include "editor-support/cocostudio/CCDatas.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCSGUIReader.cpp b/cocos/editor-support/cocostudio/CCSGUIReader.cpp index 3f2e89d862..f5ca3f3ae4 100644 --- a/cocos/editor-support/cocostudio/CCSGUIReader.cpp +++ b/cocos/editor-support/cocostudio/CCSGUIReader.cpp @@ -21,25 +21,25 @@ 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 "cocostudio/CCSGUIReader.h" +#include "editor-support/cocostudio/CCSGUIReader.h" #include "ui/CocosGUI.h" -#include "cocostudio/CCActionManagerEx.h" +#include "editor-support/cocostudio/CCActionManagerEx.h" #include #include -#include "WidgetReader/ButtonReader/ButtonReader.h" -#include "WidgetReader/CheckBoxReader/CheckBoxReader.h" -#include "WidgetReader/SliderReader/SliderReader.h" -#include "WidgetReader/ImageViewReader/ImageViewReader.h" -#include "WidgetReader/LoadingBarReader/LoadingBarReader.h" -#include "WidgetReader/TextAtlasReader/TextAtlasReader.h" -#include "WidgetReader/TextReader/TextReader.h" -#include "WidgetReader/TextBMFontReader/TextBMFontReader.h" -#include "WidgetReader/TextFieldReader/TextFieldReader.h" -#include "WidgetReader/LayoutReader/LayoutReader.h" -#include "WidgetReader/PageViewReader/PageViewReader.h" -#include "WidgetReader/ScrollViewReader/ScrollViewReader.h" -#include "WidgetReader/ListViewReader/ListViewReader.h" -#include "cocostudio/CocoLoader.h" +#include "editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.h" +#include "editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.h" +#include "editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.h" +#include "editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.h" +#include "editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.h" +#include "editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.h" +#include "editor-support/cocostudio/WidgetReader/TextReader/TextReader.h" +#include "editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.h" +#include "editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.h" +#include "editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.h" +#include "editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.h" +#include "editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.h" +#include "editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.h" +#include "editor-support/cocostudio/CocoLoader.h" #include "tinyxml2.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCSGUIReader.h b/cocos/editor-support/cocostudio/CCSGUIReader.h index a34008161b..22defb349e 100644 --- a/cocos/editor-support/cocostudio/CCSGUIReader.h +++ b/cocos/editor-support/cocostudio/CCSGUIReader.h @@ -26,10 +26,10 @@ THE SOFTWARE. #define __CCSGUIREADER_H__ #include "ui/UILayout.h" -#include "cocostudio/DictionaryHelper.h" -#include "WidgetReader/WidgetReaderProtocol.h" +#include "editor-support/cocostudio/DictionaryHelper.h" +#include "editor-support/cocostudio/WidgetReader/WidgetReaderProtocol.h" #include "base/ObjectFactory.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace protocolbuffers { diff --git a/cocos/editor-support/cocostudio/CCSSceneReader.cpp b/cocos/editor-support/cocostudio/CCSSceneReader.cpp index 17eb393652..065361f4ab 100644 --- a/cocos/editor-support/cocostudio/CCSSceneReader.cpp +++ b/cocos/editor-support/cocostudio/CCSSceneReader.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "cocostudio/CocoStudio.h" +#include "editor-support/cocostudio/CocoStudio.h" #include "ui/CocosGUI.h" #include "audio/include/SimpleAudioEngine.h" #include "base/ObjectFactory.h" diff --git a/cocos/editor-support/cocostudio/CCSSceneReader.h b/cocos/editor-support/cocostudio/CCSSceneReader.h index 84465641db..531d6d067c 100644 --- a/cocos/editor-support/cocostudio/CCSSceneReader.h +++ b/cocos/editor-support/cocostudio/CCSSceneReader.h @@ -25,8 +25,8 @@ THE SOFTWARE. #ifndef __CCSSCENEREADER_H__ #define __CCSSCENEREADER_H__ -#include "cocostudio/DictionaryHelper.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/DictionaryHelper.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCSkin.cpp b/cocos/editor-support/cocostudio/CCSkin.cpp index 93e38f7b70..b12ee73e26 100644 --- a/cocos/editor-support/cocostudio/CCSkin.cpp +++ b/cocos/editor-support/cocostudio/CCSkin.cpp @@ -27,9 +27,9 @@ THE SOFTWARE. #include "base/CCDirector.h" #include "renderer/CCRenderer.h" -#include "cocostudio/CCSkin.h" -#include "cocostudio/CCTransformHelp.h" -#include "cocostudio/CCArmature.h" +#include "editor-support/cocostudio/CCSkin.h" +#include "editor-support/cocostudio/CCTransformHelp.h" +#include "editor-support/cocostudio/CCArmature.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCSkin.h b/cocos/editor-support/cocostudio/CCSkin.h index 37753ab3c3..b1c5ea00dd 100644 --- a/cocos/editor-support/cocostudio/CCSkin.h +++ b/cocos/editor-support/cocostudio/CCSkin.h @@ -28,9 +28,9 @@ THE SOFTWARE. #include "2d/CCSprite.h" #include "renderer/CCQuadCommand.h" -#include "cocostudio/CCArmatureDefine.h" -#include "cocostudio/CCBone.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CCArmatureDefine.h" +#include "editor-support/cocostudio/CCBone.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.cpp b/cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.cpp index 1bf81840c1..ce5e2d4dce 100644 --- a/cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.cpp +++ b/cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "cocostudio/CCSpriteFrameCacheHelper.h" +#include "editor-support/cocostudio/CCSpriteFrameCacheHelper.h" #include "platform/CCFileUtils.h" #include "2d/CCSpriteFrame.h" #include "2d/CCSpriteFrameCache.h" diff --git a/cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.h b/cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.h index adba6b087e..493d7e003e 100644 --- a/cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.h +++ b/cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.h @@ -25,8 +25,8 @@ THE SOFTWARE. #define __CCSPRITEFRAMECACHEHELPER_H__ #include "platform/CCPlatformMacros.h" -#include "cocostudio/CCArmatureDefine.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CCArmatureDefine.h" +#include "editor-support/cocostudio/CocosStudioExport.h" #include #include #include diff --git a/cocos/editor-support/cocostudio/CCTransformHelp.cpp b/cocos/editor-support/cocostudio/CCTransformHelp.cpp index b4c2cb8fe3..8815027492 100644 --- a/cocos/editor-support/cocostudio/CCTransformHelp.cpp +++ b/cocos/editor-support/cocostudio/CCTransformHelp.cpp @@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "cocostudio/CCTransformHelp.h" -#include "cocostudio/CCUtilMath.h" +#include "editor-support/cocostudio/CCTransformHelp.h" +#include "editor-support/cocostudio/CCUtilMath.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCTransformHelp.h b/cocos/editor-support/cocostudio/CCTransformHelp.h index e0c9c0a086..b22d2489bd 100644 --- a/cocos/editor-support/cocostudio/CCTransformHelp.h +++ b/cocos/editor-support/cocostudio/CCTransformHelp.h @@ -25,9 +25,9 @@ THE SOFTWARE. #ifndef __CCTRANSFORMHELP_H__ #define __CCTRANSFORMHELP_H__ -#include "cocostudio/CCArmatureDefine.h" -#include "cocostudio/CCDatas.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CCArmatureDefine.h" +#include "editor-support/cocostudio/CCDatas.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCTween.cpp b/cocos/editor-support/cocostudio/CCTween.cpp index 41e63c0772..08750a054e 100644 --- a/cocos/editor-support/cocostudio/CCTween.cpp +++ b/cocos/editor-support/cocostudio/CCTween.cpp @@ -23,12 +23,12 @@ THE SOFTWARE. ****************************************************************************/ -#include "cocostudio/CCTween.h" -#include "cocostudio/CCArmatureAnimation.h" -#include "cocostudio/CCBone.h" -#include "cocostudio/CCArmature.h" -#include "cocostudio/CCUtilMath.h" -#include "cocostudio/CCTransformHelp.h" +#include "editor-support/cocostudio/CCTween.h" +#include "editor-support/cocostudio/CCArmatureAnimation.h" +#include "editor-support/cocostudio/CCBone.h" +#include "editor-support/cocostudio/CCArmature.h" +#include "editor-support/cocostudio/CCUtilMath.h" +#include "editor-support/cocostudio/CCTransformHelp.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCTween.h b/cocos/editor-support/cocostudio/CCTween.h index 4a02e62df5..03eac9a646 100644 --- a/cocos/editor-support/cocostudio/CCTween.h +++ b/cocos/editor-support/cocostudio/CCTween.h @@ -26,9 +26,9 @@ THE SOFTWARE. #ifndef __CCTWEEN_H__ #define __CCTWEEN_H__ -#include "cocostudio/CCProcessBase.h" +#include "editor-support/cocostudio/CCProcessBase.h" #include "2d/CCTweenFunction.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCUtilMath.cpp b/cocos/editor-support/cocostudio/CCUtilMath.cpp index 19bc3d4361..bf5e4deb44 100644 --- a/cocos/editor-support/cocostudio/CCUtilMath.cpp +++ b/cocos/editor-support/cocostudio/CCUtilMath.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "cocostudio/CCUtilMath.h" +#include "editor-support/cocostudio/CCUtilMath.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCUtilMath.h b/cocos/editor-support/cocostudio/CCUtilMath.h index a0ab0a5b92..8d781ba08c 100644 --- a/cocos/editor-support/cocostudio/CCUtilMath.h +++ b/cocos/editor-support/cocostudio/CCUtilMath.h @@ -26,8 +26,8 @@ THE SOFTWARE. #define __CCUTILMATH_H__ #include "2d/CCSprite.h" -#include "cocostudio/CCArmatureDefine.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CCArmatureDefine.h" +#include "editor-support/cocostudio/CocosStudioExport.h" #include namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CocoLoader.cpp b/cocos/editor-support/cocostudio/CocoLoader.cpp index d6c5ab4c64..ec0d0f43b1 100644 --- a/cocos/editor-support/cocostudio/CocoLoader.cpp +++ b/cocos/editor-support/cocostudio/CocoLoader.cpp @@ -1,4 +1,4 @@ -#include "CocoLoader.h" +#include "editor-support/cocostudio/CocoLoader.h" #include "zlib.h" using namespace std; diff --git a/cocos/editor-support/cocostudio/CocoLoader.h b/cocos/editor-support/cocostudio/CocoLoader.h index 44e34f5ac4..0b1d5dce11 100644 --- a/cocos/editor-support/cocostudio/CocoLoader.h +++ b/cocos/editor-support/cocostudio/CocoLoader.h @@ -27,7 +27,7 @@ #include #include "json/document.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CocosStudioExport.h" #pragma pack (4) diff --git a/cocos/editor-support/cocostudio/CocoStudio.cpp b/cocos/editor-support/cocostudio/CocoStudio.cpp index 646166a545..cb3a44f15e 100644 --- a/cocos/editor-support/cocostudio/CocoStudio.cpp +++ b/cocos/editor-support/cocostudio/CocoStudio.cpp @@ -1,32 +1,32 @@ -#include "CocoStudio.h" +#include "editor-support/cocostudio/CocoStudio.h" -#include "cocostudio/WidgetReader/NodeReader/NodeReader.h" -#include "cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.h" -#include "cocostudio/WidgetReader/SpriteReader/SpriteReader.h" -#include "cocostudio/WidgetReader/ParticleReader/ParticleReader.h" -#include "cocostudio/WidgetReader/GameMapReader/GameMapReader.h" -#include "cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.h" -#include "cocostudio/WidgetReader/ComAudioReader/ComAudioReader.h" +#include "editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.h" +#include "editor-support/cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.h" +#include "editor-support/cocostudio/WidgetReader/SpriteReader/SpriteReader.h" +#include "editor-support/cocostudio/WidgetReader/ParticleReader/ParticleReader.h" +#include "editor-support/cocostudio/WidgetReader/GameMapReader/GameMapReader.h" +#include "editor-support/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.h" +#include "editor-support/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.h" -#include "cocostudio/WidgetReader/ButtonReader/ButtonReader.h" -#include "cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.h" -#include "cocostudio/WidgetReader/ImageViewReader/ImageViewReader.h" -#include "cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.h" -#include "cocostudio/WidgetReader/TextReader/TextReader.h" -#include "cocostudio/WidgetReader/TextFieldReader/TextFieldReader.h" -#include "cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.h" -#include "cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.h" -#include "cocostudio/WidgetReader/SliderReader/SliderReader.h" -#include "cocostudio/WidgetReader/LayoutReader/LayoutReader.h" -#include "cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.h" -#include "cocostudio/WidgetReader/PageViewReader/PageViewReader.h" -#include "cocostudio/WidgetReader/ListViewReader/ListViewReader.h" -#include "cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h" -#include "cocostudio/WidgetReader/Node3DReader/Node3DReader.h" -#include "cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.h" -#include "cocostudio/WidgetReader/UserCameraReader/UserCameraReader.h" -#include "cocostudio/WidgetReader/Particle3DReader/Particle3DReader.h" +#include "editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.h" +#include "editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.h" +#include "editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.h" +#include "editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.h" +#include "editor-support/cocostudio/WidgetReader/TextReader/TextReader.h" +#include "editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.h" +#include "editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.h" +#include "editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.h" +#include "editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.h" +#include "editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.h" +#include "editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.h" +#include "editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.h" +#include "editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.h" +#include "editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h" +#include "editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.h" +#include "editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.h" +#include "editor-support/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.h" +#include "editor-support/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.h" namespace cocostudio diff --git a/cocos/editor-support/cocostudio/CocoStudio.h b/cocos/editor-support/cocostudio/CocoStudio.h index d4237f84a6..b6eae114f5 100644 --- a/cocos/editor-support/cocostudio/CocoStudio.h +++ b/cocos/editor-support/cocostudio/CocoStudio.h @@ -25,49 +25,49 @@ THE SOFTWARE. #ifndef __EDITOR_SUPPORT_COCOSTUDIO_H__ #define __EDITOR_SUPPORT_COCOSTUDIO_H__ -#include "cocostudio/CCActionFrame.h" -#include "cocostudio/CCActionFrameEasing.h" -#include "cocostudio/CCActionManagerEx.h" -#include "cocostudio/CCActionNode.h" -#include "cocostudio/CCActionObject.h" -#include "cocostudio/CCArmature.h" -#include "cocostudio/CCBone.h" -#include "cocostudio/CCArmatureAnimation.h" -#include "cocostudio/CCProcessBase.h" -#include "cocostudio/CCTween.h" -#include "cocostudio/CCDatas.h" -#include "cocostudio/CCBatchNode.h" -#include "cocostudio/CCDecorativeDisplay.h" -#include "cocostudio/CCDisplayFactory.h" -#include "cocostudio/CCDisplayManager.h" -#include "cocostudio/CCSkin.h" -#include "cocostudio/CCColliderDetector.h" -#include "cocostudio/CCArmatureDataManager.h" -#include "cocostudio/CCArmatureDefine.h" -#include "cocostudio/CCDataReaderHelper.h" -#include "cocostudio/CCTransformHelp.h" -#include "cocostudio/CCUtilMath.h" -#include "cocostudio/CCComBase.h" -#include "cocostudio/CCComAttribute.h" -#include "cocostudio/CCComAudio.h" -#include "cocostudio/CCComController.h" -#include "cocostudio/CCComRender.h" -#include "cocostudio/CCInputDelegate.h" -#include "cocostudio/DictionaryHelper.h" -#include "cocostudio/CCSGUIReader.h" -#include "cocostudio/CCSSceneReader.h" -#include "cocostudio/TriggerBase.h" -#include "cocostudio/ActionTimeline/CCActionTimelineCache.h" -#include "cocostudio/ActionTimeline/CCFrame.h" -#include "cocostudio/ActionTimeline/CCTimeLine.h" -#include "cocostudio/ActionTimeline/CCActionTimeline.h" -#include "cocostudio/ActionTimeline/CCActionTimelineNode.h" -#include "cocostudio/ActionTimeline/CCBoneNode.h" -#include "cocostudio/ActionTimeline/CCSkeletonNode.h" -#include "cocostudio/CocosStudioExport.h" -#include "cocostudio/ActionTimeline/CSLoader.h" +#include "editor-support/cocostudio/CCActionFrame.h" +#include "editor-support/cocostudio/CCActionFrameEasing.h" +#include "editor-support/cocostudio/CCActionManagerEx.h" +#include "editor-support/cocostudio/CCActionNode.h" +#include "editor-support/cocostudio/CCActionObject.h" +#include "editor-support/cocostudio/CCArmature.h" +#include "editor-support/cocostudio/CCBone.h" +#include "editor-support/cocostudio/CCArmatureAnimation.h" +#include "editor-support/cocostudio/CCProcessBase.h" +#include "editor-support/cocostudio/CCTween.h" +#include "editor-support/cocostudio/CCDatas.h" +#include "editor-support/cocostudio/CCBatchNode.h" +#include "editor-support/cocostudio/CCDecorativeDisplay.h" +#include "editor-support/cocostudio/CCDisplayFactory.h" +#include "editor-support/cocostudio/CCDisplayManager.h" +#include "editor-support/cocostudio/CCSkin.h" +#include "editor-support/cocostudio/CCColliderDetector.h" +#include "editor-support/cocostudio/CCArmatureDataManager.h" +#include "editor-support/cocostudio/CCArmatureDefine.h" +#include "editor-support/cocostudio/CCDataReaderHelper.h" +#include "editor-support/cocostudio/CCTransformHelp.h" +#include "editor-support/cocostudio/CCUtilMath.h" +#include "editor-support/cocostudio/CCComBase.h" +#include "editor-support/cocostudio/CCComAttribute.h" +#include "editor-support/cocostudio/CCComAudio.h" +#include "editor-support/cocostudio/CCComController.h" +#include "editor-support/cocostudio/CCComRender.h" +#include "editor-support/cocostudio/CCInputDelegate.h" +#include "editor-support/cocostudio/DictionaryHelper.h" +#include "editor-support/cocostudio/CCSGUIReader.h" +#include "editor-support/cocostudio/CCSSceneReader.h" +#include "editor-support/cocostudio/TriggerBase.h" +#include "editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.h" +#include "editor-support/cocostudio/ActionTimeline/CCFrame.h" +#include "editor-support/cocostudio/ActionTimeline/CCTimeLine.h" +#include "editor-support/cocostudio/ActionTimeline/CCActionTimeline.h" +#include "editor-support/cocostudio/ActionTimeline/CCActionTimelineNode.h" +#include "editor-support/cocostudio/ActionTimeline/CCBoneNode.h" +#include "editor-support/cocostudio/ActionTimeline/CCSkeletonNode.h" +#include "editor-support/cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/ActionTimeline/CSLoader.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CocosStudioExtension.cpp b/cocos/editor-support/cocostudio/CocosStudioExtension.cpp index 6daa9a8cd8..d20a0d9f93 100644 --- a/cocos/editor-support/cocostudio/CocosStudioExtension.cpp +++ b/cocos/editor-support/cocostudio/CocosStudioExtension.cpp @@ -1,4 +1,4 @@ -#include "CocosStudioExtension.h" +#include "editor-support/cocostudio/CocosStudioExtension.h" NS_CC_BEGIN diff --git a/cocos/editor-support/cocostudio/DictionaryHelper.cpp b/cocos/editor-support/cocostudio/DictionaryHelper.cpp index 44cec2bef0..b1b0a819a5 100644 --- a/cocos/editor-support/cocostudio/DictionaryHelper.cpp +++ b/cocos/editor-support/cocostudio/DictionaryHelper.cpp @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ #include "platform/CCPlatformMacros.h" -#include "cocostudio/DictionaryHelper.h" +#include "editor-support/cocostudio/DictionaryHelper.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/DictionaryHelper.h b/cocos/editor-support/cocostudio/DictionaryHelper.h index 1ae1b8c588..52b09c6b44 100644 --- a/cocos/editor-support/cocostudio/DictionaryHelper.h +++ b/cocos/editor-support/cocostudio/DictionaryHelper.h @@ -26,7 +26,7 @@ THE SOFTWARE. #define __DICTIONARYHELPER_H__ #include "json/document.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CocosStudioExport.h" #define DICTOOL DictionaryHelper::getInstance() diff --git a/cocos/editor-support/cocostudio/FlatBuffersSerialize.cpp b/cocos/editor-support/cocostudio/FlatBuffersSerialize.cpp index a09fd0b44d..b4ceca999d 100644 --- a/cocos/editor-support/cocostudio/FlatBuffersSerialize.cpp +++ b/cocos/editor-support/cocostudio/FlatBuffersSerialize.cpp @@ -22,38 +22,38 @@ THE SOFTWARE. ****************************************************************************/ -#include "FlatBuffersSerialize.h" +#include "editor-support/cocostudio/FlatBuffersSerialize.h" #include "base/ObjectFactory.h" #include "ui/CocosGUI.h" -#include "cocostudio/CocoStudio.h" -#include "CSLanguageDataBinary_generated.h" -#include "CSParseBinary_generated.h" +#include "editor-support/cocostudio/CocoStudio.h" +#include "editor-support/cocostudio/CSLanguageDataBinary_generated.h" +#include "editor-support/cocostudio/CSParseBinary_generated.h" -#include "WidgetReader/NodeReaderProtocol.h" -#include "WidgetReader/NodeReaderDefine.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" -#include "WidgetReader/NodeReader/NodeReader.h" -#include "WidgetReader/SingleNodeReader/SingleNodeReader.h" -#include "WidgetReader/SpriteReader/SpriteReader.h" -#include "WidgetReader/ParticleReader/ParticleReader.h" -#include "WidgetReader/GameMapReader/GameMapReader.h" -#include "WidgetReader/ComAudioReader/ComAudioReader.h" -#include "WidgetReader/ProjectNodeReader/ProjectNodeReader.h" +#include "editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.h" +#include "editor-support/cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.h" +#include "editor-support/cocostudio/WidgetReader/SpriteReader/SpriteReader.h" +#include "editor-support/cocostudio/WidgetReader/ParticleReader/ParticleReader.h" +#include "editor-support/cocostudio/WidgetReader/GameMapReader/GameMapReader.h" +#include "editor-support/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.h" +#include "editor-support/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.h" -#include "WidgetReader/ButtonReader/ButtonReader.h" -#include "WidgetReader/CheckBoxReader/CheckBoxReader.h" -#include "WidgetReader/ImageViewReader/ImageViewReader.h" -#include "WidgetReader/TextBMFontReader/TextBMFontReader.h" -#include "WidgetReader/TextReader/TextReader.h" -#include "WidgetReader/TextFieldReader/TextFieldReader.h" -#include "WidgetReader/TextAtlasReader/TextAtlasReader.h" -#include "WidgetReader/LoadingBarReader/LoadingBarReader.h" -#include "WidgetReader/SliderReader/SliderReader.h" -#include "WidgetReader/LayoutReader/LayoutReader.h" -#include "WidgetReader/ScrollViewReader/ScrollViewReader.h" -#include "WidgetReader/PageViewReader/PageViewReader.h" -#include "WidgetReader/ListViewReader/ListViewReader.h" +#include "editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.h" +#include "editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.h" +#include "editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.h" +#include "editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.h" +#include "editor-support/cocostudio/WidgetReader/TextReader/TextReader.h" +#include "editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.h" +#include "editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.h" +#include "editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.h" +#include "editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.h" +#include "editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.h" +#include "editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.h" +#include "editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.h" +#include "editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.h" #include "tinyxml2.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/FlatBuffersSerialize.h b/cocos/editor-support/cocostudio/FlatBuffersSerialize.h index edc47fad89..853e105f8b 100644 --- a/cocos/editor-support/cocostudio/FlatBuffersSerialize.h +++ b/cocos/editor-support/cocostudio/FlatBuffersSerialize.h @@ -29,7 +29,7 @@ #include #include "ExtensionMacros.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CocosStudioExport.h" #include "platform/CCPlatformMacros.h" #include "ui/UIWidget.h" diff --git a/cocos/editor-support/cocostudio/LocalizationManager.cpp b/cocos/editor-support/cocostudio/LocalizationManager.cpp index 79b42f0067..5cba9fd6a0 100644 --- a/cocos/editor-support/cocostudio/LocalizationManager.cpp +++ b/cocos/editor-support/cocostudio/LocalizationManager.cpp @@ -1,5 +1,5 @@ -#include "LocalizationManager.h" -#include "CCPlatformMacros.h" +#include "editor-support/cocostudio/LocalizationManager.h" +#include "platform/CCPlatformMacros.h" #include "platform/CCFileUtils.h" #include "editor-support/cocostudio/CSLanguageDataBinary_generated.h" diff --git a/cocos/editor-support/cocostudio/LocalizationManager.h b/cocos/editor-support/cocostudio/LocalizationManager.h index d6973d4370..311d15df23 100644 --- a/cocos/editor-support/cocostudio/LocalizationManager.h +++ b/cocos/editor-support/cocostudio/LocalizationManager.h @@ -4,7 +4,7 @@ #include #include #include "json/document.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace cocostudio { /** diff --git a/cocos/editor-support/cocostudio/TriggerBase.cpp b/cocos/editor-support/cocostudio/TriggerBase.cpp index fed2934135..7022a6b29a 100755 --- a/cocos/editor-support/cocostudio/TriggerBase.cpp +++ b/cocos/editor-support/cocostudio/TriggerBase.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "TriggerBase.h" +#include "editor-support/cocostudio/TriggerBase.h" using namespace cocos2d; using namespace cocostudio; diff --git a/cocos/editor-support/cocostudio/TriggerBase.h b/cocos/editor-support/cocostudio/TriggerBase.h index dedc3fc70e..03a3c8e665 100755 --- a/cocos/editor-support/cocostudio/TriggerBase.h +++ b/cocos/editor-support/cocostudio/TriggerBase.h @@ -25,11 +25,11 @@ THE SOFTWARE. #ifndef __TRIGGEREVENT_H__ #define __TRIGGEREVENT_H__ -#include "cocostudio/CocoStudio.h" +#include "editor-support/cocostudio/CocoStudio.h" #include "base/ObjectFactory.h" -#include "TriggerObj.h" -#include "TriggerMng.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/TriggerObj.h" +#include "editor-support/cocostudio/TriggerMng.h" +#include "editor-support/cocostudio/CocosStudioExport.h" #define DECLARE_CLASS_INFO \ diff --git a/cocos/editor-support/cocostudio/TriggerMng.cpp b/cocos/editor-support/cocostudio/TriggerMng.cpp index cf0156eb04..30400f1fce 100755 --- a/cocos/editor-support/cocostudio/TriggerMng.cpp +++ b/cocos/editor-support/cocostudio/TriggerMng.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "TriggerMng.h" +#include "editor-support/cocostudio/TriggerMng.h" #include "json/filestream.h" #include "json/prettywriter.h" #include "json/stringbuffer.h" diff --git a/cocos/editor-support/cocostudio/TriggerMng.h b/cocos/editor-support/cocostudio/TriggerMng.h index 4afb5dc4f3..9d54116e2c 100755 --- a/cocos/editor-support/cocostudio/TriggerMng.h +++ b/cocos/editor-support/cocostudio/TriggerMng.h @@ -24,7 +24,7 @@ THE SOFTWARE. #ifndef __TRIGGERMNG_H__ #define __TRIGGERMNG_H__ -#include "CocoStudio.h" +#include "editor-support/cocostudio/CocoStudio.h" namespace cocos2d { class EventDispatcher; diff --git a/cocos/editor-support/cocostudio/TriggerObj.cpp b/cocos/editor-support/cocostudio/TriggerObj.cpp index 7dd22cae4a..3d78a8c612 100755 --- a/cocos/editor-support/cocostudio/TriggerObj.cpp +++ b/cocos/editor-support/cocostudio/TriggerObj.cpp @@ -21,7 +21,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 "TriggerObj.h" +#include "editor-support/cocostudio/TriggerObj.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/TriggerObj.h b/cocos/editor-support/cocostudio/TriggerObj.h index d52c80ee02..e991845a52 100755 --- a/cocos/editor-support/cocostudio/TriggerObj.h +++ b/cocos/editor-support/cocostudio/TriggerObj.h @@ -25,7 +25,7 @@ THE SOFTWARE. #ifndef __TRIGGEROBJ_H__ #define __TRIGGEROBJ_H__ -#include "CocoStudio.h" +#include "editor-support/cocostudio/CocoStudio.h" #include "base/CCVector.h" namespace cocos2d { diff --git a/cocos/editor-support/cocostudio/WidgetCallBackHandlerProtocol.cpp b/cocos/editor-support/cocostudio/WidgetCallBackHandlerProtocol.cpp index 634e9fe3a7..61e82e9a6e 100755 --- a/cocos/editor-support/cocostudio/WidgetCallBackHandlerProtocol.cpp +++ b/cocos/editor-support/cocostudio/WidgetCallBackHandlerProtocol.cpp @@ -22,4 +22,4 @@ THE SOFTWARE. ****************************************************************************/ -#include "WidgetCallBackHandlerProtocol.h" +#include "editor-support/cocostudio/WidgetCallBackHandlerProtocol.h" diff --git a/cocos/editor-support/cocostudio/WidgetCallBackHandlerProtocol.h b/cocos/editor-support/cocostudio/WidgetCallBackHandlerProtocol.h index 94ca495cda..f8964bd88a 100755 --- a/cocos/editor-support/cocostudio/WidgetCallBackHandlerProtocol.h +++ b/cocos/editor-support/cocostudio/WidgetCallBackHandlerProtocol.h @@ -26,7 +26,7 @@ #define __cocos2d_libs__WidgetCallBackHandlerProtocol__ #include "cocos2d.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CocosStudioExport.h" #include "ui/UIWidget.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.cpp index 9e89b3e9f5..dabb3cce9e 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.cpp @@ -1,10 +1,10 @@ #include "tinyxml2/tinyxml2.h" #include "flatbuffers/flatbuffers.h" -#include "cocostudio/WidgetReader/NodeReader/NodeReader.h" -#include "cocostudio/CSParseBinary_generated.h" -#include "CSArmatureNode_generated.h" -#include "cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h" -#include "cocostudio/CCArmature.h" +#include "editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.h" +#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "editor-support/cocostudio/WidgetReader/ArmatureNodeReader/CSArmatureNode_generated.h" +#include "editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h" +#include "editor-support/cocostudio/CCArmature.h" USING_NS_CC; diff --git a/cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h b/cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h index 1ae0d998c8..12a14959aa 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h @@ -25,8 +25,8 @@ THE SOFTWARE. #ifndef __ARMATURENODEREADER_H_ #define __ARMATURENODEREADER_H_ -#include "cocostudio/WidgetReader/NodeReaderProtocol.h" -#include "cocostudio/WidgetReader/NodeReaderDefine.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" /**************************************** diff --git a/cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp index c3289cba02..afd0f7b544 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp @@ -1,12 +1,12 @@ -#include "ButtonReader.h" +#include "editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.h" #include "ui/UIButton.h" -#include "cocostudio/CocoLoader.h" -#include "cocostudio/CSParseBinary_generated.h" -#include "cocostudio/FlatBuffersSerialize.h" -#include "cocostudio/LocalizationManager.h" +#include "editor-support/cocostudio/CocoLoader.h" +#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "editor-support/cocostudio/FlatBuffersSerialize.h" +#include "editor-support/cocostudio/LocalizationManager.h" #include "tinyxml2.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.h b/cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.h index 4dae566598..8316cef4d7 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.h @@ -25,8 +25,8 @@ #ifndef __TestCpp__ButtonReader__ #define __TestCpp__ButtonReader__ -#include "cocostudio/WidgetReader/WidgetReader.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/WidgetReader/WidgetReader.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.cpp index 171554870f..1e3ef68696 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.cpp @@ -1,11 +1,11 @@ -#include "CheckBoxReader.h" +#include "editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.h" #include "ui/UICheckBox.h" -#include "cocostudio/CocoLoader.h" -#include "cocostudio/CSParseBinary_generated.h" -#include "cocostudio/FlatBuffersSerialize.h" +#include "editor-support/cocostudio/CocoLoader.h" +#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "editor-support/cocostudio/FlatBuffersSerialize.h" #include "tinyxml2.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.h b/cocos/editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.h index ff60ce0512..4d03a62e84 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.h @@ -25,8 +25,8 @@ #ifndef __TestCpp__CheckBoxReader__ #define __TestCpp__CheckBoxReader__ -#include "cocostudio/WidgetReader/WidgetReader.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/WidgetReader/WidgetReader.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.cpp index 8142cf3120..551ed9600d 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.cpp @@ -22,11 +22,11 @@ THE SOFTWARE. ****************************************************************************/ -#include "ComAudioReader.h" +#include "editor-support/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.h" -#include "cocostudio/CCComAudio.h" -#include "cocostudio/CSParseBinary_generated.h" -#include "cocostudio/WidgetReader/NodeReader/NodeReader.h" +#include "editor-support/cocostudio/CCComAudio.h" +#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.h" #include "tinyxml2.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.h b/cocos/editor-support/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.h index 26c5ebbe82..38e707746e 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.h @@ -28,8 +28,8 @@ #include "base/CCRef.h" #include "2d/CCComponent.h" #include "2d/CCNode.h" -#include "cocostudio/CocosStudioExport.h" -#include "cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "editor-support/cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" namespace cocostudio diff --git a/cocos/editor-support/cocostudio/WidgetReader/GameMapReader/GameMapReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/GameMapReader/GameMapReader.cpp index 449e8df93e..6217cea6f7 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/GameMapReader/GameMapReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/GameMapReader/GameMapReader.cpp @@ -22,12 +22,12 @@ THE SOFTWARE. ****************************************************************************/ -#include "GameMapReader.h" +#include "editor-support/cocostudio/WidgetReader/GameMapReader/GameMapReader.h" #include "2d/CCTMXXMLParser.h" -#include "cocostudio/CSParseBinary_generated.h" -#include "cocostudio/WidgetReader/NodeReader/NodeReader.h" +#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.h" #include "tinyxml2.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/GameMapReader/GameMapReader.h b/cocos/editor-support/cocostudio/WidgetReader/GameMapReader/GameMapReader.h index b17071282c..4c461a6ff1 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/GameMapReader/GameMapReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/GameMapReader/GameMapReader.h @@ -25,9 +25,9 @@ #ifndef __cocos2d_libs__GameMapReader__ #define __cocos2d_libs__GameMapReader__ -#include "cocostudio/CocosStudioExport.h" -#include "cocostudio/WidgetReader/NodeReaderProtocol.h" -#include "cocostudio/WidgetReader/NodeReaderDefine.h" +#include "editor-support/cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" namespace cocostudio diff --git a/cocos/editor-support/cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.cpp index 2fe55b9409..61dfed4bbd 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.cpp @@ -22,14 +22,14 @@ THE SOFTWARE. ****************************************************************************/ -#include "GameNode3DReader.h" +#include "editor-support/cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.h" -#include "cocostudio/CCComExtensionData.h" -#include "cocostudio/CSParseBinary_generated.h" -#include "cocostudio/CSParse3DBinary_generated.h" +#include "editor-support/cocostudio/CCComExtensionData.h" +#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "editor-support/cocostudio/CSParse3DBinary_generated.h" -#include "cocostudio/FlatBuffersSerialize.h" -#include "cocostudio/WidgetReader/NodeReader/NodeReader.h" +#include "editor-support/cocostudio/FlatBuffersSerialize.h" +#include "editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.h" #include "tinyxml2.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.h b/cocos/editor-support/cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.h index 4e8eca330d..0f4749735f 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.h @@ -26,9 +26,9 @@ #define __cocos2d_libs__GameNode3DReader__ #include "2d/CCCameraBackgroundBrush.h" -#include "cocostudio/CocosStudioExport.h" -#include "cocostudio/WidgetReader/NodeReaderProtocol.h" -#include "cocostudio/WidgetReader/NodeReaderDefine.h" +#include "editor-support/cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" namespace tinyxml2 { diff --git a/cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp index 04f2d49d65..7e5fbcd30e 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp @@ -1,11 +1,11 @@ -#include "ImageViewReader.h" +#include "editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.h" #include "ui/UIImageView.h" -#include "cocostudio/CocoLoader.h" -#include "cocostudio/CSParseBinary_generated.h" -#include "cocostudio/FlatBuffersSerialize.h" +#include "editor-support/cocostudio/CocoLoader.h" +#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "editor-support/cocostudio/FlatBuffersSerialize.h" #include "tinyxml2.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.h b/cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.h index f76240d8d3..c8646730a7 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.h @@ -25,8 +25,8 @@ #ifndef __TestCpp__ImageViewReader__ #define __TestCpp__ImageViewReader__ -#include "cocostudio/WidgetReader/WidgetReader.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/WidgetReader/WidgetReader.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.cpp index b52e59a048..01139eebd7 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.cpp @@ -1,14 +1,14 @@ -#include "LayoutReader.h" +#include "editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.h" #include "ui/UILayout.h" -#include "cocostudio/CocoLoader.h" +#include "editor-support/cocostudio/CocoLoader.h" #include "ui/UIScrollView.h" #include "ui/UIPageView.h" #include "ui/UIListView.h" -#include "cocostudio/CSParseBinary_generated.h" -#include "cocostudio/FlatBuffersSerialize.h" +#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "editor-support/cocostudio/FlatBuffersSerialize.h" #include "tinyxml2.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.h b/cocos/editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.h index 0cb05123c4..71ecd685b4 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.h @@ -25,8 +25,8 @@ #ifndef __TestCpp__LayoutReader__ #define __TestCpp__LayoutReader__ -#include "cocostudio/WidgetReader/WidgetReader.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/WidgetReader/WidgetReader.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/Light3DReader/Light3DReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/Light3DReader/Light3DReader.cpp index a359d18ab6..ca009461c4 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/Light3DReader/Light3DReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/Light3DReader/Light3DReader.cpp @@ -22,14 +22,14 @@ THE SOFTWARE. ****************************************************************************/ -#include "Light3DReader.h" +#include "editor-support/cocostudio/WidgetReader/Light3DReader/Light3DReader.h" #include "2d/CCLight.h" -#include "cocostudio/CSParseBinary_generated.h" -#include "cocostudio/CSParse3DBinary_generated.h" +#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "editor-support/cocostudio/CSParse3DBinary_generated.h" -#include "cocostudio/FlatBuffersSerialize.h" -#include "cocostudio/WidgetReader/Node3DReader/Node3DReader.h" +#include "editor-support/cocostudio/FlatBuffersSerialize.h" +#include "editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.h" #include "tinyxml2.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/Light3DReader/Light3DReader.h b/cocos/editor-support/cocostudio/WidgetReader/Light3DReader/Light3DReader.h index 1a257fdb15..b0565f316e 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/Light3DReader/Light3DReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/Light3DReader/Light3DReader.h @@ -25,9 +25,9 @@ #ifndef __cocos2d_libs__Light3DReader__ #define __cocos2d_libs__Light3DReader__ -#include "cocostudio/CocosStudioExport.h" -#include "cocostudio/WidgetReader/NodeReaderProtocol.h" -#include "cocostudio/WidgetReader/NodeReaderDefine.h" +#include "editor-support/cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" namespace tinyxml2 { diff --git a/cocos/editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.cpp index de5baabadf..9184fbfee9 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.cpp @@ -1,11 +1,11 @@ -#include "ListViewReader.h" +#include "editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.h" #include "ui/UIListView.h" -#include "cocostudio/CocoLoader.h" -#include "cocostudio/CSParseBinary_generated.h" -#include "cocostudio/FlatBuffersSerialize.h" +#include "editor-support/cocostudio/CocoLoader.h" +#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "editor-support/cocostudio/FlatBuffersSerialize.h" #include "tinyxml2.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.h b/cocos/editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.h index 4d4ef38d0b..54a4971e48 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.h @@ -25,8 +25,8 @@ #ifndef __TestCpp__ListViewReader__ #define __TestCpp__ListViewReader__ -#include "cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp index ef72bc384a..50ef988a9f 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp @@ -1,11 +1,11 @@ -#include "LoadingBarReader.h" +#include "editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.h" #include "ui/UILoadingBar.h" -#include "cocostudio/CocoLoader.h" -#include "cocostudio/CSParseBinary_generated.h" -#include "cocostudio/FlatBuffersSerialize.h" +#include "editor-support/cocostudio/CocoLoader.h" +#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "editor-support/cocostudio/FlatBuffersSerialize.h" #include "tinyxml2.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.h b/cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.h index da785b8de7..f5b5bde02b 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.h @@ -25,8 +25,8 @@ #ifndef __TestCpp__LoadingBarReader__ #define __TestCpp__LoadingBarReader__ -#include "cocostudio/WidgetReader/WidgetReader.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/WidgetReader/WidgetReader.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.cpp index cf9bcd09f9..bcf1324cef 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.cpp @@ -22,13 +22,13 @@ THE SOFTWARE. ****************************************************************************/ -#include "Node3DReader.h" +#include "editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.h" -#include "cocostudio/CSParseBinary_generated.h" -#include "cocostudio/CSParse3DBinary_generated.h" +#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "editor-support/cocostudio/CSParse3DBinary_generated.h" -#include "cocostudio/FlatBuffersSerialize.h" -#include "cocostudio/WidgetReader/NodeReader/NodeReader.h" +#include "editor-support/cocostudio/FlatBuffersSerialize.h" +#include "editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.h" #include "tinyxml2.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.h b/cocos/editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.h index febc5d7ca9..86f2b34a11 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.h @@ -26,9 +26,9 @@ #define __cocos2d_libs__Node3DReader__ #include "math/Vec3.h" -#include "cocostudio/CocosStudioExport.h" -#include "cocostudio/WidgetReader/NodeReaderProtocol.h" -#include "cocostudio/WidgetReader/NodeReaderDefine.h" +#include "editor-support/cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" namespace tinyxml2 { diff --git a/cocos/editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.cpp index 8b060d0bb0..cb8a4eaefe 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.cpp @@ -22,11 +22,11 @@ THE SOFTWARE. ****************************************************************************/ -#include "NodeReader.h" +#include "editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.h" -#include "cocostudio/CSParseBinary_generated.h" -#include "cocostudio/ActionTimeline/CCActionTimeline.h" -#include "cocostudio/CCComExtensionData.h" +#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "editor-support/cocostudio/ActionTimeline/CCActionTimeline.h" +#include "editor-support/cocostudio/CCComExtensionData.h" #include "tinyxml2.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.h b/cocos/editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.h index ee2d4c8a1c..671df9bf76 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.h @@ -26,9 +26,9 @@ #define __cocos2d_libs__NodeReader__ #include "cocos2d.h" -#include "cocostudio/CocosStudioExport.h" -#include "cocostudio/WidgetReader/NodeReaderProtocol.h" -#include "cocostudio/WidgetReader/NodeReaderDefine.h" +#include "editor-support/cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/NodeReaderDefine.cpp b/cocos/editor-support/cocostudio/WidgetReader/NodeReaderDefine.cpp index 035e81ce0a..e6058c3682 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/NodeReaderDefine.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/NodeReaderDefine.cpp @@ -1,3 +1,3 @@ -#include "NodeReaderDefine.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/NodeReaderProtocol.cpp b/cocos/editor-support/cocostudio/WidgetReader/NodeReaderProtocol.cpp index b28158b62f..633bc3361d 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/NodeReaderProtocol.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/NodeReaderProtocol.cpp @@ -6,4 +6,4 @@ // // -#include "NodeReaderProtocol.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h b/cocos/editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h index c02bb3a51f..ed8a1a3e89 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h +++ b/cocos/editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h @@ -25,7 +25,7 @@ #ifndef __cocos2d_libs__NodeReaderProtocol__ #define __cocos2d_libs__NodeReaderProtocol__ -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace flatbuffers { diff --git a/cocos/editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.cpp index 3a5fb57d1c..c29c6f9daf 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.cpp @@ -1,12 +1,12 @@ -#include "PageViewReader.h" +#include "editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.h" #include "ui/UIPageView.h" #include "ui/UILayout.h" -#include "cocostudio/CocoLoader.h" -#include "cocostudio/CSParseBinary_generated.h" -#include "cocostudio/FlatBuffersSerialize.h" +#include "editor-support/cocostudio/CocoLoader.h" +#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "editor-support/cocostudio/FlatBuffersSerialize.h" #include "tinyxml2.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.h b/cocos/editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.h index 6e78114a34..46f1ef8fcf 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.h @@ -25,8 +25,8 @@ #ifndef __TestCpp__PageViewReader__ #define __TestCpp__PageViewReader__ -#include "cocostudio/WidgetReader/LayoutReader/LayoutReader.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.cpp index a55bacf485..340979e240 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.cpp @@ -23,12 +23,12 @@ ****************************************************************************/ #include "platform/CCFileUtils.h" -#include "Particle3DReader.h" +#include "editor-support/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.h" -#include "cocostudio/CSParseBinary_generated.h" -#include "cocostudio/CSParse3DBinary_generated.h" -#include "cocostudio/FlatBuffersSerialize.h" -#include "cocostudio/WidgetReader/Node3DReader/Node3DReader.h" +#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "editor-support/cocostudio/CSParse3DBinary_generated.h" +#include "editor-support/cocostudio/FlatBuffersSerialize.h" +#include "editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.h" #include "tinyxml2.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.h b/cocos/editor-support/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.h index 4ac718bfb8..877fb1eb9a 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.h @@ -25,9 +25,9 @@ #ifndef __cocos2d_libs__Particle3DReader__ #define __cocos2d_libs__Particle3DReader__ -#include "cocostudio/CocosStudioExport.h" -#include "cocostudio/WidgetReader/NodeReaderProtocol.h" -#include "cocostudio/WidgetReader/NodeReaderDefine.h" +#include "editor-support/cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/ParticleReader/ParticleReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/ParticleReader/ParticleReader.cpp index 13e35aa1e8..a39daa114f 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ParticleReader/ParticleReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/ParticleReader/ParticleReader.cpp @@ -22,10 +22,10 @@ THE SOFTWARE. ****************************************************************************/ -#include "ParticleReader.h" +#include "editor-support/cocostudio/WidgetReader/ParticleReader/ParticleReader.h" -#include "cocostudio/CSParseBinary_generated.h" -#include "cocostudio/WidgetReader/NodeReader/NodeReader.h" +#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.h" #include "tinyxml2.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/ParticleReader/ParticleReader.h b/cocos/editor-support/cocostudio/WidgetReader/ParticleReader/ParticleReader.h index c72b62799e..222f69372d 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ParticleReader/ParticleReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/ParticleReader/ParticleReader.h @@ -25,9 +25,9 @@ #ifndef __cocos2d_libs__ParticleReader__ #define __cocos2d_libs__ParticleReader__ -#include "cocostudio/CocosStudioExport.h" -#include "cocostudio/WidgetReader/NodeReaderProtocol.h" -#include "cocostudio/WidgetReader/NodeReaderDefine.h" +#include "editor-support/cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" namespace cocostudio diff --git a/cocos/editor-support/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.cpp index 83e880c883..332a957c08 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.cpp @@ -22,10 +22,10 @@ THE SOFTWARE. ****************************************************************************/ -#include "ProjectNodeReader.h" +#include "editor-support/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.h" -#include "cocostudio/CSParseBinary_generated.h" -#include "cocostudio/WidgetReader/NodeReader/NodeReader.h" +#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.h" #include "tinyxml2.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.h b/cocos/editor-support/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.h index c11f152c8e..d4e7e1fce5 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.h @@ -26,8 +26,8 @@ #define __cocos2d_libs__ProjectNodeReader__ #include "base/CCRef.h" -#include "cocostudio/CocosStudioExport.h" -#include "cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "editor-support/cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" namespace cocostudio diff --git a/cocos/editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.cpp index 37af12c9f5..47441c67ae 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.cpp @@ -1,11 +1,11 @@ -#include "ScrollViewReader.h" +#include "editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.h" #include "ui/UIScrollView.h" -#include "cocostudio/CocoLoader.h" -#include "cocostudio/CSParseBinary_generated.h" -#include "cocostudio/FlatBuffersSerialize.h" +#include "editor-support/cocostudio/CocoLoader.h" +#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "editor-support/cocostudio/FlatBuffersSerialize.h" #include "tinyxml2.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.h b/cocos/editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.h index 522e3ec087..2434c34646 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.h @@ -25,8 +25,8 @@ #ifndef __TestCpp__ScrollViewReader__ #define __TestCpp__ScrollViewReader__ -#include "cocostudio/WidgetReader/LayoutReader/LayoutReader.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.cpp index 6540ec4c03..47800cf358 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.cpp @@ -22,11 +22,11 @@ THE SOFTWARE. ****************************************************************************/ -#include "SingleNodeReader.h" +#include "editor-support/cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.h" -#include "cocostudio/CSParseBinary_generated.h" -#include "cocostudio/ActionTimeline/CCActionTimeline.h" -#include "cocostudio/WidgetReader/NodeReader/NodeReader.h" +#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "editor-support/cocostudio/ActionTimeline/CCActionTimeline.h" +#include "editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.h" #include "tinyxml2.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.h b/cocos/editor-support/cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.h index 931412a3b1..b1e23b2db4 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.h @@ -25,9 +25,9 @@ #ifndef __cocos2d_libs__SingleNodeReader__ #define __cocos2d_libs__SingleNodeReader__ -#include "cocostudio/CocosStudioExport.h" -#include "cocostudio/WidgetReader/NodeReaderProtocol.h" -#include "cocostudio/WidgetReader/NodeReaderDefine.h" +#include "editor-support/cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" namespace cocostudio diff --git a/cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.cpp index 28ae147be5..63de57524d 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.cpp @@ -24,11 +24,11 @@ THE SOFTWARE. #include "tinyxml2/tinyxml2.h" #include "flatbuffers/flatbuffers.h" -#include "cocostudio/WidgetReader/NodeReader/NodeReader.h" -#include "cocostudio/CSParseBinary_generated.h" -#include "cocostudio/WidgetReader/SkeletonReader/CSBoneBinary_generated.h" -#include "cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.h" -#include "cocostudio/ActionTimeline/CCBoneNode.h" +#include "editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.h" +#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "editor-support/cocostudio/WidgetReader/SkeletonReader/CSBoneBinary_generated.h" +#include "editor-support/cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.h" +#include "editor-support/cocostudio/ActionTimeline/CCBoneNode.h" USING_NS_CC; diff --git a/cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.h b/cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.h index 040bc561b7..99850d3b19 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.h @@ -25,8 +25,8 @@ THE SOFTWARE. #ifndef __BONENODEREADER_H_ #define __BONENODEREADER_H_ -#include "cocostudio/WidgetReader/NodeReaderProtocol.h" -#include "cocostudio/WidgetReader/NodeReaderDefine.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" class BoneNodeReader : public cocos2d::Ref, public cocostudio::NodeReaderProtocol { diff --git a/cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.cpp index 9b0244d38d..a083937d93 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.cpp @@ -24,11 +24,11 @@ THE SOFTWARE. #include "tinyxml2/tinyxml2.h" #include "flatbuffers/flatbuffers.h" -#include "cocostudio/WidgetReader/SkeletonReader/CSBoneBinary_generated.h" -#include "cocostudio/WidgetReader/NodeReader/NodeReader.h" -#include "cocostudio/CSParseBinary_generated.h" -#include "cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.h" -#include "cocostudio/ActionTimeline/CCSkeletonNode.h" +#include "editor-support/cocostudio/WidgetReader/SkeletonReader/CSBoneBinary_generated.h" +#include "editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.h" +#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "editor-support/cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.h" +#include "editor-support/cocostudio/ActionTimeline/CCSkeletonNode.h" USING_NS_CC; USING_NS_TIMELINE; diff --git a/cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.h b/cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.h index 95932eeed6..0729c05d70 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.h @@ -25,7 +25,7 @@ THE SOFTWARE. #ifndef _SKELETONNODEREADER_H_ #define _SKELETONNODEREADER_H_ -#include "cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.h" +#include "editor-support/cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.h" class SkeletonNodeReader : public BoneNodeReader { diff --git a/cocos/editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.cpp index 18db60f410..91acde79ee 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.cpp @@ -1,11 +1,11 @@ -#include "SliderReader.h" +#include "editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.h" #include "ui/UISlider.h" -#include "cocostudio/CocoLoader.h" -#include "cocostudio/CSParseBinary_generated.h" -#include "cocostudio/FlatBuffersSerialize.h" +#include "editor-support/cocostudio/CocoLoader.h" +#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "editor-support/cocostudio/FlatBuffersSerialize.h" #include "tinyxml2.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.h b/cocos/editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.h index 042394a01f..235319dbae 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.h @@ -25,8 +25,8 @@ #ifndef __TestCpp__SliderReader__ #define __TestCpp__SliderReader__ -#include "cocostudio/WidgetReader/WidgetReader.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/WidgetReader/WidgetReader.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.cpp index 388b269e23..58114f29ba 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.cpp @@ -27,13 +27,13 @@ #include "3d/CCAnimate3D.h" #include "3d/CCAnimation3D.h" #include "platform/CCFileUtils.h" -#include "Sprite3DReader.h" +#include "editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.h" -#include "cocostudio/CSParseBinary_generated.h" -#include "cocostudio/CSParse3DBinary_generated.h" +#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "editor-support/cocostudio/CSParse3DBinary_generated.h" -#include "cocostudio/FlatBuffersSerialize.h" -#include "cocostudio/WidgetReader/Node3DReader/Node3DReader.h" +#include "editor-support/cocostudio/FlatBuffersSerialize.h" +#include "editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.h" #include "tinyxml2.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.h b/cocos/editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.h index 863342770f..c4d64b1919 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.h @@ -26,9 +26,9 @@ #define __cocos2d_libs__Sprite3DReader__ #include "math/Vec2.h" -#include "cocostudio/CocosStudioExport.h" -#include "cocostudio/WidgetReader/NodeReaderProtocol.h" -#include "cocostudio/WidgetReader/NodeReaderDefine.h" +#include "editor-support/cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" namespace tinyxml2 { diff --git a/cocos/editor-support/cocostudio/WidgetReader/SpriteReader/SpriteReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/SpriteReader/SpriteReader.cpp index 17c76550e5..0e30199943 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/SpriteReader/SpriteReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/SpriteReader/SpriteReader.cpp @@ -22,11 +22,11 @@ THE SOFTWARE. ****************************************************************************/ -#include "SpriteReader.h" +#include "editor-support/cocostudio/WidgetReader/SpriteReader/SpriteReader.h" -#include "cocostudio/CSParseBinary_generated.h" -#include "cocostudio/FlatBuffersSerialize.h" -#include "cocostudio/WidgetReader/NodeReader/NodeReader.h" +#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "editor-support/cocostudio/FlatBuffersSerialize.h" +#include "editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.h" #include "tinyxml2.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/SpriteReader/SpriteReader.h b/cocos/editor-support/cocostudio/WidgetReader/SpriteReader/SpriteReader.h index 7bfc7a0057..117e1f08c0 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/SpriteReader/SpriteReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/SpriteReader/SpriteReader.h @@ -25,9 +25,9 @@ #ifndef __cocos2d_libs__SpriteReader__ #define __cocos2d_libs__SpriteReader__ -#include "cocostudio/CocosStudioExport.h" -#include "cocostudio/WidgetReader/NodeReaderProtocol.h" -#include "cocostudio/WidgetReader/NodeReaderDefine.h" +#include "editor-support/cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" namespace cocostudio diff --git a/cocos/editor-support/cocostudio/WidgetReader/TabControlReader/TabControlReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/TabControlReader/TabControlReader.cpp index c61e912f1e..8073c67b3c 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/TabControlReader/TabControlReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/TabControlReader/TabControlReader.cpp @@ -25,12 +25,12 @@ #include "tinyxml2/tinyxml2.h" #include "flatbuffers/flatbuffers.h" -#include "cocostudio/WidgetReader/WidgetReader.h" -#include "cocostudio/CSParseBinary_generated.h" -#include "cocostudio/WidgetReader/TabControlReader/TabControlReader.h" -#include "cocostudio/FlatBuffersSerialize.h" -#include "cocostudio/ActionTimeline/CSLoader.h" -#include "cocos/ui/UITabControl.h" +#include "editor-support/cocostudio/WidgetReader/WidgetReader.h" +#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "editor-support/cocostudio/WidgetReader/TabControlReader/TabControlReader.h" +#include "editor-support/cocostudio/FlatBuffersSerialize.h" +#include "editor-support/cocostudio/ActionTimeline/CSLoader.h" +#include "ui/UITabControl.h" USING_NS_CC; diff --git a/cocos/editor-support/cocostudio/WidgetReader/TabControlReader/TabControlReader.h b/cocos/editor-support/cocostudio/WidgetReader/TabControlReader/TabControlReader.h index 7a3e035c47..73b43c213e 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/TabControlReader/TabControlReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/TabControlReader/TabControlReader.h @@ -25,9 +25,9 @@ #ifndef __TABCONTROLREADER_H_ #define __TABCONTROLREADER_H_ -#include "cocostudio/WidgetReader/NodeReaderProtocol.h" -#include "cocostudio/WidgetReader/NodeReaderDefine.h" -#include "cocostudio/WidgetReader/TabControlReader/CSTabControl_generated.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" +#include "editor-support/cocostudio/WidgetReader/TabControlReader/CSTabControl_generated.h" class TabControlReader : public cocos2d::Ref, public cocostudio::NodeReaderProtocol diff --git a/cocos/editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.cpp index 3b2d11e7ce..6a40f306ad 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.cpp @@ -1,11 +1,11 @@ -#include "TextAtlasReader.h" +#include "editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.h" #include "ui/UITextAtlas.h" -#include "cocostudio/CocoLoader.h" -#include "cocostudio/CSParseBinary_generated.h" -#include "cocostudio/FlatBuffersSerialize.h" +#include "editor-support/cocostudio/CocoLoader.h" +#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "editor-support/cocostudio/FlatBuffersSerialize.h" #include "tinyxml2.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.h b/cocos/editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.h index 03d416fdc2..9e9967802d 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.h @@ -25,8 +25,8 @@ #ifndef __TestCpp__TextAtlasReader__ #define __TestCpp__TextAtlasReader__ -#include "cocostudio/WidgetReader/WidgetReader.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/WidgetReader/WidgetReader.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.cpp index 8207e91b38..378308a518 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.cpp @@ -1,12 +1,12 @@ -#include "TextBMFontReader.h" +#include "editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.h" #include "2d/CCFontAtlasCache.h" #include "ui/UITextBMFont.h" -#include "cocostudio/CocoLoader.h" -#include "cocostudio/CSParseBinary_generated.h" -#include "cocostudio/LocalizationManager.h" +#include "editor-support/cocostudio/CocoLoader.h" +#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "editor-support/cocostudio/LocalizationManager.h" #include "tinyxml2.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.h b/cocos/editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.h index c56f302d22..dc55f3963e 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.h @@ -25,8 +25,8 @@ #ifndef __TestCpp__TextBMFontReader__ #define __TestCpp__TextBMFontReader__ -#include "cocostudio/WidgetReader/WidgetReader.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/WidgetReader/WidgetReader.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.cpp index 3ed0fc1016..fcce298ba3 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.cpp @@ -1,11 +1,11 @@ -#include "TextFieldReader.h" +#include "editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.h" #include "ui/UITextField.h" -#include "cocostudio/CocoLoader.h" -#include "cocostudio/CSParseBinary_generated.h" -#include "cocostudio/LocalizationManager.h" +#include "editor-support/cocostudio/CocoLoader.h" +#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "editor-support/cocostudio/LocalizationManager.h" #include "tinyxml2.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.h b/cocos/editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.h index 0d7932242b..a751d12add 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.h @@ -25,8 +25,8 @@ #ifndef __TestCpp__TextFieldReader__ #define __TestCpp__TextFieldReader__ -#include "cocostudio/WidgetReader/WidgetReader.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/WidgetReader/WidgetReader.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp index e0def35086..b6ba3c6f72 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp @@ -1,11 +1,11 @@ -#include "TextReader.h" +#include "editor-support/cocostudio/WidgetReader/TextReader/TextReader.h" #include "ui/UIText.h" -#include "cocostudio/CocoLoader.h" -#include "cocostudio/CSParseBinary_generated.h" -#include "cocostudio/LocalizationManager.h" +#include "editor-support/cocostudio/CocoLoader.h" +#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "editor-support/cocostudio/LocalizationManager.h" #include "tinyxml2.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.h b/cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.h index 9fcd854b00..32c1729b85 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.h @@ -25,8 +25,8 @@ #ifndef __TestCpp__TextReader__ #define __TestCpp__TextReader__ -#include "cocostudio/WidgetReader/WidgetReader.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/WidgetReader/WidgetReader.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.cpp index 6d0fdbd9db..4b331cddc1 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.cpp @@ -25,13 +25,13 @@ #include "base/CCDirector.h" #include "2d/CCCamera.h" #include "platform/CCFileUtils.h" -#include "UserCameraReader.h" +#include "editor-support/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.h" -#include "cocostudio/CSParseBinary_generated.h" -#include "cocostudio/CSParse3DBinary_generated.h" -#include "cocostudio/FlatBuffersSerialize.h" -#include "cocostudio/WidgetReader/Node3DReader/Node3DReader.h" -#include "cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.h" +#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "editor-support/cocostudio/CSParse3DBinary_generated.h" +#include "editor-support/cocostudio/FlatBuffersSerialize.h" +#include "editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.h" +#include "editor-support/cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.h" #include "tinyxml2.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.h b/cocos/editor-support/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.h index 3b9065ce1d..04162cc9c1 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.h @@ -26,9 +26,9 @@ #define __cocos2d_libs__UserCameraReader__ #include "math/Vec2.h" -#include "cocostudio/CocosStudioExport.h" -#include "cocostudio/WidgetReader/NodeReaderProtocol.h" -#include "cocostudio/WidgetReader/NodeReaderDefine.h" +#include "editor-support/cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" namespace tinyxml2 { diff --git a/cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp index c11487970c..e288404922 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp @@ -1,17 +1,17 @@ -#include "WidgetReader.h" +#include "editor-support/cocostudio/WidgetReader/WidgetReader.h" -#include "cocostudio/CocoLoader.h" +#include "editor-support/cocostudio/CocoLoader.h" #include "ui/UIButton.h" -#include "../ActionTimeline/CCActionTimeline.h" -#include "cocostudio/CCComExtensionData.h" -#include "cocostudio/CSParseBinary_generated.h" +#include "editor-support/cocostudio/ActionTimeline/CCActionTimeline.h" +#include "editor-support/cocostudio/CCComExtensionData.h" +#include "editor-support/cocostudio/CSParseBinary_generated.h" #include "tinyxml2.h" #include "flatbuffers/flatbuffers.h" #include "ui/UILayoutComponent.h" -#include "cocostudio/ActionTimeline/CSLoader.h" +#include "editor-support/cocostudio/ActionTimeline/CSLoader.h" USING_NS_CC; using namespace ui; diff --git a/cocos/editor-support/cocostudio/WidgetReader/WidgetReader.h b/cocos/editor-support/cocostudio/WidgetReader/WidgetReader.h index 88b7b2afef..67e29ac524 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/WidgetReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/WidgetReader.h @@ -25,12 +25,12 @@ #ifndef __TestCpp__WidgetReader__ #define __TestCpp__WidgetReader__ -#include "WidgetReaderProtocol.h" -#include "cocostudio/CCSGUIReader.h" +#include "editor-support/cocostudio/WidgetReader/WidgetReaderProtocol.h" +#include "editor-support/cocostudio/CCSGUIReader.h" #include "ui/GUIDefine.h" -#include "cocostudio/CocosStudioExport.h" -#include "cocostudio/WidgetReader/NodeReaderProtocol.h" -#include "cocostudio/WidgetReader/NodeReaderDefine.h" +#include "editor-support/cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/WidgetReaderProtocol.h b/cocos/editor-support/cocostudio/WidgetReader/WidgetReaderProtocol.h index b266122e05..0cf625f32a 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/WidgetReaderProtocol.h +++ b/cocos/editor-support/cocostudio/WidgetReader/WidgetReaderProtocol.h @@ -26,8 +26,8 @@ #define __TestCpp__WidgetReaderProtocol__ #include "cocos2d.h" -#include "cocostudio/DictionaryHelper.h" -#include "cocostudio/CocosStudioExport.h" +#include "editor-support/cocostudio/DictionaryHelper.h" +#include "editor-support/cocostudio/CocosStudioExport.h" namespace protocolbuffers { diff --git a/cocos/editor-support/spine/Json.c b/cocos/editor-support/spine/Json.c index 6225ff00cc..66bd339699 100644 --- a/cocos/editor-support/spine/Json.c +++ b/cocos/editor-support/spine/Json.c @@ -34,7 +34,7 @@ #define _BSD_SOURCE #endif -#include "Json.h" +#include "editor-support/spine/Json.h" #include #include #include /* strtod (C89), strtof (C99) */ diff --git a/cocos/editor-support/spine/SkeletonJson.c b/cocos/editor-support/spine/SkeletonJson.c index 84fd997672..79d4bb2968 100644 --- a/cocos/editor-support/spine/SkeletonJson.c +++ b/cocos/editor-support/spine/SkeletonJson.c @@ -31,7 +31,7 @@ #include #include -#include "Json.h" +#include "editor-support/spine/Json.h" #include #include diff --git a/cocos/math/CCMath.h b/cocos/math/CCMath.h index fe1afe36c0..bca9f41f9b 100644 --- a/cocos/math/CCMath.h +++ b/cocos/math/CCMath.h @@ -1,10 +1,10 @@ #ifndef __CC_MATH_H__ #define __CC_MATH_H__ -#include "Vec2.h" -#include "Vec3.h" -#include "Vec4.h" -#include "Mat4.h" -#include "Quaternion.h" +#include "math/Vec2.h" +#include "math/Vec3.h" +#include "math/Vec4.h" +#include "math/Mat4.h" +#include "math/Quaternion.h" #endif diff --git a/cocos/math/MathUtil.cpp b/cocos/math/MathUtil.cpp index 569d14f50d..ceaa218405 100644 --- a/cocos/math/MathUtil.cpp +++ b/cocos/math/MathUtil.cpp @@ -18,7 +18,7 @@ Original file from GamePlay3D: http://gameplay3d.org This file was modified to fit the cocos2d-x project */ -#include "MathUtil.h" +#include "math/MathUtil.h" #include "base/ccMacros.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) @@ -59,18 +59,18 @@ This file was modified to fit the cocos2d-x project #endif #ifdef INCLUDE_NEON32 -#include "MathUtilNeon.inl" +#include "math/MathUtilNeon.inl" #endif #ifdef INCLUDE_NEON64 -#include "MathUtilNeon64.inl" +#include "math/MathUtilNeon64.inl" #endif #ifdef INCLUDE_SSE -#include "MathUtilSSE.inl" +#include "math/MathUtilSSE.inl" #endif -#include "MathUtil.inl" +#include "math/MathUtil.inl" NS_CC_MATH_BEGIN diff --git a/cocos/math/MathUtil.h b/cocos/math/MathUtil.h index fffea2390f..d7db8d9468 100644 --- a/cocos/math/MathUtil.h +++ b/cocos/math/MathUtil.h @@ -26,7 +26,7 @@ #include #endif -#include "CCMathBase.h" +#include "math/CCMathBase.h" /** * @addtogroup base diff --git a/cocos/math/Quaternion.cpp b/cocos/math/Quaternion.cpp index 16dac52d71..214efd27c5 100644 --- a/cocos/math/Quaternion.cpp +++ b/cocos/math/Quaternion.cpp @@ -18,7 +18,7 @@ This file was modified to fit the cocos2d-x project */ -#include "Quaternion.h" +#include "math/Quaternion.h" #include "base/ccMacros.h" NS_CC_MATH_BEGIN diff --git a/cocos/math/Quaternion.h b/cocos/math/Quaternion.h index 1554bace47..6581499ecc 100644 --- a/cocos/math/Quaternion.h +++ b/cocos/math/Quaternion.h @@ -415,6 +415,6 @@ NS_CC_MATH_END end of base group @} */ -#include "Quaternion.inl" +#include "math/Quaternion.inl" #endif diff --git a/cocos/math/Quaternion.inl b/cocos/math/Quaternion.inl index b848b7f6a7..f6ad8fec8f 100644 --- a/cocos/math/Quaternion.inl +++ b/cocos/math/Quaternion.inl @@ -18,7 +18,7 @@ This file was modified to fit the cocos2d-x project */ -#include "Quaternion.h" +#include "math/Quaternion.h" NS_CC_MATH_BEGIN diff --git a/cocos/math/Vec2.h b/cocos/math/Vec2.h index 4c60410d67..da868ec786 100644 --- a/cocos/math/Vec2.h +++ b/cocos/math/Vec2.h @@ -766,6 +766,6 @@ NS_CC_MATH_END @} */ -#include "Vec2.inl" +#include "math/Vec2.inl" #endif // MATH_VEC2_H diff --git a/cocos/math/Vec3.h b/cocos/math/Vec3.h index 8813a8738c..de469b827d 100644 --- a/cocos/math/Vec3.h +++ b/cocos/math/Vec3.h @@ -506,6 +506,6 @@ NS_CC_MATH_END end of base group @} */ -#include "Vec3.inl" +#include "math/Vec3.inl" #endif // MATH_VEC3_H diff --git a/cocos/network/HttpClient-android.cpp b/cocos/network/HttpClient-android.cpp index 45eca7971f..1d5d500259 100644 --- a/cocos/network/HttpClient-android.cpp +++ b/cocos/network/HttpClient-android.cpp @@ -27,7 +27,7 @@ #include "platform/CCPlatformConfig.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) -#include "HttpClient.h" +#include "network/HttpClient.h" #include #include diff --git a/cocos/network/HttpClient-winrt.cpp b/cocos/network/HttpClient-winrt.cpp index e1c6c3ca7b..15f75f0016 100644 --- a/cocos/network/HttpClient-winrt.cpp +++ b/cocos/network/HttpClient-winrt.cpp @@ -27,7 +27,7 @@ THE SOFTWARE. #include "platform/CCPlatformConfig.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) -#include "HttpClient.h" +#include "network/HttpClient.h" #include #include @@ -40,7 +40,7 @@ THE SOFTWARE. #include "base/CCScheduler.h" #include "platform/CCFileUtils.h" -#include "HttpConnection-winrt.h" +#include "network/HttpConnection-winrt.h" NS_CC_BEGIN diff --git a/cocos/network/HttpClient.cpp b/cocos/network/HttpClient.cpp index 8d800bb2ef..c124e70829 100644 --- a/cocos/network/HttpClient.cpp +++ b/cocos/network/HttpClient.cpp @@ -24,7 +24,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "HttpClient.h" +#include "network/HttpClient.h" #include #include #include diff --git a/cocos/network/HttpConnection-winrt.cpp b/cocos/network/HttpConnection-winrt.cpp index bd1552c11e..6e344cc0bc 100644 --- a/cocos/network/HttpConnection-winrt.cpp +++ b/cocos/network/HttpConnection-winrt.cpp @@ -28,7 +28,7 @@ THE SOFTWARE. #if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) #include "network/HttpCookie.h" -#include "HttpConnection-winrt.h" +#include "network/HttpConnection-winrt.h" NS_CC_BEGIN diff --git a/cocos/network/HttpCookie.cpp b/cocos/network/HttpCookie.cpp index a7f805c0c6..c293819daa 100644 --- a/cocos/network/HttpCookie.cpp +++ b/cocos/network/HttpCookie.cpp @@ -22,8 +22,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "HttpCookie.h" -#include "CCFileUtils.h" +#include "network/HttpCookie.h" +#include "platform/CCFileUtils.h" #include #include diff --git a/cocos/network/SocketIO.cpp b/cocos/network/SocketIO.cpp index b4f3f1064d..62cd820813 100644 --- a/cocos/network/SocketIO.cpp +++ b/cocos/network/SocketIO.cpp @@ -27,14 +27,14 @@ ****************************************************************************/ -#include "SocketIO.h" +#include "network/SocketIO.h" #include #include #include #include "base/CCDirector.h" #include "base/CCScheduler.h" -#include "WebSocket.h" -#include "HttpClient.h" +#include "network/WebSocket.h" +#include "network/HttpClient.h" #include "json/rapidjson.h" #include "json/document.h" diff --git a/cocos/network/WebSocket.cpp b/cocos/network/WebSocket.cpp index 15a205bfbd..655cfeca98 100644 --- a/cocos/network/WebSocket.cpp +++ b/cocos/network/WebSocket.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include "WebSocket.h" +#include "network/WebSocket.h" #include "base/CCDirector.h" #include "base/CCScheduler.h" #include "base/CCEventDispatcher.h" diff --git a/cocos/physics/CCPhysicsContact.cpp b/cocos/physics/CCPhysicsContact.cpp index 54b9d0cc67..b1750598e7 100644 --- a/cocos/physics/CCPhysicsContact.cpp +++ b/cocos/physics/CCPhysicsContact.cpp @@ -21,12 +21,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCPhysicsContact.h" +#include "physics/CCPhysicsContact.h" #if CC_USE_PHYSICS #include "chipmunk/chipmunk.h" -#include "CCPhysicsBody.h" -#include "CCPhysicsHelper.h" +#include "physics/CCPhysicsBody.h" +#include "physics/CCPhysicsHelper.h" #include "base/CCEventCustom.h" NS_CC_BEGIN diff --git a/cocos/physics/CCPhysicsJoint.cpp b/cocos/physics/CCPhysicsJoint.cpp index 4586578940..23c02f8828 100644 --- a/cocos/physics/CCPhysicsJoint.cpp +++ b/cocos/physics/CCPhysicsJoint.cpp @@ -26,9 +26,9 @@ #if CC_USE_PHYSICS #include "chipmunk/chipmunk.h" -#include "CCPhysicsBody.h" -#include "CCPhysicsWorld.h" -#include "CCPhysicsHelper.h" +#include "physics/CCPhysicsBody.h" +#include "physics/CCPhysicsWorld.h" +#include "physics/CCPhysicsHelper.h" #include "2d/CCNode.h" NS_CC_BEGIN diff --git a/cocos/physics/CCPhysicsShape.cpp b/cocos/physics/CCPhysicsShape.cpp index ad14ed223b..43b01d2436 100644 --- a/cocos/physics/CCPhysicsShape.cpp +++ b/cocos/physics/CCPhysicsShape.cpp @@ -31,9 +31,9 @@ #include "chipmunk/chipmunk.h" #include "chipmunk/chipmunk_unsafe.h" -#include "CCPhysicsBody.h" -#include "CCPhysicsWorld.h" -#include "CCPhysicsHelper.h" +#include "physics/CCPhysicsBody.h" +#include "physics/CCPhysicsWorld.h" +#include "physics/CCPhysicsHelper.h" NS_CC_BEGIN extern const float PHYSICS_INFINITY; diff --git a/cocos/physics/CCPhysicsWorld.cpp b/cocos/physics/CCPhysicsWorld.cpp index 7dc07e0cc7..f4c29242f7 100644 --- a/cocos/physics/CCPhysicsWorld.cpp +++ b/cocos/physics/CCPhysicsWorld.cpp @@ -28,12 +28,12 @@ #include #include "chipmunk/chipmunk_private.h" -#include "CCPhysicsBody.h" -#include "CCPhysicsShape.h" -#include "CCPhysicsContact.h" -#include "CCPhysicsJoint.h" -#include "CCPhysicsContact.h" -#include "CCPhysicsHelper.h" +#include "physics/CCPhysicsBody.h" +#include "physics/CCPhysicsShape.h" +#include "physics/CCPhysicsContact.h" +#include "physics/CCPhysicsJoint.h" +#include "physics/CCPhysicsContact.h" +#include "physics/CCPhysicsHelper.h" #include "2d/CCDrawNode.h" #include "2d/CCScene.h" diff --git a/cocos/physics3d/CCPhysics3D.cpp b/cocos/physics3d/CCPhysics3D.cpp index 02018b2081..6d872fff31 100644 --- a/cocos/physics3d/CCPhysics3D.cpp +++ b/cocos/physics3d/CCPhysics3D.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCPhysics3D.h" +#include "physics3d/CCPhysics3D.h" #if CC_USE_3D_PHYSICS diff --git a/cocos/physics3d/CCPhysics3D.h b/cocos/physics3d/CCPhysics3D.h index e98b2f8a79..c26818fef3 100644 --- a/cocos/physics3d/CCPhysics3D.h +++ b/cocos/physics3d/CCPhysics3D.h @@ -30,13 +30,13 @@ #if CC_USE_3D_PHYSICS -#include "CCPhysics3DShape.h" -#include "CCPhysicsSprite3D.h" -#include "CCPhysics3DWorld.h" -#include "CCPhysics3DDebugDrawer.h" -#include "CCPhysics3DObject.h" -#include "CCPhysics3DComponent.h" -#include "CCPhysics3DConstraint.h" +#include "physics3d/CCPhysics3DShape.h" +#include "physics3d/CCPhysicsSprite3D.h" +#include "physics3d/CCPhysics3DWorld.h" +#include "physics3d/CCPhysics3DDebugDrawer.h" +#include "physics3d/CCPhysics3DObject.h" +#include "physics3d/CCPhysics3DComponent.h" +#include "physics3d/CCPhysics3DConstraint.h" NS_CC_BEGIN diff --git a/cocos/physics3d/CCPhysics3DComponent.cpp b/cocos/physics3d/CCPhysics3DComponent.cpp index 757c258a25..39907e98e8 100644 --- a/cocos/physics3d/CCPhysics3DComponent.cpp +++ b/cocos/physics3d/CCPhysics3DComponent.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCPhysics3D.h" +#include "physics3d/CCPhysics3D.h" #include "2d/CCNode.h" #include "2d/CCScene.h" diff --git a/cocos/physics3d/CCPhysics3DConstraint.cpp b/cocos/physics3d/CCPhysics3DConstraint.cpp index dc59d370b4..8ec3eba53a 100644 --- a/cocos/physics3d/CCPhysics3DConstraint.cpp +++ b/cocos/physics3d/CCPhysics3DConstraint.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCPhysics3D.h" +#include "physics3d/CCPhysics3D.h" #if CC_USE_3D_PHYSICS diff --git a/cocos/physics3d/CCPhysics3DDebugDrawer.cpp b/cocos/physics3d/CCPhysics3DDebugDrawer.cpp index b635c6debe..304e885438 100644 --- a/cocos/physics3d/CCPhysics3DDebugDrawer.cpp +++ b/cocos/physics3d/CCPhysics3DDebugDrawer.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCPhysics3D.h" +#include "physics3d/CCPhysics3D.h" #include "base/CCConfiguration.h" #include "base/ccMacros.h" #include "base/CCDirector.h" diff --git a/cocos/physics3d/CCPhysics3DObject.cpp b/cocos/physics3d/CCPhysics3DObject.cpp index 8f9aebfb93..0134d41075 100644 --- a/cocos/physics3d/CCPhysics3DObject.cpp +++ b/cocos/physics3d/CCPhysics3DObject.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCPhysics3D.h" +#include "physics3d/CCPhysics3D.h" #include "base/ccUTF8.h" #if CC_USE_3D_PHYSICS diff --git a/cocos/physics3d/CCPhysics3DShape.cpp b/cocos/physics3d/CCPhysics3DShape.cpp index 4ceee16dc9..3a7a0e8fee 100644 --- a/cocos/physics3d/CCPhysics3DShape.cpp +++ b/cocos/physics3d/CCPhysics3DShape.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCPhysics3D.h" +#include "physics3d/CCPhysics3D.h" #if CC_USE_3D_PHYSICS diff --git a/cocos/physics3d/CCPhysics3DWorld.cpp b/cocos/physics3d/CCPhysics3DWorld.cpp index 4217df2b2e..60b184c9b4 100644 --- a/cocos/physics3d/CCPhysics3DWorld.cpp +++ b/cocos/physics3d/CCPhysics3DWorld.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCPhysics3D.h" +#include "physics3d/CCPhysics3D.h" #include "renderer/CCRenderer.h" #if CC_USE_3D_PHYSICS diff --git a/cocos/physics3d/CCPhysicsSprite3D.cpp b/cocos/physics3d/CCPhysicsSprite3D.cpp index e004f19acf..461b50997b 100644 --- a/cocos/physics3d/CCPhysicsSprite3D.cpp +++ b/cocos/physics3d/CCPhysicsSprite3D.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCPhysics3D.h" +#include "physics3d/CCPhysics3D.h" #if CC_USE_3D_PHYSICS diff --git a/cocos/physics3d/CCPhysicsSprite3D.h b/cocos/physics3d/CCPhysicsSprite3D.h index 4d34df22fb..44efbd4cba 100644 --- a/cocos/physics3d/CCPhysicsSprite3D.h +++ b/cocos/physics3d/CCPhysicsSprite3D.h @@ -27,8 +27,8 @@ #include "base/ccConfig.h" #include "3d/CCSprite3D.h" -#include "CCPhysics3DObject.h" -#include "CCPhysics3DComponent.h" +#include "physics3d/CCPhysics3DObject.h" +#include "physics3d/CCPhysics3DComponent.h" #if CC_USE_3D_PHYSICS diff --git a/cocos/platform/CCFileUtils.cpp b/cocos/platform/CCFileUtils.cpp index 39464b65c6..ed622f7034 100644 --- a/cocos/platform/CCFileUtils.cpp +++ b/cocos/platform/CCFileUtils.cpp @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCFileUtils.h" +#include "platform/CCFileUtils.h" #include diff --git a/cocos/platform/CCImage.cpp b/cocos/platform/CCImage.cpp index 6d507d6b33..a27685b49d 100644 --- a/cocos/platform/CCImage.cpp +++ b/cocos/platform/CCImage.cpp @@ -79,14 +79,14 @@ extern "C" #endif // CC_USE_WEBP #include "base/ccMacros.h" -#include "CCCommon.h" -#include "CCStdC.h" -#include "CCFileUtils.h" +#include "platform/CCCommon.h" +#include "platform/CCStdC.h" +#include "platform/CCFileUtils.h" #include "base/CCConfiguration.h" #include "base/ccUtils.h" #include "base/ZipUtils.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) -#include "android/CCFileUtils-android.h" +#include "platform/android/CCFileUtils-android.h" #endif #define CC_GL_ATC_RGB_AMD 0x8C92 diff --git a/cocos/platform/CCImage.h b/cocos/platform/CCImage.h index cbf5ef6de1..86e80f1a54 100644 --- a/cocos/platform/CCImage.h +++ b/cocos/platform/CCImage.h @@ -31,7 +31,7 @@ THE SOFTWARE. #include "renderer/CCTexture2D.h" #if defined(CC_USE_WIC) -#include "WICImageLoader-winrt.h" +#include "platform/winrt/WICImageLoader-winrt.h" #endif // premultiply alpha, or the effect will wrong when want to use other pixel format in Texture2D, diff --git a/cocos/platform/android/CCEnhanceAPI-android.cpp b/cocos/platform/android/CCEnhanceAPI-android.cpp index 96b9d84b2d..5e7c28cb6d 100644 --- a/cocos/platform/android/CCEnhanceAPI-android.cpp +++ b/cocos/platform/android/CCEnhanceAPI-android.cpp @@ -17,8 +17,8 @@ #include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID -#include "jni/JniHelper.h" -#include "CCEnhanceAPI-android.h" +#include "platform/android/jni/JniHelper.h" +#include "platform/android/CCEnhanceAPI-android.h" #include #include diff --git a/cocos/platform/android/CCFileUtils-android.cpp b/cocos/platform/android/CCFileUtils-android.cpp index bf055f97dd..98fd641215 100644 --- a/cocos/platform/android/CCFileUtils-android.cpp +++ b/cocos/platform/android/CCFileUtils-android.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID -#include "CCFileUtils-android.h" +#include "platform/android/CCFileUtils-android.h" #include "platform/CCCommon.h" #include "platform/android/jni/JniHelper.h" #include "android/asset_manager.h" diff --git a/cocos/platform/android/CCGLViewImpl-android.cpp b/cocos/platform/android/CCGLViewImpl-android.cpp index 2fc9b01d39..8248f72f9d 100644 --- a/cocos/platform/android/CCGLViewImpl-android.cpp +++ b/cocos/platform/android/CCGLViewImpl-android.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID -#include "CCGLViewImpl-android.h" +#include "platform/android/CCGLViewImpl-android.h" #include "base/CCDirector.h" #include "base/ccMacros.h" #include "platform/android/jni/JniHelper.h" diff --git a/cocos/platform/android/javaactivity-android.cpp b/cocos/platform/android/javaactivity-android.cpp index 6e826c639e..413510ac7f 100644 --- a/cocos/platform/android/javaactivity-android.cpp +++ b/cocos/platform/android/javaactivity-android.cpp @@ -25,8 +25,8 @@ THE SOFTWARE. #include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID -#include "CCApplication-android.h" -#include "CCGLViewImpl-android.h" +#include "platform/android/CCApplication-android.h" +#include "platform/android/CCGLViewImpl-android.h" #include "base/CCDirector.h" #include "base/CCEventCustom.h" #include "base/CCEventType.h" diff --git a/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxAccelerometer.cpp b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxAccelerometer.cpp index 23199fe053..e6b2b7224c 100644 --- a/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxAccelerometer.cpp +++ b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxAccelerometer.cpp @@ -1,4 +1,4 @@ -#include "JniHelper.h" +#include "platform/android/jni/JniHelper.h" #include #include "base/CCDirector.h" #include "base/CCEventDispatcher.h" diff --git a/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp index 3e0e70331f..6394a470d1 100644 --- a/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp +++ b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp @@ -26,11 +26,11 @@ THE SOFTWARE. #include #include #include -#include "JniHelper.h" -#include "CCFileUtils-android.h" +#include "platform/android/jni/JniHelper.h" +#include "platform/android/CCFileUtils-android.h" #include "android/asset_manager_jni.h" #include "deprecated/CCString.h" -#include "Java_org_cocos2dx_lib_Cocos2dxHelper.h" +#include "platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h" #include "base/ccUTF8.h" diff --git a/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp index 5992f7783c..685d92052f 100644 --- a/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp +++ b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp @@ -5,7 +5,7 @@ #include "base/CCEventDispatcher.h" #include "../CCApplication.h" #include "platform/CCFileUtils.h" -#include "JniHelper.h" +#include "platform/android/jni/JniHelper.h" #include #include "base/ccUTF8.h" diff --git a/cocos/platform/android/jni/JniHelper.cpp b/cocos/platform/android/jni/JniHelper.cpp index a4f684ee94..a4caa36eb8 100644 --- a/cocos/platform/android/jni/JniHelper.cpp +++ b/cocos/platform/android/jni/JniHelper.cpp @@ -22,7 +22,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 "JniHelper.h" +#include "platform/android/jni/JniHelper.h" #include #include #include diff --git a/cocos/platform/apple/CCLock-apple.cpp b/cocos/platform/apple/CCLock-apple.cpp index 4ac0698964..032d0c9c62 100644 --- a/cocos/platform/apple/CCLock-apple.cpp +++ b/cocos/platform/apple/CCLock-apple.cpp @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCLock-apple.h" +#include "platform/apple/CCLock-apple.h" NS_CC_BEGIN diff --git a/cocos/platform/desktop/CCGLViewImpl-desktop.cpp b/cocos/platform/desktop/CCGLViewImpl-desktop.cpp index 079ab5cc28..f897df2a63 100644 --- a/cocos/platform/desktop/CCGLViewImpl-desktop.cpp +++ b/cocos/platform/desktop/CCGLViewImpl-desktop.cpp @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCGLViewImpl-desktop.h" +#include "platform/desktop/CCGLViewImpl-desktop.h" #include diff --git a/cocos/platform/linux/CCApplication-linux.cpp b/cocos/platform/linux/CCApplication-linux.cpp index 8f19a553fb..e7c6f63a76 100644 --- a/cocos/platform/linux/CCApplication-linux.cpp +++ b/cocos/platform/linux/CCApplication-linux.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_LINUX -#include "CCApplication-linux.h" +#include "platform/linux/CCApplication-linux.h" #include #include #include diff --git a/cocos/platform/linux/CCCommon-linux.cpp b/cocos/platform/linux/CCCommon-linux.cpp index 18726dbb8e..d3f8f3fa7f 100644 --- a/cocos/platform/linux/CCCommon-linux.cpp +++ b/cocos/platform/linux/CCCommon-linux.cpp @@ -27,7 +27,7 @@ THE SOFTWARE. #if CC_TARGET_PLATFORM == CC_PLATFORM_LINUX #include "platform/CCCommon.h" -#include "CCStdC-linux.h" +#include "platform/linux/CCStdC-linux.h" #include "base/CCConsole.h" NS_CC_BEGIN diff --git a/cocos/platform/linux/CCFileUtils-linux.cpp b/cocos/platform/linux/CCFileUtils-linux.cpp index cd915e940d..c0f633695e 100644 --- a/cocos/platform/linux/CCFileUtils-linux.cpp +++ b/cocos/platform/linux/CCFileUtils-linux.cpp @@ -26,8 +26,8 @@ THE SOFTWARE. #include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_LINUX -#include "CCFileUtils-linux.h" -#include "CCApplication-linux.h" +#include "platform/linux/CCFileUtils-linux.h" +#include "platform/linux/CCApplication-linux.h" #include "platform/CCCommon.h" #include "base/ccMacros.h" #include "deprecated/CCString.h" diff --git a/cocos/platform/linux/CCStdC-linux.cpp b/cocos/platform/linux/CCStdC-linux.cpp index 6c3f079579..b35eb9a84f 100644 --- a/cocos/platform/linux/CCStdC-linux.cpp +++ b/cocos/platform/linux/CCStdC-linux.cpp @@ -24,7 +24,7 @@ THE SOFTWARE. ****************************************************************************/ #include "platform/CCPlatformConfig.h" -#include "CCStdC-linux.h" +#include "platform/linux/CCStdC-linux.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_LINUX diff --git a/cocos/platform/win32/CCFileUtils-win32.cpp b/cocos/platform/win32/CCFileUtils-win32.cpp index c4c376ded1..f734f56c4d 100644 --- a/cocos/platform/win32/CCFileUtils-win32.cpp +++ b/cocos/platform/win32/CCFileUtils-win32.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 -#include "CCFileUtils-win32.h" +#include "platform/win32/CCFileUtils-win32.h" #include "platform/CCCommon.h" #include #include diff --git a/cocos/platform/win32/CCStdC-win32.h b/cocos/platform/win32/CCStdC-win32.h index b541922c67..210657a465 100644 --- a/cocos/platform/win32/CCStdC-win32.h +++ b/cocos/platform/win32/CCStdC-win32.h @@ -89,7 +89,7 @@ typedef SSIZE_T ssize_t; #if _MSC_VER >= 1600 || defined(__MINGW32__) #include #else - #include "./compat/stdint.h" + #include "platform/win32/compat/stdint.h" #endif #define _WINSOCKAPI_ diff --git a/cocos/platform/win32/compat/stdint.h b/cocos/platform/win32/compat/stdint.h index a7130075ca..14276eba8b 100644 --- a/cocos/platform/win32/compat/stdint.h +++ b/cocos/platform/win32/compat/stdint.h @@ -32,7 +32,7 @@ #ifndef _MSC_STDINT_H_ // [ #define _MSC_STDINT_H_ -#include "CCPlatformConfig.h" +#include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 #ifndef _MSC_VER // [ diff --git a/cocos/platform/win32/inet_pton_mingw.cpp b/cocos/platform/win32/inet_pton_mingw.cpp index f29c961341..5c51fd3468 100644 --- a/cocos/platform/win32/inet_pton_mingw.cpp +++ b/cocos/platform/win32/inet_pton_mingw.cpp @@ -30,7 +30,7 @@ #define ERRNO ((int)GetLastError()) #define SET_ERRNO(x) (SetLastError((DWORD)(x))) -#include "inet_pton_mingw.h" +#include "platform/win32/inet_pton_mingw.h" #define ENABLE_IPV6 diff --git a/cocos/platform/win8.1-universal/Cocos2dRenderer.cpp b/cocos/platform/win8.1-universal/Cocos2dRenderer.cpp index 5b62283690..f5ef80ab1d 100644 --- a/cocos/platform/win8.1-universal/Cocos2dRenderer.cpp +++ b/cocos/platform/win8.1-universal/Cocos2dRenderer.cpp @@ -16,9 +16,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -#include "Cocos2dRenderer.h" +#include "platform/win8.1-universal/Cocos2dRenderer.h" #include "AppDelegate.h" -#include "CCGLViewImpl-winrt.h" +#include "platform/winrt/CCGLViewImpl-winrt.h" #include "CCApplication.h" #include "cocos2d.h" #include "renderer/CCTextureCache.h" diff --git a/cocos/platform/win8.1-universal/OpenGLES.cpp b/cocos/platform/win8.1-universal/OpenGLES.cpp index 2721b1ee4f..bb44973cab 100644 --- a/cocos/platform/win8.1-universal/OpenGLES.cpp +++ b/cocos/platform/win8.1-universal/OpenGLES.cpp @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -#include "OpenGLES.h" +#include "platform/win8.1-universal/OpenGLES.h" using namespace Platform; using namespace Windows::UI::Xaml::Controls; using namespace Windows::Foundation; diff --git a/cocos/platform/win8.1-universal/OpenGLESPage.xaml.cpp b/cocos/platform/win8.1-universal/OpenGLESPage.xaml.cpp index a7b3edfd3e..bdd4198c1b 100644 --- a/cocos/platform/win8.1-universal/OpenGLESPage.xaml.cpp +++ b/cocos/platform/win8.1-universal/OpenGLESPage.xaml.cpp @@ -17,7 +17,7 @@ */ #include "App.xaml.h" -#include "OpenGLESPage.xaml.h" +#include "platform/win8.1-universal/OpenGLESPage.xaml.h" using namespace CocosAppWinRT; using namespace cocos2d; diff --git a/cocos/platform/win8.1-universal/OpenGLESPage.xaml.h b/cocos/platform/win8.1-universal/OpenGLESPage.xaml.h index 83fa8215c8..0c570756d4 100644 --- a/cocos/platform/win8.1-universal/OpenGLESPage.xaml.h +++ b/cocos/platform/win8.1-universal/OpenGLESPage.xaml.h @@ -18,13 +18,13 @@ #pragma once -#include "OpenGLES.h" +#include "platform/win8.1-universal/OpenGLES.h" #include "OpenGLESPage.g.h" #include #include #include -#include "Cocos2dRenderer.h" +#include "platform/win8.1-universal/Cocos2dRenderer.h" namespace CocosAppWinRT { diff --git a/cocos/platform/win8.1-universal/pch.cpp b/cocos/platform/win8.1-universal/pch.cpp index bcb5590be1..6043f66758 100644 --- a/cocos/platform/win8.1-universal/pch.cpp +++ b/cocos/platform/win8.1-universal/pch.cpp @@ -1 +1 @@ -#include "pch.h" +#include "platform/win8.1-universal/pch.h" diff --git a/cocos/platform/winrt/CCApplication.cpp b/cocos/platform/winrt/CCApplication.cpp index 65a583994a..2544261c09 100644 --- a/cocos/platform/winrt/CCApplication.cpp +++ b/cocos/platform/winrt/CCApplication.cpp @@ -34,7 +34,7 @@ using namespace Windows::Foundation; #include "base/CCDirector.h" #include #include "platform/CCFileUtils.h" -#include "CCWinRTUtils.h" +#include "platform/winrt/CCWinRTUtils.h" #include "platform/CCApplication.h" #include "tinyxml2/tinyxml2.h" diff --git a/cocos/platform/winrt/CCCommon.cpp b/cocos/platform/winrt/CCCommon.cpp index c313dfd0b3..7cf2b364db 100644 --- a/cocos/platform/winrt/CCCommon.cpp +++ b/cocos/platform/winrt/CCCommon.cpp @@ -25,7 +25,7 @@ THE SOFTWARE. #include "platform/CCCommon.h" #include "platform/CCStdC.h" #include "platform/winrt/CCGLViewImpl-winrt.h" -#include "CCWinRTUtils.h" +#include "platform/winrt/CCWinRTUtils.h" #if defined(VLD_DEBUG_MEMORY) #include diff --git a/cocos/platform/winrt/CCFileUtilsWinRT.cpp b/cocos/platform/winrt/CCFileUtilsWinRT.cpp index 338f9eba89..6cc70086be 100644 --- a/cocos/platform/winrt/CCFileUtilsWinRT.cpp +++ b/cocos/platform/winrt/CCFileUtilsWinRT.cpp @@ -22,9 +22,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 "CCFileUtilsWinRT.h" +#include "platform/winrt/CCFileUtilsWinRT.h" #include -#include "CCWinRTUtils.h" +#include "platform/winrt/CCWinRTUtils.h" #include "platform/CCCommon.h" using namespace std; diff --git a/cocos/platform/winrt/CCFreeTypeFont.cpp b/cocos/platform/winrt/CCFreeTypeFont.cpp index 6ce6ffac45..a443dd85fb 100644 --- a/cocos/platform/winrt/CCFreeTypeFont.cpp +++ b/cocos/platform/winrt/CCFreeTypeFont.cpp @@ -21,7 +21,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCFreeTypeFont.h" +#include "platform/winrt/CCFreeTypeFont.h" #include "base/CCDirector.h" #include "platform/CCFileUtils.h" diff --git a/cocos/platform/winrt/CCGL.h b/cocos/platform/winrt/CCGL.h index feeafe282b..562eb81557 100644 --- a/cocos/platform/winrt/CCGL.h +++ b/cocos/platform/winrt/CCGL.h @@ -41,7 +41,7 @@ THE SOFTWARE. #define glMapBuffer glMapBufferOES #else -#include "CCGL_Angle.h" +#include "platform/winrt/CCGL_Angle.h" #endif diff --git a/cocos/platform/winrt/CCGLViewImpl-winrt.cpp b/cocos/platform/winrt/CCGLViewImpl-winrt.cpp index b6af97b0ef..25b35eebb6 100644 --- a/cocos/platform/winrt/CCGLViewImpl-winrt.cpp +++ b/cocos/platform/winrt/CCGLViewImpl-winrt.cpp @@ -23,14 +23,14 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCGLViewImpl-winrt.h" +#include "platform/winrt/CCGLViewImpl-winrt.h" #include "base/ccMacros.h" #include "base/CCDirector.h" #include "base/CCTouch.h" #include "base/CCIMEDispatcher.h" #include "base/CCEventListenerKeyboard.h" -#include "CCApplication.h" -#include "CCWinRTUtils.h" +#include "platform/winrt/CCApplication.h" +#include "platform/winrt/CCWinRTUtils.h" #include "deprecated/CCNotificationCenter.h" #include "base/CCDirector.h" #include "base/CCEventDispatcher.h" diff --git a/cocos/platform/winrt/CCGLViewImpl-winrt.h b/cocos/platform/winrt/CCGLViewImpl-winrt.h index 8afd385cb8..a0314c7bc4 100644 --- a/cocos/platform/winrt/CCGLViewImpl-winrt.h +++ b/cocos/platform/winrt/CCGLViewImpl-winrt.h @@ -26,9 +26,9 @@ THE SOFTWARE. #ifndef __CC_EGLVIEWIMPL_WINRT_H__ #define __CC_EGLVIEWIMPL_WINRT_H__ -#include "CCStdC.h" +#include "platform/winrt/CCStdC.h" #include "platform/CCCommon.h" -#include "Keyboard-winrt.h" +#include "platform/winrt/Keyboard-winrt.h" #include "platform/CCGLView.h" #include "base/CCEventKeyboard.h" diff --git a/cocos/platform/winrt/CCGLViewImpl.cpp b/cocos/platform/winrt/CCGLViewImpl.cpp index 0a4535847a..3136a42ee2 100644 --- a/cocos/platform/winrt/CCGLViewImpl.cpp +++ b/cocos/platform/winrt/CCGLViewImpl.cpp @@ -26,13 +26,13 @@ THE SOFTWARE. #include "platform/CCPlatformConfig.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) -#include "CCGLViewImpl.h" +#include "platform/winrt/CCGLViewImpl.h" #include "base/ccMacros.h" #include "base/CCDirector.h" #include "base/CCTouch.h" #include "base/CCIMEDispatcher.h" -#include "CCApplication.h" -#include "CCWinRTUtils.h" +#include "platform/winrt/CCApplication.h" +#include "platform/winrt/CCWinRTUtils.h" #if (_MSC_VER >= 1800) #include diff --git a/cocos/platform/winrt/CCGLViewImpl.h b/cocos/platform/winrt/CCGLViewImpl.h index 9b87c30fda..3ff351f8da 100644 --- a/cocos/platform/winrt/CCGLViewImpl.h +++ b/cocos/platform/winrt/CCGLViewImpl.h @@ -29,10 +29,10 @@ THE SOFTWARE. #include "platform/CCPlatformConfig.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) -#include "CCStdC.h" -#include "CCGL.h" +#include "platform/winrt/CCStdC.h" +#include "platform/winrt/CCGL.h" #include "platform/CCCommon.h" -#include "InputEvent.h" +#include "platform/winrt/InputEvent.h" #include "platform/CCGLView.h" #include diff --git a/cocos/platform/winrt/CCPThreadWinRT.cpp b/cocos/platform/winrt/CCPThreadWinRT.cpp index 33df10ee59..aae5f5b629 100644 --- a/cocos/platform/winrt/CCPThreadWinRT.cpp +++ b/cocos/platform/winrt/CCPThreadWinRT.cpp @@ -27,7 +27,7 @@ THE SOFTWARE. #include "platform/CCPlatformConfig.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) -#include "CCPThreadWinRT.h" +#include "platform/winrt/CCPThreadWinRT.h" NS_CC_BEGIN diff --git a/cocos/platform/winrt/CCPrecompiledShaders.cpp b/cocos/platform/winrt/CCPrecompiledShaders.cpp index c76202e6d7..b6cc308436 100644 --- a/cocos/platform/winrt/CCPrecompiledShaders.cpp +++ b/cocos/platform/winrt/CCPrecompiledShaders.cpp @@ -22,10 +22,10 @@ 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 "CCPrecompiledShaders.h" -#include "CCWinRTUtils.h" +#include "platform/winrt/CCPrecompiledShaders.h" +#include "platform/winrt/CCWinRTUtils.h" #include "renderer/CCGLProgram.h" -#include "sha1.h" +#include "platform/winrt/sha1.h" using namespace Windows::Graphics::Display; using namespace Windows::Storage; diff --git a/cocos/platform/winrt/CCPrecompiledShaders.h b/cocos/platform/winrt/CCPrecompiledShaders.h index eb853e9e2c..ca269fabac 100644 --- a/cocos/platform/winrt/CCPrecompiledShaders.h +++ b/cocos/platform/winrt/CCPrecompiledShaders.h @@ -26,7 +26,7 @@ THE SOFTWARE. #define __CC_PRECOMPILED_SHADERS_H__ #include "platform/CCCommon.h" -#include "CCGL.h" +#include "platform/winrt/CCGL.h" #include #include diff --git a/cocos/platform/winrt/CCWinRTUtils.cpp b/cocos/platform/winrt/CCWinRTUtils.cpp index f8dd5c1dbe..c1e0352b04 100644 --- a/cocos/platform/winrt/CCWinRTUtils.cpp +++ b/cocos/platform/winrt/CCWinRTUtils.cpp @@ -22,7 +22,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 "CCWinRTUtils.h" +#include "platform/winrt/CCWinRTUtils.h" #include #include #include diff --git a/cocos/platform/winrt/InputEvent.cpp b/cocos/platform/winrt/InputEvent.cpp index 1f3425a67c..f8802d7992 100644 --- a/cocos/platform/winrt/InputEvent.cpp +++ b/cocos/platform/winrt/InputEvent.cpp @@ -23,9 +23,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "InputEvent.h" -#include "CCWinRTUtils.h" -#include "CCGLViewImpl-winrt.h" +#include "platform/winrt/InputEvent.h" +#include "platform/winrt/CCWinRTUtils.h" +#include "platform/winrt/CCGLViewImpl-winrt.h" #include "base/CCEventAcceleration.h" #include "base/CCDirector.h" #include "base/CCEventDispatcher.h" diff --git a/cocos/platform/winrt/InputEvent.h b/cocos/platform/winrt/InputEvent.h index 501cbdfba9..019ead74ae 100644 --- a/cocos/platform/winrt/InputEvent.h +++ b/cocos/platform/winrt/InputEvent.h @@ -26,8 +26,8 @@ THE SOFTWARE. #ifndef __WINRT_INPUT_EVENT__ #define __WINRT_INPUT_EVENT__ -#include "CCPlatformMacros.h" -#include "InputEventTypes.h" +#include "platform/CCPlatformMacros.h" +#include "platform/winrt/InputEventTypes.h" #include "base/ccTypes.h" #include diff --git a/cocos/platform/winrt/Keyboard-winrt.cpp b/cocos/platform/winrt/Keyboard-winrt.cpp index 88803874ea..b72024faf7 100644 --- a/cocos/platform/winrt/Keyboard-winrt.cpp +++ b/cocos/platform/winrt/Keyboard-winrt.cpp @@ -25,9 +25,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "Keyboard-winrt.h" +#include "platform/winrt/Keyboard-winrt.h" #include "base/CCEventKeyboard.h" -#include "CCGLViewImpl-winrt.h" +#include "platform/winrt/CCGLViewImpl-winrt.h" #include "base/CCIMEDispatcher.h" #include "base/CCDirector.h" #include "base/CCEventDispatcher.h" diff --git a/cocos/platform/winrt/Keyboard-winrt.h b/cocos/platform/winrt/Keyboard-winrt.h index 0687fe89be..27bf6a7def 100644 --- a/cocos/platform/winrt/Keyboard-winrt.h +++ b/cocos/platform/winrt/Keyboard-winrt.h @@ -28,7 +28,7 @@ THE SOFTWARE. #pragma once #include -#include "InputEvent.h" +#include "platform/winrt/InputEvent.h" NS_CC_BEGIN diff --git a/cocos/platform/winrt/WICImageLoader-winrt.cpp b/cocos/platform/winrt/WICImageLoader-winrt.cpp index 004d24b3b1..fa3c22d6f2 100644 --- a/cocos/platform/winrt/WICImageLoader-winrt.cpp +++ b/cocos/platform/winrt/WICImageLoader-winrt.cpp @@ -24,8 +24,8 @@ THE SOFTWARE. Based upon code from the DirectX Tool Kit by Microsoft Corporation, obtained from https://directxtk.codeplex.com ****************************************************************************/ -#include "WICImageLoader-winrt.h" -#include "CCWinRTUtils.h" +#include "platform/winrt/WICImageLoader-winrt.h" +#include "platform/winrt/CCWinRTUtils.h" NS_CC_BEGIN diff --git a/cocos/platform/winrt/WICImageLoader-winrt.h b/cocos/platform/winrt/WICImageLoader-winrt.h index 354b61f51a..e5d329fa93 100644 --- a/cocos/platform/winrt/WICImageLoader-winrt.h +++ b/cocos/platform/winrt/WICImageLoader-winrt.h @@ -36,7 +36,7 @@ obtained from https://directxtk.codeplex.com #include #include #include -#include "CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" NS_CC_BEGIN diff --git a/cocos/platform/winrt/inet_pton_winrt.cpp b/cocos/platform/winrt/inet_pton_winrt.cpp index f906b52d0c..f9bc0d20e6 100644 --- a/cocos/platform/winrt/inet_pton_winrt.cpp +++ b/cocos/platform/winrt/inet_pton_winrt.cpp @@ -28,7 +28,7 @@ #define ERRNO ((int)GetLastError()) #define SET_ERRNO(x) (SetLastError((DWORD)(x))) -#include "inet_pton_winrt.h" +#include "platform/winrt/inet_pton_winrt.h" #define ENABLE_IPV6 diff --git a/cocos/platform/winrt/pch.cpp b/cocos/platform/winrt/pch.cpp index bcb5590be1..18be0eee5f 100644 --- a/cocos/platform/winrt/pch.cpp +++ b/cocos/platform/winrt/pch.cpp @@ -1 +1 @@ -#include "pch.h" +#include "platform/winrt/pch.h" diff --git a/cocos/platform/winrt/pch.h b/cocos/platform/winrt/pch.h index 5dbe96eb9f..e52377fbf6 100644 --- a/cocos/platform/winrt/pch.h +++ b/cocos/platform/winrt/pch.h @@ -1,6 +1,6 @@ #pragma once -#include "targetver.h" +#include "platform/winrt/targetver.h" #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN diff --git a/cocos/platform/winrt/sha1.cpp b/cocos/platform/winrt/sha1.cpp index 5d9e188c34..9d181fe65e 100644 --- a/cocos/platform/winrt/sha1.cpp +++ b/cocos/platform/winrt/sha1.cpp @@ -50,7 +50,7 @@ * */ -#include "sha1.h" +#include "platform/winrt/sha1.h" /* * Define the SHA1 circular left shift macro diff --git a/cocos/renderer/CCGroupCommand.h b/cocos/renderer/CCGroupCommand.h index a1d8a6b6c7..3314361379 100644 --- a/cocos/renderer/CCGroupCommand.h +++ b/cocos/renderer/CCGroupCommand.h @@ -30,7 +30,7 @@ #include #include "base/CCRef.h" -#include "CCRenderCommand.h" +#include "renderer/CCRenderCommand.h" /** * @addtogroup renderer diff --git a/cocos/renderer/CCPass.cpp b/cocos/renderer/CCPass.cpp index 2ac59e3092..96a60bcaa0 100644 --- a/cocos/renderer/CCPass.cpp +++ b/cocos/renderer/CCPass.cpp @@ -27,7 +27,7 @@ - Qt3D: http://qt-project.org/ ****************************************************************************/ -#include "CCPass.h" +#include "renderer/CCPass.h" #include "renderer/CCGLProgramState.h" #include "renderer/CCGLProgram.h" #include "renderer/CCTexture2D.h" diff --git a/cocos/renderer/CCRenderState.cpp b/cocos/renderer/CCRenderState.cpp index ac33211a51..6f148038da 100644 --- a/cocos/renderer/CCRenderState.cpp +++ b/cocos/renderer/CCRenderState.cpp @@ -24,7 +24,7 @@ ****************************************************************************/ -#include "CCRenderState.h" +#include "renderer/CCRenderState.h" #include diff --git a/cocos/renderer/CCVertexAttribBinding.cpp b/cocos/renderer/CCVertexAttribBinding.cpp index 3ef71b3b8d..42514f8af7 100644 --- a/cocos/renderer/CCVertexAttribBinding.cpp +++ b/cocos/renderer/CCVertexAttribBinding.cpp @@ -19,7 +19,7 @@ This file was modified to fit the cocos2d-x project */ -#include "CCVertexAttribBinding.h" +#include "renderer/CCVertexAttribBinding.h" #include "renderer/CCGLProgramState.h" #include "renderer/ccGLStateCache.h" #include "platform/CCGL.h" diff --git a/cocos/renderer/ccShaders.cpp b/cocos/renderer/ccShaders.cpp index 67726f2f7b..c9d9314f6b 100644 --- a/cocos/renderer/ccShaders.cpp +++ b/cocos/renderer/ccShaders.cpp @@ -31,65 +31,65 @@ THE SOFTWARE. NS_CC_BEGIN // -#include "ccShader_Position_uColor.frag" +#include "renderer/ccShader_Position_uColor.frag" -#include "ccShader_Position_uColor.vert" +#include "renderer/ccShader_Position_uColor.vert" // -#include "ccShader_PositionColor.frag" -#include "ccShader_PositionColor.vert" +#include "renderer/ccShader_PositionColor.frag" +#include "renderer/ccShader_PositionColor.vert" // -#include "ccShader_PositionColorTextureAsPointsize.vert" +#include "renderer/ccShader_PositionColorTextureAsPointsize.vert" // -#include "ccShader_PositionTexture.frag" -#include "ccShader_PositionTexture.vert" +#include "renderer/ccShader_PositionTexture.frag" +#include "renderer/ccShader_PositionTexture.vert" // -#include "ccShader_PositionTextureA8Color.frag" -#include "ccShader_PositionTextureA8Color.vert" +#include "renderer/ccShader_PositionTextureA8Color.frag" +#include "renderer/ccShader_PositionTextureA8Color.vert" // -#include "ccShader_PositionTextureColor.frag" -#include "ccShader_PositionTextureColor.vert" +#include "renderer/ccShader_PositionTextureColor.frag" +#include "renderer/ccShader_PositionTextureColor.vert" // -#include "ccShader_PositionTextureColor_noMVP.frag" -#include "ccShader_PositionTextureColor_noMVP.vert" +#include "renderer/ccShader_PositionTextureColor_noMVP.frag" +#include "renderer/ccShader_PositionTextureColor_noMVP.vert" // -#include "ccShader_PositionTextureColorAlphaTest.frag" +#include "renderer/ccShader_PositionTextureColorAlphaTest.frag" // -#include "ccShader_PositionTexture_uColor.frag" -#include "ccShader_PositionTexture_uColor.vert" +#include "renderer/ccShader_PositionTexture_uColor.frag" +#include "renderer/ccShader_PositionTexture_uColor.vert" -#include "ccShader_PositionColorLengthTexture.frag" -#include "ccShader_PositionColorLengthTexture.vert" +#include "renderer/ccShader_PositionColorLengthTexture.frag" +#include "renderer/ccShader_PositionColorLengthTexture.vert" -#include "ccShader_UI_Gray.frag" +#include "renderer/ccShader_UI_Gray.frag" // -#include "ccShader_Label.vert" -#include "ccShader_Label_df.frag" -#include "ccShader_Label_df_glow.frag" -#include "ccShader_Label_normal.frag" -#include "ccShader_Label_outline.frag" +#include "renderer/ccShader_Label.vert" +#include "renderer/ccShader_Label_df.frag" +#include "renderer/ccShader_Label_df_glow.frag" +#include "renderer/ccShader_Label_normal.frag" +#include "renderer/ccShader_Label_outline.frag" // -#include "ccShader_3D_PositionTex.vert" -#include "ccShader_3D_Color.frag" -#include "ccShader_3D_ColorTex.frag" -#include "ccShader_3D_PositionNormalTex.vert" -#include "ccShader_3D_ColorNormal.frag" -#include "ccShader_3D_ColorNormalTex.frag" -#include "ccShader_3D_Particle.vert" -#include "ccShader_3D_Particle.frag" -#include "ccShader_3D_Skybox.vert" -#include "ccShader_3D_Skybox.frag" -#include "ccShader_3D_Terrain.vert" -#include "ccShader_3D_Terrain.frag" -#include "ccShader_CameraClear.vert" -#include "ccShader_CameraClear.frag" +#include "renderer/ccShader_3D_PositionTex.vert" +#include "renderer/ccShader_3D_Color.frag" +#include "renderer/ccShader_3D_ColorTex.frag" +#include "renderer/ccShader_3D_PositionNormalTex.vert" +#include "renderer/ccShader_3D_ColorNormal.frag" +#include "renderer/ccShader_3D_ColorNormalTex.frag" +#include "renderer/ccShader_3D_Particle.vert" +#include "renderer/ccShader_3D_Particle.frag" +#include "renderer/ccShader_3D_Skybox.vert" +#include "renderer/ccShader_3D_Skybox.frag" +#include "renderer/ccShader_3D_Terrain.vert" +#include "renderer/ccShader_3D_Terrain.frag" +#include "renderer/ccShader_CameraClear.vert" +#include "renderer/ccShader_CameraClear.frag" NS_CC_END diff --git a/cocos/scripting/js-bindings/auto/js_bindings_chipmunk_auto_classes.cpp b/cocos/scripting/js-bindings/auto/js_bindings_chipmunk_auto_classes.cpp index 0cfb4bef05..165e9622d9 100644 --- a/cocos/scripting/js-bindings/auto/js_bindings_chipmunk_auto_classes.cpp +++ b/cocos/scripting/js-bindings/auto/js_bindings_chipmunk_auto_classes.cpp @@ -3,15 +3,15 @@ * Generated by "generate_jsb.py -c chipmunk_jsb.ini" on 2016-02-23 * Script version: v0.10 */ -#include "js_bindings_config.h" +#include "scripting/js-bindings/manual/js_bindings_config.h" #ifdef JSB_INCLUDE_CHIPMUNK -#include "chipmunk/js_bindings_chipmunk_manual.h" +#include "scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.h" #include "jsfriendapi.h" -#include "js_bindings_config.h" -#include "js_manual_conversions.h" -#include "js_bindings_chipmunk_functions.h" +#include "scripting/js-bindings/manual/js_bindings_config.h" +#include "scripting/js-bindings/manual/js_manual_conversions.h" +#include "scripting/js-bindings/auto/js_bindings_chipmunk_functions.h" /* * cpConstraint diff --git a/cocos/scripting/js-bindings/auto/js_bindings_chipmunk_auto_classes.h b/cocos/scripting/js-bindings/auto/js_bindings_chipmunk_auto_classes.h index 304ab0dc6f..d78395a167 100644 --- a/cocos/scripting/js-bindings/auto/js_bindings_chipmunk_auto_classes.h +++ b/cocos/scripting/js-bindings/auto/js_bindings_chipmunk_auto_classes.h @@ -3,10 +3,10 @@ * Generated by "generate_jsb.py -c chipmunk_jsb.ini" on 2016-02-23 * Script version: v0.10 */ -#include "js_bindings_config.h" +#include "scripting/js-bindings/manual/js_bindings_config.h" #ifdef JSB_INCLUDE_CHIPMUNK -#include "chipmunk/js_bindings_chipmunk_manual.h" +#include "scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.h" extern JSObject *JSB_cpConstraint_object; extern JSClass *JSB_cpConstraint_class; void JSB_cpConstraint_createClass(JSContext *cx, JS::HandleObject globalObj, const char* name ); diff --git a/cocos/scripting/js-bindings/auto/js_bindings_chipmunk_auto_classes_registration.h b/cocos/scripting/js-bindings/auto/js_bindings_chipmunk_auto_classes_registration.h index d4e18c33a5..d7827dc79b 100644 --- a/cocos/scripting/js-bindings/auto/js_bindings_chipmunk_auto_classes_registration.h +++ b/cocos/scripting/js-bindings/auto/js_bindings_chipmunk_auto_classes_registration.h @@ -3,10 +3,10 @@ * Generated by "generate_jsb.py -c chipmunk_jsb.ini" on 2016-02-23 * Script version: v0.10 */ -#include "js_bindings_config.h" +#include "scripting/js-bindings/manual/js_bindings_config.h" #ifdef JSB_INCLUDE_CHIPMUNK -#include "chipmunk/js_bindings_chipmunk_manual.h" +#include "scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.h" JSB_cpConstraint_createClass(cx, chipmunk, "Constraint"); JSB_cpGrooveJoint_createClass(cx, chipmunk, "GrooveJoint"); JSB_cpSimpleMotor_createClass(cx, chipmunk, "SimpleMotor"); diff --git a/cocos/scripting/js-bindings/auto/js_bindings_chipmunk_functions.cpp b/cocos/scripting/js-bindings/auto/js_bindings_chipmunk_functions.cpp index b2c85c861f..81cad5f7a0 100644 --- a/cocos/scripting/js-bindings/auto/js_bindings_chipmunk_functions.cpp +++ b/cocos/scripting/js-bindings/auto/js_bindings_chipmunk_functions.cpp @@ -3,15 +3,15 @@ * Generated by "generate_jsb.py -c chipmunk_jsb.ini" on 2016-02-23 * Script version: v0.10 */ -#include "js_bindings_config.h" +#include "scripting/js-bindings/manual/js_bindings_config.h" #ifdef JSB_INCLUDE_CHIPMUNK -#include "chipmunk/js_bindings_chipmunk_manual.h" +#include "scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.h" #include "jsfriendapi.h" -#include "js_bindings_config.h" -#include "js_manual_conversions.h" -#include "js_bindings_chipmunk_functions.h" +#include "scripting/js-bindings/manual/js_bindings_config.h" +#include "scripting/js-bindings/manual/js_manual_conversions.h" +#include "scripting/js-bindings/auto/js_bindings_chipmunk_functions.h" // Arguments: cpArbiter*, cpSpace* // Ret value: cpBool diff --git a/cocos/scripting/js-bindings/auto/js_bindings_chipmunk_functions.h b/cocos/scripting/js-bindings/auto/js_bindings_chipmunk_functions.h index 7d2bef8877..5f2b0c1a6c 100644 --- a/cocos/scripting/js-bindings/auto/js_bindings_chipmunk_functions.h +++ b/cocos/scripting/js-bindings/auto/js_bindings_chipmunk_functions.h @@ -3,10 +3,10 @@ * Generated by "generate_jsb.py -c chipmunk_jsb.ini" on 2016-02-23 * Script version: v0.10 */ -#include "js_bindings_config.h" +#include "scripting/js-bindings/manual/js_bindings_config.h" #ifdef JSB_INCLUDE_CHIPMUNK -#include "chipmunk/js_bindings_chipmunk_manual.h" +#include "scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.h" #ifdef __cplusplus extern "C" { diff --git a/cocos/scripting/js-bindings/auto/js_bindings_chipmunk_functions_registration.h b/cocos/scripting/js-bindings/auto/js_bindings_chipmunk_functions_registration.h index 5809efed73..0f143925b0 100644 --- a/cocos/scripting/js-bindings/auto/js_bindings_chipmunk_functions_registration.h +++ b/cocos/scripting/js-bindings/auto/js_bindings_chipmunk_functions_registration.h @@ -3,10 +3,10 @@ * Generated by "generate_jsb.py -c chipmunk_jsb.ini" on 2016-02-23 * Script version: v0.10 */ -#include "js_bindings_config.h" +#include "scripting/js-bindings/manual/js_bindings_config.h" #ifdef JSB_INCLUDE_CHIPMUNK -#include "chipmunk/js_bindings_chipmunk_manual.h" +#include "scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.h" JS_DefineFunction(cx, chipmunk, "arbiterCallWildcardBeginA", JSB_cpArbiterCallWildcardBeginA, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE ); JS_DefineFunction(cx, chipmunk, "arbiterCallWildcardBeginB", JSB_cpArbiterCallWildcardBeginB, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE ); JS_DefineFunction(cx, chipmunk, "arbiterCallWildcardPostSolveA", JSB_cpArbiterCallWildcardPostSolveA, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE ); diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_3d_auto.cpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_3d_auto.cpp index 080bb70ff4..7ac649b566 100644 --- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_3d_auto.cpp +++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_3d_auto.cpp @@ -1,8 +1,8 @@ -#include "jsb_cocos2dx_3d_auto.hpp" -#include "cocos2d_specifics.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_3d_auto.hpp" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" #include "cocos2d.h" -#include "CCBundle3D.h" -#include "3d/jsb_cocos2dx_3d_manual.h" +#include "3d/CCBundle3D.h" +#include "scripting/js-bindings/manual/3d/jsb_cocos2dx_3d_manual.h" template static bool dummy_constructor(JSContext *cx, uint32_t argc, jsval *vp) diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_3d_extension_auto.cpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_3d_extension_auto.cpp index f659a9388e..a02564db18 100644 --- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_3d_extension_auto.cpp +++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_3d_extension_auto.cpp @@ -1,5 +1,5 @@ -#include "jsb_cocos2dx_3d_extension_auto.hpp" -#include "cocos2d_specifics.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_3d_extension_auto.hpp" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" #include "cocos-ext.h" template diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_audioengine_auto.cpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_audioengine_auto.cpp index 2eab49c1cb..3558eb324a 100644 --- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_audioengine_auto.cpp +++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_audioengine_auto.cpp @@ -1,7 +1,7 @@ -#include "jsb_cocos2dx_audioengine_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_audioengine_auto.hpp" #if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) -#include "cocos2d_specifics.hpp" -#include "AudioEngine.h" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" +#include "audio/include/AudioEngine.h" template static bool dummy_constructor(JSContext *cx, uint32_t argc, jsval *vp) diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp index 0ef1d6f253..7a1a526b60 100644 --- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp +++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp @@ -1,10 +1,10 @@ -#include "jsb_cocos2dx_auto.hpp" -#include "cocos2d_specifics.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" #include "cocos2d.h" -#include "SimpleAudioEngine.h" -#include "CCProtectedNode.h" -#include "CCAsyncTaskPool.h" -#include "component/CCComponentJS.h" +#include "audio/include/SimpleAudioEngine.h" +#include "2d/CCProtectedNode.h" +#include "base/CCAsyncTaskPool.h" +#include "scripting/js-bindings/manual/component/CCComponentJS.h" template static bool dummy_constructor(JSContext *cx, uint32_t argc, jsval *vp) diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_builder_auto.cpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_builder_auto.cpp index f87dc7307e..962645b282 100644 --- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_builder_auto.cpp +++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_builder_auto.cpp @@ -1,6 +1,6 @@ -#include "jsb_cocos2dx_builder_auto.hpp" -#include "cocos2d_specifics.hpp" -#include "CocosBuilder.h" +#include "scripting/js-bindings/auto/jsb_cocos2dx_builder_auto.hpp" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" +#include "editor-support/cocosbuilder/CocosBuilder.h" template static bool dummy_constructor(JSContext *cx, uint32_t argc, jsval *vp) diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_video_auto.cpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_video_auto.cpp index 73dd9947d7..ec1729a97f 100644 --- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_video_auto.cpp +++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_video_auto.cpp @@ -1,7 +1,7 @@ -#include "jsb_cocos2dx_experimental_video_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_experimental_video_auto.hpp" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) && !defined(CC_TARGET_OS_TVOS) -#include "cocos2d_specifics.hpp" -#include "UIVideoPlayer.h" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" +#include "ui/UIVideoPlayer.h" template static bool dummy_constructor(JSContext *cx, uint32_t argc, jsval *vp) diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_webView_auto.cpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_webView_auto.cpp index 584240766e..efeb127b25 100644 --- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_webView_auto.cpp +++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_webView_auto.cpp @@ -1,7 +1,7 @@ -#include "jsb_cocos2dx_experimental_webView_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_experimental_webView_auto.hpp" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) && !defined(CC_TARGET_OS_TVOS) -#include "cocos2d_specifics.hpp" -#include "UIWebView.h" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" +#include "ui/UIWebView.h" template static bool dummy_constructor(JSContext *cx, uint32_t argc, jsval *vp) diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.cpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.cpp index 62b3c60704..84b5ccacac 100644 --- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.cpp +++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.cpp @@ -1,5 +1,5 @@ -#include "jsb_cocos2dx_extension_auto.hpp" -#include "cocos2d_specifics.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.hpp" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" #include "cocos-ext.h" template diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_navmesh_auto.cpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_navmesh_auto.cpp index 9528e337fe..9fbd649001 100644 --- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_navmesh_auto.cpp +++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_navmesh_auto.cpp @@ -1,8 +1,8 @@ -#include "jsb_cocos2dx_navmesh_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_navmesh_auto.hpp" #if CC_USE_NAVMESH -#include "cocos2d_specifics.hpp" -#include "CCNavMesh.h" -#include "navmesh/jsb_cocos2dx_navmesh_conversions.h" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" +#include "navmesh/CCNavMesh.h" +#include "scripting/js-bindings/manual/navmesh/jsb_cocos2dx_navmesh_conversions.h" template static bool dummy_constructor(JSContext *cx, uint32_t argc, jsval *vp) diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_physics3d_auto.cpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_physics3d_auto.cpp index 3feee23b12..7f39f2ba87 100644 --- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_physics3d_auto.cpp +++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_physics3d_auto.cpp @@ -1,8 +1,8 @@ -#include "jsb_cocos2dx_physics3d_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_physics3d_auto.hpp" #if CC_USE_3D_PHYSICS && CC_ENABLE_BULLET_INTEGRATION -#include "cocos2d_specifics.hpp" -#include "CCPhysics3D.h" -#include "physics3d/jsb_cocos2dx_physics3d_manual.h" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" +#include "physics3d/CCPhysics3D.h" +#include "scripting/js-bindings/manual/physics3d/jsb_cocos2dx_physics3d_manual.h" template static bool dummy_constructor(JSContext *cx, uint32_t argc, jsval *vp) diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.cpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.cpp index 4b39013b8c..afd2dd1eb2 100644 --- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.cpp +++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.cpp @@ -1,7 +1,7 @@ -#include "jsb_cocos2dx_spine_auto.hpp" -#include "cocos2d_specifics.hpp" -#include "spine-cocos2dx.h" -#include "jsb_cocos2dx_spine_manual.h" +#include "scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.hpp" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" +#include "editor-support/spine/spine-cocos2dx.h" +#include "scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.h" template static bool dummy_constructor(JSContext *cx, uint32_t argc, jsval *vp) diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp index c391db2018..72650596a7 100644 --- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp +++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp @@ -1,8 +1,8 @@ -#include "jsb_cocos2dx_studio_auto.hpp" -#include "cocos2d_specifics.hpp" -#include "CocoStudio.h" -#include "CCComExtensionData.h" -#include "jsb_cocos2dx_studio_conversions.h" +#include "scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.hpp" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" +#include "editor-support/cocostudio/CocoStudio.h" +#include "editor-support/cocostudio/CCComExtensionData.h" +#include "scripting/js-bindings/manual/cocostudio/jsb_cocos2dx_studio_conversions.h" template static bool dummy_constructor(JSContext *cx, uint32_t argc, jsval *vp) diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.cpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.cpp index e9bdbc9553..01f65f0252 100644 --- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.cpp +++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.cpp @@ -1,7 +1,7 @@ -#include "jsb_cocos2dx_ui_auto.hpp" -#include "cocos2d_specifics.hpp" -#include "CocosGUI.h" -#include "UIScrollViewBar.h" +#include "scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.hpp" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" +#include "ui/CocosGUI.h" +#include "ui/UIScrollViewBar.h" template static bool dummy_constructor(JSContext *cx, uint32_t argc, jsval *vp) diff --git a/cocos/scripting/js-bindings/manual/3d/jsb_cocos2dx_3d_manual.cpp b/cocos/scripting/js-bindings/manual/3d/jsb_cocos2dx_3d_manual.cpp index 6ce6a37a25..772a268704 100644 --- a/cocos/scripting/js-bindings/manual/3d/jsb_cocos2dx_3d_manual.cpp +++ b/cocos/scripting/js-bindings/manual/3d/jsb_cocos2dx_3d_manual.cpp @@ -23,9 +23,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "jsb_cocos2dx_3d_manual.h" -#include "cocos2d_specifics.hpp" -#include "jsb_cocos2dx_3d_auto.hpp" +#include "scripting/js-bindings/manual/3d/jsb_cocos2dx_3d_manual.h" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_3d_auto.hpp" #include "3d/CCBundle3D.h" using namespace cocos2d; diff --git a/cocos/scripting/js-bindings/manual/ScriptingCore.cpp b/cocos/scripting/js-bindings/manual/ScriptingCore.cpp index 5c72f3c1db..6c63d1c91c 100644 --- a/cocos/scripting/js-bindings/manual/ScriptingCore.cpp +++ b/cocos/scripting/js-bindings/manual/ScriptingCore.cpp @@ -22,17 +22,17 @@ * THE SOFTWARE. */ -#include "ScriptingCore.h" +#include "scripting/js-bindings/manual/ScriptingCore.h" // Removed in Firefox v27, use 'js/OldDebugAPI.h' instead //#include "jsdbgapi.h" #include "js/OldDebugAPI.h" #include "cocos2d.h" -#include "local-storage/LocalStorage.h" -#include "cocos2d_specifics.hpp" -#include "jsb_cocos2dx_auto.hpp" -#include "js_bindings_config.h" +#include "storage/local-storage/LocalStorage.h" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp" +#include "scripting/js-bindings/manual/js_bindings_config.h" // for debug socket #if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) @@ -66,7 +66,7 @@ #define LOGD(...) js_log(__VA_ARGS__) #endif -#include "js_bindings_config.h" +#include "scripting/js-bindings/manual/js_bindings_config.h" #if COCOS2D_DEBUG #define TRACE_DEBUGGER_SERVER(...) CCLOG(__VA_ARGS__) diff --git a/cocos/scripting/js-bindings/manual/ScriptingCore.h b/cocos/scripting/js-bindings/manual/ScriptingCore.h index 6c4c2c6fdd..6768f15496 100644 --- a/cocos/scripting/js-bindings/manual/ScriptingCore.h +++ b/cocos/scripting/js-bindings/manual/ScriptingCore.h @@ -30,12 +30,12 @@ #include "jsfriendapi.h" #include "cocos2d.h" #include "ui/CocosGUI.h" -#include "js_bindings_config.h" -#include "js_bindings_core.h" -#include "spidermonkey_specifics.h" -#include "js_manual_conversions.h" +#include "scripting/js-bindings/manual/js_bindings_config.h" +#include "scripting/js-bindings/manual/js_bindings_core.h" +#include "scripting/js-bindings/manual/spidermonkey_specifics.h" +#include "scripting/js-bindings/manual/js_manual_conversions.h" #include "mozilla/Maybe.h" -#include "js-BindingsExport.h" +#include "scripting/js-bindings/manual/js-BindingsExport.h" #include #include diff --git a/cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.cpp b/cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.cpp index d3f4d5b238..eb79698f02 100644 --- a/cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.cpp +++ b/cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.cpp @@ -24,12 +24,12 @@ #include "jsapi.h" #include "jsfriendapi.h" #include "extensions/cocos-ext.h" -#include "js_bindings_config.h" -#include "cocos2d_specifics.hpp" +#include "scripting/js-bindings/manual/js_bindings_config.h" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" #ifdef JSB_INCLUDE_CHIPMUNK -#include "js_bindings_chipmunk_manual.h" -#include "js_manual_conversions.h" +#include "scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.h" +#include "scripting/js-bindings/manual/js_manual_conversions.h" USING_NS_CC_EXT; // Function declarations diff --git a/cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.h b/cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.h index 2598365a59..aaca07ed69 100644 --- a/cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.h +++ b/cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.h @@ -26,13 +26,13 @@ #define __js_bindings_chipmunk_manual #include "jsapi.h" -#include "js_bindings_config.h" -#include "js_manual_conversions.h" -#include "ScriptingCore.h" +#include "scripting/js-bindings/manual/js_bindings_config.h" +#include "scripting/js-bindings/manual/js_manual_conversions.h" +#include "scripting/js-bindings/manual/ScriptingCore.h" #ifdef JSB_INCLUDE_CHIPMUNK #include "chipmunk/chipmunk_private.h" -#include "js_bindings_chipmunk_auto_classes.h" +#include "scripting/js-bindings/auto/js_bindings_chipmunk_auto_classes.h" // Free Functions bool JSB_cpSpaceAddCollisionHandler(JSContext *cx, uint32_t argc, jsval *vp); diff --git a/cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_registration.cpp b/cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_registration.cpp index 6d48dc63c8..e88193687e 100644 --- a/cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_registration.cpp +++ b/cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_registration.cpp @@ -25,14 +25,14 @@ #define JSB_INCLUDE_CHIPMUNK #endif -#include "js_bindings_config.h" -#include "ScriptingCore.h" +#include "scripting/js-bindings/manual/js_bindings_config.h" +#include "scripting/js-bindings/manual/ScriptingCore.h" // chipmunk -#include "js_bindings_chipmunk_auto_classes.h" -#include "js_bindings_chipmunk_functions.h" -#include "js_bindings_chipmunk_manual.h" +#include "scripting/js-bindings/auto/js_bindings_chipmunk_auto_classes.h" +#include "scripting/js-bindings/auto/js_bindings_chipmunk_functions.h" +#include "scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.h" void jsb_register_chipmunk(JSContext* cx, JS::HandleObject object) @@ -47,8 +47,8 @@ void jsb_register_chipmunk(JSContext* cx, JS::HandleObject object) JS_SetProperty(cx, object, "cp", chipmunkVal); JSB_cpBase_createClass(cx, chipmunk, "Base"); // manual base class registration -#include "js_bindings_chipmunk_auto_classes_registration.h" -#include "js_bindings_chipmunk_functions_registration.h" +#include "scripting/js-bindings/auto/js_bindings_chipmunk_auto_classes_registration.h" +#include "scripting/js-bindings/auto/js_bindings_chipmunk_functions_registration.h" // manual JS_DefineFunction(cx, chipmunk, "spaceAddCollisionHandler", JSB_cpSpaceAddCollisionHandler, 8, JSPROP_PERMANENT | JSPROP_ENUMERATE ); diff --git a/cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp b/cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp index 273a692ef5..871d27f3d5 100644 --- a/cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp +++ b/cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp @@ -21,14 +21,14 @@ * THE SOFTWARE. */ -#include "cocos2d_specifics.hpp" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" #include "cocos2d.h" #include -#include "js_bindings_config.h" -#include "jsb_cocos2dx_auto.hpp" -#include "jsb_event_dispatcher_manual.h" +#include "scripting/js-bindings/manual/js_bindings_config.h" +#include "scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp" +#include "scripting/js-bindings/manual/jsb_event_dispatcher_manual.h" #include "navmesh/CCNavMesh.h" -#include "component/CCComponentJS.h" +#include "scripting/js-bindings/manual/component/CCComponentJS.h" using namespace cocos2d; schedFunc_proxy_t *_schedFunc_target_ht = NULL; diff --git a/cocos/scripting/js-bindings/manual/cocos2d_specifics.hpp b/cocos/scripting/js-bindings/manual/cocos2d_specifics.hpp index 8ccf4ec87e..f3281e8830 100644 --- a/cocos/scripting/js-bindings/manual/cocos2d_specifics.hpp +++ b/cocos/scripting/js-bindings/manual/cocos2d_specifics.hpp @@ -24,7 +24,7 @@ #ifndef __JS_COCOS2D_X_SPECIFICS_H__ #define __JS_COCOS2D_X_SPECIFICS_H__ -#include "ScriptingCore.h" +#include "scripting/js-bindings/manual/ScriptingCore.h" #include "platform/CCSAXParser.h" class JSScheduleWrapper; diff --git a/cocos/scripting/js-bindings/manual/cocosbuilder/cocosbuilder_specifics.hpp b/cocos/scripting/js-bindings/manual/cocosbuilder/cocosbuilder_specifics.hpp index 6f414f780b..6f9b95cb65 100644 --- a/cocos/scripting/js-bindings/manual/cocosbuilder/cocosbuilder_specifics.hpp +++ b/cocos/scripting/js-bindings/manual/cocosbuilder/cocosbuilder_specifics.hpp @@ -24,7 +24,7 @@ #ifndef __JS_COCOSBUILDER_SPECIFICS_H__ #define __JS_COCOSBUILDER_SPECIFICS_H__ -#include "../cocos2d_specifics.hpp" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" class JSCCBAnimationWrapper: public JSCallbackWrapper { diff --git a/cocos/scripting/js-bindings/manual/cocosbuilder/js_bindings_ccbreader.cpp b/cocos/scripting/js-bindings/manual/cocosbuilder/js_bindings_ccbreader.cpp index 38a3b016e9..e7fd319093 100644 --- a/cocos/scripting/js-bindings/manual/cocosbuilder/js_bindings_ccbreader.cpp +++ b/cocos/scripting/js-bindings/manual/cocosbuilder/js_bindings_ccbreader.cpp @@ -22,9 +22,9 @@ * THE SOFTWARE. */ -#include "js_bindings_ccbreader.h" -#include "ScriptingCore.h" -#include "js_bindings_config.h" +#include "scripting/js-bindings/manual/cocosbuilder/js_bindings_ccbreader.h" +#include "scripting/js-bindings/manual/ScriptingCore.h" +#include "scripting/js-bindings/manual/js_bindings_config.h" USING_NS_CC; USING_NS_CC_EXT; diff --git a/cocos/scripting/js-bindings/manual/cocosbuilder/js_bindings_ccbreader.h b/cocos/scripting/js-bindings/manual/cocosbuilder/js_bindings_ccbreader.h index ba7f00a2ff..7fdbaeb9b2 100644 --- a/cocos/scripting/js-bindings/manual/cocosbuilder/js_bindings_ccbreader.h +++ b/cocos/scripting/js-bindings/manual/cocosbuilder/js_bindings_ccbreader.h @@ -25,8 +25,8 @@ #ifndef __JS_BINDINGS_CCBREADER_H__ #define __JS_BINDINGS_CCBREADER_H__ -#include "cocosbuilder_specifics.hpp" -#include "cocosbuilder/CocosBuilder.h" +#include "scripting/js-bindings/manual/cocosbuilder/cocosbuilder_specifics.hpp" +#include "editor-support/cocosbuilder/CocosBuilder.h" class CCBScriptCallbackProxy: public cocos2d::Layer , public cocosbuilder::CCBSelectorResolver diff --git a/cocos/scripting/js-bindings/manual/cocostudio/jsb_cocos2dx_studio_conversions.cpp b/cocos/scripting/js-bindings/manual/cocostudio/jsb_cocos2dx_studio_conversions.cpp index 8ad8a10f6e..409b9b102f 100644 --- a/cocos/scripting/js-bindings/manual/cocostudio/jsb_cocos2dx_studio_conversions.cpp +++ b/cocos/scripting/js-bindings/manual/cocostudio/jsb_cocos2dx_studio_conversions.cpp @@ -21,9 +21,9 @@ * THE SOFTWARE. */ -#include "jsb_cocos2dx_studio_conversions.h" -#include "cocos2d_specifics.hpp" -#include "cocostudio/CocoStudio.h" +#include "scripting/js-bindings/manual/cocostudio/jsb_cocos2dx_studio_conversions.h" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" +#include "editor-support/cocostudio/CocoStudio.h" jsval animationInfo_to_jsval(JSContext* cx, const cocostudio::timeline::AnimationInfo& v) { diff --git a/cocos/scripting/js-bindings/manual/cocostudio/jsb_cocos2dx_studio_manual.cpp b/cocos/scripting/js-bindings/manual/cocostudio/jsb_cocos2dx_studio_manual.cpp index 2ed6a23861..60ad4b0198 100644 --- a/cocos/scripting/js-bindings/manual/cocostudio/jsb_cocos2dx_studio_manual.cpp +++ b/cocos/scripting/js-bindings/manual/cocostudio/jsb_cocos2dx_studio_manual.cpp @@ -21,10 +21,10 @@ * THE SOFTWARE. */ -#include "jsb_cocos2dx_studio_manual.h" -#include "ScriptingCore.h" -#include "cocos2d_specifics.hpp" -#include "cocostudio/CocoStudio.h" +#include "scripting/js-bindings/manual/cocostudio/jsb_cocos2dx_studio_manual.h" +#include "scripting/js-bindings/manual/ScriptingCore.h" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" +#include "editor-support/cocostudio/CocoStudio.h" class JSArmatureWrapper: public JSCallbackWrapper { public: diff --git a/cocos/scripting/js-bindings/manual/component/CCComponentJS.cpp b/cocos/scripting/js-bindings/manual/component/CCComponentJS.cpp index 97d87e188a..707d189136 100644 --- a/cocos/scripting/js-bindings/manual/component/CCComponentJS.cpp +++ b/cocos/scripting/js-bindings/manual/component/CCComponentJS.cpp @@ -24,11 +24,11 @@ #include "jsapi.h" #include "mozilla/Maybe.h" -#include "CCComponentJS.h" +#include "scripting/js-bindings/manual/component/CCComponentJS.h" #include "base/CCScriptSupport.h" -#include "ScriptingCore.h" -#include "cocos2d_specifics.hpp" -#include "js_manual_conversions.h" +#include "scripting/js-bindings/manual/ScriptingCore.h" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" +#include "scripting/js-bindings/manual/js_manual_conversions.h" NS_CC_BEGIN diff --git a/cocos/scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_video_manual.cpp b/cocos/scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_video_manual.cpp index 8e0f25aca3..c2636887da 100644 --- a/cocos/scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_video_manual.cpp +++ b/cocos/scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_video_manual.cpp @@ -1,10 +1,10 @@ -#include "jsb_cocos2dx_experimental_video_manual.h" +#include "scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_video_manual.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) -#include "UIVideoPlayer.h" -#include "ScriptingCore.h" -#include "cocos2d_specifics.hpp" +#include "ui/UIVideoPlayer.h" +#include "scripting/js-bindings/manual/ScriptingCore.h" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" #include "cocos2d.h" using namespace cocos2d; diff --git a/cocos/scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_webView_manual.cpp b/cocos/scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_webView_manual.cpp index ec61e0c33b..f16e82aa9f 100644 --- a/cocos/scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_webView_manual.cpp +++ b/cocos/scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_webView_manual.cpp @@ -1,10 +1,10 @@ -#include "jsb_cocos2dx_experimental_webView_manual.h" +#include "scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_webView_manual.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) -#include "UIWebView.h" -#include "ScriptingCore.h" -#include "cocos2d_specifics.hpp" +#include "ui/UIWebView.h" +#include "scripting/js-bindings/manual/ScriptingCore.h" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" using namespace cocos2d; diff --git a/cocos/scripting/js-bindings/manual/extension/jsb_cocos2dx_extension_manual.cpp b/cocos/scripting/js-bindings/manual/extension/jsb_cocos2dx_extension_manual.cpp index f0682d37c3..c56b54ac7a 100644 --- a/cocos/scripting/js-bindings/manual/extension/jsb_cocos2dx_extension_manual.cpp +++ b/cocos/scripting/js-bindings/manual/extension/jsb_cocos2dx_extension_manual.cpp @@ -21,11 +21,11 @@ * THE SOFTWARE. */ -#include "jsb_cocos2dx_extension_manual.h" +#include "scripting/js-bindings/manual/extension/jsb_cocos2dx_extension_manual.h" #include "extensions/cocos-ext.h" -#include "ScriptingCore.h" -#include "cocos2d_specifics.hpp" -#include "jsb_cocos2dx_auto.hpp" +#include "scripting/js-bindings/manual/ScriptingCore.h" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp" #include USING_NS_CC; diff --git a/cocos/scripting/js-bindings/manual/extension/jsb_cocos2dx_extension_manual.h b/cocos/scripting/js-bindings/manual/extension/jsb_cocos2dx_extension_manual.h index 6a1378ff52..ab92d601f5 100644 --- a/cocos/scripting/js-bindings/manual/extension/jsb_cocos2dx_extension_manual.h +++ b/cocos/scripting/js-bindings/manual/extension/jsb_cocos2dx_extension_manual.h @@ -26,7 +26,7 @@ #include "jsapi.h" #include "jsfriendapi.h" -#include "cocos/network/CCDownloader.h" +#include "network/CCDownloader.h" #include "renderer/CCTexture2D.h" class __JSDownloaderDelegator : cocos2d::Ref diff --git a/cocos/scripting/js-bindings/manual/js_bindings_core.cpp b/cocos/scripting/js-bindings/manual/js_bindings_core.cpp index be2fbc2264..d0591cae19 100644 --- a/cocos/scripting/js-bindings/manual/js_bindings_core.cpp +++ b/cocos/scripting/js-bindings/manual/js_bindings_core.cpp @@ -20,11 +20,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "js_bindings_config.h" -#include "js_bindings_core.h" +#include "scripting/js-bindings/manual/js_bindings_config.h" +#include "scripting/js-bindings/manual/js_bindings_core.h" // cocos2d + chipmunk registration files -#include "chipmunk/js_bindings_chipmunk_registration.h" +#include "scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_registration.h" #include "cocos2d.h" //#pragma mark - Hash diff --git a/cocos/scripting/js-bindings/manual/js_bindings_opengl.cpp b/cocos/scripting/js-bindings/manual/js_bindings_opengl.cpp index 42ab6d95f3..0d7ce491f0 100644 --- a/cocos/scripting/js-bindings/manual/js_bindings_opengl.cpp +++ b/cocos/scripting/js-bindings/manual/js_bindings_opengl.cpp @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -#include "js_bindings_opengl.h" +#include "scripting/js-bindings/manual/js_bindings_opengl.h" NS_CC_BEGIN diff --git a/cocos/scripting/js-bindings/manual/js_bindings_opengl.h b/cocos/scripting/js-bindings/manual/js_bindings_opengl.h index 061cecf5d3..6517e095ea 100644 --- a/cocos/scripting/js-bindings/manual/js_bindings_opengl.h +++ b/cocos/scripting/js-bindings/manual/js_bindings_opengl.h @@ -20,8 +20,8 @@ * THE SOFTWARE. */ -#include "ScriptingCore.h" -#include "cocos2d_specifics.hpp" +#include "scripting/js-bindings/manual/ScriptingCore.h" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" NS_CC_BEGIN diff --git a/cocos/scripting/js-bindings/manual/js_manual_conversions.cpp b/cocos/scripting/js-bindings/manual/js_manual_conversions.cpp index c6f4b99abe..26d7e79e2e 100644 --- a/cocos/scripting/js-bindings/manual/js_manual_conversions.cpp +++ b/cocos/scripting/js-bindings/manual/js_manual_conversions.cpp @@ -22,10 +22,10 @@ * THE SOFTWARE. */ -#include "ScriptingCore.h" -#include "js_bindings_config.h" -#include "js_manual_conversions.h" -#include "cocos2d_specifics.hpp" +#include "scripting/js-bindings/manual/ScriptingCore.h" +#include "scripting/js-bindings/manual/js_bindings_config.h" +#include "scripting/js-bindings/manual/js_manual_conversions.h" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" #include "math/TransformUtils.h" #include "editor-support/cocostudio/CocosStudioExtension.h" diff --git a/cocos/scripting/js-bindings/manual/js_manual_conversions.h b/cocos/scripting/js-bindings/manual/js_manual_conversions.h index dc09c22e4d..58d8561b52 100644 --- a/cocos/scripting/js-bindings/manual/js_manual_conversions.h +++ b/cocos/scripting/js-bindings/manual/js_manual_conversions.h @@ -27,11 +27,11 @@ #include "jsapi.h" #include "jsfriendapi.h" -#include "js_bindings_core.h" -#include "js_bindings_config.h" +#include "scripting/js-bindings/manual/js_bindings_core.h" +#include "scripting/js-bindings/manual/js_bindings_config.h" #include "cocos2d.h" -#include "spidermonkey_specifics.h" -#include "js-BindingsExport.h" +#include "scripting/js-bindings/manual/spidermonkey_specifics.h" +#include "scripting/js-bindings/manual/js-BindingsExport.h" #define JSB_COMPATIBLE_WITH_COCOS2D_HTML5_BASIC_TYPES diff --git a/cocos/scripting/js-bindings/manual/js_module_register.cpp b/cocos/scripting/js-bindings/manual/js_module_register.cpp index f1b1fea9d8..068ac7a262 100644 --- a/cocos/scripting/js-bindings/manual/js_module_register.cpp +++ b/cocos/scripting/js-bindings/manual/js_module_register.cpp @@ -1,45 +1,45 @@ -#include "js_module_register.h" +#include "scripting/js-bindings/manual/js_module_register.h" -#include "jsb_cocos2dx_auto.hpp" -#include "jsb_cocos2dx_ui_auto.hpp" -#include "jsb_cocos2dx_studio_auto.hpp" -#include "jsb_cocos2dx_builder_auto.hpp" -#include "jsb_cocos2dx_spine_auto.hpp" -#include "jsb_cocos2dx_extension_auto.hpp" -#include "jsb_cocos2dx_3d_auto.hpp" -#include "jsb_cocos2dx_3d_extension_auto.hpp" -#include "3d/jsb_cocos2dx_3d_manual.h" -#include "ui/jsb_cocos2dx_ui_manual.h" -#include "cocostudio/jsb_cocos2dx_studio_manual.h" -#include "cocosbuilder/js_bindings_ccbreader.h" -#include "spine/jsb_cocos2dx_spine_manual.h" -#include "extension/jsb_cocos2dx_extension_manual.h" -#include "localstorage/js_bindings_system_registration.h" -#include "chipmunk/js_bindings_chipmunk_registration.h" -#include "jsb_opengl_registration.h" -#include "network/XMLHTTPRequest.h" -#include "network/jsb_websocket.h" -#include "network/jsb_socketio.h" -#include "jsb_cocos2dx_physics3d_auto.hpp" -#include "physics3d/jsb_cocos2dx_physics3d_manual.h" -#include "jsb_cocos2dx_navmesh_auto.hpp" -#include "navmesh/jsb_cocos2dx_navmesh_manual.h" +#include "scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_builder_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_3d_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_3d_extension_auto.hpp" +#include "scripting/js-bindings/manual/3d/jsb_cocos2dx_3d_manual.h" +#include "scripting/js-bindings/manual/ui/jsb_cocos2dx_ui_manual.h" +#include "scripting/js-bindings/manual/cocostudio/jsb_cocos2dx_studio_manual.h" +#include "scripting/js-bindings/manual/cocosbuilder/js_bindings_ccbreader.h" +#include "scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.h" +#include "scripting/js-bindings/manual/extension/jsb_cocos2dx_extension_manual.h" +#include "scripting/js-bindings/manual/localstorage/js_bindings_system_registration.h" +#include "scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_registration.h" +#include "scripting/js-bindings/manual/jsb_opengl_registration.h" +#include "scripting/js-bindings/manual/network/XMLHTTPRequest.h" +#include "scripting/js-bindings/manual/network/jsb_websocket.h" +#include "scripting/js-bindings/manual/network/jsb_socketio.h" +#include "scripting/js-bindings/auto/jsb_cocos2dx_physics3d_auto.hpp" +#include "scripting/js-bindings/manual/physics3d/jsb_cocos2dx_physics3d_manual.h" +#include "scripting/js-bindings/auto/jsb_cocos2dx_navmesh_auto.hpp" +#include "scripting/js-bindings/manual/navmesh/jsb_cocos2dx_navmesh_manual.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) -#include "jsb_cocos2dx_experimental_video_auto.hpp" -#include "experimental/jsb_cocos2dx_experimental_video_manual.h" -#include "jsb_cocos2dx_experimental_webView_auto.hpp" -#include "experimental/jsb_cocos2dx_experimental_webView_manual.h" +#include "scripting/js-bindings/auto/jsb_cocos2dx_experimental_video_auto.hpp" +#include "scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_video_manual.h" +#include "scripting/js-bindings/auto/jsb_cocos2dx_experimental_webView_auto.hpp" +#include "scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_webView_manual.h" #endif #if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) -#include "jsb_cocos2dx_audioengine_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_audioengine_auto.hpp" #endif #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) -#include "platform/android/CCJavascriptJavaBridge.h" +#include "scripting/js-bindings/manual/platform/android/CCJavascriptJavaBridge.h" #elif (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC) -#include "platform/ios/JavaScriptObjCBridge.h" +#include "scripting/js-bindings/manual/platform/ios/JavaScriptObjCBridge.h" #endif USING_NS_CC; diff --git a/cocos/scripting/js-bindings/manual/js_module_register.h b/cocos/scripting/js-bindings/manual/js_module_register.h index aa06bd0cbe..df758bedef 100644 --- a/cocos/scripting/js-bindings/manual/js_module_register.h +++ b/cocos/scripting/js-bindings/manual/js_module_register.h @@ -2,7 +2,7 @@ #define __JS_TEMPLATE_RUNTIME_FRAMEWORKS_RUNTIME_SRC_CLASSES_JS_MODULE_REGISTER_H__ #include "scripting/js-bindings/manual/ScriptingCore.h" -#include "js-BindingsExport.h" +#include "scripting/js-bindings/manual/js-BindingsExport.h" CC_JS_DLL int js_module_register(); diff --git a/cocos/scripting/js-bindings/manual/jsb_event_dispatcher_manual.cpp b/cocos/scripting/js-bindings/manual/jsb_event_dispatcher_manual.cpp index b0abd3acd2..b6ebb61b71 100644 --- a/cocos/scripting/js-bindings/manual/jsb_event_dispatcher_manual.cpp +++ b/cocos/scripting/js-bindings/manual/jsb_event_dispatcher_manual.cpp @@ -20,10 +20,10 @@ * THE SOFTWARE. */ -#include "jsb_event_dispatcher_manual.h" +#include "scripting/js-bindings/manual/jsb_event_dispatcher_manual.h" #include "cocos2d.h" -#include "ScriptingCore.h" -#include "cocos2d_specifics.hpp" +#include "scripting/js-bindings/manual/ScriptingCore.h" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" USING_NS_CC; diff --git a/cocos/scripting/js-bindings/manual/jsb_opengl_functions.cpp b/cocos/scripting/js-bindings/manual/jsb_opengl_functions.cpp index 70868d2189..40a1b4b57b 100644 --- a/cocos/scripting/js-bindings/manual/jsb_opengl_functions.cpp +++ b/cocos/scripting/js-bindings/manual/jsb_opengl_functions.cpp @@ -3,16 +3,16 @@ * Generated by "generate_jsb.py -c opengl_jsb.ini" on 2013-03-05 * Script version: v0.6 */ -#include "js_bindings_config.h" +#include "scripting/js-bindings/manual/js_bindings_config.h" #ifdef JSB_INCLUDE_OPENGL -#include "jsb_opengl_manual.h" +#include "scripting/js-bindings/manual/jsb_opengl_manual.h" #include "jsfriendapi.h" //#include "jsb_config.h" -#include "js_bindings_core.h" -#include "js_manual_conversions.h" -#include "jsb_opengl_functions.h" +#include "scripting/js-bindings/manual/js_bindings_core.h" +#include "scripting/js-bindings/manual/js_manual_conversions.h" +#include "scripting/js-bindings/manual/jsb_opengl_functions.h" #include "platform/CCGL.h" // Arguments: GLenum diff --git a/cocos/scripting/js-bindings/manual/jsb_opengl_functions.h b/cocos/scripting/js-bindings/manual/jsb_opengl_functions.h index 9a4449a7bb..64a3093468 100644 --- a/cocos/scripting/js-bindings/manual/jsb_opengl_functions.h +++ b/cocos/scripting/js-bindings/manual/jsb_opengl_functions.h @@ -3,10 +3,10 @@ * Generated by "generate_jsb.py -c opengl_jsb.ini" on 2013-03-05 * Script version: v0.6 */ -#include "js_bindings_config.h" +#include "scripting/js-bindings/manual/js_bindings_config.h" #ifdef JSB_INCLUDE_OPENGL -#include "jsb_opengl_manual.h" +#include "scripting/js-bindings/manual/jsb_opengl_manual.h" extern "C" { diff --git a/cocos/scripting/js-bindings/manual/jsb_opengl_manual.cpp b/cocos/scripting/js-bindings/manual/jsb_opengl_manual.cpp index 530ca6a040..b58e2bdfc0 100644 --- a/cocos/scripting/js-bindings/manual/jsb_opengl_manual.cpp +++ b/cocos/scripting/js-bindings/manual/jsb_opengl_manual.cpp @@ -21,13 +21,13 @@ * THE SOFTWARE. */ -#include "js_bindings_config.h" +#include "scripting/js-bindings/manual/js_bindings_config.h" #ifdef JSB_INCLUDE_OPENGL -#include "jsb_opengl_manual.h" -#include "js_manual_conversions.h" -#include "js_bindings_core.h" -#include "jsb_opengl_functions.h" +#include "scripting/js-bindings/manual/jsb_opengl_manual.h" +#include "scripting/js-bindings/manual/js_manual_conversions.h" +#include "scripting/js-bindings/manual/js_bindings_core.h" +#include "scripting/js-bindings/manual/jsb_opengl_functions.h" #include "platform/CCGL.h" diff --git a/cocos/scripting/js-bindings/manual/jsb_opengl_manual.h b/cocos/scripting/js-bindings/manual/jsb_opengl_manual.h index 59bbb45d6d..17a705a551 100644 --- a/cocos/scripting/js-bindings/manual/jsb_opengl_manual.h +++ b/cocos/scripting/js-bindings/manual/jsb_opengl_manual.h @@ -25,7 +25,7 @@ #ifndef __jsb_opengl_manual #define __jsb_opengl_manual -#include "js_bindings_config.h" +#include "scripting/js-bindings/manual/js_bindings_config.h" #ifdef JSB_INCLUDE_OPENGL #include "jsapi.h" diff --git a/cocos/scripting/js-bindings/manual/jsb_opengl_registration.cpp b/cocos/scripting/js-bindings/manual/jsb_opengl_registration.cpp index aa1d7e815d..c080f5870a 100644 --- a/cocos/scripting/js-bindings/manual/jsb_opengl_registration.cpp +++ b/cocos/scripting/js-bindings/manual/jsb_opengl_registration.cpp @@ -21,17 +21,17 @@ * THE SOFTWARE. */ -#include "js_bindings_config.h" -#include "js_bindings_core.h" +#include "scripting/js-bindings/manual/js_bindings_config.h" +#include "scripting/js-bindings/manual/js_bindings_core.h" #include "jsfriendapi.h" -#include "cocos2d_specifics.hpp" -#include "jsb_opengl_manual.h" -#include "js_bindings_opengl.h" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" +#include "scripting/js-bindings/manual/jsb_opengl_manual.h" +#include "scripting/js-bindings/manual/js_bindings_opengl.h" //#include "jsb_opengl_functions_registration.h" // system -#include "jsb_opengl_functions.h" +#include "scripting/js-bindings/manual/jsb_opengl_functions.h" void JSB_register_opengl(JSContext *_cx, JS::HandleObject object) { diff --git a/cocos/scripting/js-bindings/manual/jsb_opengl_registration.h b/cocos/scripting/js-bindings/manual/jsb_opengl_registration.h index a19f3e75c0..7db1ee17ad 100644 --- a/cocos/scripting/js-bindings/manual/jsb_opengl_registration.h +++ b/cocos/scripting/js-bindings/manual/jsb_opengl_registration.h @@ -23,7 +23,7 @@ #ifndef __JSB_OPENGL_REGISTRATION #define __JSB_OPENGL_REGISTRATION -#include "jsb_opengl_functions.h" +#include "scripting/js-bindings/manual/jsb_opengl_functions.h" void JSB_register_opengl( JSContext *globalC, JS::HandleObject globalO); diff --git a/cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_functions.cpp b/cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_functions.cpp index 590e26f198..d29f884798 100644 --- a/cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_functions.cpp +++ b/cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_functions.cpp @@ -3,12 +3,12 @@ * Generated by "generate_js_bindings.py -c system_jsb.ini" on 2012-12-17 * Script version: v0.5 */ -#include "js_bindings_system_functions.h" -#include "js_bindings_config.h" -#include "js_bindings_core.h" -#include "js_manual_conversions.h" -#include "ScriptingCore.h" -#include "local-storage/LocalStorage.h" +#include "scripting/js-bindings/manual/localstorage/js_bindings_system_functions.h" +#include "scripting/js-bindings/manual/js_bindings_config.h" +#include "scripting/js-bindings/manual/js_bindings_core.h" +#include "scripting/js-bindings/manual/js_manual_conversions.h" +#include "scripting/js-bindings/manual/ScriptingCore.h" +#include "storage/local-storage/LocalStorage.h" USING_NS_CC; diff --git a/cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_functions.h b/cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_functions.h index 6560d0b2d3..5f4fe1166b 100644 --- a/cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_functions.h +++ b/cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_functions.h @@ -3,7 +3,7 @@ * Generated by "generate_js_bindings.py -c system_jsb.ini" on 2012-12-17 * Script version: v0.5 */ -#include "js_bindings_config.h" +#include "scripting/js-bindings/manual/js_bindings_config.h" #include "jsapi.h" #ifdef __cplusplus diff --git a/cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_functions_registration.h b/cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_functions_registration.h index c3798dd7f2..afffa96c2d 100644 --- a/cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_functions_registration.h +++ b/cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_functions_registration.h @@ -3,10 +3,10 @@ * Generated by "generate_js_bindings.py -c system_jsb.ini" on 2012-12-17 * Script version: v0.5 */ -#include "../js_bindings_config.h" +#include "scripting/js-bindings/manual/js_bindings_config.h" //#ifdef JSB_INCLUDE_SYSTEM -//#include "LocalStorage.h" +//#include "storage/local-storage/LocalStorage.h" JS_DefineFunction(_cx, system, "getItem", JSB_localStorageGetItem, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE ); JS_DefineFunction(_cx, system, "removeItem", JSB_localStorageRemoveItem, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE ); JS_DefineFunction(_cx, system, "setItem", JSB_localStorageSetItem, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE ); diff --git a/cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_registration.cpp b/cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_registration.cpp index fd43cfbef8..e51c48dcfc 100644 --- a/cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_registration.cpp +++ b/cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_registration.cpp @@ -21,13 +21,13 @@ * THE SOFTWARE. */ -#include "js_bindings_config.h" -#include "js_bindings_core.h" -#include "local-storage/LocalStorage.h" +#include "scripting/js-bindings/manual/js_bindings_config.h" +#include "scripting/js-bindings/manual/js_bindings_core.h" +#include "storage/local-storage/LocalStorage.h" #include "cocos2d.h" // system -#include "js_bindings_system_functions.h" +#include "scripting/js-bindings/manual/localstorage/js_bindings_system_functions.h" void jsb_register_system( JSContext *_cx, JS::HandleObject object) @@ -51,7 +51,7 @@ void jsb_register_system( JSContext *_cx, JS::HandleObject object) // sys.localStorage functions JS::RootedObject system(_cx, ls); -#include "js_bindings_system_functions_registration.h" +#include "scripting/js-bindings/manual/localstorage/js_bindings_system_functions_registration.h" // Init DB with full path //NSString *path = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) lastObject]; diff --git a/cocos/scripting/js-bindings/manual/navmesh/jsb_cocos2dx_navmesh_conversions.cpp b/cocos/scripting/js-bindings/manual/navmesh/jsb_cocos2dx_navmesh_conversions.cpp index f952c33f62..5830825d47 100644 --- a/cocos/scripting/js-bindings/manual/navmesh/jsb_cocos2dx_navmesh_conversions.cpp +++ b/cocos/scripting/js-bindings/manual/navmesh/jsb_cocos2dx_navmesh_conversions.cpp @@ -21,10 +21,10 @@ * THE SOFTWARE. */ -#include "jsb_cocos2dx_navmesh_conversions.h" +#include "scripting/js-bindings/manual/navmesh/jsb_cocos2dx_navmesh_conversions.h" #if CC_USE_NAVMESH -#include "cocos2d_specifics.hpp" -#include "js_manual_conversions.h" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" +#include "scripting/js-bindings/manual/js_manual_conversions.h" bool jsval_to_NavMeshAgentParam(JSContext *cx, JS::HandleValue v, cocos2d::NavMeshAgentParam* ret) { diff --git a/cocos/scripting/js-bindings/manual/navmesh/jsb_cocos2dx_navmesh_manual.cpp b/cocos/scripting/js-bindings/manual/navmesh/jsb_cocos2dx_navmesh_manual.cpp index 331a69d2f1..990698dd9a 100644 --- a/cocos/scripting/js-bindings/manual/navmesh/jsb_cocos2dx_navmesh_manual.cpp +++ b/cocos/scripting/js-bindings/manual/navmesh/jsb_cocos2dx_navmesh_manual.cpp @@ -24,13 +24,13 @@ 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 "jsb_cocos2dx_navmesh_auto.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_navmesh_auto.hpp" #if CC_USE_NAVMESH -#include "ScriptingCore.h" -#include "cocos2d_specifics.hpp" +#include "scripting/js-bindings/manual/ScriptingCore.h" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" #include "cocos2d.h" #include "navmesh/CCNavMesh.h" -#include "js_manual_conversions.h" +#include "scripting/js-bindings/manual/js_manual_conversions.h" static bool jsb_cocos2dx_navmesh_NavMeshAgent_move(JSContext *cx, uint32_t argc, jsval *vp) { diff --git a/cocos/scripting/js-bindings/manual/network/XMLHTTPRequest.cpp b/cocos/scripting/js-bindings/manual/network/XMLHTTPRequest.cpp index 1fbe310cec..18c52223de 100644 --- a/cocos/scripting/js-bindings/manual/network/XMLHTTPRequest.cpp +++ b/cocos/scripting/js-bindings/manual/network/XMLHTTPRequest.cpp @@ -26,10 +26,10 @@ */ -#include "XMLHTTPRequest.h" +#include "scripting/js-bindings/manual/network/XMLHTTPRequest.h" #include #include -#include "cocos2d_specifics.hpp" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" using namespace std; diff --git a/cocos/scripting/js-bindings/manual/network/XMLHTTPRequest.h b/cocos/scripting/js-bindings/manual/network/XMLHTTPRequest.h index eb9d424fdb..009ed86ff5 100644 --- a/cocos/scripting/js-bindings/manual/network/XMLHTTPRequest.h +++ b/cocos/scripting/js-bindings/manual/network/XMLHTTPRequest.h @@ -32,9 +32,9 @@ #include "jsapi.h" #include "jsfriendapi.h" #include "network/HttpClient.h" -#include "js_bindings_config.h" -#include "ScriptingCore.h" -#include "jsb_helper.h" +#include "scripting/js-bindings/manual/js_bindings_config.h" +#include "scripting/js-bindings/manual/ScriptingCore.h" +#include "scripting/js-bindings/manual/jsb_helper.h" class MinXmlHttpRequest : public cocos2d::Ref { diff --git a/cocos/scripting/js-bindings/manual/network/jsb_socketio.cpp b/cocos/scripting/js-bindings/manual/network/jsb_socketio.cpp index 8b8ee3d93b..b6ac750500 100644 --- a/cocos/scripting/js-bindings/manual/network/jsb_socketio.cpp +++ b/cocos/scripting/js-bindings/manual/network/jsb_socketio.cpp @@ -21,14 +21,14 @@ * THE SOFTWARE. */ -#include "jsb_socketio.h" -#include "jsb_helper.h" +#include "scripting/js-bindings/manual/network/jsb_socketio.h" +#include "scripting/js-bindings/manual/jsb_helper.h" #include "cocos2d.h" #include "network/WebSocket.h" #include "network/SocketIO.h" -#include "spidermonkey_specifics.h" -#include "ScriptingCore.h" -#include "cocos2d_specifics.hpp" +#include "scripting/js-bindings/manual/spidermonkey_specifics.h" +#include "scripting/js-bindings/manual/ScriptingCore.h" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" using namespace cocos2d::network; diff --git a/cocos/scripting/js-bindings/manual/network/jsb_websocket.cpp b/cocos/scripting/js-bindings/manual/network/jsb_websocket.cpp index 686b3d5132..4c8859c3fb 100644 --- a/cocos/scripting/js-bindings/manual/network/jsb_websocket.cpp +++ b/cocos/scripting/js-bindings/manual/network/jsb_websocket.cpp @@ -21,12 +21,12 @@ * THE SOFTWARE. */ -#include "jsb_websocket.h" +#include "scripting/js-bindings/manual/network/jsb_websocket.h" #include "cocos2d.h" #include "network/WebSocket.h" -#include "spidermonkey_specifics.h" -#include "ScriptingCore.h" -#include "cocos2d_specifics.hpp" +#include "scripting/js-bindings/manual/spidermonkey_specifics.h" +#include "scripting/js-bindings/manual/ScriptingCore.h" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" using namespace cocos2d::network; diff --git a/cocos/scripting/js-bindings/manual/physics3d/jsb_cocos2dx_physics3d_manual.cpp b/cocos/scripting/js-bindings/manual/physics3d/jsb_cocos2dx_physics3d_manual.cpp index cfdbcee04e..4c2711e5d5 100644 --- a/cocos/scripting/js-bindings/manual/physics3d/jsb_cocos2dx_physics3d_manual.cpp +++ b/cocos/scripting/js-bindings/manual/physics3d/jsb_cocos2dx_physics3d_manual.cpp @@ -25,12 +25,12 @@ THE SOFTWARE. ****************************************************************************/ -#include "jsb_cocos2dx_physics3d_manual.h" +#include "scripting/js-bindings/manual/physics3d/jsb_cocos2dx_physics3d_manual.h" #include "base/ccConfig.h" #if CC_USE_3D_PHYSICS && CC_ENABLE_BULLET_INTEGRATION -#include "jsb_cocos2dx_physics3d_auto.hpp" -#include "cocos2d_specifics.hpp" +#include "scripting/js-bindings/auto/jsb_cocos2dx_physics3d_auto.hpp" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" #include "physics3d/CCPhysics3D.h" using namespace cocos2d; diff --git a/cocos/scripting/js-bindings/manual/platform/android/CCJavascriptJavaBridge.cpp b/cocos/scripting/js-bindings/manual/platform/android/CCJavascriptJavaBridge.cpp index 419dc4b603..4cad91fa6e 100644 --- a/cocos/scripting/js-bindings/manual/platform/android/CCJavascriptJavaBridge.cpp +++ b/cocos/scripting/js-bindings/manual/platform/android/CCJavascriptJavaBridge.cpp @@ -21,12 +21,12 @@ */ #include -#include "CCJavascriptJavaBridge.h" +#include "scripting/js-bindings/manual/platform/android/CCJavascriptJavaBridge.h" #include "cocos2d.h" #include "platform/android/jni/JniHelper.h" -#include "spidermonkey_specifics.h" -#include "ScriptingCore.h" -#include "js_manual_conversions.h" +#include "scripting/js-bindings/manual/spidermonkey_specifics.h" +#include "scripting/js-bindings/manual/ScriptingCore.h" +#include "scripting/js-bindings/manual/js_manual_conversions.h" #include "base/ccUTF8.h" #define LOG_TAG "CCJavascriptJavaBridge" diff --git a/cocos/scripting/js-bindings/manual/platform/android/CCJavascriptJavaBridge.h b/cocos/scripting/js-bindings/manual/platform/android/CCJavascriptJavaBridge.h index 3e69efd1e3..6cc0c47e7e 100644 --- a/cocos/scripting/js-bindings/manual/platform/android/CCJavascriptJavaBridge.h +++ b/cocos/scripting/js-bindings/manual/platform/android/CCJavascriptJavaBridge.h @@ -28,8 +28,8 @@ #include #include "jsapi.h" #include "jsfriendapi.h" -#include "js_bindings_config.h" -#include "jsb_helper.h" +#include "scripting/js-bindings/manual/js_bindings_config.h" +#include "scripting/js-bindings/manual/jsb_helper.h" using namespace std; diff --git a/cocos/scripting/js-bindings/manual/platform/ios/JavaScriptObjCBridge.h b/cocos/scripting/js-bindings/manual/platform/ios/JavaScriptObjCBridge.h index 5598e1bbe8..e0265c38b3 100644 --- a/cocos/scripting/js-bindings/manual/platform/ios/JavaScriptObjCBridge.h +++ b/cocos/scripting/js-bindings/manual/platform/ios/JavaScriptObjCBridge.h @@ -24,10 +24,10 @@ #include #include -#include "jsb_helper.h" +#include "scripting/js-bindings/manual/jsb_helper.h" #include "jsapi.h" #include "jsfriendapi.h" -#include "js_bindings_config.h" +#include "scripting/js-bindings/manual/js_bindings_config.h" using namespace std; #define JSO_ERR_OK (0) diff --git a/cocos/scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.cpp b/cocos/scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.cpp index 32d66ed438..bec566c0bc 100644 --- a/cocos/scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.cpp +++ b/cocos/scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.cpp @@ -21,10 +21,10 @@ * THE SOFTWARE. */ -#include "jsb_cocos2dx_spine_manual.h" -#include "ScriptingCore.h" -#include "cocos2d_specifics.hpp" -#include "spine/spine-cocos2dx.h" +#include "scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.h" +#include "scripting/js-bindings/manual/ScriptingCore.h" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" +#include "editor-support/spine/spine-cocos2dx.h" using namespace spine; diff --git a/cocos/scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.h b/cocos/scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.h index 6ccf87be76..dacbab6e3a 100644 --- a/cocos/scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.h +++ b/cocos/scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.h @@ -25,7 +25,7 @@ #define __jsb_cocos2dx_spine_manual__ #include "jsapi.h" -#include "spine/spine-cocos2dx.h" +#include "editor-support/spine/spine-cocos2dx.h" void register_all_cocos2dx_spine_manual(JSContext* cx, JS::HandleObject global); diff --git a/cocos/scripting/js-bindings/manual/ui/jsb_cocos2dx_ui_manual.cpp b/cocos/scripting/js-bindings/manual/ui/jsb_cocos2dx_ui_manual.cpp index d7b7a32231..6394ef6ae9 100755 --- a/cocos/scripting/js-bindings/manual/ui/jsb_cocos2dx_ui_manual.cpp +++ b/cocos/scripting/js-bindings/manual/ui/jsb_cocos2dx_ui_manual.cpp @@ -21,9 +21,9 @@ * THE SOFTWARE. */ -#include "jsb_cocos2dx_ui_manual.h" -#include "ScriptingCore.h" -#include "cocos2d_specifics.hpp" +#include "scripting/js-bindings/manual/ui/jsb_cocos2dx_ui_manual.h" +#include "scripting/js-bindings/manual/ScriptingCore.h" +#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" #include "ui/CocosGUI.h" using namespace cocos2d; diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.cpp index d331e4aed3..d9fc5dab84 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.cpp @@ -1,8 +1,8 @@ -#include "lua_cocos2dx_3d_auto.hpp" +#include "scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.hpp" #include "cocos2d.h" -#include "CCBundle3D.h" -#include "tolua_fix.h" -#include "LuaBasicConversions.h" +#include "3d/CCBundle3D.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" int lua_cocos2dx_3d_Animation3D_initWithFile(lua_State* tolua_S) diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_audioengine_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_audioengine_auto.cpp index f1ac1aee98..52203515c4 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_audioengine_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_audioengine_auto.cpp @@ -1,8 +1,8 @@ -#include "lua_cocos2dx_audioengine_auto.hpp" +#include "scripting/lua-bindings/auto/lua_cocos2dx_audioengine_auto.hpp" #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 -#include "AudioEngine.h" -#include "tolua_fix.h" -#include "LuaBasicConversions.h" +#include "audio/include/AudioEngine.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" int lua_cocos2dx_audioengine_AudioProfile_constructor(lua_State* tolua_S) diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp index 3efb08d2d6..7ba1e296c2 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp @@ -1,10 +1,10 @@ -#include "lua_cocos2dx_auto.hpp" +#include "scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp" #include "cocos2d.h" -#include "CCProtectedNode.h" -#include "CCAsyncTaskPool.h" -#include "CCComponentLua.h" -#include "tolua_fix.h" -#include "LuaBasicConversions.h" +#include "2d/CCProtectedNode.h" +#include "base/CCAsyncTaskPool.h" +#include "scripting/lua-bindings/manual/CCComponentLua.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" int lua_cocos2dx_Ref_release(lua_State* tolua_S) diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_cocosbuilder_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_cocosbuilder_auto.cpp index cdf7797978..68ff4b0dad 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_cocosbuilder_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_cocosbuilder_auto.cpp @@ -1,7 +1,7 @@ -#include "lua_cocos2dx_cocosbuilder_auto.hpp" -#include "CocosBuilder.h" -#include "tolua_fix.h" -#include "LuaBasicConversions.h" +#include "scripting/lua-bindings/auto/lua_cocos2dx_cocosbuilder_auto.hpp" +#include "editor-support/cocosbuilder/CocosBuilder.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" int lua_cocos2dx_cocosbuilder_CCBAnimationManager_moveAnimationsFromNode(lua_State* tolua_S) diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_cocosdenshion_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_cocosdenshion_auto.cpp index a5b8d213c4..dd3b252a07 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_cocosdenshion_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_cocosdenshion_auto.cpp @@ -1,7 +1,7 @@ -#include "lua_cocos2dx_cocosdenshion_auto.hpp" -#include "SimpleAudioEngine.h" -#include "tolua_fix.h" -#include "LuaBasicConversions.h" +#include "scripting/lua-bindings/auto/lua_cocos2dx_cocosdenshion_auto.hpp" +#include "audio/include/SimpleAudioEngine.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" int lua_cocos2dx_cocosdenshion_SimpleAudioEngine_preloadBackgroundMusic(lua_State* tolua_S) diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.cpp index d7c4d142af..f10665c860 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.cpp @@ -1,8 +1,8 @@ -#include "lua_cocos2dx_controller_auto.hpp" +#include "scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.hpp" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) -#include "CCGameController.h" -#include "tolua_fix.h" -#include "LuaBasicConversions.h" +#include "base/CCGameController.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" int lua_cocos2dx_controller_Controller_receiveExternalKeyEvent(lua_State* tolua_S) diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_csloader_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_csloader_auto.cpp index 2736da98a1..7bea1e581f 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_csloader_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_csloader_auto.cpp @@ -1,7 +1,7 @@ -#include "lua_cocos2dx_csloader_auto.hpp" -#include "CSLoader.h" -#include "tolua_fix.h" -#include "LuaBasicConversions.h" +#include "scripting/lua-bindings/auto/lua_cocos2dx_csloader_auto.hpp" +#include "editor-support/cocostudio/ActionTimeline/CSLoader.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" int lua_cocos2dx_csloader_CSLoader_createNodeFromJson(lua_State* tolua_S) diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_auto.cpp index cfce645d27..c5fc1885fc 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_auto.cpp @@ -1,8 +1,8 @@ -#include "lua_cocos2dx_experimental_auto.hpp" -#include "CCFastTMXLayer.h" -#include "CCFastTMXTiledMap.h" -#include "tolua_fix.h" -#include "LuaBasicConversions.h" +#include "scripting/lua-bindings/auto/lua_cocos2dx_experimental_auto.hpp" +#include "2d/CCFastTMXLayer.h" +#include "2d/CCFastTMXTiledMap.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" int lua_cocos2dx_experimental_TMXLayer_getPositionAt(lua_State* tolua_S) diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_video_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_video_auto.cpp index 07d6544742..b7cb1808a9 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_video_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_video_auto.cpp @@ -1,8 +1,8 @@ -#include "lua_cocos2dx_experimental_video_auto.hpp" +#include "scripting/lua-bindings/auto/lua_cocos2dx_experimental_video_auto.hpp" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) && !defined(CC_TARGET_OS_TVOS) -#include "UIVideoPlayer.h" -#include "tolua_fix.h" -#include "LuaBasicConversions.h" +#include "ui/UIVideoPlayer.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" int lua_cocos2dx_experimental_video_VideoPlayer_getFileName(lua_State* tolua_S) diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_webview_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_webview_auto.cpp index 9e06649124..7b882f461d 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_webview_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_webview_auto.cpp @@ -1,8 +1,8 @@ -#include "lua_cocos2dx_experimental_webview_auto.hpp" +#include "scripting/lua-bindings/auto/lua_cocos2dx_experimental_webview_auto.hpp" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) && !defined(CC_TARGET_OS_TVOS) -#include "UIWebView.h" -#include "tolua_fix.h" -#include "LuaBasicConversions.h" +#include "ui/UIWebView.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" int lua_cocos2dx_experimental_webview_WebView_canGoBack(lua_State* tolua_S) diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.cpp index 8ce723dba3..c8bf5c3dcb 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.cpp @@ -1,7 +1,7 @@ -#include "lua_cocos2dx_extension_auto.hpp" +#include "scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.hpp" #include "cocos-ext.h" -#include "tolua_fix.h" -#include "LuaBasicConversions.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" int lua_cocos2dx_extension_Control_setEnabled(lua_State* tolua_S) diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_navmesh_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_navmesh_auto.cpp index d05e6bdfb2..4bcdae3e02 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_navmesh_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_navmesh_auto.cpp @@ -1,9 +1,9 @@ -#include "lua_cocos2dx_navmesh_auto.hpp" +#include "scripting/lua-bindings/auto/lua_cocos2dx_navmesh_auto.hpp" #if CC_USE_NAVMESH -#include "CCNavMesh.h" -#include "lua_cocos2dx_navmesh_conversions.h" -#include "tolua_fix.h" -#include "LuaBasicConversions.h" +#include "navmesh/CCNavMesh.h" +#include "scripting/lua-bindings/manual/navmesh/lua_cocos2dx_navmesh_conversions.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" int lua_cocos2dx_navmesh_NavMeshAgent_setMaxSpeed(lua_State* tolua_S) diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics3d_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics3d_auto.cpp index bd27994ea7..9277415661 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics3d_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics3d_auto.cpp @@ -1,8 +1,8 @@ -#include "lua_cocos2dx_physics3d_auto.hpp" +#include "scripting/lua-bindings/auto/lua_cocos2dx_physics3d_auto.hpp" #if CC_USE_3D_PHYSICS && CC_ENABLE_BULLET_INTEGRATION -#include "CCPhysics3D.h" -#include "tolua_fix.h" -#include "LuaBasicConversions.h" +#include "physics3d/CCPhysics3D.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" int lua_cocos2dx_physics3d_Physics3DShape_getbtShape(lua_State* tolua_S) diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.cpp index fbad0fb6ac..0f98cc349c 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.cpp @@ -1,8 +1,8 @@ -#include "lua_cocos2dx_physics_auto.hpp" +#include "scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.hpp" #if CC_USE_PHYSICS #include "cocos2d.h" -#include "tolua_fix.h" -#include "LuaBasicConversions.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" int lua_cocos2dx_physics_PhysicsShape_getFriction(lua_State* tolua_S) diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_spine_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_spine_auto.cpp index 63214e30e2..577cdaa468 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_spine_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_spine_auto.cpp @@ -1,7 +1,7 @@ -#include "lua_cocos2dx_spine_auto.hpp" -#include "spine-cocos2dx.h" -#include "tolua_fix.h" -#include "LuaBasicConversions.h" +#include "scripting/lua-bindings/auto/lua_cocos2dx_spine_auto.hpp" +#include "editor-support/spine/spine-cocos2dx.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" int lua_cocos2dx_spine_SkeletonRenderer_setTimeScale(lua_State* tolua_S) diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp index d2434e7dcc..77504bbd2d 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp @@ -1,9 +1,9 @@ -#include "lua_cocos2dx_studio_auto.hpp" -#include "CocoStudio.h" -#include "CCComExtensionData.h" -#include "lua-cocos-studio-conversions.h" -#include "tolua_fix.h" -#include "LuaBasicConversions.h" +#include "scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.hpp" +#include "editor-support/cocostudio/CocoStudio.h" +#include "editor-support/cocostudio/CCComExtensionData.h" +#include "scripting/lua-bindings/manual/cocostudio/lua-cocos-studio-conversions.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" int lua_cocos2dx_studio_ActionFrame_getAction(lua_State* tolua_S) diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp index ff41472ec1..3ead7d94eb 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp @@ -1,7 +1,7 @@ -#include "lua_cocos2dx_ui_auto.hpp" -#include "CocosGUI.h" -#include "tolua_fix.h" -#include "LuaBasicConversions.h" +#include "scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp" +#include "ui/CocosGUI.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" int lua_cocos2dx_ui_LayoutParameter_clone(lua_State* tolua_S) diff --git a/cocos/scripting/lua-bindings/manual/3d/lua_cocos2dx_3d_manual.cpp b/cocos/scripting/lua-bindings/manual/3d/lua_cocos2dx_3d_manual.cpp index a0d93aac8e..37ceedd882 100644 --- a/cocos/scripting/lua-bindings/manual/3d/lua_cocos2dx_3d_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/3d/lua_cocos2dx_3d_manual.cpp @@ -21,10 +21,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "lua_cocos2dx_3d_manual.h" -#include "lua_cocos2dx_3d_auto.hpp" -#include "LuaBasicConversions.h" -#include "CCLuaEngine.h" +#include "scripting/lua-bindings/manual/3d/lua_cocos2dx_3d_manual.h" +#include "scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.hpp" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" #include "3d/CCBundle3D.h" extern int lua_cocos2dx_3d_Sprite3D_setBlendFunc(lua_State* L); diff --git a/cocos/scripting/lua-bindings/manual/CCComponentLua.cpp b/cocos/scripting/lua-bindings/manual/CCComponentLua.cpp index dcc4ad963e..294525bd73 100644 --- a/cocos/scripting/lua-bindings/manual/CCComponentLua.cpp +++ b/cocos/scripting/lua-bindings/manual/CCComponentLua.cpp @@ -22,11 +22,11 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCComponentLua.h" +#include "scripting/lua-bindings/manual/CCComponentLua.h" #include #include "base/CCScriptSupport.h" -#include "CCLuaEngine.h" -#include "LuaBasicConversions.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" NS_CC_BEGIN diff --git a/cocos/scripting/lua-bindings/manual/CCLuaBridge.cpp b/cocos/scripting/lua-bindings/manual/CCLuaBridge.cpp index 50aaca89e5..698c880c3d 100644 --- a/cocos/scripting/lua-bindings/manual/CCLuaBridge.cpp +++ b/cocos/scripting/lua-bindings/manual/CCLuaBridge.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCLuaBridge.h" +#include "scripting/lua-bindings/manual/CCLuaBridge.h" NS_CC_BEGIN diff --git a/cocos/scripting/lua-bindings/manual/CCLuaBridge.h b/cocos/scripting/lua-bindings/manual/CCLuaBridge.h index cc6c036a0c..b19a90571d 100644 --- a/cocos/scripting/lua-bindings/manual/CCLuaBridge.h +++ b/cocos/scripting/lua-bindings/manual/CCLuaBridge.h @@ -27,7 +27,7 @@ #include #include -#include "CCLuaEngine.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" extern "C" { #include "lua.h" diff --git a/cocos/scripting/lua-bindings/manual/CCLuaEngine.cpp b/cocos/scripting/lua-bindings/manual/CCLuaEngine.cpp index 69ef046381..b07ff808fb 100644 --- a/cocos/scripting/lua-bindings/manual/CCLuaEngine.cpp +++ b/cocos/scripting/lua-bindings/manual/CCLuaEngine.cpp @@ -23,15 +23,15 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCLuaEngine.h" -#include "tolua_fix.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" #include "cocos2d.h" #include "extensions/GUI/CCControlExtension/CCControl.h" -#include "LuaOpengl.h" -#include "lua_cocos2dx_manual.hpp" -#include "lua_cocos2dx_extension_manual.h" -#include "lua_cocos2dx_coco_studio_manual.hpp" -#include "lua_cocos2dx_ui_manual.hpp" +#include "scripting/lua-bindings/manual/cocos2d/LuaOpengl.h" +#include "scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.hpp" +#include "scripting/lua-bindings/manual/extension/lua_cocos2dx_extension_manual.h" +#include "scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_coco_studio_manual.hpp" +#include "scripting/lua-bindings/manual/ui/lua_cocos2dx_ui_manual.hpp" #if _MSC_VER > 1800 #pragma comment(lib,"lua51-2015.lib") diff --git a/cocos/scripting/lua-bindings/manual/CCLuaEngine.h b/cocos/scripting/lua-bindings/manual/CCLuaEngine.h index a35650dc34..7e0ead180f 100644 --- a/cocos/scripting/lua-bindings/manual/CCLuaEngine.h +++ b/cocos/scripting/lua-bindings/manual/CCLuaEngine.h @@ -32,10 +32,10 @@ extern "C" { #include "cocos2d.h" #include "base/CCScriptSupport.h" -#include "CCLuaStack.h" -#include "CCLuaValue.h" -#include "cocos2d/LuaScriptHandlerMgr.h" -#include "Lua-BindingsExport.h" +#include "scripting/lua-bindings/manual/CCLuaStack.h" +#include "scripting/lua-bindings/manual/CCLuaValue.h" +#include "scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.h" +#include "scripting/lua-bindings/manual/Lua-BindingsExport.h" /** diff --git a/cocos/scripting/lua-bindings/manual/CCLuaStack.cpp b/cocos/scripting/lua-bindings/manual/CCLuaStack.cpp index a3de8b324b..d17e9ecb9b 100644 --- a/cocos/scripting/lua-bindings/manual/CCLuaStack.cpp +++ b/cocos/scripting/lua-bindings/manual/CCLuaStack.cpp @@ -23,8 +23,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCLuaStack.h" -#include "tolua_fix.h" +#include "scripting/lua-bindings/manual/CCLuaStack.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" #include "external/xxtea/xxtea.h" extern "C" { #include "lua.h" @@ -33,26 +33,26 @@ extern "C" { #include "lauxlib.h" } -#include "Cocos2dxLuaLoader.h" +#include "scripting/lua-bindings/manual/Cocos2dxLuaLoader.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC) -#include "platform/ios/CCLuaObjcBridge.h" +#include "scripting/lua-bindings/manual/platform/ios/CCLuaObjcBridge.h" #endif #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) -#include "platform/android/CCLuaJavaBridge.h" +#include "scripting/lua-bindings/manual/platform/android/CCLuaJavaBridge.h" #endif -#include "LuaOpengl.h" -#include "LuaScriptHandlerMgr.h" -#include "lua_cocos2dx_auto.hpp" -#include "lua_cocos2dx_manual.hpp" -#include "LuaBasicConversions.h" -#include "lua_cocos2dx_deprecated.h" -#include "lua_cocos2dx_physics_auto.hpp" -#include "lua_cocos2dx_physics_manual.hpp" -#include "lua_cocos2dx_experimental_auto.hpp" -#include "lua_cocos2dx_experimental_manual.hpp" +#include "scripting/lua-bindings/manual/cocos2d/LuaOpengl.h" +#include "scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.h" +#include "scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp" +#include "scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.hpp" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" +#include "scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_deprecated.h" +#include "scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.hpp" +#include "scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_physics_manual.hpp" +#include "scripting/lua-bindings/auto/lua_cocos2dx_experimental_auto.hpp" +#include "scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_experimental_manual.hpp" namespace { diff --git a/cocos/scripting/lua-bindings/manual/CCLuaStack.h b/cocos/scripting/lua-bindings/manual/CCLuaStack.h index e2ab3ec37f..d2a6e5ade6 100644 --- a/cocos/scripting/lua-bindings/manual/CCLuaStack.h +++ b/cocos/scripting/lua-bindings/manual/CCLuaStack.h @@ -31,7 +31,7 @@ extern "C" { } #include "cocos2d.h" -#include "CCLuaValue.h" +#include "scripting/lua-bindings/manual/CCLuaValue.h" /** * @addtogroup lua diff --git a/cocos/scripting/lua-bindings/manual/CCLuaValue.cpp b/cocos/scripting/lua-bindings/manual/CCLuaValue.cpp index d55718787a..be5ed5dd7a 100644 --- a/cocos/scripting/lua-bindings/manual/CCLuaValue.cpp +++ b/cocos/scripting/lua-bindings/manual/CCLuaValue.cpp @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCLuaValue.h" +#include "scripting/lua-bindings/manual/CCLuaValue.h" NS_CC_BEGIN diff --git a/cocos/scripting/lua-bindings/manual/Cocos2dxLuaLoader.cpp b/cocos/scripting/lua-bindings/manual/Cocos2dxLuaLoader.cpp index 956e9b0cd7..3b544d5797 100644 --- a/cocos/scripting/lua-bindings/manual/Cocos2dxLuaLoader.cpp +++ b/cocos/scripting/lua-bindings/manual/Cocos2dxLuaLoader.cpp @@ -22,12 +22,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 "Cocos2dxLuaLoader.h" +#include "scripting/lua-bindings/manual/Cocos2dxLuaLoader.h" #include #include -#include "CCLuaStack.h" -#include "CCLuaEngine.h" +#include "scripting/lua-bindings/manual/CCLuaStack.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" using namespace cocos2d; diff --git a/cocos/scripting/lua-bindings/manual/LuaBasicConversions.cpp b/cocos/scripting/lua-bindings/manual/LuaBasicConversions.cpp index f8605d7f9f..a3c1e59cde 100644 --- a/cocos/scripting/lua-bindings/manual/LuaBasicConversions.cpp +++ b/cocos/scripting/lua-bindings/manual/LuaBasicConversions.cpp @@ -22,8 +22,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "LuaBasicConversions.h" -#include "tolua_fix.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" diff --git a/cocos/scripting/lua-bindings/manual/LuaBasicConversions.h b/cocos/scripting/lua-bindings/manual/LuaBasicConversions.h index ddbc32d80b..d453f71eb2 100644 --- a/cocos/scripting/lua-bindings/manual/LuaBasicConversions.h +++ b/cocos/scripting/lua-bindings/manual/LuaBasicConversions.h @@ -28,9 +28,9 @@ extern "C" { #include "lua.h" #include "tolua++.h" } -#include "tolua_fix.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" #include "cocos2d.h" -#include "Lua-BindingsExport.h" +#include "scripting/lua-bindings/manual/Lua-BindingsExport.h" #include "editor-support/cocostudio/CocosStudioExtension.h" using namespace cocos2d; diff --git a/cocos/scripting/lua-bindings/manual/audioengine/lua_cocos2dx_audioengine_manual.cpp b/cocos/scripting/lua-bindings/manual/audioengine/lua_cocos2dx_audioengine_manual.cpp index 2d45e43ca8..b81761f9cb 100644 --- a/cocos/scripting/lua-bindings/manual/audioengine/lua_cocos2dx_audioengine_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/audioengine/lua_cocos2dx_audioengine_manual.cpp @@ -23,15 +23,15 @@ ****************************************************************************/ #include "platform/CCPlatformConfig.h" -#include "lua_cocos2dx_audioengine_manual.h" +#include "scripting/lua-bindings/manual/audioengine/lua_cocos2dx_audioengine_manual.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 -#include "lua_cocos2dx_audioengine_auto.hpp" -#include "tolua_fix.h" -#include "LuaBasicConversions.h" -#include "CCLuaEngine.h" -#include "AudioEngine.h" +#include "scripting/lua-bindings/auto/lua_cocos2dx_audioengine_auto.hpp" +#include "scripting/lua-bindings/manual/tolua_fix.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" +#include "audio/include/AudioEngine.h" static int lua_get_AudioProfile_name(lua_State* L) { diff --git a/cocos/scripting/lua-bindings/manual/cocos2d/LuaOpengl.cpp b/cocos/scripting/lua-bindings/manual/cocos2d/LuaOpengl.cpp index 1389d3f592..c04794236a 100644 --- a/cocos/scripting/lua-bindings/manual/cocos2d/LuaOpengl.cpp +++ b/cocos/scripting/lua-bindings/manual/cocos2d/LuaOpengl.cpp @@ -21,16 +21,16 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "LuaOpengl.h" +#include "scripting/lua-bindings/manual/cocos2d/LuaOpengl.h" #include #include -#include "tolua_fix.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" #include "cocos2d.h" -#include "CCLuaStack.h" -#include "CCLuaValue.h" -#include "CCLuaEngine.h" -#include "LuaScriptHandlerMgr.h" -#include "LuaBasicConversions.h" +#include "scripting/lua-bindings/manual/CCLuaStack.h" +#include "scripting/lua-bindings/manual/CCLuaValue.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" +#include "scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" using namespace cocos2d; diff --git a/cocos/scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.cpp b/cocos/scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.cpp index 9e92ea3db8..74a110648c 100644 --- a/cocos/scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.cpp +++ b/cocos/scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.cpp @@ -21,15 +21,15 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "LuaScriptHandlerMgr.h" +#include "scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.h" #include #include -#include "tolua_fix.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" #include "cocos2d.h" -#include "CCLuaStack.h" -#include "CCLuaValue.h" -#include "CCLuaEngine.h" -#include "LuaOpengl.h" +#include "scripting/lua-bindings/manual/CCLuaStack.h" +#include "scripting/lua-bindings/manual/CCLuaValue.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" +#include "scripting/lua-bindings/manual/cocos2d/LuaOpengl.h" using namespace cocos2d; diff --git a/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_deprecated.cpp b/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_deprecated.cpp index a2acf106e1..2935b14902 100644 --- a/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_deprecated.cpp +++ b/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_deprecated.cpp @@ -21,12 +21,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "lua_cocos2dx_deprecated.h" +#include "scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_deprecated.h" #include "cocos2d.h" -#include "tolua_fix.h" -#include "LuaBasicConversions.h" -#include "LuaScriptHandlerMgr.h" -#include "CCLuaValue.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" +#include "scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.h" +#include "scripting/lua-bindings/manual/CCLuaValue.h" USING_NS_CC; diff --git a/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_experimental_manual.cpp b/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_experimental_manual.cpp index 166d969ab2..859908857c 100644 --- a/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_experimental_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_experimental_manual.cpp @@ -1,8 +1,8 @@ -#include "lua_cocos2dx_experimental_manual.hpp" -#include "tolua_fix.h" -#include "LuaBasicConversions.h" -#include "CCLuaValue.h" -#include "CCLuaEngine.h" +#include "scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_experimental_manual.hpp" +#include "scripting/lua-bindings/manual/tolua_fix.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" +#include "scripting/lua-bindings/manual/CCLuaValue.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" static int lua_cocos2dx_experimental_TMXLayer_getTileGIDAt(lua_State* tolua_S) { diff --git a/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.cpp b/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.cpp index e99544fa09..827d698c6c 100644 --- a/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.cpp @@ -21,11 +21,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "lua_cocos2dx_manual.hpp" -#include "tolua_fix.h" -#include "LuaBasicConversions.h" -#include "CCLuaValue.h" -#include "CCLuaEngine.h" +#include "scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.hpp" +#include "scripting/lua-bindings/manual/tolua_fix.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" +#include "scripting/lua-bindings/manual/CCLuaValue.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" #if defined(_MSC_VER) || defined(__MINGW32__) #include #else diff --git a/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.hpp b/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.hpp index 85d3e4e666..8ccd13ce2d 100644 --- a/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.hpp +++ b/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.hpp @@ -33,7 +33,7 @@ extern "C" { #endif #include "cocos2d.h" -#include "LuaScriptHandlerMgr.h" +#include "scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.h" NS_CC_BEGIN class LuaEventListenerCustom diff --git a/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_physics_manual.cpp b/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_physics_manual.cpp index a84971f4fa..82bf8f38ca 100644 --- a/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_physics_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_physics_manual.cpp @@ -1,10 +1,10 @@ -#include "lua_cocos2dx_manual.hpp" +#include "scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.hpp" #if CC_USE_PHYSICS -#include "tolua_fix.h" -#include "LuaBasicConversions.h" -#include "CCLuaValue.h" -#include "CCLuaEngine.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" +#include "scripting/lua-bindings/manual/CCLuaValue.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" #ifndef CC_SAFE_DELETE_ARRAY #define do { if(p) { delete[] (p); (p) = nullptr; } } while(0) diff --git a/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_physics_manual.hpp b/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_physics_manual.hpp index bc9f32b165..667a72056d 100644 --- a/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_physics_manual.hpp +++ b/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_physics_manual.hpp @@ -12,7 +12,7 @@ extern "C" { #endif #include "cocos2d.h" -#include "LuaScriptHandlerMgr.h" +#include "scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.h" int register_all_cocos2dx_physics_manual(lua_State* tolua_S); diff --git a/cocos/scripting/lua-bindings/manual/cocosbuilder/CCBProxy.cpp b/cocos/scripting/lua-bindings/manual/cocosbuilder/CCBProxy.cpp index 36d031e3ab..f75172140c 100644 --- a/cocos/scripting/lua-bindings/manual/cocosbuilder/CCBProxy.cpp +++ b/cocos/scripting/lua-bindings/manual/cocosbuilder/CCBProxy.cpp @@ -22,8 +22,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCBProxy.h" -#include "LuaScriptHandlerMgr.h" +#include "scripting/lua-bindings/manual/cocosbuilder/CCBProxy.h" +#include "scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.h" CCBReader* CCBProxy::createCCBReader() { diff --git a/cocos/scripting/lua-bindings/manual/cocosbuilder/CCBProxy.h b/cocos/scripting/lua-bindings/manual/cocosbuilder/CCBProxy.h index fe35312f20..907e37c480 100644 --- a/cocos/scripting/lua-bindings/manual/cocosbuilder/CCBProxy.h +++ b/cocos/scripting/lua-bindings/manual/cocosbuilder/CCBProxy.h @@ -2,10 +2,10 @@ #define __CCBPROXY_H_ #include "cocos2d.h" -#include "CCLuaEngine.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" #include "audio/include/SimpleAudioEngine.h" #include "extensions/cocos-ext.h" -#include "cocosbuilder/CocosBuilder.h" +#include "editor-support/cocosbuilder/CocosBuilder.h" USING_NS_CC; USING_NS_CC_EXT; diff --git a/cocos/scripting/lua-bindings/manual/cocosbuilder/lua_cocos2dx_cocosbuilder_manual.cpp b/cocos/scripting/lua-bindings/manual/cocosbuilder/lua_cocos2dx_cocosbuilder_manual.cpp index bc54af11dd..3c2f1d4b96 100644 --- a/cocos/scripting/lua-bindings/manual/cocosbuilder/lua_cocos2dx_cocosbuilder_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/cocosbuilder/lua_cocos2dx_cocosbuilder_manual.cpp @@ -21,14 +21,14 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "lua_cocos2dx_cocosbuilder_manual.h" -#include "lua_cocos2dx_cocosbuilder_auto.hpp" +#include "scripting/lua-bindings/manual/cocosbuilder/lua_cocos2dx_cocosbuilder_manual.h" +#include "scripting/lua-bindings/auto/lua_cocos2dx_cocosbuilder_auto.hpp" #include "cocos2d.h" -#include "tolua_fix.h" -#include "LuaBasicConversions.h" -#include "CCLuaEngine.h" -#include "CCLuaValue.h" -#include "CCBProxy.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" +#include "scripting/lua-bindings/manual/CCLuaValue.h" +#include "scripting/lua-bindings/manual/cocosbuilder/CCBProxy.h" USING_NS_CC; USING_NS_CC_EXT; diff --git a/cocos/scripting/lua-bindings/manual/cocosdenshion/lua_cocos2dx_cocosdenshion_manual.cpp b/cocos/scripting/lua-bindings/manual/cocosdenshion/lua_cocos2dx_cocosdenshion_manual.cpp index 6560cf719b..390a71c08f 100644 --- a/cocos/scripting/lua-bindings/manual/cocosdenshion/lua_cocos2dx_cocosdenshion_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/cocosdenshion/lua_cocos2dx_cocosdenshion_manual.cpp @@ -21,9 +21,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "lua_cocos2dx_cocosdenshion_manual.h" -#include "lua_cocos2dx_cocosdenshion_auto.hpp" -#include "CCLuaEngine.h" +#include "scripting/lua-bindings/manual/cocosdenshion/lua_cocos2dx_cocosdenshion_manual.h" +#include "scripting/lua-bindings/auto/lua_cocos2dx_cocosdenshion_auto.hpp" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" int register_cocosdenshion_module(lua_State* L) { diff --git a/cocos/scripting/lua-bindings/manual/cocostudio/CustomGUIReader.cpp b/cocos/scripting/lua-bindings/manual/cocostudio/CustomGUIReader.cpp index 35dde9d0e4..8c5da79984 100644 --- a/cocos/scripting/lua-bindings/manual/cocostudio/CustomGUIReader.cpp +++ b/cocos/scripting/lua-bindings/manual/cocostudio/CustomGUIReader.cpp @@ -1,5 +1,5 @@ -#include "CustomGUIReader.h" -#include "CCLuaEngine.h" +#include "scripting/lua-bindings/manual/cocostudio/CustomGUIReader.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" #include "json/writer.h" #include "json/stringbuffer.h" diff --git a/cocos/scripting/lua-bindings/manual/cocostudio/CustomGUIReader.h b/cocos/scripting/lua-bindings/manual/cocostudio/CustomGUIReader.h index b82ddd65aa..bbd90b1950 100644 --- a/cocos/scripting/lua-bindings/manual/cocostudio/CustomGUIReader.h +++ b/cocos/scripting/lua-bindings/manual/cocostudio/CustomGUIReader.h @@ -1,7 +1,7 @@ #ifndef COCOS_SCRIPTING_LUA_BINDINGS_LUA_COCOS2DX_CUSTOM_GUI_READER_H #define COCOS_SCRIPTING_LUA_BINDINGS_LUA_COCOS2DX_CUSTOM_GUI_READER_H -#include "cocostudio/WidgetReader/WidgetReader.h" +#include "editor-support/cocostudio/WidgetReader/WidgetReader.h" USING_NS_CC; diff --git a/cocos/scripting/lua-bindings/manual/cocostudio/lua-cocos-studio-conversions.cpp b/cocos/scripting/lua-bindings/manual/cocostudio/lua-cocos-studio-conversions.cpp index b0044442be..e918e6bab5 100644 --- a/cocos/scripting/lua-bindings/manual/cocostudio/lua-cocos-studio-conversions.cpp +++ b/cocos/scripting/lua-bindings/manual/cocostudio/lua-cocos-studio-conversions.cpp @@ -22,8 +22,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "lua-cocos-studio-conversions.h" -#include "ActionTimeline/CCActionTimeline.h" +#include "scripting/lua-bindings/manual/cocostudio/lua-cocos-studio-conversions.h" +#include "editor-support/cocostudio/ActionTimeline/CCActionTimeline.h" #if COCOS2D_DEBUG >=1 extern void luaval_to_native_err(lua_State* L,const char* msg,tolua_Error* err, const char* funcName); diff --git a/cocos/scripting/lua-bindings/manual/cocostudio/lua-cocos-studio-conversions.h b/cocos/scripting/lua-bindings/manual/cocostudio/lua-cocos-studio-conversions.h index ae6d5928b1..7281d6d2b5 100644 --- a/cocos/scripting/lua-bindings/manual/cocostudio/lua-cocos-studio-conversions.h +++ b/cocos/scripting/lua-bindings/manual/cocostudio/lua-cocos-studio-conversions.h @@ -29,7 +29,7 @@ extern "C" { #include "tolua++.h" } -#include "tolua_fix.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" namespace cocostudio { diff --git a/cocos/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_coco_studio_manual.cpp b/cocos/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_coco_studio_manual.cpp index b64cb69967..e53284cad7 100644 --- a/cocos/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_coco_studio_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_coco_studio_manual.cpp @@ -21,18 +21,18 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "lua_cocos2dx_coco_studio_manual.hpp" -#include "lua_cocos2dx_studio_auto.hpp" -#include "lua_cocos2dx_csloader_auto.hpp" -#include "lua_cocos2dx_csloader_manual.hpp" +#include "scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_coco_studio_manual.hpp" +#include "scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.hpp" +#include "scripting/lua-bindings/auto/lua_cocos2dx_csloader_auto.hpp" +#include "scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_csloader_manual.hpp" #include "cocos2d.h" -#include "tolua_fix.h" -#include "LuaBasicConversions.h" -#include "LuaScriptHandlerMgr.h" -#include "CCLuaValue.h" -#include "CocoStudio.h" -#include "CCLuaEngine.h" -#include "CustomGUIReader.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" +#include "scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.h" +#include "scripting/lua-bindings/manual/CCLuaValue.h" +#include "editor-support/cocostudio/CocoStudio.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" +#include "scripting/lua-bindings/manual/cocostudio/CustomGUIReader.h" using namespace cocostudio; diff --git a/cocos/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_csloader_manual.cpp b/cocos/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_csloader_manual.cpp index c59a41f5c9..d554266084 100644 --- a/cocos/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_csloader_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_csloader_manual.cpp @@ -21,14 +21,14 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "lua_cocos2dx_csloader_manual.hpp" -#include "tolua_fix.h" -#include "LuaBasicConversions.h" -#include "CCLuaValue.h" -#include "CCLuaEngine.h" -#include "ActionTimeline/CCActionTimeline.h" -#include "ActionTimeline/CSLoader.h" -#include "ActionTimeline/CCActionTimelineNode.h" +#include "scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_csloader_manual.hpp" +#include "scripting/lua-bindings/manual/tolua_fix.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" +#include "scripting/lua-bindings/manual/CCLuaValue.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" +#include "editor-support/cocostudio/ActionTimeline/CCActionTimeline.h" +#include "editor-support/cocostudio/ActionTimeline/CSLoader.h" +#include "editor-support/cocostudio/ActionTimeline/CCActionTimelineNode.h" int lua_cocos2dx_csloader_CSLoader_createTimeline(lua_State* tolua_S) { diff --git a/cocos/scripting/lua-bindings/manual/controller/lua_cocos2dx_controller_manual.cpp b/cocos/scripting/lua-bindings/manual/controller/lua_cocos2dx_controller_manual.cpp index 8ed24cfc60..c42c1553bc 100644 --- a/cocos/scripting/lua-bindings/manual/controller/lua_cocos2dx_controller_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/controller/lua_cocos2dx_controller_manual.cpp @@ -21,16 +21,16 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "lua_cocos2dx_controller_manual.hpp" +#include "scripting/lua-bindings/manual/controller/lua_cocos2dx_controller_manual.hpp" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) #include "cocos2d.h" -#include "tolua_fix.h" -#include "LuaBasicConversions.h" -#include "cocos2d/LuaScriptHandlerMgr.h" -#include "CCLuaValue.h" -#include "CCLuaEngine.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" +#include "scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.h" +#include "scripting/lua-bindings/manual/CCLuaValue.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" #include "base/CCGameController.h" diff --git a/cocos/scripting/lua-bindings/manual/extension/lua_cocos2dx_extension_manual.cpp b/cocos/scripting/lua-bindings/manual/extension/lua_cocos2dx_extension_manual.cpp index 9339e05939..c0a4018f86 100644 --- a/cocos/scripting/lua-bindings/manual/extension/lua_cocos2dx_extension_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/extension/lua_cocos2dx_extension_manual.cpp @@ -21,15 +21,15 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "lua_cocos2dx_extension_manual.h" -#include "lua_cocos2dx_extension_auto.hpp" +#include "scripting/lua-bindings/manual/extension/lua_cocos2dx_extension_manual.h" +#include "scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.hpp" #include "cocos2d.h" -#include "tolua_fix.h" -#include "LuaBasicConversions.h" -#include "CCLuaValue.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" +#include "scripting/lua-bindings/manual/CCLuaValue.h" #include "cocos-ext.h" -#include "CCLuaEngine.h" -#include "LuaScriptHandlerMgr.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" +#include "scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.h" USING_NS_CC; USING_NS_CC_EXT; diff --git a/cocos/scripting/lua-bindings/manual/lua_module_register.cpp b/cocos/scripting/lua-bindings/manual/lua_module_register.cpp index 05e14e2818..294bd0ee1f 100644 --- a/cocos/scripting/lua-bindings/manual/lua_module_register.cpp +++ b/cocos/scripting/lua-bindings/manual/lua_module_register.cpp @@ -1,16 +1,16 @@ -#include "lua_module_register.h" +#include "scripting/lua-bindings/manual/lua_module_register.h" -#include "cocosdenshion/lua_cocos2dx_cocosdenshion_manual.h" -#include "network/lua_cocos2dx_network_manual.h" -#include "cocosbuilder/lua_cocos2dx_cocosbuilder_manual.h" -#include "cocostudio/lua_cocos2dx_coco_studio_manual.hpp" -#include "extension/lua_cocos2dx_extension_manual.h" -#include "ui/lua_cocos2dx_ui_manual.hpp" -#include "spine/lua_cocos2dx_spine_manual.hpp" -#include "3d/lua_cocos2dx_3d_manual.h" -#include "audioengine/lua_cocos2dx_audioengine_manual.h" -#include "physics3d/lua_cocos2dx_physics3d_manual.h" -#include "navmesh/lua_cocos2dx_navmesh_manual.h" +#include "scripting/lua-bindings/manual/cocosdenshion/lua_cocos2dx_cocosdenshion_manual.h" +#include "scripting/lua-bindings/manual/network/lua_cocos2dx_network_manual.h" +#include "scripting/lua-bindings/manual/cocosbuilder/lua_cocos2dx_cocosbuilder_manual.h" +#include "scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_coco_studio_manual.hpp" +#include "scripting/lua-bindings/manual/extension/lua_cocos2dx_extension_manual.h" +#include "scripting/lua-bindings/manual/ui/lua_cocos2dx_ui_manual.hpp" +#include "scripting/lua-bindings/manual/spine/lua_cocos2dx_spine_manual.hpp" +#include "scripting/lua-bindings/manual/3d/lua_cocos2dx_3d_manual.h" +#include "scripting/lua-bindings/manual/audioengine/lua_cocos2dx_audioengine_manual.h" +#include "scripting/lua-bindings/manual/physics3d/lua_cocos2dx_physics3d_manual.h" +#include "scripting/lua-bindings/manual/navmesh/lua_cocos2dx_navmesh_manual.h" int lua_module_register(lua_State* L) diff --git a/cocos/scripting/lua-bindings/manual/lua_module_register.h b/cocos/scripting/lua-bindings/manual/lua_module_register.h index b4f0570f1e..418bbcac1a 100644 --- a/cocos/scripting/lua-bindings/manual/lua_module_register.h +++ b/cocos/scripting/lua-bindings/manual/lua_module_register.h @@ -2,7 +2,7 @@ #define __LUA_TEMPLATE_RUNTIME_FRAMEWORKS_RUNTIME_SRC_CLASSES_LUA_MODULE_REGISTER_H__ #include "lua.h" -#include "Lua-BindingsExport.h" +#include "scripting/lua-bindings/manual/Lua-BindingsExport.h" CC_LUA_DLL int lua_module_register(lua_State* L); diff --git a/cocos/scripting/lua-bindings/manual/navmesh/lua_cocos2dx_navmesh_conversions.cpp b/cocos/scripting/lua-bindings/manual/navmesh/lua_cocos2dx_navmesh_conversions.cpp index e8a1fb49dc..582fdc86d1 100644 --- a/cocos/scripting/lua-bindings/manual/navmesh/lua_cocos2dx_navmesh_conversions.cpp +++ b/cocos/scripting/lua-bindings/manual/navmesh/lua_cocos2dx_navmesh_conversions.cpp @@ -22,11 +22,11 @@ THE SOFTWARE. ****************************************************************************/ -#include "lua_cocos2dx_navmesh_conversions.h" +#include "scripting/lua-bindings/manual/navmesh/lua_cocos2dx_navmesh_conversions.h" #include "base/ccConfig.h" #if CC_USE_NAVMESH -#include "LuaBasicConversions.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" #include "navmesh/CCNavMeshAgent.h" #if COCOS2D_DEBUG >=1 diff --git a/cocos/scripting/lua-bindings/manual/navmesh/lua_cocos2dx_navmesh_conversions.h b/cocos/scripting/lua-bindings/manual/navmesh/lua_cocos2dx_navmesh_conversions.h index 8809902eab..5a64f457eb 100644 --- a/cocos/scripting/lua-bindings/manual/navmesh/lua_cocos2dx_navmesh_conversions.h +++ b/cocos/scripting/lua-bindings/manual/navmesh/lua_cocos2dx_navmesh_conversions.h @@ -31,7 +31,7 @@ extern "C" { #include "tolua++.h" } -#include "tolua_fix.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" namespace cocos2d { diff --git a/cocos/scripting/lua-bindings/manual/navmesh/lua_cocos2dx_navmesh_manual.cpp b/cocos/scripting/lua-bindings/manual/navmesh/lua_cocos2dx_navmesh_manual.cpp index d398d49e61..c54c46129d 100644 --- a/cocos/scripting/lua-bindings/manual/navmesh/lua_cocos2dx_navmesh_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/navmesh/lua_cocos2dx_navmesh_manual.cpp @@ -24,11 +24,11 @@ #include "platform/CCPlatformConfig.h" #include "base/ccConfig.h" #if CC_USE_NAVMESH -#include "lua_cocos2dx_navmesh_manual.h" -#include "lua_cocos2dx_navmesh_auto.hpp" -#include "tolua_fix.h" -#include "LuaBasicConversions.h" -#include "CCLuaEngine.h" +#include "scripting/lua-bindings/manual/navmesh/lua_cocos2dx_navmesh_manual.h" +#include "scripting/lua-bindings/auto/lua_cocos2dx_navmesh_auto.hpp" +#include "scripting/lua-bindings/manual/tolua_fix.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" #include "navmesh/CCNavMesh.h" diff --git a/cocos/scripting/lua-bindings/manual/network/Lua_web_socket.cpp b/cocos/scripting/lua-bindings/manual/network/Lua_web_socket.cpp index 0b80e9a0e7..3fcd21bc52 100644 --- a/cocos/scripting/lua-bindings/manual/network/Lua_web_socket.cpp +++ b/cocos/scripting/lua-bindings/manual/network/Lua_web_socket.cpp @@ -23,15 +23,15 @@ ****************************************************************************/ #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_MAC) -#include "Lua_web_socket.h" +#include "scripting/lua-bindings/manual/network/Lua_web_socket.h" #include #include -#include "tolua_fix.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" #include "cocos2d.h" -#include "CCLuaStack.h" -#include "CCLuaValue.h" -#include "CCLuaEngine.h" -#include "LuaScriptHandlerMgr.h" +#include "scripting/lua-bindings/manual/CCLuaStack.h" +#include "scripting/lua-bindings/manual/CCLuaValue.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" +#include "scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.h" using namespace cocos2d; diff --git a/cocos/scripting/lua-bindings/manual/network/lua_cocos2dx_network_manual.cpp b/cocos/scripting/lua-bindings/manual/network/lua_cocos2dx_network_manual.cpp index bc6c252976..31ab7f21e6 100644 --- a/cocos/scripting/lua-bindings/manual/network/lua_cocos2dx_network_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/network/lua_cocos2dx_network_manual.cpp @@ -21,18 +21,18 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "lua_cocos2dx_network_manual.h" +#include "scripting/lua-bindings/manual/network/lua_cocos2dx_network_manual.h" extern "C" { #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_MAC) -#include "lua_extensions.h" +#include "scripting/lua-bindings/manual/network/lua_extensions.h" #endif } #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_MAC) -#include "Lua_web_socket.h" +#include "scripting/lua-bindings/manual/network/Lua_web_socket.h" #endif -#include "lua_xml_http_request.h" -#include "CCLuaEngine.h" +#include "scripting/lua-bindings/manual/network/lua_xml_http_request.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" int register_network_module(lua_State* L) diff --git a/cocos/scripting/lua-bindings/manual/network/lua_extensions.c b/cocos/scripting/lua-bindings/manual/network/lua_extensions.c index 2dccce23c5..7793db2c34 100644 --- a/cocos/scripting/lua-bindings/manual/network/lua_extensions.c +++ b/cocos/scripting/lua-bindings/manual/network/lua_extensions.c @@ -1,5 +1,5 @@ -#include "lua_extensions.h" +#include "scripting/lua-bindings/manual/network/lua_extensions.h" #if __cplusplus extern "C" { diff --git a/cocos/scripting/lua-bindings/manual/network/lua_xml_http_request.cpp b/cocos/scripting/lua-bindings/manual/network/lua_xml_http_request.cpp index 4ed0504bda..4564d4fd0b 100644 --- a/cocos/scripting/lua-bindings/manual/network/lua_xml_http_request.cpp +++ b/cocos/scripting/lua-bindings/manual/network/lua_xml_http_request.cpp @@ -21,13 +21,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "lua_xml_http_request.h" +#include "scripting/lua-bindings/manual/network/lua_xml_http_request.h" #include -#include "tolua_fix.h" -#include "CCLuaStack.h" -#include "CCLuaValue.h" -#include "CCLuaEngine.h" -#include "LuaScriptHandlerMgr.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" +#include "scripting/lua-bindings/manual/CCLuaStack.h" +#include "scripting/lua-bindings/manual/CCLuaValue.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" +#include "scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.h" using namespace cocos2d; diff --git a/cocos/scripting/lua-bindings/manual/physics3d/lua_cocos2dx_physics3d_manual.cpp b/cocos/scripting/lua-bindings/manual/physics3d/lua_cocos2dx_physics3d_manual.cpp index 43165ac3ab..768334cfcc 100644 --- a/cocos/scripting/lua-bindings/manual/physics3d/lua_cocos2dx_physics3d_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/physics3d/lua_cocos2dx_physics3d_manual.cpp @@ -24,11 +24,11 @@ #include "platform/CCPlatformConfig.h" #include "base/ccConfig.h" #if CC_USE_3D_PHYSICS && CC_ENABLE_BULLET_INTEGRATION -#include "lua_cocos2dx_physics3d_manual.h" -#include "lua_cocos2dx_physics3d_auto.hpp" -#include "tolua_fix.h" -#include "LuaBasicConversions.h" -#include "CCLuaEngine.h" +#include "scripting/lua-bindings/manual/physics3d/lua_cocos2dx_physics3d_manual.h" +#include "scripting/lua-bindings/auto/lua_cocos2dx_physics3d_auto.hpp" +#include "scripting/lua-bindings/manual/tolua_fix.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" #include "physics3d/CCPhysics3D.h" bool luaval_to_Physics3DRigidBodyDes(lua_State* L,int lo,cocos2d::Physics3DRigidBodyDes* outValue, const char* funcName) diff --git a/cocos/scripting/lua-bindings/manual/platform/android/CCLuaJavaBridge.cpp b/cocos/scripting/lua-bindings/manual/platform/android/CCLuaJavaBridge.cpp index 678406053a..d342f3645e 100644 --- a/cocos/scripting/lua-bindings/manual/platform/android/CCLuaJavaBridge.cpp +++ b/cocos/scripting/lua-bindings/manual/platform/android/CCLuaJavaBridge.cpp @@ -1,5 +1,5 @@ -#include "CCLuaJavaBridge.h" +#include "scripting/lua-bindings/manual/platform/android/CCLuaJavaBridge.h" #include "platform/android/jni/JniHelper.h" #include #include "base/ccUTF8.h" @@ -8,7 +8,7 @@ #define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__) extern "C" { -#include "tolua_fix.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" } LuaJavaBridge::CallInfo::~CallInfo(void) diff --git a/cocos/scripting/lua-bindings/manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp b/cocos/scripting/lua-bindings/manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp index e38c371ea8..17dd4a0dcf 100644 --- a/cocos/scripting/lua-bindings/manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp +++ b/cocos/scripting/lua-bindings/manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp @@ -1,9 +1,9 @@ -#include "Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.h" +#include "scripting/lua-bindings/manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.h" #include -#include "CCLuaJavaBridge.h" +#include "scripting/lua-bindings/manual/platform/android/CCLuaJavaBridge.h" #include "base/ccUTF8.h" diff --git a/cocos/scripting/lua-bindings/manual/platform/ios/CCLuaObjcBridge.h b/cocos/scripting/lua-bindings/manual/platform/ios/CCLuaObjcBridge.h index 0aaa1186d7..9c902594c1 100644 --- a/cocos/scripting/lua-bindings/manual/platform/ios/CCLuaObjcBridge.h +++ b/cocos/scripting/lua-bindings/manual/platform/ios/CCLuaObjcBridge.h @@ -2,7 +2,7 @@ #ifndef __LUA_OBJC_BRIDGE_H_ #define __LUA_OBJC_BRIDGE_H_ -#include "CCLuaBridge.h" +#include "scripting/lua-bindings/manual/CCLuaBridge.h" /** * @addtogroup lua diff --git a/cocos/scripting/lua-bindings/manual/spine/LuaSkeletonAnimation.cpp b/cocos/scripting/lua-bindings/manual/spine/LuaSkeletonAnimation.cpp index 6b397aec8c..1a5a742507 100644 --- a/cocos/scripting/lua-bindings/manual/spine/LuaSkeletonAnimation.cpp +++ b/cocos/scripting/lua-bindings/manual/spine/LuaSkeletonAnimation.cpp @@ -23,11 +23,11 @@ THE SOFTWARE. ****************************************************************************/ -#include "LuaSkeletonAnimation.h" +#include "scripting/lua-bindings/manual/spine/LuaSkeletonAnimation.h" #include "cocos2d.h" -#include "LuaScriptHandlerMgr.h" -#include "CCLuaStack.h" -#include "CCLuaEngine.h" +#include "scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.h" +#include "scripting/lua-bindings/manual/CCLuaStack.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" using namespace spine; USING_NS_CC; diff --git a/cocos/scripting/lua-bindings/manual/spine/LuaSkeletonAnimation.h b/cocos/scripting/lua-bindings/manual/spine/LuaSkeletonAnimation.h index f13359657e..a07df49cab 100644 --- a/cocos/scripting/lua-bindings/manual/spine/LuaSkeletonAnimation.h +++ b/cocos/scripting/lua-bindings/manual/spine/LuaSkeletonAnimation.h @@ -25,7 +25,7 @@ #ifndef LUASKELETONANIMATION_H_ #define LUASKELETONANIMATION_H_ -#include "spine-cocos2dx.h" +#include "editor-support/spine/spine-cocos2dx.h" /// @cond class LuaSkeletonAnimation: public spine::SkeletonAnimation { diff --git a/cocos/scripting/lua-bindings/manual/spine/lua_cocos2dx_spine_manual.cpp b/cocos/scripting/lua-bindings/manual/spine/lua_cocos2dx_spine_manual.cpp index 16ab65b7cd..7af0b7b545 100644 --- a/cocos/scripting/lua-bindings/manual/spine/lua_cocos2dx_spine_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/spine/lua_cocos2dx_spine_manual.cpp @@ -21,17 +21,17 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "lua_cocos2dx_spine_manual.hpp" -#include "lua_cocos2dx_spine_auto.hpp" +#include "scripting/lua-bindings/manual/spine/lua_cocos2dx_spine_manual.hpp" +#include "scripting/lua-bindings/auto/lua_cocos2dx_spine_auto.hpp" #include "cocos2d.h" -#include "tolua_fix.h" -#include "LuaBasicConversions.h" -#include "LuaScriptHandlerMgr.h" -#include "CCLuaValue.h" -#include "spine.h" -#include "spine-cocos2dx.h" -#include "LuaSkeletonAnimation.h" -#include "CCLuaEngine.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" +#include "scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.h" +#include "scripting/lua-bindings/manual/CCLuaValue.h" +#include "editor-support/spine/spine.h" +#include "editor-support/spine/spine-cocos2dx.h" +#include "scripting/lua-bindings/manual/spine/LuaSkeletonAnimation.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" using namespace spine; diff --git a/cocos/scripting/lua-bindings/manual/tolua_fix.cpp b/cocos/scripting/lua-bindings/manual/tolua_fix.cpp index a6cfd5f53e..36f62c4a87 100644 --- a/cocos/scripting/lua-bindings/manual/tolua_fix.cpp +++ b/cocos/scripting/lua-bindings/manual/tolua_fix.cpp @@ -1,7 +1,7 @@ -#include "tolua_fix.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" #include "base/CCRef.h" -#include "LuaBasicConversions.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" #include using namespace cocos2d; diff --git a/cocos/scripting/lua-bindings/manual/ui/lua_cocos2dx_experimental_video_manual.cpp b/cocos/scripting/lua-bindings/manual/ui/lua_cocos2dx_experimental_video_manual.cpp index e0ade6d8d9..7cf4cbb8c1 100644 --- a/cocos/scripting/lua-bindings/manual/ui/lua_cocos2dx_experimental_video_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/ui/lua_cocos2dx_experimental_video_manual.cpp @@ -1,12 +1,12 @@ -#include "lua_cocos2dx_experimental_video_manual.hpp" +#include "scripting/lua-bindings/manual/ui/lua_cocos2dx_experimental_video_manual.hpp" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) -#include "UIVideoPlayer.h" -#include "tolua_fix.h" -#include "LuaBasicConversions.h" -#include "CCLuaValue.h" -#include "CCLuaEngine.h" +#include "ui/UIVideoPlayer.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" +#include "scripting/lua-bindings/manual/CCLuaValue.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" diff --git a/cocos/scripting/lua-bindings/manual/ui/lua_cocos2dx_experimental_webview_manual.cpp b/cocos/scripting/lua-bindings/manual/ui/lua_cocos2dx_experimental_webview_manual.cpp index b4d204438d..55d0c4a869 100644 --- a/cocos/scripting/lua-bindings/manual/ui/lua_cocos2dx_experimental_webview_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/ui/lua_cocos2dx_experimental_webview_manual.cpp @@ -1,12 +1,12 @@ -#include "lua_cocos2dx_experimental_video_manual.hpp" +#include "scripting/lua-bindings/manual/ui/lua_cocos2dx_experimental_video_manual.hpp" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) -#include "UIWebView.h" -#include "tolua_fix.h" -#include "LuaBasicConversions.h" -#include "CCLuaValue.h" -#include "CCLuaEngine.h" +#include "ui/UIWebView.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" +#include "scripting/lua-bindings/manual/CCLuaValue.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" diff --git a/cocos/scripting/lua-bindings/manual/ui/lua_cocos2dx_ui_manual.cpp b/cocos/scripting/lua-bindings/manual/ui/lua_cocos2dx_ui_manual.cpp index 9c7e005281..bbfb38e96b 100644 --- a/cocos/scripting/lua-bindings/manual/ui/lua_cocos2dx_ui_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/ui/lua_cocos2dx_ui_manual.cpp @@ -21,21 +21,21 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "lua_cocos2dx_ui_manual.hpp" -#include "lua_cocos2dx_ui_auto.hpp" +#include "scripting/lua-bindings/manual/ui/lua_cocos2dx_ui_manual.hpp" +#include "scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) && !defined(CC_TARGET_OS_TVOS) -#include "lua_cocos2dx_experimental_video_auto.hpp" -#include "lua_cocos2dx_experimental_video_manual.hpp" -#include "lua_cocos2dx_experimental_webview_auto.hpp" -#include "lua_cocos2dx_experimental_webview_manual.hpp" +#include "scripting/lua-bindings/auto/lua_cocos2dx_experimental_video_auto.hpp" +#include "scripting/lua-bindings/manual/ui/lua_cocos2dx_experimental_video_manual.hpp" +#include "scripting/lua-bindings/auto/lua_cocos2dx_experimental_webview_auto.hpp" +#include "scripting/lua-bindings/manual/ui/lua_cocos2dx_experimental_webview_manual.hpp" #endif #include "cocos2d.h" -#include "tolua_fix.h" -#include "LuaBasicConversions.h" -#include "LuaScriptHandlerMgr.h" -#include "CCLuaValue.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" +#include "scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.h" +#include "scripting/lua-bindings/manual/CCLuaValue.h" #include "ui/CocosGUI.h" -#include "CCLuaEngine.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" using namespace ui; diff --git a/cocos/scripting/lua-bindings/manual/video/lua_cocos2dx_experimental_video_manual.cpp b/cocos/scripting/lua-bindings/manual/video/lua_cocos2dx_experimental_video_manual.cpp index a937cada2c..40e9d8c82a 100644 --- a/cocos/scripting/lua-bindings/manual/video/lua_cocos2dx_experimental_video_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/video/lua_cocos2dx_experimental_video_manual.cpp @@ -1,12 +1,12 @@ -#include "lua_cocos2dx_experimental_video_manual.hpp" +#include "scripting/lua-bindings/manual/video/lua_cocos2dx_experimental_video_manual.hpp" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) -#include "UIVideoPlayer.h" -#include "tolua_fix.h" -#include "LuaBasicConversions.h" -#include "CCLuaValue.h" -#include "CCLuaEngine.h" +#include "ui/UIVideoPlayer.h" +#include "scripting/lua-bindings/manual/tolua_fix.h" +#include "scripting/lua-bindings/manual/LuaBasicConversions.h" +#include "scripting/lua-bindings/manual/CCLuaValue.h" +#include "scripting/lua-bindings/manual/CCLuaEngine.h" diff --git a/cocos/storage/local-storage/LocalStorage-android.cpp b/cocos/storage/local-storage/LocalStorage-android.cpp index e0ef30a1f4..329b9c430c 100644 --- a/cocos/storage/local-storage/LocalStorage-android.cpp +++ b/cocos/storage/local-storage/LocalStorage-android.cpp @@ -28,7 +28,7 @@ Works on cocos2d-iphone and cocos2d-x. */ -#include "LocalStorage.h" +#include "storage/local-storage/LocalStorage.h" #include "platform/CCPlatformMacros.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) @@ -37,7 +37,7 @@ #include #include #include "jni.h" -#include "jni/JniHelper.h" +#include "platform/android/jni/JniHelper.h" USING_NS_CC; static int _initialized = 0; diff --git a/cocos/storage/local-storage/LocalStorage.cpp b/cocos/storage/local-storage/LocalStorage.cpp index da61f960ac..a97c5660b8 100644 --- a/cocos/storage/local-storage/LocalStorage.cpp +++ b/cocos/storage/local-storage/LocalStorage.cpp @@ -27,7 +27,7 @@ Works on cocos2d-iphone and cocos2d-x. */ -#include "LocalStorage.h" +#include "storage/local-storage/LocalStorage.h" #include "platform/CCPlatformMacros.h" #if (CC_TARGET_PLATFORM != CC_PLATFORM_ANDROID) diff --git a/cocos/storage/local-storage/LocalStorage.h b/cocos/storage/local-storage/LocalStorage.h index 3171386d06..4b1af92c07 100644 --- a/cocos/storage/local-storage/LocalStorage.h +++ b/cocos/storage/local-storage/LocalStorage.h @@ -27,7 +27,7 @@ THE SOFTWARE. #define __JSB_LOCALSTORAGE_H #include -#include "CCPlatformMacros.h" +#include "platform/CCPlatformMacros.h" /** * @addtogroup storage diff --git a/cocos/ui/UIEditBox/Mac/CCUIEditBoxMac.h b/cocos/ui/UIEditBox/Mac/CCUIEditBoxMac.h index fe8d53a03c..d51930889e 100644 --- a/cocos/ui/UIEditBox/Mac/CCUIEditBoxMac.h +++ b/cocos/ui/UIEditBox/Mac/CCUIEditBoxMac.h @@ -25,8 +25,8 @@ #import #import -#include "../UIEditBoxImpl-mac.h" -#include "CCUITextInput.h" +#include "ui/UIEditBox/UIEditBoxImpl-mac.h" +#include "ui/UIEditBox/Mac/CCUITextInput.h" #pragma mark - UIEditBox mac implementation diff --git a/cocos/ui/UIEditBox/Mac/CCUIMultilineTextField.h b/cocos/ui/UIEditBox/Mac/CCUIMultilineTextField.h index 4798016715..43d71e1b63 100644 --- a/cocos/ui/UIEditBox/Mac/CCUIMultilineTextField.h +++ b/cocos/ui/UIEditBox/Mac/CCUIMultilineTextField.h @@ -24,7 +24,7 @@ ****************************************************************************/ #import -#include "CCUITextInput.h" +#include "ui/UIEditBox/Mac/CCUITextInput.h" @interface CCUIMultilineTextField : NSTextView { diff --git a/cocos/ui/UIEditBox/Mac/CCUIPasswordTextField.h b/cocos/ui/UIEditBox/Mac/CCUIPasswordTextField.h index c0698ce8cb..04f6bb6c92 100644 --- a/cocos/ui/UIEditBox/Mac/CCUIPasswordTextField.h +++ b/cocos/ui/UIEditBox/Mac/CCUIPasswordTextField.h @@ -24,7 +24,7 @@ ****************************************************************************/ #import -#include "CCUITextInput.h" +#include "ui/UIEditBox/Mac/CCUITextInput.h" @interface CCUIPasswordTextField : NSSecureTextField { diff --git a/cocos/ui/UIEditBox/Mac/CCUISingleLineTextField.h b/cocos/ui/UIEditBox/Mac/CCUISingleLineTextField.h index 77e6548d3b..d2d29b1593 100644 --- a/cocos/ui/UIEditBox/Mac/CCUISingleLineTextField.h +++ b/cocos/ui/UIEditBox/Mac/CCUISingleLineTextField.h @@ -24,7 +24,7 @@ ****************************************************************************/ #import -#include "CCUITextInput.h" +#include "ui/UIEditBox/Mac/CCUITextInput.h" @interface CCUISingleLineTextField : NSTextField { diff --git a/cocos/ui/UIEditBox/UIEditBox.cpp b/cocos/ui/UIEditBox/UIEditBox.cpp index a1eff078bc..89496b5352 100644 --- a/cocos/ui/UIEditBox/UIEditBox.cpp +++ b/cocos/ui/UIEditBox/UIEditBox.cpp @@ -23,8 +23,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "UIEditBox.h" -#include "UIEditBoxImpl.h" +#include "ui/UIEditBox/UIEditBox.h" +#include "ui/UIEditBox/UIEditBoxImpl.h" NS_CC_BEGIN diff --git a/cocos/ui/UIEditBox/UIEditBoxImpl-android.cpp b/cocos/ui/UIEditBox/UIEditBoxImpl-android.cpp index 3c8bf0363b..5ce5e6de02 100644 --- a/cocos/ui/UIEditBox/UIEditBoxImpl-android.cpp +++ b/cocos/ui/UIEditBox/UIEditBoxImpl-android.cpp @@ -24,11 +24,11 @@ THE SOFTWARE. ****************************************************************************/ -#include "UIEditBoxImpl-android.h" +#include "ui/UIEditBox/UIEditBoxImpl-android.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) -#include "UIEditBox.h" +#include "ui/UIEditBox/UIEditBox.h" #include #include "platform/android/jni/JniHelper.h" #include "2d/CCLabel.h" diff --git a/cocos/ui/UIEditBox/UIEditBoxImpl-android.h b/cocos/ui/UIEditBox/UIEditBoxImpl-android.h index b9f0f6714a..47f1d955c7 100644 --- a/cocos/ui/UIEditBox/UIEditBoxImpl-android.h +++ b/cocos/ui/UIEditBox/UIEditBoxImpl-android.h @@ -30,7 +30,7 @@ #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) -#include "UIEditBoxImpl-common.h" +#include "ui/UIEditBox/UIEditBoxImpl-common.h" NS_CC_BEGIN diff --git a/cocos/ui/UIEditBox/UIEditBoxImpl-common.cpp b/cocos/ui/UIEditBox/UIEditBoxImpl-common.cpp index a07b3aad34..86485f488e 100644 --- a/cocos/ui/UIEditBox/UIEditBoxImpl-common.cpp +++ b/cocos/ui/UIEditBox/UIEditBoxImpl-common.cpp @@ -23,11 +23,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "UIEditBoxImpl-common.h" +#include "ui/UIEditBox/UIEditBoxImpl-common.h" #define kLabelZOrder 9999 -#include "UIEditBox.h" +#include "ui/UIEditBox/UIEditBox.h" #include "base/CCDirector.h" #include "2d/CCLabel.h" #include "ui/UIHelper.h" diff --git a/cocos/ui/UIEditBox/UIEditBoxImpl-common.h b/cocos/ui/UIEditBox/UIEditBoxImpl-common.h index dcb3ebb299..41bc0f1c86 100644 --- a/cocos/ui/UIEditBox/UIEditBoxImpl-common.h +++ b/cocos/ui/UIEditBox/UIEditBoxImpl-common.h @@ -29,7 +29,7 @@ #include "platform/CCPlatformConfig.h" -#include "UIEditBoxImpl.h" +#include "ui/UIEditBox/UIEditBoxImpl.h" NS_CC_BEGIN diff --git a/cocos/ui/UIEditBox/UIEditBoxImpl-ios.h b/cocos/ui/UIEditBox/UIEditBoxImpl-ios.h index 4af15370f1..76d0469293 100644 --- a/cocos/ui/UIEditBox/UIEditBoxImpl-ios.h +++ b/cocos/ui/UIEditBox/UIEditBoxImpl-ios.h @@ -28,7 +28,7 @@ #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) -#include "UIEditBoxImpl-common.h" +#include "ui/UIEditBox/UIEditBoxImpl-common.h" diff --git a/cocos/ui/UIEditBox/UIEditBoxImpl-linux.cpp b/cocos/ui/UIEditBox/UIEditBoxImpl-linux.cpp index f4488dc9af..0d7ab2d890 100644 --- a/cocos/ui/UIEditBox/UIEditBoxImpl-linux.cpp +++ b/cocos/ui/UIEditBox/UIEditBoxImpl-linux.cpp @@ -23,11 +23,11 @@ THE SOFTWARE. ****************************************************************************/ -#include "UIEditBoxImpl-linux.h" +#include "ui/UIEditBox/UIEditBoxImpl-linux.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_LINUX) -#include "UIEditBox.h" +#include "ui/UIEditBox/UIEditBox.h" #include "2d/CCLabel.h" #include "base/ccUTF8.h" #include diff --git a/cocos/ui/UIEditBox/UIEditBoxImpl-linux.h b/cocos/ui/UIEditBox/UIEditBoxImpl-linux.h index fd589765e2..6e80cd5783 100644 --- a/cocos/ui/UIEditBox/UIEditBoxImpl-linux.h +++ b/cocos/ui/UIEditBox/UIEditBoxImpl-linux.h @@ -30,7 +30,7 @@ #if (CC_TARGET_PLATFORM == CC_PLATFORM_LINUX) -#include "UIEditBoxImpl-common.h" +#include "ui/UIEditBox/UIEditBoxImpl-common.h" NS_CC_BEGIN diff --git a/cocos/ui/UIEditBox/UIEditBoxImpl-mac.h b/cocos/ui/UIEditBox/UIEditBoxImpl-mac.h index b1afae96c9..1e92d86294 100644 --- a/cocos/ui/UIEditBox/UIEditBoxImpl-mac.h +++ b/cocos/ui/UIEditBox/UIEditBoxImpl-mac.h @@ -30,7 +30,7 @@ #if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) -#include "UIEditBoxImpl-common.h" +#include "ui/UIEditBox/UIEditBoxImpl-common.h" @class UIEditBoxImplMac; @class NSFont; diff --git a/cocos/ui/UIEditBox/UIEditBoxImpl-stub.cpp b/cocos/ui/UIEditBox/UIEditBoxImpl-stub.cpp index ebe0a7eac7..5f41f37c4d 100644 --- a/cocos/ui/UIEditBox/UIEditBoxImpl-stub.cpp +++ b/cocos/ui/UIEditBox/UIEditBoxImpl-stub.cpp @@ -1,4 +1,4 @@ -#include "UIEditBox.h" +#include "ui/UIEditBox/UIEditBox.h" #if (CC_TARGET_PLATFORM != CC_PLATFORM_ANDROID ) && (CC_TARGET_PLATFORM != CC_PLATFORM_IOS ) && (CC_TARGET_PLATFORM != CC_PLATFORM_WIN32) && (CC_TARGET_PLATFORM != CC_PLATFORM_MAC) && (CC_TARGET_PLATFORM != CC_PLATFORM_TIZEN) && (CC_TARGET_PLATFORM != CC_PLATFORM_WINRT) && (CC_TARGET_PLATFORM != CC_PLATFORM_WP8) diff --git a/cocos/ui/UIEditBox/UIEditBoxImpl-win32.cpp b/cocos/ui/UIEditBox/UIEditBoxImpl-win32.cpp index 9ad5332c85..1f0144b339 100644 --- a/cocos/ui/UIEditBox/UIEditBoxImpl-win32.cpp +++ b/cocos/ui/UIEditBox/UIEditBoxImpl-win32.cpp @@ -22,12 +22,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "UIEditBoxImpl-win32.h" +#include "ui/UIEditBox/UIEditBoxImpl-win32.h" #include "platform/CCPlatformConfig.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) -#include "UIEditBox.h" +#include "ui/UIEditBox/UIEditBox.h" #include #include #include diff --git a/cocos/ui/UIEditBox/UIEditBoxImpl-win32.h b/cocos/ui/UIEditBox/UIEditBoxImpl-win32.h index f18bd145df..cc552d4ab7 100644 --- a/cocos/ui/UIEditBox/UIEditBoxImpl-win32.h +++ b/cocos/ui/UIEditBox/UIEditBoxImpl-win32.h @@ -30,7 +30,7 @@ #if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) -#include "UIEditBoxImpl.h" +#include "ui/UIEditBox/UIEditBoxImpl.h" NS_CC_BEGIN diff --git a/cocos/ui/UIEditBox/UIEditBoxImpl-winrt.cpp b/cocos/ui/UIEditBox/UIEditBoxImpl-winrt.cpp index 7908a1dd86..e93f357359 100644 --- a/cocos/ui/UIEditBox/UIEditBoxImpl-winrt.cpp +++ b/cocos/ui/UIEditBox/UIEditBoxImpl-winrt.cpp @@ -28,13 +28,13 @@ THE SOFTWARE. #include "platform/CCPlatformConfig.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) -#include "UIEditBoxImpl-winrt.h" -#include "UIEditBox.h" -#include "CCGLViewImpl-winrt.h" +#include "ui/UIEditBox/UIEditBoxImpl-winrt.h" +#include "ui/UIEditBox/UIEditBox.h" +#include "platform/winrt/CCGLViewImpl-winrt.h" #include "base/CCScriptSupport.h" #include "base/ccUTF8.h" #include "2d/CCLabel.h" -#include "CCWinRTUtils.h" +#include "platform/winrt/CCWinRTUtils.h" using namespace Platform; using namespace Concurrency; diff --git a/cocos/ui/UIEditBox/UIEditBoxImpl-winrt.h b/cocos/ui/UIEditBox/UIEditBoxImpl-winrt.h index 452070e04f..449463ca10 100644 --- a/cocos/ui/UIEditBox/UIEditBoxImpl-winrt.h +++ b/cocos/ui/UIEditBox/UIEditBoxImpl-winrt.h @@ -30,7 +30,7 @@ THE SOFTWARE. #include #include -#include "UIEditBoxImpl.h" +#include "ui/UIEditBox/UIEditBoxImpl.h" NS_CC_BEGIN diff --git a/cocos/ui/UIEditBox/UIEditBoxImpl.h b/cocos/ui/UIEditBox/UIEditBoxImpl.h index 699b4e5dda..aff01313a9 100644 --- a/cocos/ui/UIEditBox/UIEditBoxImpl.h +++ b/cocos/ui/UIEditBox/UIEditBoxImpl.h @@ -26,7 +26,7 @@ #ifndef __UIEditBoxIMPL_H__ #define __UIEditBoxIMPL_H__ -#include "UIEditBox.h" +#include "ui/UIEditBox/UIEditBox.h" namespace cocos2d { diff --git a/cocos/ui/UIEditBox/iOS/CCUIEditBoxIOS.h b/cocos/ui/UIEditBox/iOS/CCUIEditBoxIOS.h index 6aefdd03d6..fac886a0be 100644 --- a/cocos/ui/UIEditBox/iOS/CCUIEditBoxIOS.h +++ b/cocos/ui/UIEditBox/iOS/CCUIEditBoxIOS.h @@ -27,7 +27,7 @@ #import #import "CCUITextInput.h" -#include "UIEditBoxImpl-ios.h" +#include "ui/UIEditBox/UIEditBoxImpl-ios.h" @interface UIEditBoxImplIOS_objc : NSObject diff --git a/cocos/ui/UILayoutComponent.cpp b/cocos/ui/UILayoutComponent.cpp index 892d242522..9a3a2f546c 100644 --- a/cocos/ui/UILayoutComponent.cpp +++ b/cocos/ui/UILayoutComponent.cpp @@ -21,11 +21,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "UIPageView.h" -#include "UILayoutComponent.h" +#include "ui/UIPageView.h" +#include "ui/UILayoutComponent.h" #include "2d/CCNode.h" -#include "GUIDefine.h" -#include "UIHelper.h" +#include "ui/GUIDefine.h" +#include "ui/UIHelper.h" NS_CC_BEGIN diff --git a/cocos/ui/UILayoutManager.cpp b/cocos/ui/UILayoutManager.cpp index a5904ea087..288c4e051f 100644 --- a/cocos/ui/UILayoutManager.cpp +++ b/cocos/ui/UILayoutManager.cpp @@ -22,8 +22,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "UILayoutManager.h" -#include "UILayout.h" +#include "ui/UILayoutManager.h" +#include "ui/UILayout.h" NS_CC_BEGIN diff --git a/cocos/ui/UIPageViewIndicator.cpp b/cocos/ui/UIPageViewIndicator.cpp index 6931b75ca8..d1b61c6401 100644 --- a/cocos/ui/UIPageViewIndicator.cpp +++ b/cocos/ui/UIPageViewIndicator.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "UIPageViewIndicator.h" +#include "ui/UIPageViewIndicator.h" #include "2d/CCSprite.h" #include "base/ccUtils.h" diff --git a/cocos/ui/UIPageViewIndicator.h b/cocos/ui/UIPageViewIndicator.h index 6adb2f7a98..1545b91ca2 100644 --- a/cocos/ui/UIPageViewIndicator.h +++ b/cocos/ui/UIPageViewIndicator.h @@ -25,7 +25,7 @@ THE SOFTWARE. #ifndef __UIPAGEVIEWINDICATOR_H__ #define __UIPAGEVIEWINDICATOR_H__ -#include "UIPageView.h" +#include "ui/UIPageView.h" NS_CC_BEGIN /** diff --git a/cocos/ui/UIRichText.cpp b/cocos/ui/UIRichText.cpp index 8b1be4d595..e9f9c0ea5e 100644 --- a/cocos/ui/UIRichText.cpp +++ b/cocos/ui/UIRichText.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "UIRichText.h" +#include "ui/UIRichText.h" #include diff --git a/cocos/ui/UIScale9Sprite.cpp b/cocos/ui/UIScale9Sprite.cpp index 91759f4916..41e70471cb 100644 --- a/cocos/ui/UIScale9Sprite.cpp +++ b/cocos/ui/UIScale9Sprite.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "UIScale9Sprite.h" +#include "ui/UIScale9Sprite.h" #include "2d/CCSprite.h" #include "2d/CCSpriteFrameCache.h" #include "base/CCVector.h" diff --git a/cocos/ui/UIScrollViewBar.cpp b/cocos/ui/UIScrollViewBar.cpp index c48c54db1b..96c2c744d4 100644 --- a/cocos/ui/UIScrollViewBar.cpp +++ b/cocos/ui/UIScrollViewBar.cpp @@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "UIScrollViewBar.h" -#include "CCImage.h" +#include "ui/UIScrollViewBar.h" +#include "platform/CCImage.h" #include "2d/CCSprite.h" #include "base/ccUtils.h" diff --git a/cocos/ui/UITabControl.cpp b/cocos/ui/UITabControl.cpp index b2207631b3..3a41f17d0e 100644 --- a/cocos/ui/UITabControl.cpp +++ b/cocos/ui/UITabControl.cpp @@ -26,7 +26,7 @@ #include "2d/CCSprite.h" #include "2d/CCLabel.h" #include "ui/UILayout.h" -#include "UITabControl.h" +#include "ui/UITabControl.h" NS_CC_BEGIN diff --git a/cocos/ui/UIVideoPlayer-android.cpp b/cocos/ui/UIVideoPlayer-android.cpp index e7b6ca0b82..d0dfb471fc 100644 --- a/cocos/ui/UIVideoPlayer-android.cpp +++ b/cocos/ui/UIVideoPlayer-android.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "UIVideoPlayer.h" +#include "ui/UIVideoPlayer.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) #include diff --git a/cocos/ui/UIWebView-inl.h b/cocos/ui/UIWebView-inl.h index 7edb3c5420..3c265e7d10 100644 --- a/cocos/ui/UIWebView-inl.h +++ b/cocos/ui/UIWebView-inl.h @@ -24,7 +24,7 @@ /// @cond DO_NOT_SHOW -#include "UIWebView.h" +#include "ui/UIWebView.h" #include "platform/CCGLView.h" #include "base/CCDirector.h" #include "platform/CCFileUtils.h" diff --git a/cocos/ui/UIWebView.cpp b/cocos/ui/UIWebView.cpp index b7b2a4fc7d..6265795284 100644 --- a/cocos/ui/UIWebView.cpp +++ b/cocos/ui/UIWebView.cpp @@ -25,7 +25,7 @@ #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) -#include "UIWebViewImpl-android.h" -#include "UIWebView-inl.h" +#include "ui/UIWebViewImpl-android.h" +#include "ui/UIWebView-inl.h" #endif diff --git a/cocos/ui/UIWebViewImpl-android.cpp b/cocos/ui/UIWebViewImpl-android.cpp index 34fbb72285..233d607921 100644 --- a/cocos/ui/UIWebViewImpl-android.cpp +++ b/cocos/ui/UIWebViewImpl-android.cpp @@ -24,14 +24,14 @@ #ifdef __ANDROID__ -#include "UIWebViewImpl-android.h" +#include "ui/UIWebViewImpl-android.h" #include #include #include #include "platform/android/jni/JniHelper.h" -#include "UIWebView.h" +#include "ui/UIWebView.h" #include "platform/CCGLView.h" #include "base/CCDirector.h" #include "platform/CCFileUtils.h"