diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b5ada9baa..97957aebca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,6 +51,9 @@ set(BUILD_LUA_LIBS ON) add_subdirectory(${COCOS2DX_ROOT_PATH}/cocos ${ENGINE_BINARY_PATH}/cocos/core) +# engine extensions +add_subdirectory(${COCOS2DX_ROOT_PATH}/extensions) + # prevent tests project to build "cocos2d-x/cocos" again set(BUILD_ENGINE_DONE ON) diff --git a/cmake/Modules/CocosBuildHelpers.cmake b/cmake/Modules/CocosBuildHelpers.cmake index 761d33f95a..c03eca8163 100644 --- a/cmake/Modules/CocosBuildHelpers.cmake +++ b/cmake/Modules/CocosBuildHelpers.cmake @@ -255,6 +255,7 @@ function(setup_cocos_app_config app_name) cocos_def_copy_resource_target(${app_name}) endif() + target_link_libraries(${app_name} ${CC_EXTENSION_LIBS}) endfunction() # if cc_variable not set, then set it cc_value diff --git a/cmake/Modules/CocosBuildSet.cmake b/cmake/Modules/CocosBuildSet.cmake index e0fa47915b..e7f856c8e5 100644 --- a/cmake/Modules/CocosBuildSet.cmake +++ b/cmake/Modules/CocosBuildSet.cmake @@ -31,6 +31,9 @@ message(STATUS "HOST_SYSTEM:" ${CMAKE_HOST_SYSTEM_NAME}) # the default behavior of build module option(BUILD_LUA_LIBS "Build lua libraries" OFF) +# hold the extensions list to auto link to app +set(CC_EXTENSION_LIBS "" CACHE INTERNAL "extensions for auto link to target application") + # include helper functions include(CocosBuildHelpers) diff --git a/cocos/CMakeLists.txt b/cocos/CMakeLists.txt index 3a23d49042..1decc82b3a 100644 --- a/cocos/CMakeLists.txt +++ b/cocos/CMakeLists.txt @@ -34,10 +34,6 @@ set(COCOS2D_X_VERSION 4.0) set(COCOS_CORE_LIB cocos2d) project(cocos2d_libs) -# default value for cocos2dx extensions modules build -option(BUILD_EDITOR_COCOSTUDIO "Build editor support for cocostudio" ON) -option(BUILD_EDITOR_SPINE "Build editor support for spine" ON) -option(BUILD_EXTENSIONS "Build extension library" ON) option(CC_USE_ALSOFT_ON_APPLE "Use openal-soft on apple platform" OFF) set(CC_USE_ALSOFT_ON_APPLE ${CC_USE_ALSOFT_ON_APPLE} CACHE BOOL "Use openal-soft on apple platform" FORCE) @@ -59,24 +55,6 @@ include(ui/CMakeLists.txt) include(network/CMakeLists.txt) include(audio/CMakeLists.txt) -if(BUILD_EDITOR_COCOSTUDIO) - include(editor-support/cocostudio/CMakeLists.txt) - set(COCOS_EDITOR_SUPPORT_SRC ${COCOS_EDITOR_SUPPORT_SRC} ${COCOS_CS_SRC} ${COCOS_CS_HEADER}) -endif(BUILD_EDITOR_COCOSTUDIO) - -if(BUILD_EDITOR_SPINE) - if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/editor-support/spine/CMakeLists.txt") - include(editor-support/spine/CMakeLists.txt) - else() - message(WARNING "${CMAKE_CURRENT_SOURCE_DIR}/editor-support/spine/CMakeLists.txt not found!") - endif() - set(COCOS_EDITOR_SUPPORT_SRC ${COCOS_EDITOR_SUPPORT_SRC} ${COCOS_SPINE_SRC} ${COCOS_SPINE_HEADER}) -endif(BUILD_EDITOR_SPINE) - -if(BUILD_EXTENSIONS) - include(../extensions/CMakeLists.txt) -endif(BUILD_EXTENSIONS) - set(COCOS_HEADER cocos2d.h ${COCOS_2D_HEADER} ${COCOS_3D_HEADER} @@ -90,8 +68,6 @@ set(COCOS_HEADER cocos2d.h ${COCOS_AUDIO_HEADER} ${COCOS_UI_HEADER} ${COCOS_NETWORK_HEADER} - ${COCOS_EDITOR_SUPPORT_HEADER} - ${COCOS_EXTENSIONS_HEADER} ) set(COCOS_SRC cocos2d.cpp @@ -107,8 +83,6 @@ set(COCOS_SRC cocos2d.cpp ${COCOS_AUDIO_SRC} ${COCOS_UI_SRC} ${COCOS_NETWORK_SRC} - ${COCOS_EDITOR_SUPPORT_SRC} - ${COCOS_EXTENSIONS_SRC} ) list(APPEND COCOS_SRC ${COCOS_HEADER}) @@ -129,10 +103,10 @@ use_cocos2dx_libs_depend(cocos2d) target_include_directories(cocos2d PUBLIC ${COCOS2DX_ROOT_PATH} PUBLIC ${COCOS2DX_ROOT_PATH}/external - PUBLIC ${COCOS2DX_ROOT_PATH}/cocos PUBLIC ${COCOS2DX_ROOT_PATH}/extensions + PUBLIC ${COCOS2DX_ROOT_PATH}/cocos PUBLIC ${COCOS2DX_ROOT_PATH}/cocos/platform - PUBLIC ${COCOS2DX_ROOT_PATH}/cocos/editor-support + INTERFACE ${COCOS2DX_ROOT_PATH}/cocos/base INTERFACE ${COCOS2DX_ROOT_PATH}/cocos/audio/include INTERFACE ${COCOS2DX_ROOT_PATH}/cocos/platform/${PLATFORM_FOLDER} diff --git a/cocos/editor-support/cocostudio/CMakeLists.txt b/cocos/editor-support/cocostudio/CMakeLists.txt deleted file mode 100644 index f9381a0991..0000000000 --- a/cocos/editor-support/cocostudio/CMakeLists.txt +++ /dev/null @@ -1,204 +0,0 @@ -set(COCOS_CS_HEADER - editor-support/cocostudio/CCProcessBase.h - editor-support/cocostudio/TriggerMng.h - editor-support/cocostudio/CCDataReaderHelper.h - editor-support/cocostudio/CCDisplayManager.h - editor-support/cocostudio/CCComAttribute.h - editor-support/cocostudio/CCArmatureDefine.h - editor-support/cocostudio/CCUtilMath.h - editor-support/cocostudio/CCInputDelegate.h - editor-support/cocostudio/CCDecorativeDisplay.h - editor-support/cocostudio/CCActionManagerEx.h - editor-support/cocostudio/ActionTimeline/CCTimelineMacro.h - editor-support/cocostudio/ActionTimeline/CCSkeletonNode.h - editor-support/cocostudio/ActionTimeline/CCFrame.h - editor-support/cocostudio/ActionTimeline/CCActionTimeline.h - editor-support/cocostudio/ActionTimeline/CCActionTimelineNode.h - editor-support/cocostudio/ActionTimeline/CCBoneNode.h - editor-support/cocostudio/ActionTimeline/CCTimeLine.h - editor-support/cocostudio/ActionTimeline/CSLoader.h - editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.h - editor-support/cocostudio/ActionTimeline/CCSkinNode.h - editor-support/cocostudio/ActionTimeline/CCActionTimelineData.h - editor-support/cocostudio/CocosStudioExtension.h - editor-support/cocostudio/CCTransformHelp.h - editor-support/cocostudio/CocoStudio.h - editor-support/cocostudio/CCBatchNode.h - editor-support/cocostudio/CCActionFrame.h - editor-support/cocostudio/FlatBuffersSerialize.h - editor-support/cocostudio/CCComRender.h - editor-support/cocostudio/CSLanguageDataBinary_generated.h - editor-support/cocostudio/CCSpriteFrameCacheHelper.h - editor-support/cocostudio/CCBone.h - editor-support/cocostudio/CocosStudioExport.h - editor-support/cocostudio/CCArmatureAnimation.h - editor-support/cocostudio/CCActionFrameEasing.h - editor-support/cocostudio/CCTween.h - editor-support/cocostudio/CCActionNode.h - editor-support/cocostudio/CSParse3DBinary_generated.h - editor-support/cocostudio/DictionaryHelper.h - editor-support/cocostudio/CSParseBinary_generated.h - editor-support/cocostudio/CCComBase.h - editor-support/cocostudio/WidgetCallBackHandlerProtocol.h - editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h - editor-support/cocostudio/WidgetReader/ArmatureNodeReader/CSArmatureNode_generated.h - editor-support/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.h - editor-support/cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.h - editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.h - editor-support/cocostudio/WidgetReader/GameMapReader/GameMapReader.h - editor-support/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.h - editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.h - editor-support/cocostudio/WidgetReader/SpriteReader/SpriteReader.h - editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.h - editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.h - editor-support/cocostudio/WidgetReader/WidgetReaderProtocol.h - editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.h - editor-support/cocostudio/WidgetReader/Light3DReader/Light3DReader.h - editor-support/cocostudio/WidgetReader/SpineSkeletonReader/SpineSkeletonReader.h - editor-support/cocostudio/WidgetReader/TabControlReader/TabControlReader.h - editor-support/cocostudio/WidgetReader/TabControlReader/CSTabControl_generated.h - editor-support/cocostudio/WidgetReader/TextReader/TextReader.h - editor-support/cocostudio/WidgetReader/WidgetReader.h - editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.h - editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.h - editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.h - editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.h - editor-support/cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.h - editor-support/cocostudio/WidgetReader/NodeReaderDefine.h - editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.h - editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.h - editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.h - editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.h - editor-support/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.h - editor-support/cocostudio/WidgetReader/ParticleReader/ParticleReader.h - editor-support/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.h - editor-support/cocostudio/WidgetReader/SkeletonReader/CSBoneBinary_generated.h - editor-support/cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.h - editor-support/cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.h - editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.h - editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.h - editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldExReader.h - editor-support/cocostudio/WidgetReader/RichTextReader/RichTextReader.h - editor-support/cocostudio/WidgetReader/RadioButtonReader/RadioButtonReader.h - editor-support/cocostudio/WidgetReader/RadioButtonReader/RadioButtonGroupReader.h - editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h - editor-support/cocostudio/CCComAudio.h - editor-support/cocostudio/CCDisplayFactory.h - editor-support/cocostudio/CCArmature.h - editor-support/cocostudio/CCArmatureDataManager.h - editor-support/cocostudio/CCDatas.h - editor-support/cocostudio/CCComExtensionData.h - editor-support/cocostudio/CCComController.h - editor-support/cocostudio/TriggerObj.h - editor-support/cocostudio/CocoLoader.h - editor-support/cocostudio/CCColliderDetector.h - editor-support/cocostudio/LocalizationManager.h - editor-support/cocostudio/CCActionObject.h - editor-support/cocostudio/TriggerBase.h - editor-support/cocostudio/CCSSceneReader.h - editor-support/cocostudio/CCSGUIReader.h - editor-support/cocostudio/CCSkin.h - editor-support/cocostudio/ext/SimpleTimer.h - editor-support/cocostudio/ext/matrix3f.hpp - editor-support/cocostudio/ext/glslutils.hpp - editor-support/cocostudio/ext/LayoutHelper.h - editor-support/cocostudio/ext/UITextFieldEx.h - editor-support/cocostudio/ext/SpineSkeletonDataCache.h - ) - -set(COCOS_CS_SRC - editor-support/cocostudio/CCActionFrame.cpp - editor-support/cocostudio/CCActionFrameEasing.cpp - editor-support/cocostudio/CCActionManagerEx.cpp - editor-support/cocostudio/CCActionNode.cpp - editor-support/cocostudio/CCActionObject.cpp - editor-support/cocostudio/CCArmature.cpp - editor-support/cocostudio/CCArmatureAnimation.cpp - editor-support/cocostudio/CCArmatureDataManager.cpp - editor-support/cocostudio/CCArmatureDefine.cpp - editor-support/cocostudio/CCBatchNode.cpp - editor-support/cocostudio/CCBone.cpp - editor-support/cocostudio/CCColliderDetector.cpp - editor-support/cocostudio/CCComAttribute.cpp - editor-support/cocostudio/CCComAudio.cpp - editor-support/cocostudio/CCComController.cpp - editor-support/cocostudio/CCComRender.cpp - editor-support/cocostudio/CCDataReaderHelper.cpp - editor-support/cocostudio/CCDatas.cpp - editor-support/cocostudio/CCDecorativeDisplay.cpp - editor-support/cocostudio/CCDisplayFactory.cpp - editor-support/cocostudio/CCDisplayManager.cpp - editor-support/cocostudio/CCInputDelegate.cpp - editor-support/cocostudio/CCProcessBase.cpp - editor-support/cocostudio/CCSGUIReader.cpp - editor-support/cocostudio/CCSSceneReader.cpp - editor-support/cocostudio/CCSkin.cpp - editor-support/cocostudio/CCSpriteFrameCacheHelper.cpp - editor-support/cocostudio/CCTransformHelp.cpp - editor-support/cocostudio/CCTween.cpp - editor-support/cocostudio/CCUtilMath.cpp - editor-support/cocostudio/CocoLoader.cpp - editor-support/cocostudio/DictionaryHelper.cpp - editor-support/cocostudio/LocalizationManager.cpp - editor-support/cocostudio/TriggerBase.cpp - editor-support/cocostudio/TriggerMng.cpp - editor-support/cocostudio/TriggerObj.cpp - editor-support/cocostudio/FlatBuffersSerialize.cpp - editor-support/cocostudio/CCComExtensionData.cpp - editor-support/cocostudio/CocoStudio.cpp - editor-support/cocostudio/WidgetCallBackHandlerProtocol.cpp - editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.cpp - editor-support/cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.cpp - editor-support/cocostudio/WidgetReader/SpriteReader/SpriteReader.cpp - editor-support/cocostudio/WidgetReader/ParticleReader/ParticleReader.cpp - editor-support/cocostudio/WidgetReader/GameMapReader/GameMapReader.cpp - editor-support/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.cpp - editor-support/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.cpp - editor-support/cocostudio/WidgetReader/WidgetReader.cpp - editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp - editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.cpp - editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.cpp - editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldExReader.cpp - editor-support/cocostudio/WidgetReader/RichTextReader/RichTextReader.cpp - editor-support/cocostudio/WidgetReader/RadioButtonReader/RadioButtonReader.cpp - editor-support/cocostudio/WidgetReader/RadioButtonReader/RadioButtonGroupReader.cpp - editor-support/cocostudio/WidgetReader/WidgetReader.cpp - editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.cpp - editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.cpp - editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.cpp - editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp - editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.cpp - editor-support/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.cpp - editor-support/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.cpp - editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.cpp - editor-support/cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.cpp - editor-support/cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.cpp - editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.cpp - editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.cpp - editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.cpp - editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp - editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp - editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.cpp - editor-support/cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.cpp - editor-support/cocostudio/WidgetReader/Light3DReader/Light3DReader.cpp - editor-support/cocostudio/WidgetReader/SpineSkeletonReader/SpineSkeletonReader.cpp - editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.cpp - editor-support/cocostudio/ActionTimeline/CCActionTimeline.cpp - editor-support/cocostudio/ActionTimeline/CCActionTimelineNode.cpp - editor-support/cocostudio/ActionTimeline/CCFrame.cpp - editor-support/cocostudio/ActionTimeline/CCTimeLine.cpp - editor-support/cocostudio/ActionTimeline/CSLoader.cpp - editor-support/cocostudio/ActionTimeline/CCBoneNode.cpp - editor-support/cocostudio/ActionTimeline/CCSkeletonNode.cpp - editor-support/cocostudio/ActionTimeline/CCSkinNode.cpp - editor-support/cocostudio/ActionTimeline/CCActionTimelineData.cpp - editor-support/cocostudio/FlatBuffersSerialize.cpp - editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.cpp - editor-support/cocostudio/WidgetReader/TabControlReader/TabControlReader.cpp - editor-support/cocostudio/WidgetReader/NodeReaderProtocol.cpp - editor-support/cocostudio/ext/glslutils.cpp - editor-support/cocostudio/ext/LayoutHelper.cpp - editor-support/cocostudio/ext/SimpleTimer.cpp - editor-support/cocostudio/ext/UITextFieldEx.cpp - editor-support/cocostudio/ext/SpineSkeletonDataCache.cpp - ) diff --git a/cocos/editor-support/cocostudio/CocoStudio.cpp b/cocos/editor-support/cocostudio/CocoStudio.cpp deleted file mode 100644 index cb3a44f15e..0000000000 --- a/cocos/editor-support/cocostudio/CocoStudio.cpp +++ /dev/null @@ -1,73 +0,0 @@ - -#include "editor-support/cocostudio/CocoStudio.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 "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 -{ - void destroyCocosStudio() - { - NodeReader::destroyInstance(); - SingleNodeReader::destroyInstance(); - SpriteReader::destroyInstance(); - ParticleReader::destroyInstance(); - GameMapReader::destroyInstance(); - ProjectNodeReader::destroyInstance(); - ComAudioReader::destroyInstance(); - - WidgetReader::destroyInstance(); - ButtonReader::destroyInstance(); - CheckBoxReader::destroyInstance(); - ImageViewReader::destroyInstance(); - TextBMFontReader::destroyInstance(); - TextReader::destroyInstance(); - TextFieldReader::destroyInstance(); - TextAtlasReader::destroyInstance(); - LoadingBarReader::destroyInstance(); - SliderReader::destroyInstance(); - LayoutReader::destroyInstance(); - ScrollViewReader::destroyInstance(); - PageViewReader::destroyInstance(); - ListViewReader::destroyInstance(); - - ArmatureNodeReader::destroyInstance(); - Node3DReader::destroyInstance(); - Sprite3DReader::destroyInstance(); - UserCameraReader::destroyInstance(); - Particle3DReader::destroyInstance(); - - cocos2d::CSLoader::destroyInstance(); - - - ArmatureDataManager::destroyInstance(); - SceneReader::destroyInstance(); - ActionManagerEx::destroyInstance(); - GUIReader::destroyInstance(); - } -} \ No newline at end of file diff --git a/cocos/editor-support/cocostudio/CocoStudio.h b/cocos/editor-support/cocostudio/CocoStudio.h deleted file mode 100644 index 63a861f833..0000000000 --- a/cocos/editor-support/cocostudio/CocoStudio.h +++ /dev/null @@ -1,75 +0,0 @@ -/**************************************************************************** -Copyright (c) 2013-2017 Chukong Technologies Inc. - -http://www.cocos2d-x.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -****************************************************************************/ - -#ifndef __EDITOR_SUPPORT_COCOSTUDIO_H__ -#define __EDITOR_SUPPORT_COCOSTUDIO_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/ActionTimeline/CSLoader.h" -#include "editor-support/cocostudio/CocosStudioExport.h" - -namespace cocostudio -{ - void CC_STUDIO_DLL destroyCocosStudio(); -} - -#endif diff --git a/cocos/editor-support/cocostudio/WidgetReader/NodeReaderDefine.cpp b/cocos/editor-support/cocostudio/WidgetReader/NodeReaderDefine.cpp deleted file mode 100644 index e6058c3682..0000000000 --- a/cocos/editor-support/cocostudio/WidgetReader/NodeReaderDefine.cpp +++ /dev/null @@ -1,3 +0,0 @@ - - -#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" diff --git a/cocos/editor-support/dragonBones/proj.win10/libDragonBones.vcxproj b/cocos/editor-support/dragonBones/proj.win10/libDragonBones.vcxproj deleted file mode 100644 index be33cfaac1..0000000000 --- a/cocos/editor-support/dragonBones/proj.win10/libDragonBones.vcxproj +++ /dev/null @@ -1,550 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {4b3ba10a-941f-4e08-8a50-8a7fcb822bb8} - StaticLibrary - libSpine - libSpine - en-US - 14.0 - true - Windows Store - 8.2 - 10.0.10240.0 - 10.0.10240.0 - - - - StaticLibrary - true - v140 - - - StaticLibrary - true - v140 - - - StaticLibrary - true - v140 - - - StaticLibrary - false - true - v140 - - - StaticLibrary - false - true - v140 - - - StaticLibrary - false - true - v140 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - false - - - false - - - false - - - false - - - false - - - - NotUsing - true - false - 4458;4456;4996;%(DisableSpecificWarnings) - $(EngineRoot)external\win10-specific\angle\include;%(AdditionalIncludeDirectories) - ProgramDatabase - $(IntDir)$(ProjectName).pdb - - - Console - false - false - - - /IGNORE:4264 %(AdditionalOptions) - - - - - NotUsing - true - false - false - 4458;4456;4996;%(DisableSpecificWarnings) - $(EngineRoot)external\win10-specific\angle\include;%(AdditionalIncludeDirectories) - $(IntDir)$(ProjectName).pdb - ProgramDatabase - - - Console - false - false - - - false - /IGNORE:4264 %(AdditionalOptions) - - - - - NotUsing - true - false - 4458;4456;4996;%(DisableSpecificWarnings) - $(EngineRoot)external\win10-specific\angle\include;%(AdditionalIncludeDirectories) - ProgramDatabase - $(IntDir)$(ProjectName).pdb - - - Console - false - false - - - /IGNORE:4264 %(AdditionalOptions) - - - - - NotUsing - true - false - false - 4458;4456;4996;%(DisableSpecificWarnings) - $(EngineRoot)external\win10-specific\angle\include;%(AdditionalIncludeDirectories) - ProgramDatabase - $(IntDir)$(ProjectName).pdb - - - Console - false - false - - - false - /IGNORE:4264 %(AdditionalOptions) - - - - - NotUsing - true - false - 4458;4456;4996;%(DisableSpecificWarnings) - $(EngineRoot)external\win10-specific\angle\include;%(AdditionalIncludeDirectories) - ProgramDatabase - $(IntDir)$(ProjectName).pdb - - - Console - false - false - - - /IGNORE:4264 %(AdditionalOptions) - - - - - NotUsing - true - false - false - 4458;4456;4996;%(DisableSpecificWarnings) - $(EngineRoot)external\win10-specific\angle\include;%(AdditionalIncludeDirectories) - $(IntDir)$(ProjectName).pdb - ProgramDatabase - - - Console - false - false - - - false - /IGNORE:4264 %(AdditionalOptions) - - - - - - \ No newline at end of file diff --git a/cocos/editor-support/dragonBones/proj.win10/libSpine.vcxproj b/cocos/editor-support/dragonBones/proj.win10/libSpine.vcxproj deleted file mode 100644 index be33cfaac1..0000000000 --- a/cocos/editor-support/dragonBones/proj.win10/libSpine.vcxproj +++ /dev/null @@ -1,550 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - false - false - false - false - false - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {4b3ba10a-941f-4e08-8a50-8a7fcb822bb8} - StaticLibrary - libSpine - libSpine - en-US - 14.0 - true - Windows Store - 8.2 - 10.0.10240.0 - 10.0.10240.0 - - - - StaticLibrary - true - v140 - - - StaticLibrary - true - v140 - - - StaticLibrary - true - v140 - - - StaticLibrary - false - true - v140 - - - StaticLibrary - false - true - v140 - - - StaticLibrary - false - true - v140 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - false - - - false - - - false - - - false - - - false - - - - NotUsing - true - false - 4458;4456;4996;%(DisableSpecificWarnings) - $(EngineRoot)external\win10-specific\angle\include;%(AdditionalIncludeDirectories) - ProgramDatabase - $(IntDir)$(ProjectName).pdb - - - Console - false - false - - - /IGNORE:4264 %(AdditionalOptions) - - - - - NotUsing - true - false - false - 4458;4456;4996;%(DisableSpecificWarnings) - $(EngineRoot)external\win10-specific\angle\include;%(AdditionalIncludeDirectories) - $(IntDir)$(ProjectName).pdb - ProgramDatabase - - - Console - false - false - - - false - /IGNORE:4264 %(AdditionalOptions) - - - - - NotUsing - true - false - 4458;4456;4996;%(DisableSpecificWarnings) - $(EngineRoot)external\win10-specific\angle\include;%(AdditionalIncludeDirectories) - ProgramDatabase - $(IntDir)$(ProjectName).pdb - - - Console - false - false - - - /IGNORE:4264 %(AdditionalOptions) - - - - - NotUsing - true - false - false - 4458;4456;4996;%(DisableSpecificWarnings) - $(EngineRoot)external\win10-specific\angle\include;%(AdditionalIncludeDirectories) - ProgramDatabase - $(IntDir)$(ProjectName).pdb - - - Console - false - false - - - false - /IGNORE:4264 %(AdditionalOptions) - - - - - NotUsing - true - false - 4458;4456;4996;%(DisableSpecificWarnings) - $(EngineRoot)external\win10-specific\angle\include;%(AdditionalIncludeDirectories) - ProgramDatabase - $(IntDir)$(ProjectName).pdb - - - Console - false - false - - - /IGNORE:4264 %(AdditionalOptions) - - - - - NotUsing - true - false - false - 4458;4456;4996;%(DisableSpecificWarnings) - $(EngineRoot)external\win10-specific\angle\include;%(AdditionalIncludeDirectories) - $(IntDir)$(ProjectName).pdb - ProgramDatabase - - - Console - false - false - - - false - /IGNORE:4264 %(AdditionalOptions) - - - - - - \ No newline at end of file diff --git a/cocos/editor-support/dragonBones/proj.win32/libDragonBones.vcxproj b/cocos/editor-support/dragonBones/proj.win32/libDragonBones.vcxproj deleted file mode 100644 index 45a16f0dac..0000000000 --- a/cocos/editor-support/dragonBones/proj.win32/libDragonBones.vcxproj +++ /dev/null @@ -1,135 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {B7C2A162-DEC9-4418-972E-240AB3CBFCAC} - libDragonBones - 10.0 - - - - StaticLibrary - true - v120 - v120_xp - v140 - v140_xp - Unicode - v142 - - - StaticLibrary - false - v120 - v120_xp - v140 - v140_xp - true - Unicode - v142 - - - - - - - - - - - - - - - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - - - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - - - - Level3 - Disabled - - - $(EngineRoot);$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - 4267;4251;4244;%(DisableSpecificWarnings) - false - - - true - - - - - Level3 - MinSpace - true - true - - - WIN32;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(EngineRoot);$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) - None - false - - - true - true - true - - - - - - \ No newline at end of file diff --git a/cocos/editor-support/dragonBones/proj.win32/libDragonBones.vcxproj.filters b/cocos/editor-support/dragonBones/proj.win32/libDragonBones.vcxproj.filters deleted file mode 100644 index a336e3cbaf..0000000000 --- a/cocos/editor-support/dragonBones/proj.win32/libDragonBones.vcxproj.filters +++ /dev/null @@ -1,144 +0,0 @@ - - - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {02afee1d-78c1-4158-ac52-e447c02d5c3f} - - - {e3f6131b-3a9c-480e-9af0-a8ec1cd4231d} - - - {73853265-096c-41e5-b418-0c94ad2011bd} - - - {e5750f4c-5b1c-47e6-9268-cbd684eaba18} - - - {45b324d2-dffa-417d-8678-a8bcc3a25f60} - - - {e8752ee7-95cd-4d91-96ec-851dc89395ff} - - - {8ca4944f-99e6-40ef-abb2-ebd560eb2df7} - - - {f5699d99-8bdf-424b-8214-3442291563e0} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\animation - - - Source Files\animation - - - Source Files\animation - - - Source Files\animation - - - Source Files\animation - - - Source Files\armature - - - Source Files\armature - - - Source Files\armature - - - Source Files\armature - - - Source Files\armature - - - Source Files\armature - - - Source Files\core - - - Source Files\core - - - Source Files\event - - - Source Files\factory - - - Source Files\geom - - - Source Files\geom - - - Source Files\model - - - Source Files\model - - - Source Files\model - - - Source Files\model - - - Source Files\model - - - Source Files\model - - - Source Files\model - - - Source Files\model - - - Source Files\model - - - Source Files\model - - - Source Files\model - - - Source Files\parser - - - Source Files\parser - - - Source Files\parser - - - \ No newline at end of file diff --git a/cocos/editor-support/dragonBones/proj.win8.1-universal/libSpine.Shared/libSpine.Shared.vcxitems b/cocos/editor-support/dragonBones/proj.win8.1-universal/libSpine.Shared/libSpine.Shared.vcxitems deleted file mode 100644 index c9d5b815c8..0000000000 --- a/cocos/editor-support/dragonBones/proj.win8.1-universal/libSpine.Shared/libSpine.Shared.vcxitems +++ /dev/null @@ -1,160 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - {adafd00d-a0d6-46ef-9f0b-ea2880bfe1de} - libSpine - libSpine.Shared - 248F659F-DAC5-46E8-AC09-60EC9FC95053 - - - - $(EngineRoot)cocos\editor-support;%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory) - - - - - - - - false - - - false - - - false - - - false - - - false - - - false - - - false - - - - false - - - false - - - false - - - - false - - - false - - - false - - - false - - - false - - - false - - - false - - - false - - - false - - - false - - - false - - - false - - - - - false - - - false - - - false - - - - false - - - false - - - false - - - - false - - - false - - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cocos/editor-support/dragonBones/proj.win8.1-universal/libSpine.Shared/libSpine.Shared.vcxitems.filters b/cocos/editor-support/dragonBones/proj.win8.1-universal/libSpine.Shared/libSpine.Shared.vcxitems.filters deleted file mode 100644 index 5d45eb189d..0000000000 --- a/cocos/editor-support/dragonBones/proj.win8.1-universal/libSpine.Shared/libSpine.Shared.vcxitems.filters +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cocos/editor-support/dragonBones/proj.win8.1-universal/libSpine.Windows/libSpine.Windows.vcxproj b/cocos/editor-support/dragonBones/proj.win8.1-universal/libSpine.Windows/libSpine.Windows.vcxproj deleted file mode 100644 index 9531a55444..0000000000 --- a/cocos/editor-support/dragonBones/proj.win8.1-universal/libSpine.Windows/libSpine.Windows.vcxproj +++ /dev/null @@ -1,247 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - {f3550fe0-c795-44f6-8feb-093eb68143ae} - libSpine - en-US - 12.0 - true - Windows Store - 8.1 - CodeSharingStaticLibrary - - - - StaticLibrary - true - v120 - - - StaticLibrary - true - v120 - - - StaticLibrary - true - v120 - - - StaticLibrary - false - false - v120 - - - StaticLibrary - false - false - v120 - - - StaticLibrary - false - false - v120 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - false - - - false - - - false - - - false - - - false - - - - NotUsing - true - false - WIN32;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(EngineRoot)external\winrt_8.1-specific\angle\include;%(AdditionalIncludeDirectories) - 4996;%(DisableSpecificWarnings) - ProgramDatabase - $(OutDir)$(TargetName).pdb - - - Console - false - false - - - /IGNORE:4264 %(AdditionalOptions) - - - - - NotUsing - true - false - WIN32;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(EngineRoot)external\winrt_8.1-specific\angle\include;%(AdditionalIncludeDirectories) - 4996;%(DisableSpecificWarnings) - ProgramDatabase - $(OutDir)$(TargetName).pdb - - - Console - false - false - - - /IGNORE:4264 %(AdditionalOptions) - - - - - NotUsing - true - false - WIN32;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(EngineRoot)external\winrt_8.1-specific\angle\include;%(AdditionalIncludeDirectories) - 4996;%(DisableSpecificWarnings) - ProgramDatabase - $(OutDir)$(TargetName).pdb - - - Console - false - false - - - /IGNORE:4264 %(AdditionalOptions) - - - - - NotUsing - true - false - WIN32;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(EngineRoot)external\winrt_8.1-specific\angle\include;%(AdditionalIncludeDirectories) - 4996;%(DisableSpecificWarnings) - ProgramDatabase - $(OutDir)$(TargetName).pdb - - - Console - false - false - - - /IGNORE:4264 %(AdditionalOptions) - - - - - NotUsing - true - false - WIN32;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(EngineRoot)external\winrt_8.1-specific\angle\include;%(AdditionalIncludeDirectories) - 4996;%(DisableSpecificWarnings) - ProgramDatabase - $(OutDir)$(TargetName).pdb - - - Console - false - false - - - /IGNORE:4264 %(AdditionalOptions) - - - - - NotUsing - true - false - WIN32;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(EngineRoot)external\winrt_8.1-specific\angle\include;%(AdditionalIncludeDirectories) - 4996;%(DisableSpecificWarnings) - ProgramDatabase - $(OutDir)$(TargetName).pdb - - - Console - false - false - - - /IGNORE:4264 %(AdditionalOptions) - - - - - - \ No newline at end of file diff --git a/cocos/editor-support/dragonBones/proj.win8.1-universal/libSpine.Windows/libSpine.Windows.vcxproj.filters b/cocos/editor-support/dragonBones/proj.win8.1-universal/libSpine.Windows/libSpine.Windows.vcxproj.filters deleted file mode 100644 index a7761ab018..0000000000 --- a/cocos/editor-support/dragonBones/proj.win8.1-universal/libSpine.Windows/libSpine.Windows.vcxproj.filters +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/cocos/editor-support/dragonBones/proj.win8.1-universal/libSpine.WindowsPhone/libSpine.WindowsPhone.vcxproj b/cocos/editor-support/dragonBones/proj.win8.1-universal/libSpine.WindowsPhone/libSpine.WindowsPhone.vcxproj deleted file mode 100644 index 278333145b..0000000000 --- a/cocos/editor-support/dragonBones/proj.win8.1-universal/libSpine.WindowsPhone/libSpine.WindowsPhone.vcxproj +++ /dev/null @@ -1,172 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Release - ARM - - - Release - Win32 - - - - {cc1da216-a80d-4be4-b309-acb6af313aff} - libSpine - en-US - 12.0 - true - Windows Phone - 8.1 - CodeSharingStaticLibrary - - - - StaticLibrary - true - v120_wp81 - - - StaticLibrary - true - v120_wp81 - - - StaticLibrary - false - false - v120_wp81 - - - StaticLibrary - false - false - v120_wp81 - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - false - - - false - - - false - - - - NotUsing - true - false - WIN32;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(EngineRoot)external\wp_8.1-specific\angle\include;%(AdditionalIncludeDirectories) - 4996;%(DisableSpecificWarnings) - ProgramDatabase - $(OutDir)$(TargetName).pdb - - - Console - false - false - - - /IGNORE:4264 %(AdditionalOptions) - - - - - NotUsing - true - false - WIN32;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(EngineRoot)external\wp_8.1-specific\angle\include;%(AdditionalIncludeDirectories) - 4996;%(DisableSpecificWarnings) - ProgramDatabase - $(OutDir)$(TargetName).pdb - - - Console - false - false - - - /IGNORE:4264 %(AdditionalOptions) - - - - - NotUsing - true - false - WIN32;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(EngineRoot)external\wp_8.1-specific\angle\include;%(AdditionalIncludeDirectories) - 4996;%(DisableSpecificWarnings) - ProgramDatabase - $(OutDir)$(TargetName).pdb - - - Console - false - false - - - /IGNORE:4264 %(AdditionalOptions) - - - - - NotUsing - true - false - WIN32;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(EngineRoot)external\wp_8.1-specific\angle\include;%(AdditionalIncludeDirectories) - 4996;%(DisableSpecificWarnings) - ProgramDatabase - $(OutDir)$(TargetName).pdb - - - Console - false - false - - - /IGNORE:4264 %(AdditionalOptions) - - - - - - \ No newline at end of file diff --git a/cocos/editor-support/dragonBones/proj.win8.1-universal/libSpine.WindowsPhone/libSpine.WindowsPhone.vcxproj.filters b/cocos/editor-support/dragonBones/proj.win8.1-universal/libSpine.WindowsPhone/libSpine.WindowsPhone.vcxproj.filters deleted file mode 100644 index a7761ab018..0000000000 --- a/cocos/editor-support/dragonBones/proj.win8.1-universal/libSpine.WindowsPhone/libSpine.WindowsPhone.vcxproj.filters +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/cocos/editor-support/spine/CMakeLists.txt b/cocos/editor-support/spine/CMakeLists.txt deleted file mode 100644 index 5e5035ffb8..0000000000 --- a/cocos/editor-support/spine/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ - -file(GLOB_RECURSE COCOS_SPINE_SRC - ${CMAKE_CURRENT_LIST_DIR}/*.cpp - ${CMAKE_CURRENT_LIST_DIR}/**/*.cpp -) - -file(GLOB_RECURSE COCOS_SPINE_HEADER - ${CMAKE_CURRENT_LIST_DIR}/*.h - ${CMAKE_CURRENT_LIST_DIR}/**/*.h -) \ No newline at end of file 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 a9b63e239d..af2b198705 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_csloader_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_csloader_auto.cpp @@ -1,5 +1,5 @@ #include "scripting/lua-bindings/auto/lua_cocos2dx_csloader_auto.hpp" -#include "editor-support/cocostudio/ActionTimeline/CSLoader.h" +#include "cocostudio/ActionTimeline/CSLoader.h" #include "scripting/lua-bindings/manual/tolua_fix.h" #include "scripting/lua-bindings/manual/LuaBasicConversions.h" 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 e4d7dba95e..99c691fec5 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp @@ -1,6 +1,6 @@ #include "scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.hpp" -#include "editor-support/cocostudio/CocoStudio.h" -#include "editor-support/cocostudio/CCComExtensionData.h" +#include "cocostudio/CocoStudio.h" +#include "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" diff --git a/cocos/scripting/lua-bindings/manual/LuaBasicConversions.h b/cocos/scripting/lua-bindings/manual/LuaBasicConversions.h index 07f2c19121..0bccd2f67b 100644 --- a/cocos/scripting/lua-bindings/manual/LuaBasicConversions.h +++ b/cocos/scripting/lua-bindings/manual/LuaBasicConversions.h @@ -35,7 +35,7 @@ extern "C" { #include "scripting/lua-bindings/manual/tolua_fix.h" #include "scripting/lua-bindings/manual/Lua-BindingsExport.h" -#include "editor-support/cocostudio/CocosStudioExtension.h" +#include "cocostudio/CocosStudioExtension.h" #include "2d/CCLabel.h" #include "2d/CCSprite.h" #include "3d/CCBundle3D.h" diff --git a/cocos/scripting/lua-bindings/manual/cocostudio/CustomGUIReader.h b/cocos/scripting/lua-bindings/manual/cocostudio/CustomGUIReader.h index 4cac4ada92..ddd7b26a9d 100644 --- a/cocos/scripting/lua-bindings/manual/cocostudio/CustomGUIReader.h +++ b/cocos/scripting/lua-bindings/manual/cocostudio/CustomGUIReader.h @@ -25,7 +25,7 @@ #ifndef COCOS_SCRIPTING_LUA_BINDINGS_LUA_COCOS2DX_CUSTOM_GUI_READER_H #define COCOS_SCRIPTING_LUA_BINDINGS_LUA_COCOS2DX_CUSTOM_GUI_READER_H -#include "editor-support/cocostudio/WidgetReader/WidgetReader.h" +#include "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 7786744a02..83286ea8db 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 @@ -24,7 +24,7 @@ ****************************************************************************/ #include "scripting/lua-bindings/manual/cocostudio/lua-cocos-studio-conversions.h" -#include "editor-support/cocostudio/ActionTimeline/CCActionTimeline.h" +#include "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_cocos2dx_coco_studio_manual.cpp b/cocos/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_coco_studio_manual.cpp index cfe727f2eb..c6926535ac 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 @@ -31,7 +31,7 @@ #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 "cocostudio/CocoStudio.h" #include "scripting/lua-bindings/manual/CCLuaEngine.h" #include "scripting/lua-bindings/manual/cocostudio/CustomGUIReader.h" 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 1c37131018..cf948b1158 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 @@ -27,9 +27,9 @@ #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" +#include "cocostudio/ActionTimeline/CCActionTimeline.h" +#include "cocostudio/ActionTimeline/CSLoader.h" +#include "cocostudio/ActionTimeline/CCActionTimelineNode.h" int lua_cocos2dx_csloader_CSLoader_createTimeline(lua_State* tolua_S) { diff --git a/cocos/scripting/lua-bindings/manual/spine/LuaSkeletonAnimation.h b/cocos/scripting/lua-bindings/manual/spine/LuaSkeletonAnimation.h index 2e9e03e12c..70bc32f6f3 100644 --- a/cocos/scripting/lua-bindings/manual/spine/LuaSkeletonAnimation.h +++ b/cocos/scripting/lua-bindings/manual/spine/LuaSkeletonAnimation.h @@ -26,7 +26,7 @@ #ifndef LUASKELETONANIMATION_H_ #define LUASKELETONANIMATION_H_ -#include "editor-support/spine/spine-cocos2dx.h" +#include "spine/spine-cocos2dx.h" /// @cond class LuaSkeletonAnimation: public spine::SkeletonAnimation { diff --git a/cocos/ui/CocosGUI.h b/cocos/ui/CocosGUI.h index bcb8e5d94f..a6ae69ec89 100644 --- a/cocos/ui/CocosGUI.h +++ b/cocos/ui/CocosGUI.h @@ -56,7 +56,6 @@ THE SOFTWARE. #include "ui/UIEditBox/UIEditBox.h" #include "ui/UILayoutComponent.h" #include "ui/UITabControl.h" -#include "editor-support/cocostudio/CocosStudioExtension.h" /** * @addtogroup ui diff --git a/cocos/ui/GUIDefine.h b/cocos/ui/GUIDefine.h index ef6759c6a4..6b8729dced 100644 --- a/cocos/ui/GUIDefine.h +++ b/cocos/ui/GUIDefine.h @@ -74,4 +74,53 @@ #define __LAYOUT_COMPONENT_NAME "__ui_layout" ///@endcond +NS_CC_BEGIN +struct CC_DLL ResourceData +{ + int type; + std::string file; + std::string plist; + + ResourceData() + { + type = 0; + file = ""; + plist = ""; + } + ResourceData(const ResourceData& rv) + { + type = rv.type; + file = rv.file; + plist = rv.plist; + } + ResourceData(ResourceData&& rv) + { + type = rv.type; + file = std::move(rv.file); + plist = std::move(rv.plist); + } + + ResourceData(int iType, std::string sFile, std::string sPlist) + { + type = iType; + file = sFile; + plist = sPlist; + } + ResourceData& operator=(const ResourceData& rv) + { + type = rv.type; + file = rv.file; + plist = rv.plist; + return *this; + } + ResourceData& operator=(ResourceData&& rv) + { + type = rv.type; + file = std::move(rv.file); + plist = std::move(rv.plist); + return *this; + } +}; +NS_CC_END + #endif /* defined(__TestCpp__GUIDefine__) */ diff --git a/cocos/ui/UIAbstractCheckButton.cpp b/cocos/ui/UIAbstractCheckButton.cpp index d281d0ba7f..5eafe0765a 100644 --- a/cocos/ui/UIAbstractCheckButton.cpp +++ b/cocos/ui/UIAbstractCheckButton.cpp @@ -25,7 +25,6 @@ THE SOFTWARE. #include "ui/UIAbstractCheckButton.h" #include "2d/CCSprite.h" -#include "editor-support/cocostudio/CocosStudioExtension.h" #include "renderer/ccShaders.h" #include "renderer/backend/ProgramStateRegistry.h" diff --git a/cocos/ui/UIButton.cpp b/cocos/ui/UIButton.cpp index 2e69dd117d..f935c98d93 100644 --- a/cocos/ui/UIButton.cpp +++ b/cocos/ui/UIButton.cpp @@ -31,7 +31,6 @@ THE SOFTWARE. #include "platform/CCFileUtils.h" #include "ui/UIHelper.h" #include -#include "editor-support/cocostudio/CocosStudioExtension.h" NS_CC_BEGIN diff --git a/cocos/ui/UIImageView.cpp b/cocos/ui/UIImageView.cpp index a9c8b2ebcd..62e8bdb739 100644 --- a/cocos/ui/UIImageView.cpp +++ b/cocos/ui/UIImageView.cpp @@ -27,7 +27,6 @@ THE SOFTWARE. #include "ui/UIScale9Sprite.h" #include "ui/UIHelper.h" #include "2d/CCSprite.h" -#include "editor-support/cocostudio/CocosStudioExtension.h" NS_CC_BEGIN diff --git a/cocos/ui/UILayout.cpp b/cocos/ui/UILayout.cpp index 0170636dea..ac636a925a 100644 --- a/cocos/ui/UILayout.cpp +++ b/cocos/ui/UILayout.cpp @@ -35,7 +35,6 @@ THE SOFTWARE. #include "2d/CCSprite.h" #include "base/CCEventFocus.h" #include "base/CCStencilStateManager.h" -#include "editor-support/cocostudio/CocosStudioExtension.h" #include diff --git a/cocos/ui/UILoadingBar.cpp b/cocos/ui/UILoadingBar.cpp index a8ad0ecc1e..a274fba556 100644 --- a/cocos/ui/UILoadingBar.cpp +++ b/cocos/ui/UILoadingBar.cpp @@ -27,7 +27,6 @@ THE SOFTWARE. #include "ui/UIHelper.h" #include "ui/UIScale9Sprite.h" #include "2d/CCSprite.h" -#include "editor-support/cocostudio/CocosStudioExtension.h" NS_CC_BEGIN diff --git a/cocos/ui/UISlider.cpp b/cocos/ui/UISlider.cpp index 700966643b..843eee8031 100644 --- a/cocos/ui/UISlider.cpp +++ b/cocos/ui/UISlider.cpp @@ -28,7 +28,6 @@ THE SOFTWARE. #include "ui/UIHelper.h" #include "2d/CCSprite.h" #include "2d/CCCamera.h" -#include "editor-support/cocostudio/CocosStudioExtension.h" #include "renderer/ccShaders.h" NS_CC_BEGIN diff --git a/cocos/ui/UITextAtlas.cpp b/cocos/ui/UITextAtlas.cpp index 9cd63b298d..619f651c8f 100644 --- a/cocos/ui/UITextAtlas.cpp +++ b/cocos/ui/UITextAtlas.cpp @@ -25,7 +25,6 @@ THE SOFTWARE. #include "ui/UITextAtlas.h" #include "2d/CCLabel.h" -#include "editor-support/cocostudio/CocosStudioExtension.h" NS_CC_BEGIN diff --git a/cocos/ui/UITextBMFont.cpp b/cocos/ui/UITextBMFont.cpp index 6fb2c866d3..92ec64033b 100644 --- a/cocos/ui/UITextBMFont.cpp +++ b/cocos/ui/UITextBMFont.cpp @@ -25,7 +25,6 @@ THE SOFTWARE. #include "ui/UITextBMFont.h" #include "2d/CCLabel.h" -#include "editor-support/cocostudio/CocosStudioExtension.h" NS_CC_BEGIN diff --git a/extensions/CMakeLists.txt b/extensions/CMakeLists.txt index 25196ec859..b8767d7391 100644 --- a/extensions/CMakeLists.txt +++ b/extensions/CMakeLists.txt @@ -1,355 +1,46 @@ -set(COCOS_EXTENSIONS_HEADER - ../extensions/ExtensionMacros.h - ../extensions/assets-manager/AssetsManagerEx.h - ../extensions/assets-manager/Manifest.h - ../extensions/assets-manager/CCEventListenerAssetsManagerEx.h - ../extensions/assets-manager/AssetsManager.h - ../extensions/assets-manager/CCEventAssetsManagerEx.h - ../extensions/physics-nodes/CCPhysicsSprite.h - ../extensions/physics-nodes/CCPhysicsDebugNode.h - ../extensions/Particle3D/CCParticleSystem3D.h - ../extensions/Particle3D/PU/CCPUDoExpireEventHandler.h - ../extensions/Particle3D/PU/CCPUParticleSystem3D.h - ../extensions/Particle3D/PU/CCPUDoStopSystemEventHandler.h - ../extensions/Particle3D/PU/CCPUAffectorManager.h - ../extensions/Particle3D/PU/CCPUTechniqueTranslator.h - ../extensions/Particle3D/PU/CCPURender.h - ../extensions/Particle3D/PU/CCPUObserver.h - ../extensions/Particle3D/PU/CCPUMeshSurfaceEmitterTranslator.h - ../extensions/Particle3D/PU/CCPUAlignAffector.h - ../extensions/Particle3D/PU/CCPUSphereColliderTranslator.h - ../extensions/Particle3D/PU/CCPUAffectorTranslator.h - ../extensions/Particle3D/PU/CCPUTextureRotator.h - ../extensions/Particle3D/PU/CCPUTextureRotatorTranslator.h - ../extensions/Particle3D/PU/CCPUParticleSystem3DTranslator.h - ../extensions/Particle3D/PU/CCPUCircleEmitterTranslator.h - ../extensions/Particle3D/PU/CCPURandomiser.h - ../extensions/Particle3D/PU/CCPUBoxCollider.h - ../extensions/Particle3D/PU/CCPUScriptCompiler.h - ../extensions/Particle3D/PU/CCPUDynamicAttributeTranslator.h - ../extensions/Particle3D/PU/CCPUOnRandomObserver.h - ../extensions/Particle3D/PU/CCPUOnCollisionObserver.h - ../extensions/Particle3D/PU/CCPUBoxEmitterTranslator.h - ../extensions/Particle3D/PU/CCPUDoAffectorEventHandler.h - ../extensions/Particle3D/PU/CCPUEventHandlerTranslator.h - ../extensions/Particle3D/PU/CCPULineEmitterTranslator.h - ../extensions/Particle3D/PU/CCPUMaterialTranslator.h - ../extensions/Particle3D/PU/CCPUVelocityMatchingAffector.h - ../extensions/Particle3D/PU/CCPUEmitterTranslator.h - ../extensions/Particle3D/PU/CCPUOnCountObserver.h - ../extensions/Particle3D/PU/CCPUScriptParser.h - ../extensions/Particle3D/PU/CCPUOnEmissionObserver.h - ../extensions/Particle3D/PU/CCPUBaseForceAffectorTranslator.h - ../extensions/Particle3D/PU/CCPURibbonTrailRender.h - ../extensions/Particle3D/PU/CCPUDoPlacementParticleEventHandlerTranslator.h - ../extensions/Particle3D/PU/CCPUDoScaleEventHandler.h - ../extensions/Particle3D/PU/CCPUScriptTranslator.h - ../extensions/Particle3D/PU/CCPURandomiserTranslator.h - ../extensions/Particle3D/PU/CCPUBoxEmitter.h - ../extensions/Particle3D/PU/CCPUPlaneColliderTranslator.h - ../extensions/Particle3D/PU/CCPUVortexAffectorTranslator.h - ../extensions/Particle3D/PU/CCPUUtil.h - ../extensions/Particle3D/PU/CCPUListener.h - ../extensions/Particle3D/PU/CCPUGravityAffectorTranslator.h - ../extensions/Particle3D/PU/CCPUDoEnableComponentEventHandler.h - ../extensions/Particle3D/PU/CCPUInterParticleCollider.h - ../extensions/Particle3D/PU/CCPUDoStopSystemEventHandlerTranslator.h - ../extensions/Particle3D/PU/CCPUPositionEmitterTranslator.h - ../extensions/Particle3D/PU/CCPUGeometryRotator.h - ../extensions/Particle3D/PU/CCPUOnEventFlagObserver.h - ../extensions/Particle3D/PU/CCPULinearForceAffector.h - ../extensions/Particle3D/PU/CCPUOnTimeObserverTranslator.h - ../extensions/Particle3D/PU/CCPUBillboardChain.h - ../extensions/Particle3D/PU/CCPUScaleVelocityAffectorTranslator.h - ../extensions/Particle3D/PU/CCPUParticleFollower.h - ../extensions/Particle3D/PU/CCPUPositionEmitter.h - ../extensions/Particle3D/PU/CCPUTextureAnimatorTranslator.h - ../extensions/Particle3D/PU/CCPUPlaneCollider.h - ../extensions/Particle3D/PU/CCPUBehaviour.h - ../extensions/Particle3D/PU/CCPUOnQuotaObserver.h - ../extensions/Particle3D/PU/CCPULineAffectorTranslator.h - ../extensions/Particle3D/PU/CCPUJetAffectorTranslator.h - ../extensions/Particle3D/PU/CCPUDoEnableComponentEventHandlerTranslator.h - ../extensions/Particle3D/PU/CCPUForceFieldAffector.h - ../extensions/Particle3D/PU/CCPUDoFreezeEventHandler.h - ../extensions/Particle3D/PU/CCPUOnClearObserverTranslator.h - ../extensions/Particle3D/PU/CCPUAffector.h - ../extensions/Particle3D/PU/CCPUAlignAffectorTranslator.h - ../extensions/Particle3D/PU/CCPUEmitterManager.h - ../extensions/Particle3D/PU/CCPUObserverTranslator.h - ../extensions/Particle3D/PU/CCPUBaseCollider.h - ../extensions/Particle3D/PU/CCPUParticleFollowerTranslator.h - ../extensions/Particle3D/PU/CCPUBaseColliderTranslator.h - ../extensions/Particle3D/PU/CCPUOnVelocityObserverTranslator.h - ../extensions/Particle3D/PU/CCPUVertexEmitter.h - ../extensions/Particle3D/PU/CCPUMaterialManager.h - ../extensions/Particle3D/PU/CCPUScaleAffectorTranslator.h - ../extensions/Particle3D/PU/CCPUSphereSurfaceEmitterTranslator.h - ../extensions/Particle3D/PU/CCPUSphereSurfaceEmitter.h - ../extensions/Particle3D/PU/CCPUEmitter.h - ../extensions/Particle3D/PU/CCPUCollisionAvoidanceAffector.h - ../extensions/Particle3D/PU/CCPUDoFreezeEventHandlerTranslator.h - ../extensions/Particle3D/PU/CCPUSimpleSpline.h - ../extensions/Particle3D/PU/CCPUFlockCenteringAffector.h - ../extensions/Particle3D/PU/CCPUOnExpireObserverTranslator.h - ../extensions/Particle3D/PU/CCPULineEmitter.h - ../extensions/Particle3D/PU/CCPUDoAffectorEventHandlerTranslator.h - ../extensions/Particle3D/PU/CCPUTextureAnimator.h - ../extensions/Particle3D/PU/CCPUSineForceAffectorTranslator.h - ../extensions/Particle3D/PU/CCPUCircleEmitter.h - ../extensions/Particle3D/PU/CCPUSlaveBehaviour.h - ../extensions/Particle3D/PU/CCPUOnPositionObserverTranslator.h - ../extensions/Particle3D/PU/CCPUOnEventFlagObserverTranslator.h - ../extensions/Particle3D/PU/CCPUScriptLexer.h - ../extensions/Particle3D/PU/CCPUOnExpireObserver.h - ../extensions/Particle3D/PU/CCPUOnRandomObserverTranslator.h - ../extensions/Particle3D/PU/CCPURibbonTrail.h - ../extensions/Particle3D/PU/CCPUColorAffectorTranslator.h - ../extensions/Particle3D/PU/CCPUEventHandler.h - ../extensions/Particle3D/PU/CCPUNoise.h - ../extensions/Particle3D/PU/CCPUEventHandlerManager.h - ../extensions/Particle3D/PU/CCPUSlaveBehaviourTranslator.h - ../extensions/Particle3D/PU/CCPUColorAffector.h - ../extensions/Particle3D/PU/CCPUScaleVelocityAffector.h - ../extensions/Particle3D/PU/CCPUDynamicAttribute.h - ../extensions/Particle3D/PU/CCPUSphere.h - ../extensions/Particle3D/PU/CCPUSlaveEmitter.h - ../extensions/Particle3D/PU/CCPUBaseForceAffector.h - ../extensions/Particle3D/PU/CCPUVelocityMatchingAffectorTranslator.h - ../extensions/Particle3D/PU/CCPUDoScaleEventHandlerTranslator.h - ../extensions/Particle3D/PU/CCPUGravityAffector.h - ../extensions/Particle3D/PU/CCPUBeamRender.h - ../extensions/Particle3D/PU/CCPUOnClearObserver.h - ../extensions/Particle3D/PU/CCPUOnEmissionObserverTranslator.h - ../extensions/Particle3D/PU/CCPUJetAffector.h - ../extensions/Particle3D/PU/CCPUSphereCollider.h - ../extensions/Particle3D/PU/CCPUPathFollowerTranslator.h - ../extensions/Particle3D/PU/CCPUOnQuotaObserverTranslator.h - ../extensions/Particle3D/PU/CCPUPointEmitter.h - ../extensions/Particle3D/PU/CCPUCollisionAvoidanceAffectorTranslator.h - ../extensions/Particle3D/PU/CCPUPlane.h - ../extensions/Particle3D/PU/CCPUGeometryRotatorTranslator.h - ../extensions/Particle3D/PU/CCPUOnCountObserverTranslator.h - ../extensions/Particle3D/PU/CCPUDoExpireEventHandlerTranslator.h - ../extensions/Particle3D/PU/CCPUMeshSurfaceEmitter.h - ../extensions/Particle3D/PU/CCPULineAffector.h - ../extensions/Particle3D/PU/CCPUSineForceAffector.h - ../extensions/Particle3D/PU/CCPUPathFollower.h - ../extensions/Particle3D/PU/CCPULinearForceAffectorTranslator.h - ../extensions/Particle3D/PU/CCPUObserverManager.h - ../extensions/Particle3D/PU/CCPUBoxColliderTranslator.h - ../extensions/Particle3D/PU/CCPUDoPlacementParticleEventHandler.h - ../extensions/Particle3D/PU/CCPUOnVelocityObserver.h - ../extensions/Particle3D/PU/CCPUScaleAffector.h - ../extensions/Particle3D/PU/CCPUInterParticleColliderTranslator.h - ../extensions/Particle3D/PU/CCPUPointEmitterTranslator.h - ../extensions/Particle3D/PU/CCPUVortexAffector.h - ../extensions/Particle3D/PU/CCPUTranslateManager.h - ../extensions/Particle3D/PU/CCPUFlockCenteringAffectorTranslator.h - ../extensions/Particle3D/PU/CCPUOnTimeObserver.h - ../extensions/Particle3D/PU/CCPUBehaviourManager.h - ../extensions/Particle3D/PU/CCPUOnCollisionObserverTranslator.h - ../extensions/Particle3D/PU/CCPURendererTranslator.h - ../extensions/Particle3D/PU/CCPUSlaveEmitterTranslator.h - ../extensions/Particle3D/PU/CCPUBehaviourTranslator.h - ../extensions/Particle3D/PU/CCPUForceField.h - ../extensions/Particle3D/PU/CCPUForceFieldAffectorTranslator.h - ../extensions/Particle3D/PU/CCPUOnPositionObserver.h - ../extensions/Particle3D/CCParticle3DEmitter.h - ../extensions/Particle3D/CCParticle3DAffector.h - ../extensions/Particle3D/CCParticle3DRender.h - ../extensions/cocos-ext.h - ../extensions/GUI/CCControlExtension/CCControlHuePicker.h - ../extensions/GUI/CCControlExtension/CCControlUtils.h - ../extensions/GUI/CCControlExtension/CCControl.h - ../extensions/GUI/CCControlExtension/CCControlExtensions.h - ../extensions/GUI/CCControlExtension/CCControlColourPicker.h - ../extensions/GUI/CCControlExtension/CCControlButton.h - ../extensions/GUI/CCControlExtension/CCInvocation.h - ../extensions/GUI/CCControlExtension/CCControlSlider.h - ../extensions/GUI/CCControlExtension/CCControlStepper.h - ../extensions/GUI/CCControlExtension/CCControlSaturationBrightnessPicker.h - ../extensions/GUI/CCControlExtension/CCControlPotentiometer.h - ../extensions/GUI/CCControlExtension/CCControlSwitch.h - ../extensions/GUI/CCScrollView/CCTableViewCell.h - ../extensions/GUI/CCScrollView/CCScrollView.h - ../extensions/GUI/CCScrollView/CCTableView.h -# ../extensions/ExtensionDeprecated.h - ../extensions/ExtensionExport.h - ) -set(COCOS_EXTENSIONS_SRC +# default value for cocos2dx extensions modules to Build +# currently 7 extensions +# extensions dependicies: COCOSTUDIO may depend on spine & dragonBones if they are present in buildset - ../extensions/assets-manager/AssetsManager.cpp - ../extensions/assets-manager/AssetsManagerEx.cpp - ../extensions/assets-manager/CCEventAssetsManagerEx.cpp - ../extensions/assets-manager/CCEventListenerAssetsManagerEx.cpp - ../extensions/assets-manager/Manifest.cpp - ../extensions/GUI/CCControlExtension/CCControl.cpp - ../extensions/GUI/CCControlExtension/CCControlButton.cpp - ../extensions/GUI/CCControlExtension/CCControlColourPicker.cpp - ../extensions/GUI/CCControlExtension/CCControlHuePicker.cpp - ../extensions/GUI/CCControlExtension/CCControlPotentiometer.cpp - ../extensions/GUI/CCControlExtension/CCControlSaturationBrightnessPicker.cpp - ../extensions/GUI/CCControlExtension/CCControlSlider.cpp - ../extensions/GUI/CCControlExtension/CCControlStepper.cpp - ../extensions/GUI/CCControlExtension/CCControlSwitch.cpp - ../extensions/GUI/CCControlExtension/CCControlUtils.cpp - ../extensions/GUI/CCControlExtension/CCInvocation.cpp - ../extensions/GUI/CCScrollView/CCScrollView.cpp - ../extensions/GUI/CCScrollView/CCTableView.cpp - ../extensions/GUI/CCScrollView/CCTableViewCell.cpp - ../extensions/physics-nodes/CCPhysicsDebugNode.cpp - ../extensions/physics-nodes/CCPhysicsSprite.cpp - ../extensions/Particle3D/CCParticle3DAffector.cpp - ../extensions/Particle3D/CCParticle3DEmitter.cpp - ../extensions/Particle3D/CCParticle3DRender.cpp - ../extensions/Particle3D/CCParticleSystem3D.cpp - ../extensions/Particle3D/PU/CCPUDynamicAttribute.cpp - ../extensions/Particle3D/PU/CCPUDynamicAttributeTranslator.cpp - ../extensions/Particle3D/PU/CCPUForceField.cpp - ../extensions/Particle3D/PU/CCPUMaterialManager.cpp - ../extensions/Particle3D/PU/CCPUMaterialTranslator.cpp - ../extensions/Particle3D/PU/CCPUNoise.cpp - ../extensions/Particle3D/PU/CCPUPlane.cpp - ../extensions/Particle3D/PU/CCPURendererTranslator.cpp - ../extensions/Particle3D/PU/CCPUScriptCompiler.cpp - ../extensions/Particle3D/PU/CCPUScriptLexer.cpp - ../extensions/Particle3D/PU/CCPUScriptParser.cpp - ../extensions/Particle3D/PU/CCPUScriptTranslator.cpp - ../extensions/Particle3D/PU/CCPUSimpleSpline.cpp - ../extensions/Particle3D/PU/CCPUSphere.cpp - ../extensions/Particle3D/PU/CCPUTechniqueTranslator.cpp - ../extensions/Particle3D/PU/CCPUTranslateManager.cpp - ../extensions/Particle3D/PU/CCPUUtil.cpp - ../extensions/Particle3D/PU/CCPUParticleSystem3D.cpp - ../extensions/Particle3D/PU/CCPUParticleSystem3DTranslator.cpp - ../extensions/Particle3D/PU/CCPUListener.cpp - ../extensions/Particle3D/PU/CCPUAffector.cpp - ../extensions/Particle3D/PU/CCPUAffectorManager.cpp - ../extensions/Particle3D/PU/CCPUAffectorTranslator.cpp - ../extensions/Particle3D/PU/CCPUAlignAffector.cpp - ../extensions/Particle3D/PU/CCPUAlignAffectorTranslator.cpp - ../extensions/Particle3D/PU/CCPUBaseCollider.cpp - ../extensions/Particle3D/PU/CCPUBaseColliderTranslator.cpp - ../extensions/Particle3D/PU/CCPUBaseForceAffector.cpp - ../extensions/Particle3D/PU/CCPUBaseForceAffectorTranslator.cpp - ../extensions/Particle3D/PU/CCPUBoxCollider.cpp - ../extensions/Particle3D/PU/CCPUBoxColliderTranslator.cpp - ../extensions/Particle3D/PU/CCPUCollisionAvoidanceAffector.cpp - ../extensions/Particle3D/PU/CCPUCollisionAvoidanceAffectorTranslator.cpp - ../extensions/Particle3D/PU/CCPUColorAffector.cpp - ../extensions/Particle3D/PU/CCPUColorAffectorTranslator.cpp - ../extensions/Particle3D/PU/CCPUFlockCenteringAffector.cpp - ../extensions/Particle3D/PU/CCPUFlockCenteringAffectorTranslator.cpp - ../extensions/Particle3D/PU/CCPUForceFieldAffector.cpp - ../extensions/Particle3D/PU/CCPUForceFieldAffectorTranslator.cpp - ../extensions/Particle3D/PU/CCPUGeometryRotator.cpp - ../extensions/Particle3D/PU/CCPUGeometryRotatorTranslator.cpp - ../extensions/Particle3D/PU/CCPUGravityAffector.cpp - ../extensions/Particle3D/PU/CCPUGravityAffectorTranslator.cpp - ../extensions/Particle3D/PU/CCPUInterParticleCollider.cpp - ../extensions/Particle3D/PU/CCPUInterParticleColliderTranslator.cpp - ../extensions/Particle3D/PU/CCPUJetAffector.cpp - ../extensions/Particle3D/PU/CCPUJetAffectorTranslator.cpp - ../extensions/Particle3D/PU/CCPULineAffector.cpp - ../extensions/Particle3D/PU/CCPULineAffectorTranslator.cpp - ../extensions/Particle3D/PU/CCPULinearForceAffector.cpp - ../extensions/Particle3D/PU/CCPULinearForceAffectorTranslator.cpp - ../extensions/Particle3D/PU/CCPUParticleFollower.cpp - ../extensions/Particle3D/PU/CCPUParticleFollowerTranslator.cpp - ../extensions/Particle3D/PU/CCPUPathFollower.cpp - ../extensions/Particle3D/PU/CCPUPathFollowerTranslator.cpp - ../extensions/Particle3D/PU/CCPUPlaneCollider.cpp - ../extensions/Particle3D/PU/CCPUPlaneColliderTranslator.cpp - ../extensions/Particle3D/PU/CCPURandomiser.cpp - ../extensions/Particle3D/PU/CCPURandomiserTranslator.cpp - ../extensions/Particle3D/PU/CCPUScaleAffector.cpp - ../extensions/Particle3D/PU/CCPUScaleAffectorTranslator.cpp - ../extensions/Particle3D/PU/CCPUScaleVelocityAffector.cpp - ../extensions/Particle3D/PU/CCPUScaleVelocityAffectorTranslator.cpp - ../extensions/Particle3D/PU/CCPUSineForceAffector.cpp - ../extensions/Particle3D/PU/CCPUSineForceAffectorTranslator.cpp - ../extensions/Particle3D/PU/CCPUSphereCollider.cpp - ../extensions/Particle3D/PU/CCPUSphereColliderTranslator.cpp - ../extensions/Particle3D/PU/CCPUTextureAnimator.cpp - ../extensions/Particle3D/PU/CCPUTextureAnimatorTranslator.cpp - ../extensions/Particle3D/PU/CCPUTextureRotator.cpp - ../extensions/Particle3D/PU/CCPUTextureRotatorTranslator.cpp - ../extensions/Particle3D/PU/CCPUVelocityMatchingAffector.cpp - ../extensions/Particle3D/PU/CCPUVelocityMatchingAffectorTranslator.cpp - ../extensions/Particle3D/PU/CCPUVortexAffector.cpp - ../extensions/Particle3D/PU/CCPUVortexAffectorTranslator.cpp - ../extensions/Particle3D/PU/CCPUBoxEmitter.cpp - ../extensions/Particle3D/PU/CCPUBoxEmitterTranslator.cpp - ../extensions/Particle3D/PU/CCPUCircleEmitter.cpp - ../extensions/Particle3D/PU/CCPUCircleEmitterTranslator.cpp - ../extensions/Particle3D/PU/CCPUEmitter.cpp - ../extensions/Particle3D/PU/CCPUEmitterManager.cpp - ../extensions/Particle3D/PU/CCPUEmitterTranslator.cpp - ../extensions/Particle3D/PU/CCPULineEmitter.cpp - ../extensions/Particle3D/PU/CCPULineEmitterTranslator.cpp - ../extensions/Particle3D/PU/CCPUMeshSurfaceEmitter.cpp - ../extensions/Particle3D/PU/CCPUMeshSurfaceEmitterTranslator.cpp - ../extensions/Particle3D/PU/CCPUPointEmitter.cpp - ../extensions/Particle3D/PU/CCPUPointEmitterTranslator.cpp - ../extensions/Particle3D/PU/CCPUPositionEmitter.cpp - ../extensions/Particle3D/PU/CCPUPositionEmitterTranslator.cpp - ../extensions/Particle3D/PU/CCPUSlaveEmitter.cpp - ../extensions/Particle3D/PU/CCPUSlaveEmitterTranslator.cpp - ../extensions/Particle3D/PU/CCPUSphereSurfaceEmitter.cpp - ../extensions/Particle3D/PU/CCPUSphereSurfaceEmitterTranslator.cpp - ../extensions/Particle3D/PU/CCPUVertexEmitter.cpp - ../extensions/Particle3D/PU/CCPURender.cpp - ../extensions/Particle3D/PU/CCPUBeamRender.cpp - ../extensions/Particle3D/PU/CCPUBillboardChain.cpp - ../extensions/Particle3D/PU/CCPURibbonTrail.cpp - ../extensions/Particle3D/PU/CCPURibbonTrailRender.cpp - ../extensions/Particle3D/PU/CCPUDoAffectorEventHandler.cpp - ../extensions/Particle3D/PU/CCPUDoAffectorEventHandlerTranslator.cpp - ../extensions/Particle3D/PU/CCPUDoEnableComponentEventHandler.cpp - ../extensions/Particle3D/PU/CCPUDoEnableComponentEventHandlerTranslator.cpp - ../extensions/Particle3D/PU/CCPUDoExpireEventHandler.cpp - ../extensions/Particle3D/PU/CCPUDoExpireEventHandlerTranslator.cpp - ../extensions/Particle3D/PU/CCPUDoFreezeEventHandler.cpp - ../extensions/Particle3D/PU/CCPUDoFreezeEventHandlerTranslator.cpp - ../extensions/Particle3D/PU/CCPUDoPlacementParticleEventHandler.cpp - ../extensions/Particle3D/PU/CCPUDoPlacementParticleEventHandlerTranslator.cpp - ../extensions/Particle3D/PU/CCPUDoScaleEventHandler.cpp - ../extensions/Particle3D/PU/CCPUDoScaleEventHandlerTranslator.cpp - ../extensions/Particle3D/PU/CCPUDoStopSystemEventHandler.cpp - ../extensions/Particle3D/PU/CCPUDoStopSystemEventHandlerTranslator.cpp - ../extensions/Particle3D/PU/CCPUEventHandler.cpp - ../extensions/Particle3D/PU/CCPUEventHandlerManager.cpp - ../extensions/Particle3D/PU/CCPUEventHandlerTranslator.cpp - ../extensions/Particle3D/PU/CCPUObserver.cpp - ../extensions/Particle3D/PU/CCPUObserverManager.cpp - ../extensions/Particle3D/PU/CCPUObserverTranslator.cpp - ../extensions/Particle3D/PU/CCPUOnClearObserver.cpp - ../extensions/Particle3D/PU/CCPUOnClearObserverTranslator.cpp - ../extensions/Particle3D/PU/CCPUOnCollisionObserver.cpp - ../extensions/Particle3D/PU/CCPUOnCollisionObserverTranslator.cpp - ../extensions/Particle3D/PU/CCPUOnCountObserver.cpp - ../extensions/Particle3D/PU/CCPUOnCountObserverTranslator.cpp - ../extensions/Particle3D/PU/CCPUOnEmissionObserver.cpp - ../extensions/Particle3D/PU/CCPUOnEmissionObserverTranslator.cpp - ../extensions/Particle3D/PU/CCPUOnEventFlagObserver.cpp - ../extensions/Particle3D/PU/CCPUOnEventFlagObserverTranslator.cpp - ../extensions/Particle3D/PU/CCPUOnExpireObserver.cpp - ../extensions/Particle3D/PU/CCPUOnExpireObserverTranslator.cpp - ../extensions/Particle3D/PU/CCPUOnPositionObserver.cpp - ../extensions/Particle3D/PU/CCPUOnPositionObserverTranslator.cpp - ../extensions/Particle3D/PU/CCPUOnQuotaObserver.cpp - ../extensions/Particle3D/PU/CCPUOnQuotaObserverTranslator.cpp - ../extensions/Particle3D/PU/CCPUOnRandomObserver.cpp - ../extensions/Particle3D/PU/CCPUOnRandomObserverTranslator.cpp - ../extensions/Particle3D/PU/CCPUOnTimeObserver.cpp - ../extensions/Particle3D/PU/CCPUOnTimeObserverTranslator.cpp - ../extensions/Particle3D/PU/CCPUOnVelocityObserver.cpp - ../extensions/Particle3D/PU/CCPUOnVelocityObserverTranslator.cpp - ../extensions/Particle3D/PU/CCPUBehaviour.cpp - ../extensions/Particle3D/PU/CCPUBehaviourManager.cpp - ../extensions/Particle3D/PU/CCPUBehaviourTranslator.cpp - ../extensions/Particle3D/PU/CCPUSlaveBehaviour.cpp - ../extensions/Particle3D/PU/CCPUSlaveBehaviourTranslator.cpp - ) +option(BUILD_EXTENSION_ASSETMANAGER "Build extension asset-manager" ON) +option(BUILD_EXTENSION_GUI "Build extension GUI" ON) +option(BUILD_EXTENSION_PARTICLE3D "Build extension Particle3D" ON) +option(BUILD_EXTENSION_PHYSICS_NODE "Build extension physics-nodes" ON) + +option(BUILD_EXTENSION_SPINE "Build extension spine" ON) +option(BUILD_EXTENSION_DRAGONBONES "Build extension DragonBones" OFF) + +option(BUILD_EXTENSION_COCOSTUDIO "Build extension cocostudio" ON) + +message(STATUS "BUILD_EXTENSION_COCOSTUDIO:${BUILD_EXTENSION_COCOSTUDIO}") + +if(BUILD_EXTENSION_ASSETMANAGER) + add_subdirectory(assets-manager) +endif() + +if(BUILD_EXTENSION_GUI) + add_subdirectory(GUI) +endif() + +if(BUILD_EXTENSION_PARTICLE3D) + add_subdirectory(Particle3D) +endif() + +if(BUILD_EXTENSION_PHYSICS_NODE) + add_subdirectory(physics-nodes) +endif() + +if(BUILD_EXTENSION_SPINE) + add_subdirectory(spine) +endif() + +if(BUILD_EXTENSION_DRAGONBONES) + add_subdirectory(dragonbones) +endif() + +if(BUILD_EXTENSION_COCOSTUDIO) + add_subdirectory(cocostudio) +endif() + +message(STATUS "CC_EXTENSION_LIBS:${CC_EXTENSION_LIBS}") diff --git a/extensions/GUI/CMakeLists.txt b/extensions/GUI/CMakeLists.txt new file mode 100644 index 0000000000..008fa16df1 --- /dev/null +++ b/extensions/GUI/CMakeLists.txt @@ -0,0 +1,25 @@ +set(target_name GUI) + +FILE(GLOB GUI_CONTROL_SOURCES CCControlExtension/*.h;CCControlExtension/*.cpp) +FILE(GLOB GUI_SCROLLVIEW_SOURCES CCScrollView/*.h;CCScrollView/*.cpp) + +SOURCE_GROUP("CCControlExtension" FILES ${GUI_CONTROL_SOURCES}) +SOURCE_GROUP("CCScrollView" FILES ${GUI_SCROLLVIEW_SOURCES}) + +# TODO: dll +add_library(${target_name} STATIC + ${GUI_CONTROL_SOURCES} + ${GUI_SCROLLVIEW_SOURCES}) + +target_link_libraries(${target_name} cocos2d) + +set(CC_EXTENSION_LIBS "${target_name};${CC_EXTENSION_LIBS}" CACHE INTERNAL "extensions for auto link to target application") + +set_target_properties(${target_name} + PROPERTIES + ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + FOLDER "Extensions" +) + + diff --git a/extensions/Particle3D/CMakeLists.txt b/extensions/Particle3D/CMakeLists.txt new file mode 100644 index 0000000000..6e5173bcc7 --- /dev/null +++ b/extensions/Particle3D/CMakeLists.txt @@ -0,0 +1,16 @@ +set(target_name particle3d) + +FILE(GLOB PARTICLE3D_SOURCES *.h;*.cpp;./**/*.h;./**/*.cpp) + +add_library(${target_name} STATIC ${PARTICLE3D_SOURCES}) + +target_link_libraries(${target_name} cocos2d) + +set(CC_EXTENSION_LIBS "${target_name};${CC_EXTENSION_LIBS}" CACHE INTERNAL "extensions for auto link to target application") + +set_target_properties(${target_name} + PROPERTIES + ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + FOLDER "Extensions" +) diff --git a/extensions/assets-manager/CMakeLists.txt b/extensions/assets-manager/CMakeLists.txt new file mode 100644 index 0000000000..92e1024293 --- /dev/null +++ b/extensions/assets-manager/CMakeLists.txt @@ -0,0 +1,20 @@ +set(target_name assets-manager) + +FILE(GLOB ASSETS_MANAGER_HEADER *.h) +FILE(GLOB ASSETS_MANAGER_SOURCE *.cpp) + +# TODO: dll +add_library(${target_name} STATIC + ${ASSETS_MANAGER_HEADER} + ${ASSETS_MANAGER_SOURCE}) + +target_link_libraries(${target_name} cocos2d) +set(CC_EXTENSION_LIBS "${target_name};${CC_EXTENSION_LIBS}" CACHE INTERNAL "extensions for auto link to target application") + +set_target_properties(${target_name} + PROPERTIES + ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + FOLDER "Extensions" +) + diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.cpp b/extensions/cocostudio/ActionTimeline/CCActionTimeline.cpp similarity index 98% rename from cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.cpp rename to extensions/cocostudio/ActionTimeline/CCActionTimeline.cpp index b48332e398..e96d6220c8 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.cpp +++ b/extensions/cocostudio/ActionTimeline/CCActionTimeline.cpp @@ -24,9 +24,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "editor-support/cocostudio/ActionTimeline/CCActionTimeline.h" +#include "cocostudio/ActionTimeline/CCActionTimeline.h" -#include "editor-support/cocostudio/CCComExtensionData.h" +#include "cocostudio/CCComExtensionData.h" USING_NS_CC; diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.h b/extensions/cocostudio/ActionTimeline/CCActionTimeline.h similarity index 97% rename from cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.h rename to extensions/cocostudio/ActionTimeline/CCActionTimeline.h index 0340554ec1..f6906fcdcd 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.h +++ b/extensions/cocostudio/ActionTimeline/CCActionTimeline.h @@ -26,10 +26,10 @@ THE SOFTWARE. #ifndef __CCTIMELINE_ACTION_H__ #define __CCTIMELINE_ACTION_H__ -#include "editor-support/cocostudio/ActionTimeline/CCTimeLine.h" -#include "editor-support/cocostudio/ActionTimeline/CCActionTimelineData.h" +#include "cocostudio/ActionTimeline/CCTimeLine.h" +#include "cocostudio/ActionTimeline/CCActionTimelineData.h" #include "base/CCProtocols.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/CocosStudioExport.h" #include "2d/CCAction.h" NS_TIMELINE_BEGIN diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.cpp b/extensions/cocostudio/ActionTimeline/CCActionTimelineCache.cpp similarity index 98% rename from cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.cpp rename to extensions/cocostudio/ActionTimeline/CCActionTimelineCache.cpp index 0b55e3d9bf..e496ef192f 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.cpp +++ b/extensions/cocostudio/ActionTimeline/CCActionTimelineCache.cpp @@ -24,21 +24,21 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#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 "cocostudio/ActionTimeline/CCActionTimelineCache.h" +#include "cocostudio/ActionTimeline/CSLoader.h" +#include "cocostudio/ActionTimeline/CCFrame.h" +#include "cocostudio/ActionTimeline/CCTimeLine.h" +#include "cocostudio/ActionTimeline/CCActionTimeline.h" #include "platform/CCFileUtils.h" #include "2d/CCSpriteFrameCache.h" #include "2d/CCSpriteFrame.h" #include "base/ccUtils.h" -#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "cocostudio/CSParseBinary_generated.h" #include "flatbuffers/flatbuffers.h" -#include "editor-support/cocostudio/FlatBuffersSerialize.h" +#include "cocostudio/FlatBuffersSerialize.h" #include diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.h b/extensions/cocostudio/ActionTimeline/CCActionTimelineCache.h similarity index 96% rename from cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.h rename to extensions/cocostudio/ActionTimeline/CCActionTimelineCache.h index b621624ec8..128267e3bd 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.h +++ b/extensions/cocostudio/ActionTimeline/CCActionTimelineCache.h @@ -29,9 +29,9 @@ THE SOFTWARE. #include "base/CCMap.h" #include "base/CCData.h" -#include "editor-support/cocostudio/DictionaryHelper.h" -#include "editor-support/cocostudio/ActionTimeline/CCTimelineMacro.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/DictionaryHelper.h" +#include "cocostudio/ActionTimeline/CCTimelineMacro.h" +#include "cocostudio/CocosStudioExport.h" namespace flatbuffers { diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineData.cpp b/extensions/cocostudio/ActionTimeline/CCActionTimelineData.cpp similarity index 100% rename from cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineData.cpp rename to extensions/cocostudio/ActionTimeline/CCActionTimelineData.cpp diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineData.h b/extensions/cocostudio/ActionTimeline/CCActionTimelineData.h similarity index 72% rename from cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineData.h rename to extensions/cocostudio/ActionTimeline/CCActionTimelineData.h index 0548e64af0..765d35dc1b 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineData.h +++ b/extensions/cocostudio/ActionTimeline/CCActionTimelineData.h @@ -1,9 +1,9 @@ #pragma once -#include "editor-support/cocostudio/CCComBase.h" +#include "cocostudio/CCComBase.h" #include "2d/CCComponent.h" -#include "editor-support/cocostudio/CocosStudioExport.h" -#include "editor-support/cocostudio/ActionTimeline/CCTimelineMacro.h" +#include "cocostudio/CocosStudioExport.h" +#include "cocostudio/ActionTimeline/CCTimelineMacro.h" NS_TIMELINE_BEGIN diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineNode.cpp b/extensions/cocostudio/ActionTimeline/CCActionTimelineNode.cpp similarity index 96% rename from cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineNode.cpp rename to extensions/cocostudio/ActionTimeline/CCActionTimelineNode.cpp index 035aeb36e6..825acd6a74 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineNode.cpp +++ b/extensions/cocostudio/ActionTimeline/CCActionTimelineNode.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "editor-support/cocostudio/ActionTimeline/CCActionTimelineNode.h" +#include "cocostudio/ActionTimeline/CCActionTimelineNode.h" USING_NS_CC; diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineNode.h b/extensions/cocostudio/ActionTimeline/CCActionTimelineNode.h similarity index 91% rename from cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineNode.h rename to extensions/cocostudio/ActionTimeline/CCActionTimelineNode.h index 68ea52b37c..6ae6ab07c0 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineNode.h +++ b/extensions/cocostudio/ActionTimeline/CCActionTimelineNode.h @@ -25,9 +25,9 @@ #ifndef __COCOSSTUDIO_CCACTIONTIMELINENODE_H__ #define __COCOSSTUDIO_CCACTIONTIMELINENODE_H__ -#include "editor-support/cocostudio/ActionTimeline/CCActionTimeline.h" -#include "editor-support/cocostudio/ActionTimeline/CCTimelineMacro.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/ActionTimeline/CCActionTimeline.h" +#include "cocostudio/ActionTimeline/CCTimelineMacro.h" +#include "cocostudio/CocosStudioExport.h" NS_TIMELINE_BEGIN diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCBoneNode.cpp b/extensions/cocostudio/ActionTimeline/CCBoneNode.cpp similarity index 99% rename from cocos/editor-support/cocostudio/ActionTimeline/CCBoneNode.cpp rename to extensions/cocostudio/ActionTimeline/CCBoneNode.cpp index 1310889f66..41b8585e65 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCBoneNode.cpp +++ b/extensions/cocostudio/ActionTimeline/CCBoneNode.cpp @@ -28,8 +28,8 @@ THE SOFTWARE. #include "renderer/CCRenderer.h" #include "renderer/ccShaders.h" #include "renderer/backend/ProgramState.h" -#include "editor-support/cocostudio/ActionTimeline/CCBoneNode.h" -#include "editor-support/cocostudio/ActionTimeline/CCSkeletonNode.h" +#include "cocostudio/ActionTimeline/CCBoneNode.h" +#include "cocostudio/ActionTimeline/CCSkeletonNode.h" NS_TIMELINE_BEGIN diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCBoneNode.h b/extensions/cocostudio/ActionTimeline/CCBoneNode.h similarity index 97% rename from cocos/editor-support/cocostudio/ActionTimeline/CCBoneNode.h rename to extensions/cocostudio/ActionTimeline/CCBoneNode.h index dabed2e8b0..d3c3944f41 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCBoneNode.h +++ b/extensions/cocostudio/ActionTimeline/CCBoneNode.h @@ -28,9 +28,9 @@ THE SOFTWARE. #include "base/CCProtocols.h" #include "2d/CCNode.h" #include "renderer/CCCustomCommand.h" -#include "editor-support/cocostudio/ActionTimeline/CCTimelineMacro.h" -#include "editor-support/cocostudio/CocosStudioExport.h" -#include "editor-support/cocostudio/ActionTimeline/CCSkinNode.h" +#include "cocostudio/ActionTimeline/CCTimelineMacro.h" +#include "cocostudio/CocosStudioExport.h" +#include "cocostudio/ActionTimeline/CCSkinNode.h" namespace cocos2d{ namespace backend { class ProgramState; diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp b/extensions/cocostudio/ActionTimeline/CCFrame.cpp similarity index 99% rename from cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp rename to extensions/cocostudio/ActionTimeline/CCFrame.cpp index 6ed31ceb35..ecb7f635f9 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp +++ b/extensions/cocostudio/ActionTimeline/CCFrame.cpp @@ -23,9 +23,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "editor-support/cocostudio/ActionTimeline/CCFrame.h" -#include "editor-support/cocostudio/ActionTimeline/CCTimeLine.h" -#include "editor-support/cocostudio/ActionTimeline/CCActionTimeline.h" +#include "cocostudio/ActionTimeline/CCFrame.h" +#include "cocostudio/ActionTimeline/CCTimeLine.h" +#include "cocostudio/ActionTimeline/CCActionTimeline.h" #include "2d/CCSpriteFrameCache.h" #include "2d/CCSpriteFrame.h" #include diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.h b/extensions/cocostudio/ActionTimeline/CCFrame.h similarity index 98% rename from cocos/editor-support/cocostudio/ActionTimeline/CCFrame.h rename to extensions/cocostudio/ActionTimeline/CCFrame.h index 76aea12e39..c61fda2dd1 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.h +++ b/extensions/cocostudio/ActionTimeline/CCFrame.h @@ -33,8 +33,8 @@ THE SOFTWARE. #include "2d/CCNode.h" #include "2d/CCSprite.h" #include "2d/CCTweenFunction.h" -#include "editor-support/cocostudio/ActionTimeline/CCTimelineMacro.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/ActionTimeline/CCTimelineMacro.h" +#include "cocostudio/CocosStudioExport.h" NS_TIMELINE_BEGIN diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCSkeletonNode.cpp b/extensions/cocostudio/ActionTimeline/CCSkeletonNode.cpp similarity index 99% rename from cocos/editor-support/cocostudio/ActionTimeline/CCSkeletonNode.cpp rename to extensions/cocostudio/ActionTimeline/CCSkeletonNode.cpp index f9f5b5694b..d9c8c2708e 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCSkeletonNode.cpp +++ b/extensions/cocostudio/ActionTimeline/CCSkeletonNode.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 "editor-support/cocostudio/ActionTimeline/CCSkeletonNode.h" +#include "cocostudio/ActionTimeline/CCSkeletonNode.h" #include "base/CCDirector.h" #include "math/TransformUtils.h" diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCSkeletonNode.h b/extensions/cocostudio/ActionTimeline/CCSkeletonNode.h similarity index 95% rename from cocos/editor-support/cocostudio/ActionTimeline/CCSkeletonNode.h rename to extensions/cocostudio/ActionTimeline/CCSkeletonNode.h index 3fe7407d53..9cb44196cd 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCSkeletonNode.h +++ b/extensions/cocostudio/ActionTimeline/CCSkeletonNode.h @@ -26,12 +26,12 @@ THE SOFTWARE. #ifndef __CCSKELETONNODE_H__ #define __CCSKELETONNODE_H__ -#include "editor-support/cocostudio/ActionTimeline/CCTimelineMacro.h" +#include "cocostudio/ActionTimeline/CCTimelineMacro.h" #include "renderer/CCRenderer.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/CocosStudioExport.h" #include "base/CCMap.h" -#include "editor-support/cocostudio/ActionTimeline/CCBoneNode.h" +#include "cocostudio/ActionTimeline/CCBoneNode.h" NS_TIMELINE_BEGIN diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCSkinNode.cpp b/extensions/cocostudio/ActionTimeline/CCSkinNode.cpp similarity index 94% rename from cocos/editor-support/cocostudio/ActionTimeline/CCSkinNode.cpp rename to extensions/cocostudio/ActionTimeline/CCSkinNode.cpp index 474af16269..29f6a90f53 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCSkinNode.cpp +++ b/extensions/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 "editor-support/cocostudio/ActionTimeline/CCSkinNode.h" +#include "cocostudio/ActionTimeline/CCSkinNode.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCSkinNode.h b/extensions/cocostudio/ActionTimeline/CCSkinNode.h similarity index 95% rename from cocos/editor-support/cocostudio/ActionTimeline/CCSkinNode.h rename to extensions/cocostudio/ActionTimeline/CCSkinNode.h index f371d9e637..a81f444a2c 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCSkinNode.h +++ b/extensions/cocostudio/ActionTimeline/CCSkinNode.h @@ -26,7 +26,7 @@ THE SOFTWARE. #define __CCSKINNODE_H__ #include "2d/CCNode.h" -#include "editor-support/cocostudio/ActionTimeline/CCTimelineMacro.h" +#include "cocostudio/ActionTimeline/CCTimelineMacro.h" NS_TIMELINE_BEGIN diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.cpp b/extensions/cocostudio/ActionTimeline/CCTimeLine.cpp similarity index 98% rename from cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.cpp rename to extensions/cocostudio/ActionTimeline/CCTimeLine.cpp index 05c6e8c813..867759e1cc 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.cpp +++ b/extensions/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 "editor-support/cocostudio/ActionTimeline/CCTimeLine.h" -#include "editor-support/cocostudio/ActionTimeline/CCActionTimeline.h" +#include "cocostudio/ActionTimeline/CCTimeLine.h" +#include "cocostudio/ActionTimeline/CCActionTimeline.h" USING_NS_CC; diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.h b/extensions/cocostudio/ActionTimeline/CCTimeLine.h similarity index 93% rename from cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.h rename to extensions/cocostudio/ActionTimeline/CCTimeLine.h index 19cd52587e..89f421fee8 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.h +++ b/extensions/cocostudio/ActionTimeline/CCTimeLine.h @@ -25,9 +25,9 @@ THE SOFTWARE. #ifndef __CCTIMELINE_H__ #define __CCTIMELINE_H__ -#include "editor-support/cocostudio/ActionTimeline/CCFrame.h" -#include "editor-support/cocostudio/ActionTimeline/CCTimelineMacro.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/ActionTimeline/CCFrame.h" +#include "cocostudio/ActionTimeline/CCTimelineMacro.h" +#include "cocostudio/CocosStudioExport.h" NS_TIMELINE_BEGIN diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCTimelineMacro.h b/extensions/cocostudio/ActionTimeline/CCTimelineMacro.h similarity index 100% rename from cocos/editor-support/cocostudio/ActionTimeline/CCTimelineMacro.h rename to extensions/cocostudio/ActionTimeline/CCTimelineMacro.h diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp b/extensions/cocostudio/ActionTimeline/CSLoader.cpp similarity index 93% rename from cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp rename to extensions/cocostudio/ActionTimeline/CSLoader.cpp index 6e1c1fd4d2..31661f4497 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp +++ b/extensions/cocostudio/ActionTimeline/CSLoader.cpp @@ -24,7 +24,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "editor-support/cocostudio/ActionTimeline/CSLoader.h" +#include "cocostudio/ActionTimeline/CSLoader.h" #include "base/ObjectFactory.h" #include "base/CCDirector.h" @@ -35,61 +35,61 @@ #include "2d/CCTMXTiledMap.h" #include "platform/CCFileUtils.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/ActionTimeline/CCActionTimelineCache.h" +#include "cocostudio/ActionTimeline/CCActionTimeline.h" +#include "cocostudio/ActionTimeline/CCActionTimelineNode.h" +#include "cocostudio/CCSGUIReader.h" +#include "cocostudio/CocoStudio.h" +#include "cocostudio/CSParseBinary_generated.h" -#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" -#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" +#include "cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "cocostudio/WidgetReader/NodeReaderDefine.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/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/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/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/SkeletonReader/BoneNodeReader.h" -#include "editor-support/cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.h" +#include "cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.h" +#include "cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.h" -#include "editor-support/cocostudio/WidgetReader/SpineSkeletonReader/SpineSkeletonReader.h" -#include "editor-support/cocostudio/WidgetReader/RichTextReader/RichTextReader.h" -#include "editor-support/cocostudio/WidgetReader/RadioButtonReader/RadioButtonReader.h" -#include "editor-support/cocostudio/WidgetReader/RadioButtonReader/RadioButtonGroupReader.h" -#include "editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldExReader.h" -#include "editor-support/cocostudio/CCComExtensionData.h" +#include "cocostudio/WidgetReader/SpineSkeletonReader/SpineSkeletonReader.h" +#include "cocostudio/WidgetReader/RichTextReader/RichTextReader.h" +#include "cocostudio/WidgetReader/RadioButtonReader/RadioButtonReader.h" +#include "cocostudio/WidgetReader/RadioButtonReader/RadioButtonGroupReader.h" +#include "cocostudio/WidgetReader/TextFieldReader/TextFieldExReader.h" +#include "cocostudio/CCComExtensionData.h" #include "flatbuffers/flatbuffers.h" -#include "editor-support/cocostudio/FlatBuffersSerialize.h" +#include "cocostudio/FlatBuffersSerialize.h" -#include "editor-support/cocostudio/WidgetCallBackHandlerProtocol.h" +#include "cocostudio/WidgetCallBackHandlerProtocol.h" #include diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CSLoader.h b/extensions/cocostudio/ActionTimeline/CSLoader.h similarity index 98% rename from cocos/editor-support/cocostudio/ActionTimeline/CSLoader.h rename to extensions/cocostudio/ActionTimeline/CSLoader.h index b93c9561c0..5a47afb3a7 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CSLoader.h +++ b/extensions/cocostudio/ActionTimeline/CSLoader.h @@ -25,8 +25,8 @@ #ifndef __cocos2d_libs__CSLoader__ #define __cocos2d_libs__CSLoader__ -#include "editor-support/cocostudio/DictionaryHelper.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/DictionaryHelper.h" +#include "cocostudio/CocosStudioExport.h" #include "base/ObjectFactory.h" #include "base/CCData.h" diff --git a/cocos/editor-support/cocostudio/CCActionFrame.cpp b/extensions/cocostudio/CCActionFrame.cpp similarity index 99% rename from cocos/editor-support/cocostudio/CCActionFrame.cpp rename to extensions/cocostudio/CCActionFrame.cpp index fa6401f386..d83f991247 100644 --- a/cocos/editor-support/cocostudio/CCActionFrame.cpp +++ b/extensions/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 "editor-support/cocostudio/CCActionFrame.h" +#include "cocostudio/CCActionFrame.h" #include "2d/CCActionEase.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCActionFrame.h b/extensions/cocostudio/CCActionFrame.h similarity index 99% rename from cocos/editor-support/cocostudio/CCActionFrame.h rename to extensions/cocostudio/CCActionFrame.h index bb5ff81c08..a176e38b31 100644 --- a/cocos/editor-support/cocostudio/CCActionFrame.h +++ b/extensions/cocostudio/CCActionFrame.h @@ -27,7 +27,7 @@ THE SOFTWARE. #include "math/CCGeometry.h" #include "2d/CCActionInterval.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCActionFrameEasing.cpp b/extensions/cocostudio/CCActionFrameEasing.cpp similarity index 97% rename from cocos/editor-support/cocostudio/CCActionFrameEasing.cpp rename to extensions/cocostudio/CCActionFrameEasing.cpp index 1886da6c90..75033c597a 100644 --- a/cocos/editor-support/cocostudio/CCActionFrameEasing.cpp +++ b/extensions/cocostudio/CCActionFrameEasing.cpp @@ -23,8 +23,8 @@ THE SOFTWARE. ****************************************************************************/ #include -#include "editor-support/cocostudio/CCActionFrameEasing.h" -#include "editor-support/cocostudio/DictionaryHelper.h" +#include "cocostudio/CCActionFrameEasing.h" +#include "cocostudio/DictionaryHelper.h" #include "platform/CCStdC.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCActionFrameEasing.h b/extensions/cocostudio/CCActionFrameEasing.h similarity index 97% rename from cocos/editor-support/cocostudio/CCActionFrameEasing.h rename to extensions/cocostudio/CCActionFrameEasing.h index d00a750ece..8308d50290 100644 --- a/cocos/editor-support/cocostudio/CCActionFrameEasing.h +++ b/extensions/cocostudio/CCActionFrameEasing.h @@ -26,7 +26,7 @@ THE SOFTWARE. #define __ActionFrameEasing_H__ #include "base/CCRef.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCActionManagerEx.cpp b/extensions/cocostudio/CCActionManagerEx.cpp similarity index 98% rename from cocos/editor-support/cocostudio/CCActionManagerEx.cpp rename to extensions/cocostudio/CCActionManagerEx.cpp index 2c0e715243..c0854598a8 100644 --- a/cocos/editor-support/cocostudio/CCActionManagerEx.cpp +++ b/extensions/cocostudio/CCActionManagerEx.cpp @@ -23,8 +23,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "editor-support/cocostudio/CCActionManagerEx.h" -#include "editor-support/cocostudio/CocoLoader.h" +#include "cocostudio/CCActionManagerEx.h" +#include "cocostudio/CocoLoader.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCActionManagerEx.h b/extensions/cocostudio/CCActionManagerEx.h similarity index 95% rename from cocos/editor-support/cocostudio/CCActionManagerEx.h rename to extensions/cocostudio/CCActionManagerEx.h index 772497bf15..f9f85ef346 100644 --- a/cocos/editor-support/cocostudio/CCActionManagerEx.h +++ b/extensions/cocostudio/CCActionManagerEx.h @@ -25,9 +25,9 @@ THE SOFTWARE. #ifndef __ActionMANAGER_H__ #define __ActionMANAGER_H__ -#include "editor-support/cocostudio/CCActionObject.h" -#include "editor-support/cocostudio/DictionaryHelper.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/CCActionObject.h" +#include "cocostudio/DictionaryHelper.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCActionNode.cpp b/extensions/cocostudio/CCActionNode.cpp similarity index 99% rename from cocos/editor-support/cocostudio/CCActionNode.cpp rename to extensions/cocostudio/CCActionNode.cpp index 4523a3fcb2..ef67fe3969 100644 --- a/cocos/editor-support/cocostudio/CCActionNode.cpp +++ b/extensions/cocostudio/CCActionNode.cpp @@ -23,14 +23,14 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "editor-support/cocostudio/CCActionNode.h" -#include "editor-support/cocostudio/CCActionFrameEasing.h" +#include "cocostudio/CCActionNode.h" +#include "cocostudio/CCActionFrameEasing.h" #include "ui/UIWidget.h" #include "ui/UIHelper.h" #include "ui/UILayout.h" -#include "editor-support/cocostudio/CocoLoader.h" +#include "cocostudio/CocoLoader.h" #include "base/ccUtils.h" -#include "editor-support/cocostudio/CCActionManagerEx.h" +#include "cocostudio/CCActionManagerEx.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCActionNode.h b/extensions/cocostudio/CCActionNode.h similarity index 96% rename from cocos/editor-support/cocostudio/CCActionNode.h rename to extensions/cocostudio/CCActionNode.h index f2449388d4..0e2ad66b52 100644 --- a/cocos/editor-support/cocostudio/CCActionNode.h +++ b/extensions/cocostudio/CCActionNode.h @@ -25,9 +25,9 @@ THE SOFTWARE. #ifndef __ActionNODE_H__ #define __ActionNODE_H__ -#include "editor-support/cocostudio/CCActionFrame.h" -#include "editor-support/cocostudio/DictionaryHelper.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/CCActionFrame.h" +#include "cocostudio/DictionaryHelper.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCActionObject.cpp b/extensions/cocostudio/CCActionObject.cpp similarity index 98% rename from cocos/editor-support/cocostudio/CCActionObject.cpp rename to extensions/cocostudio/CCActionObject.cpp index bbbb71e00d..ff588941d0 100644 --- a/cocos/editor-support/cocostudio/CCActionObject.cpp +++ b/extensions/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 "editor-support/cocostudio/CCActionObject.h" -#include "editor-support/cocostudio/CocoLoader.h" +#include "cocostudio/CCActionObject.h" +#include "cocostudio/CocoLoader.h" #include "base/CCDirector.h" #include "base/CCScheduler.h" diff --git a/cocos/editor-support/cocostudio/CCActionObject.h b/extensions/cocostudio/CCActionObject.h similarity index 96% rename from cocos/editor-support/cocostudio/CCActionObject.h rename to extensions/cocostudio/CCActionObject.h index 4066ea4224..c466fc66d9 100644 --- a/cocos/editor-support/cocostudio/CCActionObject.h +++ b/extensions/cocostudio/CCActionObject.h @@ -25,10 +25,10 @@ THE SOFTWARE. #ifndef __ActionObject_H__ #define __ActionObject_H__ -#include "editor-support/cocostudio/CCActionNode.h" +#include "cocostudio/CCActionNode.h" #include "2d/CCActionInstant.h" -#include "editor-support/cocostudio/DictionaryHelper.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/DictionaryHelper.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCArmature.cpp b/extensions/cocostudio/CCArmature.cpp similarity index 98% rename from cocos/editor-support/cocostudio/CCArmature.cpp rename to extensions/cocostudio/CCArmature.cpp index ddd8c4c60f..eaaf6dcabb 100644 --- a/cocos/editor-support/cocostudio/CCArmature.cpp +++ b/extensions/cocostudio/CCArmature.cpp @@ -24,12 +24,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#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 "cocostudio/CCArmature.h" +#include "cocostudio/CCArmatureDataManager.h" +#include "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CCDataReaderHelper.h" +#include "cocostudio/CCDatas.h" +#include "cocostudio/CCSkin.h" #include "renderer/CCRenderer.h" #include "renderer/CCGroupCommand.h" diff --git a/cocos/editor-support/cocostudio/CCArmature.h b/extensions/cocostudio/CCArmature.h similarity index 95% rename from cocos/editor-support/cocostudio/CCArmature.h rename to extensions/cocostudio/CCArmature.h index 7ac7a4c55c..09175c34b8 100644 --- a/cocos/editor-support/cocostudio/CCArmature.h +++ b/extensions/cocostudio/CCArmature.h @@ -27,13 +27,13 @@ THE SOFTWARE. #ifndef __CCARMATURE_H__ #define __CCARMATURE_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 "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 "math/CCMath.h" class b2Body; diff --git a/cocos/editor-support/cocostudio/CCArmatureAnimation.cpp b/extensions/cocostudio/CCArmatureAnimation.cpp similarity index 97% rename from cocos/editor-support/cocostudio/CCArmatureAnimation.cpp rename to extensions/cocostudio/CCArmatureAnimation.cpp index 9f3487ebdb..cd7d7c38a3 100644 --- a/cocos/editor-support/cocostudio/CCArmatureAnimation.cpp +++ b/extensions/cocostudio/CCArmatureAnimation.cpp @@ -23,12 +23,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#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" +#include "cocostudio/CCArmatureAnimation.h" +#include "cocostudio/CCArmature.h" +#include "cocostudio/CCBone.h" +#include "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CCUtilMath.h" +#include "cocostudio/CCDatas.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCArmatureAnimation.h b/extensions/cocostudio/CCArmatureAnimation.h similarity index 98% rename from cocos/editor-support/cocostudio/CCArmatureAnimation.h rename to extensions/cocostudio/CCArmatureAnimation.h index 43de286d21..a38ed54ca0 100644 --- a/cocos/editor-support/cocostudio/CCArmatureAnimation.h +++ b/extensions/cocostudio/CCArmatureAnimation.h @@ -27,9 +27,9 @@ THE SOFTWARE. #ifndef __CCANIMATION_H__ #define __CCANIMATION_H__ -#include "editor-support/cocostudio/CCProcessBase.h" -#include "editor-support/cocostudio/CCTween.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/CCProcessBase.h" +#include "cocostudio/CCTween.h" +#include "cocostudio/CocosStudioExport.h" #include namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCArmatureDataManager.cpp b/extensions/cocostudio/CCArmatureDataManager.cpp similarity index 96% rename from cocos/editor-support/cocostudio/CCArmatureDataManager.cpp rename to extensions/cocostudio/CCArmatureDataManager.cpp index 6ec41f2f6a..aeca26be7d 100644 --- a/cocos/editor-support/cocostudio/CCArmatureDataManager.cpp +++ b/extensions/cocostudio/CCArmatureDataManager.cpp @@ -25,10 +25,10 @@ THE SOFTWARE. #include "2d/CCSpriteFrameCache.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" +#include "cocostudio/CCArmatureDataManager.h" +#include "cocostudio/CCTransformHelp.h" +#include "cocostudio/CCDataReaderHelper.h" +#include "cocostudio/CCSpriteFrameCacheHelper.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCArmatureDataManager.h b/extensions/cocostudio/CCArmatureDataManager.h similarity index 97% rename from cocos/editor-support/cocostudio/CCArmatureDataManager.h rename to extensions/cocostudio/CCArmatureDataManager.h index 577202ae2a..bbe1661f0c 100644 --- a/cocos/editor-support/cocostudio/CCArmatureDataManager.h +++ b/extensions/cocostudio/CCArmatureDataManager.h @@ -26,9 +26,9 @@ THE SOFTWARE. #ifndef __CCARMATUREDATAMANAGER_H__ #define __CCARMATUREDATAMANAGER_H__ -#include "editor-support/cocostudio/CCArmatureDefine.h" -#include "editor-support/cocostudio/CCDatas.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CCDatas.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCArmatureDefine.cpp b/extensions/cocostudio/CCArmatureDefine.cpp similarity index 95% rename from cocos/editor-support/cocostudio/CCArmatureDefine.cpp rename to extensions/cocostudio/CCArmatureDefine.cpp index f0d04a76b5..6d39e2fcc5 100644 --- a/cocos/editor-support/cocostudio/CCArmatureDefine.cpp +++ b/extensions/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 "editor-support/cocostudio/CCArmatureDefine.h" +#include "cocostudio/CCArmatureDefine.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCArmatureDefine.h b/extensions/cocostudio/CCArmatureDefine.h similarity index 100% rename from cocos/editor-support/cocostudio/CCArmatureDefine.h rename to extensions/cocostudio/CCArmatureDefine.h diff --git a/cocos/editor-support/cocostudio/CCBatchNode.cpp b/extensions/cocostudio/CCBatchNode.cpp similarity index 97% rename from cocos/editor-support/cocostudio/CCBatchNode.cpp rename to extensions/cocostudio/CCBatchNode.cpp index c02b7fb034..644f8429df 100644 --- a/cocos/editor-support/cocostudio/CCBatchNode.cpp +++ b/extensions/cocostudio/CCBatchNode.cpp @@ -23,9 +23,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "editor-support/cocostudio/CCBatchNode.h" -#include "editor-support/cocostudio/CCArmature.h" -#include "editor-support/cocostudio/CCSkin.h" +#include "cocostudio/CCBatchNode.h" +#include "cocostudio/CCArmature.h" +#include "cocostudio/CCSkin.h" #include "renderer/CCRenderer.h" #include "renderer/CCGroupCommand.h" diff --git a/cocos/editor-support/cocostudio/CCBatchNode.h b/extensions/cocostudio/CCBatchNode.h similarity index 95% rename from cocos/editor-support/cocostudio/CCBatchNode.h rename to extensions/cocostudio/CCBatchNode.h index 1d279ac4ad..a9282d2170 100644 --- a/cocos/editor-support/cocostudio/CCBatchNode.h +++ b/extensions/cocostudio/CCBatchNode.h @@ -26,8 +26,8 @@ THE SOFTWARE. #define __CCBATCHNODE_H__ #include "2d/CCNode.h" -#include "editor-support/cocostudio/CCArmatureDefine.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CocosStudioExport.h" namespace cocos2d { class GroupCommand; diff --git a/cocos/editor-support/cocostudio/CCBone.cpp b/extensions/cocostudio/CCBone.cpp similarity index 97% rename from cocos/editor-support/cocostudio/CCBone.cpp rename to extensions/cocostudio/CCBone.cpp index 6064ba0beb..7b22fa21c8 100644 --- a/cocos/editor-support/cocostudio/CCBone.cpp +++ b/extensions/cocostudio/CCBone.cpp @@ -23,12 +23,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#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" +#include "cocostudio/CCBone.h" +#include "cocostudio/CCArmature.h" +#include "cocostudio/CCUtilMath.h" +#include "cocostudio/CCArmatureDataManager.h" +#include "cocostudio/CCTransformHelp.h" +#include "cocostudio/CCDisplayManager.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCBone.h b/extensions/cocostudio/CCBone.h similarity index 96% rename from cocos/editor-support/cocostudio/CCBone.h rename to extensions/cocostudio/CCBone.h index 025e9bbb1a..d944182bf4 100644 --- a/cocos/editor-support/cocostudio/CCBone.h +++ b/extensions/cocostudio/CCBone.h @@ -26,12 +26,12 @@ THE SOFTWARE. #ifndef __CCBONE_H__ #define __CCBONE_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 "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CCDatas.h" +#include "cocostudio/CCTween.h" +#include "cocostudio/CCDecorativeDisplay.h" +#include "cocostudio/CCDisplayManager.h" +#include "cocostudio/CocosStudioExport.h" #include "2d/CCNode.h" #include "math/CCMath.h" diff --git a/cocos/editor-support/cocostudio/CCColliderDetector.cpp b/extensions/cocostudio/CCColliderDetector.cpp similarity index 98% rename from cocos/editor-support/cocostudio/CCColliderDetector.cpp rename to extensions/cocostudio/CCColliderDetector.cpp index 92ccfe4882..63f1f88a0e 100644 --- a/cocos/editor-support/cocostudio/CCColliderDetector.cpp +++ b/extensions/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 "editor-support/cocostudio/CCColliderDetector.h" -#include "editor-support/cocostudio/CCBone.h" -#include "editor-support/cocostudio/CCTransformHelp.h" +#include "cocostudio/CCColliderDetector.h" +#include "cocostudio/CCBone.h" +#include "cocostudio/CCTransformHelp.h" diff --git a/cocos/editor-support/cocostudio/CCColliderDetector.h b/extensions/cocostudio/CCColliderDetector.h similarity index 97% rename from cocos/editor-support/cocostudio/CCColliderDetector.h rename to extensions/cocostudio/CCColliderDetector.h index c611da42d6..b867c00024 100644 --- a/cocos/editor-support/cocostudio/CCColliderDetector.h +++ b/extensions/cocostudio/CCColliderDetector.h @@ -26,9 +26,9 @@ THE SOFTWARE. #ifndef __CCCOLLIDERDETECTOR_H__ #define __CCCOLLIDERDETECTOR_H__ -#include "editor-support/cocostudio/CCArmatureDefine.h" -#include "editor-support/cocostudio/CCDatas.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CCDatas.h" +#include "cocostudio/CocosStudioExport.h" #ifndef PT_RATIO #define PT_RATIO 32 diff --git a/cocos/editor-support/cocostudio/CCComAttribute.cpp b/extensions/cocostudio/CCComAttribute.cpp similarity index 99% rename from cocos/editor-support/cocostudio/CCComAttribute.cpp rename to extensions/cocostudio/CCComAttribute.cpp index 8ab76822ec..7608062188 100644 --- a/cocos/editor-support/cocostudio/CCComAttribute.cpp +++ b/extensions/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 "editor-support/cocostudio/CCComAttribute.h" +#include "cocostudio/CCComAttribute.h" #include "platform/CCFileUtils.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCComAttribute.h b/extensions/cocostudio/CCComAttribute.h similarity index 96% rename from cocos/editor-support/cocostudio/CCComAttribute.h rename to extensions/cocostudio/CCComAttribute.h index 9bfc83507a..a73de49b65 100644 --- a/cocos/editor-support/cocostudio/CCComAttribute.h +++ b/extensions/cocostudio/CCComAttribute.h @@ -26,10 +26,10 @@ THE SOFTWARE. #ifndef __CC_EXTENTIONS_CCCOMATTRIBUTE_H__ #define __CC_EXTENTIONS_CCCOMATTRIBUTE_H__ -#include "editor-support/cocostudio/CCComBase.h" +#include "cocostudio/CCComBase.h" #include "2d/CCComponent.h" #include "base/CCValue.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCComAudio.cpp b/extensions/cocostudio/CCComAudio.cpp similarity index 99% rename from cocos/editor-support/cocostudio/CCComAudio.cpp rename to extensions/cocostudio/CCComAudio.cpp index 50f30248f0..8f40397d9f 100644 --- a/cocos/editor-support/cocostudio/CCComAudio.cpp +++ b/extensions/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 "editor-support/cocostudio/CCComAudio.h" +#include "cocostudio/CCComAudio.h" #include "platform/CCFileUtils.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCComAudio.h b/extensions/cocostudio/CCComAudio.h similarity index 97% rename from cocos/editor-support/cocostudio/CCComAudio.h rename to extensions/cocostudio/CCComAudio.h index 1059f3d55d..150dfcf2de 100644 --- a/cocos/editor-support/cocostudio/CCComAudio.h +++ b/extensions/cocostudio/CCComAudio.h @@ -25,10 +25,10 @@ THE SOFTWARE. #ifndef __CC_EXTENTIONS_CCCOMAUDIO_H__ #define __CC_EXTENTIONS_CCCOMAUDIO_H__ -#include "editor-support/cocostudio/CCComBase.h" +#include "cocostudio/CCComBase.h" #include "base/CCProtocols.h" #include "2d/CCComponent.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCComBase.h b/extensions/cocostudio/CCComBase.h similarity index 93% rename from cocos/editor-support/cocostudio/CCComBase.h rename to extensions/cocostudio/CCComBase.h index 364154ea37..0503a3265c 100644 --- a/cocos/editor-support/cocostudio/CCComBase.h +++ b/extensions/cocostudio/CCComBase.h @@ -27,10 +27,10 @@ THE SOFTWARE. #define __CC_EXTENTIONS_CCCOMBASE_H__ #include -#include "editor-support/cocostudio/DictionaryHelper.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/DictionaryHelper.h" +#include "cocostudio/CocosStudioExport.h" #include "base/ObjectFactory.h" -#include "editor-support/cocostudio/CocoLoader.h" +#include "cocostudio/CocoLoader.h" #define DECLARE_CLASS_COMPONENT_INFO \ diff --git a/cocos/editor-support/cocostudio/CCComController.cpp b/extensions/cocostudio/CCComController.cpp similarity index 97% rename from cocos/editor-support/cocostudio/CCComController.cpp rename to extensions/cocostudio/CCComController.cpp index 25e47c4c33..3b103162e9 100644 --- a/cocos/editor-support/cocostudio/CCComController.cpp +++ b/extensions/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 "editor-support/cocostudio/CCComController.h" +#include "cocostudio/CCComController.h" #include "2d/CCNode.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCComController.h b/extensions/cocostudio/CCComController.h similarity index 93% rename from cocos/editor-support/cocostudio/CCComController.h rename to extensions/cocostudio/CCComController.h index bb9b5a8d52..1b104b5c81 100644 --- a/cocos/editor-support/cocostudio/CCComController.h +++ b/extensions/cocostudio/CCComController.h @@ -25,9 +25,9 @@ THE SOFTWARE. #ifndef __CC_EXTENTIONS_CCCOMCONTROLLER_H__ #define __CC_EXTENTIONS_CCCOMCONTROLLER_H__ -#include "editor-support/cocostudio/CCComBase.h" -#include "editor-support/cocostudio/CCInputDelegate.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/CCComBase.h" +#include "cocostudio/CCInputDelegate.h" +#include "cocostudio/CocosStudioExport.h" #include "2d/CCComponent.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCComExtensionData.cpp b/extensions/cocostudio/CCComExtensionData.cpp similarity index 95% rename from cocos/editor-support/cocostudio/CCComExtensionData.cpp rename to extensions/cocostudio/CCComExtensionData.cpp index fa5c7dec4a..072b617484 100644 --- a/cocos/editor-support/cocostudio/CCComExtensionData.cpp +++ b/extensions/cocostudio/CCComExtensionData.cpp @@ -23,8 +23,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "editor-support/cocostudio/CCComExtensionData.h" -#include "editor-support/cocostudio/ActionTimeline/CCActionTimelineData.h" +#include "cocostudio/CCComExtensionData.h" +#include "cocostudio/ActionTimeline/CCActionTimelineData.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCComExtensionData.h b/extensions/cocostudio/CCComExtensionData.h similarity index 96% rename from cocos/editor-support/cocostudio/CCComExtensionData.h rename to extensions/cocostudio/CCComExtensionData.h index 43b201e787..af844f85e2 100644 --- a/cocos/editor-support/cocostudio/CCComExtensionData.h +++ b/extensions/cocostudio/CCComExtensionData.h @@ -27,9 +27,9 @@ Copyright (c) 2019-2020 simdsoft, @HALX99 #define __cocos2d_libs__CCObjectExtensionData__ #include -#include "editor-support/cocostudio/CCComBase.h" +#include "cocostudio/CCComBase.h" #include "2d/CCComponent.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCComRender.cpp b/extensions/cocostudio/CCComRender.cpp similarity index 99% rename from cocos/editor-support/cocostudio/CCComRender.cpp rename to extensions/cocostudio/CCComRender.cpp index d4ed0d99df..d813c62d53 100644 --- a/cocos/editor-support/cocostudio/CCComRender.cpp +++ b/extensions/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 "editor-support/cocostudio/CCComRender.h" -#include "editor-support/cocostudio/CocoStudio.h" +#include "cocostudio/CCComRender.h" +#include "cocostudio/CocoStudio.h" #include "platform/CCFileUtils.h" #include "2d/CCTMXTiledMap.h" diff --git a/cocos/editor-support/cocostudio/CCComRender.h b/extensions/cocostudio/CCComRender.h similarity index 95% rename from cocos/editor-support/cocostudio/CCComRender.h rename to extensions/cocostudio/CCComRender.h index 01515030ea..a2fba5f52e 100644 --- a/cocos/editor-support/cocostudio/CCComRender.h +++ b/extensions/cocostudio/CCComRender.h @@ -25,9 +25,9 @@ THE SOFTWARE. #ifndef __CC_EXTENTIONS_CCCOMRENDER_H__ #define __CC_EXTENTIONS_CCCOMRENDER_H__ -#include "editor-support/cocostudio/CCComBase.h" +#include "cocostudio/CCComBase.h" #include "2d/CCComponent.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCDataReaderHelper.cpp b/extensions/cocostudio/CCDataReaderHelper.cpp similarity index 99% rename from cocos/editor-support/cocostudio/CCDataReaderHelper.cpp rename to extensions/cocostudio/CCDataReaderHelper.cpp index 5bef43bb0a..6e2fe1a3a4 100644 --- a/cocos/editor-support/cocostudio/CCDataReaderHelper.cpp +++ b/extensions/cocostudio/CCDataReaderHelper.cpp @@ -29,14 +29,14 @@ THE SOFTWARE. #include "base/CCScheduler.h" #include "base/ccUtils.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/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/CocoLoader.h" +#include "cocostudio/CocoLoader.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCDataReaderHelper.h b/extensions/cocostudio/CCDataReaderHelper.h similarity index 96% rename from cocos/editor-support/cocostudio/CCDataReaderHelper.h rename to extensions/cocostudio/CCDataReaderHelper.h index 4bb639f6ed..1a0a1727df 100644 --- a/cocos/editor-support/cocostudio/CCDataReaderHelper.h +++ b/extensions/cocostudio/CCDataReaderHelper.h @@ -25,11 +25,11 @@ THE SOFTWARE. #ifndef __CCDATAREADERHELPER_H__ #define __CCDATAREADERHELPER_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 "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CCDatas.h" +#include "cocostudio/CCArmature.h" +#include "cocostudio/DictionaryHelper.h" +#include "cocostudio/CocosStudioExport.h" #include "pugixml/pugixml_imp.hpp" #include "pugixml/pugiext.hpp" diff --git a/cocos/editor-support/cocostudio/CCDatas.cpp b/extensions/cocostudio/CCDatas.cpp similarity index 98% rename from cocos/editor-support/cocostudio/CCDatas.cpp rename to extensions/cocostudio/CCDatas.cpp index 935a5a3326..1c9713f188 100644 --- a/cocos/editor-support/cocostudio/CCDatas.cpp +++ b/extensions/cocostudio/CCDatas.cpp @@ -23,9 +23,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "editor-support/cocostudio/CCDatas.h" -#include "editor-support/cocostudio/CCUtilMath.h" -#include "editor-support/cocostudio/CCTransformHelp.h" +#include "cocostudio/CCDatas.h" +#include "cocostudio/CCUtilMath.h" +#include "cocostudio/CCTransformHelp.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCDatas.h b/extensions/cocostudio/CCDatas.h similarity index 99% rename from cocos/editor-support/cocostudio/CCDatas.h rename to extensions/cocostudio/CCDatas.h index b3ccde47ae..66609e1d1d 100644 --- a/cocos/editor-support/cocostudio/CCDatas.h +++ b/extensions/cocostudio/CCDatas.h @@ -32,9 +32,9 @@ THE SOFTWARE. #include "base/CCMap.h" #include "math/CCAffineTransform.h" -#include "editor-support/cocostudio/CCArmatureDefine.h" +#include "cocostudio/CCArmatureDefine.h" #include "2d/CCTweenFunction.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/CocosStudioExport.h" #define CC_CREATE_NO_PARAM_NO_INIT(varType)\ diff --git a/cocos/editor-support/cocostudio/CCDecorativeDisplay.cpp b/extensions/cocostudio/CCDecorativeDisplay.cpp similarity index 97% rename from cocos/editor-support/cocostudio/CCDecorativeDisplay.cpp rename to extensions/cocostudio/CCDecorativeDisplay.cpp index f05a629350..54522baa01 100644 --- a/cocos/editor-support/cocostudio/CCDecorativeDisplay.cpp +++ b/extensions/cocostudio/CCDecorativeDisplay.cpp @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "editor-support/cocostudio/CCDecorativeDisplay.h" +#include "cocostudio/CCDecorativeDisplay.h" #include "2d/CCNode.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCDecorativeDisplay.h b/extensions/cocostudio/CCDecorativeDisplay.h similarity index 91% rename from cocos/editor-support/cocostudio/CCDecorativeDisplay.h rename to extensions/cocostudio/CCDecorativeDisplay.h index 22e6693969..76c223aeea 100644 --- a/cocos/editor-support/cocostudio/CCDecorativeDisplay.h +++ b/extensions/cocostudio/CCDecorativeDisplay.h @@ -26,14 +26,14 @@ THE SOFTWARE. #ifndef __CCDECORATIVEDISPLAY_H__ #define __CCDECORATIVEDISPLAY_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" +#include "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CCDisplayFactory.h" +#include "cocostudio/CCDatas.h" +#include "cocostudio/CocosStudioExport.h" #if ENABLE_PHYSICS_BOX2D_DETECT || ENABLE_PHYSICS_CHIPMUNK_DETECT || ENABLE_PHYSICS_SAVE_CALCULATED_VERTEX -#include "editor-support/cocostudio/CCColliderDetector.h" +#include "cocostudio/CCColliderDetector.h" #endif namespace cocos2d { diff --git a/cocos/editor-support/cocostudio/CCDisplayFactory.cpp b/extensions/cocostudio/CCDisplayFactory.cpp similarity index 96% rename from cocos/editor-support/cocostudio/CCDisplayFactory.cpp rename to extensions/cocostudio/CCDisplayFactory.cpp index 42b429d8b7..069f2c349a 100644 --- a/cocos/editor-support/cocostudio/CCDisplayFactory.cpp +++ b/extensions/cocostudio/CCDisplayFactory.cpp @@ -23,12 +23,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#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 "cocostudio/CCDisplayFactory.h" +#include "cocostudio/CCBone.h" +#include "cocostudio/CCArmature.h" +#include "cocostudio/CCSkin.h" +#include "cocostudio/CCArmatureDataManager.h" +#include "cocostudio/CCTransformHelp.h" #include "2d/CCParticleSystemQuad.h" diff --git a/cocos/editor-support/cocostudio/CCDisplayFactory.h b/extensions/cocostudio/CCDisplayFactory.h similarity index 94% rename from cocos/editor-support/cocostudio/CCDisplayFactory.h rename to extensions/cocostudio/CCDisplayFactory.h index d36e59203d..61f4ea070b 100644 --- a/cocos/editor-support/cocostudio/CCDisplayFactory.h +++ b/extensions/cocostudio/CCDisplayFactory.h @@ -25,9 +25,9 @@ THE SOFTWARE. #ifndef __CCDISPLAYFACTORY_H__ #define __CCDISPLAYFACTORY_H__ -#include "editor-support/cocostudio/CCArmatureDefine.h" -#include "editor-support/cocostudio/CCDatas.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CCDatas.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCDisplayManager.cpp b/extensions/cocostudio/CCDisplayManager.cpp similarity index 97% rename from cocos/editor-support/cocostudio/CCDisplayManager.cpp rename to extensions/cocostudio/CCDisplayManager.cpp index 3a0245eb7c..bca2be1683 100644 --- a/cocos/editor-support/cocostudio/CCDisplayManager.cpp +++ b/extensions/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 "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 "cocostudio/CCDisplayManager.h" +#include "cocostudio/CCBone.h" +#include "cocostudio/CCArmature.h" +#include "cocostudio/CCUtilMath.h" +#include "cocostudio/CCSkin.h" #include "2d/CCParticleSystemQuad.h" diff --git a/cocos/editor-support/cocostudio/CCDisplayManager.h b/extensions/cocostudio/CCDisplayManager.h similarity index 96% rename from cocos/editor-support/cocostudio/CCDisplayManager.h rename to extensions/cocostudio/CCDisplayManager.h index 542bd1e42e..4e13068d42 100644 --- a/cocos/editor-support/cocostudio/CCDisplayManager.h +++ b/extensions/cocostudio/CCDisplayManager.h @@ -25,10 +25,10 @@ THE SOFTWARE. #ifndef __CCDISPLAYMANAGER_H__ #define __CCDISPLAYMANAGER_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" +#include "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CCDecorativeDisplay.h" +#include "cocostudio/CCDatas.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCInputDelegate.cpp b/extensions/cocostudio/CCInputDelegate.cpp similarity index 99% rename from cocos/editor-support/cocostudio/CCInputDelegate.cpp rename to extensions/cocostudio/CCInputDelegate.cpp index a0907d4634..12b9e26f6f 100644 --- a/cocos/editor-support/cocostudio/CCInputDelegate.cpp +++ b/extensions/cocostudio/CCInputDelegate.cpp @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "editor-support/cocostudio/CCInputDelegate.h" +#include "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/extensions/cocostudio/CCInputDelegate.h similarity index 98% rename from cocos/editor-support/cocostudio/CCInputDelegate.h rename to extensions/cocostudio/CCInputDelegate.h index c95ad352dd..98df823a1f 100644 --- a/cocos/editor-support/cocostudio/CCInputDelegate.h +++ b/extensions/cocostudio/CCInputDelegate.h @@ -32,7 +32,7 @@ THE SOFTWARE. #include "base/ccTypes.h" #include "base/CCEventKeyboard.h" #include "base/CCEventListener.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/CocosStudioExport.h" namespace cocos2d { class __Set; diff --git a/cocos/editor-support/cocostudio/CCProcessBase.cpp b/extensions/cocostudio/CCProcessBase.cpp similarity index 97% rename from cocos/editor-support/cocostudio/CCProcessBase.cpp rename to extensions/cocostudio/CCProcessBase.cpp index 3f20b67d65..68bcfc7ab3 100644 --- a/cocos/editor-support/cocostudio/CCProcessBase.cpp +++ b/extensions/cocostudio/CCProcessBase.cpp @@ -23,8 +23,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "editor-support/cocostudio/CCProcessBase.h" -#include "editor-support/cocostudio/CCUtilMath.h" +#include "cocostudio/CCProcessBase.h" +#include "cocostudio/CCUtilMath.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCProcessBase.h b/extensions/cocostudio/CCProcessBase.h similarity index 97% rename from cocos/editor-support/cocostudio/CCProcessBase.h rename to extensions/cocostudio/CCProcessBase.h index 10181db6fa..fa0e86f7d2 100644 --- a/cocos/editor-support/cocostudio/CCProcessBase.h +++ b/extensions/cocostudio/CCProcessBase.h @@ -26,9 +26,9 @@ THE SOFTWARE. #ifndef __CCPROCESSBASE_H__ #define __CCPROCESSBASE_H__ -#include "editor-support/cocostudio/CCArmatureDefine.h" -#include "editor-support/cocostudio/CCDatas.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CCDatas.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCSGUIReader.cpp b/extensions/cocostudio/CCSGUIReader.cpp similarity index 98% rename from cocos/editor-support/cocostudio/CCSGUIReader.cpp rename to extensions/cocostudio/CCSGUIReader.cpp index 2038a0086c..0ea6df7c67 100644 --- a/cocos/editor-support/cocostudio/CCSGUIReader.cpp +++ b/extensions/cocostudio/CCSGUIReader.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 "editor-support/cocostudio/CCSGUIReader.h" +#include "cocostudio/CCSGUIReader.h" #include #include @@ -33,21 +33,21 @@ THE SOFTWARE. #include "base/CCDirector.h" #include "base/ccUtils.h" -#include "editor-support/cocostudio/CCActionManagerEx.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 "cocostudio/CCActionManagerEx.h" +#include "cocostudio/WidgetReader/ButtonReader/ButtonReader.h" +#include "cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.h" +#include "cocostudio/WidgetReader/SliderReader/SliderReader.h" +#include "cocostudio/WidgetReader/ImageViewReader/ImageViewReader.h" +#include "cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.h" +#include "cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.h" +#include "cocostudio/WidgetReader/TextReader/TextReader.h" +#include "cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.h" +#include "cocostudio/WidgetReader/TextFieldReader/TextFieldReader.h" +#include "cocostudio/WidgetReader/LayoutReader/LayoutReader.h" +#include "cocostudio/WidgetReader/PageViewReader/PageViewReader.h" +#include "cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.h" +#include "cocostudio/WidgetReader/ListViewReader/ListViewReader.h" +#include "cocostudio/CocoLoader.h" using namespace cocos2d; using namespace cocos2d::ui; diff --git a/cocos/editor-support/cocostudio/CCSGUIReader.h b/extensions/cocostudio/CCSGUIReader.h similarity index 98% rename from cocos/editor-support/cocostudio/CCSGUIReader.h rename to extensions/cocostudio/CCSGUIReader.h index c3e6dfe820..ff88f99632 100644 --- a/cocos/editor-support/cocostudio/CCSGUIReader.h +++ b/extensions/cocostudio/CCSGUIReader.h @@ -27,11 +27,11 @@ THE SOFTWARE. #define __CCSGUIREADER_H__ #include "ui/UILayout.h" -#include "editor-support/cocostudio/DictionaryHelper.h" -#include "editor-support/cocostudio/WidgetReader/WidgetReaderProtocol.h" +#include "cocostudio/DictionaryHelper.h" +#include "cocostudio/WidgetReader/WidgetReaderProtocol.h" #include "base/ObjectFactory.h" #include "base/CCValue.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/CocosStudioExport.h" namespace protocolbuffers { diff --git a/cocos/editor-support/cocostudio/CCSSceneReader.cpp b/extensions/cocostudio/CCSSceneReader.cpp similarity index 99% rename from cocos/editor-support/cocostudio/CCSSceneReader.cpp rename to extensions/cocostudio/CCSSceneReader.cpp index 7f9b375ef3..7ceea5c10b 100644 --- a/cocos/editor-support/cocostudio/CCSSceneReader.cpp +++ b/extensions/cocostudio/CCSSceneReader.cpp @@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "editor-support/cocostudio/CocoStudio.h" +#include "cocostudio/CocoStudio.h" #include "ui/CocosGUI.h" #include "base/ObjectFactory.h" #include "base/ccUtils.h" diff --git a/cocos/editor-support/cocostudio/CCSSceneReader.h b/extensions/cocostudio/CCSSceneReader.h similarity index 96% rename from cocos/editor-support/cocostudio/CCSSceneReader.h rename to extensions/cocostudio/CCSSceneReader.h index 092b7ff12d..294600b75c 100644 --- a/cocos/editor-support/cocostudio/CCSSceneReader.h +++ b/extensions/cocostudio/CCSSceneReader.h @@ -26,8 +26,8 @@ THE SOFTWARE. #ifndef __CCSSCENEREADER_H__ #define __CCSSCENEREADER_H__ -#include "editor-support/cocostudio/DictionaryHelper.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/DictionaryHelper.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCSkin.cpp b/extensions/cocostudio/CCSkin.cpp similarity index 97% rename from cocos/editor-support/cocostudio/CCSkin.cpp rename to extensions/cocostudio/CCSkin.cpp index 7b7ad46ebc..4b4b049e5b 100644 --- a/cocos/editor-support/cocostudio/CCSkin.cpp +++ b/extensions/cocostudio/CCSkin.cpp @@ -28,9 +28,9 @@ THE SOFTWARE. #include "base/CCDirector.h" #include "renderer/CCRenderer.h" -#include "editor-support/cocostudio/CCSkin.h" -#include "editor-support/cocostudio/CCTransformHelp.h" -#include "editor-support/cocostudio/CCArmature.h" +#include "cocostudio/CCSkin.h" +#include "cocostudio/CCTransformHelp.h" +#include "cocostudio/CCArmature.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCSkin.h b/extensions/cocostudio/CCSkin.h similarity index 94% rename from cocos/editor-support/cocostudio/CCSkin.h rename to extensions/cocostudio/CCSkin.h index 775dd21a36..e9bb80972c 100644 --- a/cocos/editor-support/cocostudio/CCSkin.h +++ b/extensions/cocostudio/CCSkin.h @@ -28,9 +28,9 @@ THE SOFTWARE. #include "2d/CCSprite.h" #include "renderer/CCQuadCommand.h" -#include "editor-support/cocostudio/CCArmatureDefine.h" -#include "editor-support/cocostudio/CCBone.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CCBone.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.cpp b/extensions/cocostudio/CCSpriteFrameCacheHelper.cpp similarity index 98% rename from cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.cpp rename to extensions/cocostudio/CCSpriteFrameCacheHelper.cpp index 71c8054f70..b133fedd2d 100644 --- a/cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.cpp +++ b/extensions/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 "editor-support/cocostudio/CCSpriteFrameCacheHelper.h" +#include "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/extensions/cocostudio/CCSpriteFrameCacheHelper.h similarity index 95% rename from cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.h rename to extensions/cocostudio/CCSpriteFrameCacheHelper.h index df59094690..c974e38a06 100644 --- a/cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.h +++ b/extensions/cocostudio/CCSpriteFrameCacheHelper.h @@ -25,8 +25,8 @@ THE SOFTWARE. #define __CCSPRITEFRAMECACHEHELPER_H__ #include "platform/CCPlatformMacros.h" -#include "editor-support/cocostudio/CCArmatureDefine.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CocosStudioExport.h" #include #include #include diff --git a/cocos/editor-support/cocostudio/CCTransformHelp.cpp b/extensions/cocostudio/CCTransformHelp.cpp similarity index 98% rename from cocos/editor-support/cocostudio/CCTransformHelp.cpp rename to extensions/cocostudio/CCTransformHelp.cpp index 6ca8984472..735f981cf3 100644 --- a/cocos/editor-support/cocostudio/CCTransformHelp.cpp +++ b/extensions/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 "editor-support/cocostudio/CCTransformHelp.h" -#include "editor-support/cocostudio/CCUtilMath.h" +#include "cocostudio/CCTransformHelp.h" +#include "cocostudio/CCUtilMath.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCTransformHelp.h b/extensions/cocostudio/CCTransformHelp.h similarity index 94% rename from cocos/editor-support/cocostudio/CCTransformHelp.h rename to extensions/cocostudio/CCTransformHelp.h index a27e7339eb..46dcd4549e 100644 --- a/cocos/editor-support/cocostudio/CCTransformHelp.h +++ b/extensions/cocostudio/CCTransformHelp.h @@ -25,9 +25,9 @@ THE SOFTWARE. #ifndef __CCTRANSFORMHELP_H__ #define __CCTRANSFORMHELP_H__ -#include "editor-support/cocostudio/CCArmatureDefine.h" -#include "editor-support/cocostudio/CCDatas.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CCDatas.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCTween.cpp b/extensions/cocostudio/CCTween.cpp similarity index 97% rename from cocos/editor-support/cocostudio/CCTween.cpp rename to extensions/cocostudio/CCTween.cpp index f372057ab3..9635c0661d 100644 --- a/cocos/editor-support/cocostudio/CCTween.cpp +++ b/extensions/cocostudio/CCTween.cpp @@ -24,12 +24,12 @@ THE SOFTWARE. ****************************************************************************/ -#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" +#include "cocostudio/CCTween.h" +#include "cocostudio/CCArmatureAnimation.h" +#include "cocostudio/CCBone.h" +#include "cocostudio/CCArmature.h" +#include "cocostudio/CCUtilMath.h" +#include "cocostudio/CCTransformHelp.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCTween.h b/extensions/cocostudio/CCTween.h similarity index 98% rename from cocos/editor-support/cocostudio/CCTween.h rename to extensions/cocostudio/CCTween.h index 125a9faf08..72b89dd01e 100644 --- a/cocos/editor-support/cocostudio/CCTween.h +++ b/extensions/cocostudio/CCTween.h @@ -27,9 +27,9 @@ THE SOFTWARE. #ifndef __CCTWEEN_H__ #define __CCTWEEN_H__ -#include "editor-support/cocostudio/CCProcessBase.h" +#include "cocostudio/CCProcessBase.h" #include "2d/CCTweenFunction.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/CCUtilMath.cpp b/extensions/cocostudio/CCUtilMath.cpp similarity index 98% rename from cocos/editor-support/cocostudio/CCUtilMath.cpp rename to extensions/cocostudio/CCUtilMath.cpp index ad709984fe..67282c6cda 100644 --- a/cocos/editor-support/cocostudio/CCUtilMath.cpp +++ b/extensions/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 "editor-support/cocostudio/CCUtilMath.h" +#include "cocostudio/CCUtilMath.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/CCUtilMath.h b/extensions/cocostudio/CCUtilMath.h similarity index 95% rename from cocos/editor-support/cocostudio/CCUtilMath.h rename to extensions/cocostudio/CCUtilMath.h index d31e3a0968..2d6012a4f9 100644 --- a/cocos/editor-support/cocostudio/CCUtilMath.h +++ b/extensions/cocostudio/CCUtilMath.h @@ -26,8 +26,8 @@ THE SOFTWARE. #define __CCUTILMATH_H__ #include "2d/CCSprite.h" -#include "editor-support/cocostudio/CCArmatureDefine.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CocosStudioExport.h" #include namespace cocostudio { diff --git a/extensions/cocostudio/CMakeLists.txt b/extensions/cocostudio/CMakeLists.txt new file mode 100644 index 0000000000..16990313bb --- /dev/null +++ b/extensions/cocostudio/CMakeLists.txt @@ -0,0 +1,15 @@ +set(target_name cocostudio) + +FILE(GLOB_RECURSE CCS_SOURCES ./*.h;./*.cpp) + +add_library(${target_name} STATIC ${CCS_SOURCES}) + +target_link_libraries(${target_name} cocos2d) +set(CC_EXTENSION_LIBS "${target_name};${CC_EXTENSION_LIBS}" CACHE INTERNAL "extensions for auto link to target application") + +set_target_properties(${target_name} + PROPERTIES + ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + FOLDER "Extensions" +) diff --git a/cocos/editor-support/cocostudio/CSLanguageDataBinary_generated.h b/extensions/cocostudio/CSLanguageDataBinary_generated.h similarity index 100% rename from cocos/editor-support/cocostudio/CSLanguageDataBinary_generated.h rename to extensions/cocostudio/CSLanguageDataBinary_generated.h diff --git a/cocos/editor-support/cocostudio/CSParse3DBinary_generated.h b/extensions/cocostudio/CSParse3DBinary_generated.h similarity index 100% rename from cocos/editor-support/cocostudio/CSParse3DBinary_generated.h rename to extensions/cocostudio/CSParse3DBinary_generated.h diff --git a/cocos/editor-support/cocostudio/CSParseBinary_generated.h b/extensions/cocostudio/CSParseBinary_generated.h similarity index 100% rename from cocos/editor-support/cocostudio/CSParseBinary_generated.h rename to extensions/cocostudio/CSParseBinary_generated.h diff --git a/cocos/editor-support/cocostudio/CocoLoader.cpp b/extensions/cocostudio/CocoLoader.cpp similarity index 99% rename from cocos/editor-support/cocostudio/CocoLoader.cpp rename to extensions/cocostudio/CocoLoader.cpp index ec0d0f43b1..5f4b877b2d 100644 --- a/cocos/editor-support/cocostudio/CocoLoader.cpp +++ b/extensions/cocostudio/CocoLoader.cpp @@ -1,4 +1,4 @@ -#include "editor-support/cocostudio/CocoLoader.h" +#include "cocostudio/CocoLoader.h" #include "zlib.h" using namespace std; diff --git a/cocos/editor-support/cocostudio/CocoLoader.h b/extensions/cocostudio/CocoLoader.h similarity index 98% rename from cocos/editor-support/cocostudio/CocoLoader.h rename to extensions/cocostudio/CocoLoader.h index ee680f11a3..3b665e3845 100644 --- a/cocos/editor-support/cocostudio/CocoLoader.h +++ b/extensions/cocostudio/CocoLoader.h @@ -27,7 +27,7 @@ #include #include "rapidjson/document-wrapper.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/CocosStudioExport.h" #pragma pack (4) diff --git a/extensions/cocostudio/CocoStudio.cpp b/extensions/cocostudio/CocoStudio.cpp new file mode 100644 index 0000000000..a056589644 --- /dev/null +++ b/extensions/cocostudio/CocoStudio.cpp @@ -0,0 +1,73 @@ + +#include "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 "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" + + +namespace cocostudio +{ + void destroyCocosStudio() + { + NodeReader::destroyInstance(); + SingleNodeReader::destroyInstance(); + SpriteReader::destroyInstance(); + ParticleReader::destroyInstance(); + GameMapReader::destroyInstance(); + ProjectNodeReader::destroyInstance(); + ComAudioReader::destroyInstance(); + + WidgetReader::destroyInstance(); + ButtonReader::destroyInstance(); + CheckBoxReader::destroyInstance(); + ImageViewReader::destroyInstance(); + TextBMFontReader::destroyInstance(); + TextReader::destroyInstance(); + TextFieldReader::destroyInstance(); + TextAtlasReader::destroyInstance(); + LoadingBarReader::destroyInstance(); + SliderReader::destroyInstance(); + LayoutReader::destroyInstance(); + ScrollViewReader::destroyInstance(); + PageViewReader::destroyInstance(); + ListViewReader::destroyInstance(); + + ArmatureNodeReader::destroyInstance(); + Node3DReader::destroyInstance(); + Sprite3DReader::destroyInstance(); + UserCameraReader::destroyInstance(); + Particle3DReader::destroyInstance(); + + cocos2d::CSLoader::destroyInstance(); + + + ArmatureDataManager::destroyInstance(); + SceneReader::destroyInstance(); + ActionManagerEx::destroyInstance(); + GUIReader::destroyInstance(); + } +} \ No newline at end of file diff --git a/extensions/cocostudio/CocoStudio.h b/extensions/cocostudio/CocoStudio.h new file mode 100644 index 0000000000..85911cadad --- /dev/null +++ b/extensions/cocostudio/CocoStudio.h @@ -0,0 +1,75 @@ +/**************************************************************************** +Copyright (c) 2013-2017 Chukong Technologies Inc. + +http://www.cocos2d-x.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +****************************************************************************/ + +#ifndef __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/ActionTimeline/CSLoader.h" +#include "cocostudio/CocosStudioExport.h" + +namespace cocostudio +{ + void CC_STUDIO_DLL destroyCocosStudio(); +} + +#endif diff --git a/cocos/editor-support/cocostudio/CocosStudioExport.h b/extensions/cocostudio/CocosStudioExport.h similarity index 100% rename from cocos/editor-support/cocostudio/CocosStudioExport.h rename to extensions/cocostudio/CocosStudioExport.h diff --git a/cocos/editor-support/cocostudio/CocosStudioExtension.cpp b/extensions/cocostudio/CocosStudioExtension.cpp similarity index 55% rename from cocos/editor-support/cocostudio/CocosStudioExtension.cpp rename to extensions/cocostudio/CocosStudioExtension.cpp index d20a0d9f93..f1c5714aac 100644 --- a/cocos/editor-support/cocostudio/CocosStudioExtension.cpp +++ b/extensions/cocostudio/CocosStudioExtension.cpp @@ -1,4 +1,4 @@ -#include "editor-support/cocostudio/CocosStudioExtension.h" +#include "cocostudio/CocosStudioExtension.h" NS_CC_BEGIN diff --git a/cocos/editor-support/cocostudio/CocosStudioExtension.h b/extensions/cocostudio/CocosStudioExtension.h similarity index 62% rename from cocos/editor-support/cocostudio/CocosStudioExtension.h rename to extensions/cocostudio/CocosStudioExtension.h index 404c09e645..c2d99beee2 100644 --- a/cocos/editor-support/cocostudio/CocosStudioExtension.h +++ b/extensions/cocostudio/CocosStudioExtension.h @@ -31,53 +31,6 @@ NS_CC_BEGIN -struct CC_DLL ResourceData -{ - int type; - std::string file; - std::string plist; - - ResourceData() - { - type = 0; - file = ""; - plist = ""; - } - ResourceData(const ResourceData& rv) - { - type = rv.type; - file = rv.file; - plist = rv.plist; - } - ResourceData(ResourceData&& rv) - { - type = rv.type; - file = std::move(rv.file); - plist = std::move(rv.plist); - } - - ResourceData(int iType, std::string sFile, std::string sPlist) - { - type = iType; - file = sFile; - plist = sPlist; - } - ResourceData& operator=(const ResourceData& rv) - { - type = rv.type; - file = rv.file; - plist = rv.plist; - return *this; - } - ResourceData& operator=(ResourceData&& rv) - { - type = rv.type; - file = std::move(rv.file); - plist = std::move(rv.plist); - return *this; - } -}; - class CC_DLL NodeExtension { public: diff --git a/cocos/editor-support/cocostudio/DictionaryHelper.cpp b/extensions/cocostudio/DictionaryHelper.cpp similarity index 99% rename from cocos/editor-support/cocostudio/DictionaryHelper.cpp rename to extensions/cocostudio/DictionaryHelper.cpp index a1700fea4c..a439b3ca30 100644 --- a/cocos/editor-support/cocostudio/DictionaryHelper.cpp +++ b/extensions/cocostudio/DictionaryHelper.cpp @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ #include "platform/CCPlatformMacros.h" -#include "editor-support/cocostudio/DictionaryHelper.h" +#include "cocostudio/DictionaryHelper.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/DictionaryHelper.h b/extensions/cocostudio/DictionaryHelper.h similarity index 98% rename from cocos/editor-support/cocostudio/DictionaryHelper.h rename to extensions/cocostudio/DictionaryHelper.h index d6b6c9e769..dd5965fa1c 100644 --- a/cocos/editor-support/cocostudio/DictionaryHelper.h +++ b/extensions/cocostudio/DictionaryHelper.h @@ -26,7 +26,7 @@ THE SOFTWARE. #define __DICTIONARYHELPER_H__ #include "rapidjson/document-wrapper.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/CocosStudioExport.h" #define DICTOOL DictionaryHelper::getInstance() diff --git a/cocos/editor-support/cocostudio/FlatBuffersSerialize.cpp b/extensions/cocostudio/FlatBuffersSerialize.cpp similarity index 95% rename from cocos/editor-support/cocostudio/FlatBuffersSerialize.cpp rename to extensions/cocostudio/FlatBuffersSerialize.cpp index 4f9517f6f5..61085d730a 100644 --- a/cocos/editor-support/cocostudio/FlatBuffersSerialize.cpp +++ b/extensions/cocostudio/FlatBuffersSerialize.cpp @@ -24,42 +24,42 @@ THE SOFTWARE. ****************************************************************************/ -#include "editor-support/cocostudio/FlatBuffersSerialize.h" +#include "cocostudio/FlatBuffersSerialize.h" #include "base/ObjectFactory.h" #include "base/ccConstants.h" #include "ui/CocosGUI.h" #include "platform/CCFileUtils.h" -#include "editor-support/cocostudio/CocoStudio.h" -#include "editor-support/cocostudio/CSLanguageDataBinary_generated.h" -#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "cocostudio/CocoStudio.h" +#include "cocostudio/CSLanguageDataBinary_generated.h" +#include "cocostudio/CSParseBinary_generated.h" -#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" -#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" +#include "cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "cocostudio/WidgetReader/NodeReaderDefine.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 "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/ComAudioReader/ComAudioReader.h" +#include "cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.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 "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 "editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldExReader.h" +#include "cocostudio/WidgetReader/TextFieldReader/TextFieldExReader.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/FlatBuffersSerialize.h b/extensions/cocostudio/FlatBuffersSerialize.h similarity index 99% rename from cocos/editor-support/cocostudio/FlatBuffersSerialize.h rename to extensions/cocostudio/FlatBuffersSerialize.h index 9d1c9ac10d..34887d4a7b 100644 --- a/cocos/editor-support/cocostudio/FlatBuffersSerialize.h +++ b/extensions/cocostudio/FlatBuffersSerialize.h @@ -29,7 +29,7 @@ #include #include "ExtensionMacros.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/CocosStudioExport.h" #include "platform/CCPlatformMacros.h" #include "ui/UIWidget.h" diff --git a/cocos/editor-support/cocostudio/LocalizationManager.cpp b/extensions/cocostudio/LocalizationManager.cpp similarity index 96% rename from cocos/editor-support/cocostudio/LocalizationManager.cpp rename to extensions/cocostudio/LocalizationManager.cpp index 5cba9fd6a0..6cead68ecd 100644 --- a/cocos/editor-support/cocostudio/LocalizationManager.cpp +++ b/extensions/cocostudio/LocalizationManager.cpp @@ -1,7 +1,7 @@ -#include "editor-support/cocostudio/LocalizationManager.h" +#include "cocostudio/LocalizationManager.h" #include "platform/CCPlatformMacros.h" #include "platform/CCFileUtils.h" -#include "editor-support/cocostudio/CSLanguageDataBinary_generated.h" +#include "cocostudio/CSLanguageDataBinary_generated.h" using namespace cocostudio; using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/LocalizationManager.h b/extensions/cocostudio/LocalizationManager.h similarity index 98% rename from cocos/editor-support/cocostudio/LocalizationManager.h rename to extensions/cocostudio/LocalizationManager.h index 4d727c2b92..18479da8ec 100644 --- a/cocos/editor-support/cocostudio/LocalizationManager.h +++ b/extensions/cocostudio/LocalizationManager.h @@ -4,7 +4,7 @@ #include #include #include "rapidjson/document-wrapper.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { /** diff --git a/cocos/editor-support/cocostudio/TriggerBase.cpp b/extensions/cocostudio/TriggerBase.cpp old mode 100755 new mode 100644 similarity index 96% rename from cocos/editor-support/cocostudio/TriggerBase.cpp rename to extensions/cocostudio/TriggerBase.cpp index 743e79cf27..25e82fd41d --- a/cocos/editor-support/cocostudio/TriggerBase.cpp +++ b/extensions/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 "editor-support/cocostudio/TriggerBase.h" +#include "cocostudio/TriggerBase.h" #include "base/CCEventCustom.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/TriggerBase.h b/extensions/cocostudio/TriggerBase.h old mode 100755 new mode 100644 similarity index 90% rename from cocos/editor-support/cocostudio/TriggerBase.h rename to extensions/cocostudio/TriggerBase.h index ec6b3646fd..0e02eec65e --- a/cocos/editor-support/cocostudio/TriggerBase.h +++ b/extensions/cocostudio/TriggerBase.h @@ -26,11 +26,11 @@ THE SOFTWARE. #ifndef __TRIGGEREVENT_H__ #define __TRIGGEREVENT_H__ -#include "editor-support/cocostudio/CocoStudio.h" +#include "cocostudio/CocoStudio.h" #include "base/ObjectFactory.h" -#include "editor-support/cocostudio/TriggerObj.h" -#include "editor-support/cocostudio/TriggerMng.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/TriggerObj.h" +#include "cocostudio/TriggerMng.h" +#include "cocostudio/CocosStudioExport.h" #define DECLARE_CLASS_INFO \ diff --git a/cocos/editor-support/cocostudio/TriggerMng.cpp b/extensions/cocostudio/TriggerMng.cpp old mode 100755 new mode 100644 similarity index 99% rename from cocos/editor-support/cocostudio/TriggerMng.cpp rename to extensions/cocostudio/TriggerMng.cpp index ad49eeb542..99418afab0 --- a/cocos/editor-support/cocostudio/TriggerMng.cpp +++ b/extensions/cocostudio/TriggerMng.cpp @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "editor-support/cocostudio/TriggerMng.h" +#include "cocostudio/TriggerMng.h" #include "rapidjson/prettywriter.h" #include "rapidjson/stringbuffer.h" #include "base/CCDirector.h" diff --git a/cocos/editor-support/cocostudio/TriggerMng.h b/extensions/cocostudio/TriggerMng.h old mode 100755 new mode 100644 similarity index 98% rename from cocos/editor-support/cocostudio/TriggerMng.h rename to extensions/cocostudio/TriggerMng.h index 88a63fad27..359164fb76 --- a/cocos/editor-support/cocostudio/TriggerMng.h +++ b/extensions/cocostudio/TriggerMng.h @@ -25,7 +25,7 @@ THE SOFTWARE. #ifndef __TRIGGERMNG_H__ #define __TRIGGERMNG_H__ -#include "editor-support/cocostudio/CocoStudio.h" +#include "cocostudio/CocoStudio.h" namespace cocos2d { class EventDispatcher; diff --git a/cocos/editor-support/cocostudio/TriggerObj.cpp b/extensions/cocostudio/TriggerObj.cpp old mode 100755 new mode 100644 similarity index 99% rename from cocos/editor-support/cocostudio/TriggerObj.cpp rename to extensions/cocostudio/TriggerObj.cpp index 6d3d25bb25..dbcb9e4989 --- a/cocos/editor-support/cocostudio/TriggerObj.cpp +++ b/extensions/cocostudio/TriggerObj.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 "editor-support/cocostudio/TriggerObj.h" +#include "cocostudio/TriggerObj.h" #include "base/CCEventListenerCustom.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/TriggerObj.h b/extensions/cocostudio/TriggerObj.h old mode 100755 new mode 100644 similarity index 98% rename from cocos/editor-support/cocostudio/TriggerObj.h rename to extensions/cocostudio/TriggerObj.h index efd4ebeb2f..91e8cf1833 --- a/cocos/editor-support/cocostudio/TriggerObj.h +++ b/extensions/cocostudio/TriggerObj.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __TRIGGEROBJ_H__ #define __TRIGGEROBJ_H__ -#include "editor-support/cocostudio/CocoStudio.h" +#include "cocostudio/CocoStudio.h" #include "base/CCVector.h" #include "base/CCEventListenerCustom.h" diff --git a/cocos/editor-support/cocostudio/WidgetCallBackHandlerProtocol.cpp b/extensions/cocostudio/WidgetCallBackHandlerProtocol.cpp old mode 100755 new mode 100644 similarity index 96% rename from cocos/editor-support/cocostudio/WidgetCallBackHandlerProtocol.cpp rename to extensions/cocostudio/WidgetCallBackHandlerProtocol.cpp index ea26334a63..b889c2eaf2 --- a/cocos/editor-support/cocostudio/WidgetCallBackHandlerProtocol.cpp +++ b/extensions/cocostudio/WidgetCallBackHandlerProtocol.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "editor-support/cocostudio/WidgetCallBackHandlerProtocol.h" +#include "cocostudio/WidgetCallBackHandlerProtocol.h" USING_NS_CC; using namespace cocos2d::ui; diff --git a/cocos/editor-support/cocostudio/WidgetCallBackHandlerProtocol.h b/extensions/cocostudio/WidgetCallBackHandlerProtocol.h old mode 100755 new mode 100644 similarity index 97% rename from cocos/editor-support/cocostudio/WidgetCallBackHandlerProtocol.h rename to extensions/cocostudio/WidgetCallBackHandlerProtocol.h index c7600d6338..3c0f830d61 --- a/cocos/editor-support/cocostudio/WidgetCallBackHandlerProtocol.h +++ b/extensions/cocostudio/WidgetCallBackHandlerProtocol.h @@ -26,7 +26,7 @@ #define __cocos2d_libs__WidgetCallBackHandlerProtocol__ -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/CocosStudioExport.h" #include "ui/UIWidget.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.cpp b/extensions/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.cpp similarity index 94% rename from cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.cpp rename to extensions/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.cpp index f53aedbdb4..82fad2b32b 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.cpp +++ b/extensions/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.cpp @@ -1,12 +1,12 @@ -#include "editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h" +#include "cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h" #include "platform/CCFileUtils.h" #include "flatbuffers/flatbuffers.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/CCArmature.h" +#include "cocostudio/WidgetReader/NodeReader/NodeReader.h" +#include "cocostudio/CSParseBinary_generated.h" +#include "cocostudio/WidgetReader/ArmatureNodeReader/CSArmatureNode_generated.h" +#include "cocostudio/CCArmature.h" #if defined(CC_BUILD_WITH_DRANGBONES) && CC_BUILD_WITH_DRANGBONES #include "editor-support/dragonBones/CCDragonBonesHeaders.h" #endif diff --git a/cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h b/extensions/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h similarity index 94% rename from cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h rename to extensions/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h index 649e22f2f6..fbdfada0e5 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h +++ b/extensions/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h @@ -25,8 +25,8 @@ THE SOFTWARE. #ifndef __ARMATURENODEREADER_H_ #define __ARMATURENODEREADER_H_ -#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" -#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" +#include "cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "cocostudio/WidgetReader/NodeReaderDefine.h" /**************************************** diff --git a/cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/CSArmatureNode_generated.h b/extensions/cocostudio/WidgetReader/ArmatureNodeReader/CSArmatureNode_generated.h similarity index 99% rename from cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/CSArmatureNode_generated.h rename to extensions/cocostudio/WidgetReader/ArmatureNodeReader/CSArmatureNode_generated.h index a5f19bda72..c1d38bda9a 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/CSArmatureNode_generated.h +++ b/extensions/cocostudio/WidgetReader/ArmatureNodeReader/CSArmatureNode_generated.h @@ -6,7 +6,7 @@ #include "flatbuffers/flatbuffers.h" -#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "cocostudio/CSParseBinary_generated.h" namespace flatbuffers { diff --git a/cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp b/extensions/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp similarity index 99% rename from cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp rename to extensions/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp index 485676ed01..eed2a79b22 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp +++ b/extensions/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp @@ -1,15 +1,15 @@ -#include "editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.h" +#include "cocostudio/WidgetReader/ButtonReader/ButtonReader.h" #include "ui/UIButton.h" #include "2d/CCSpriteFrameCache.h" #include "2d/CCLabel.h" #include "platform/CCFileUtils.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 "cocostudio/CocoLoader.h" +#include "cocostudio/CSParseBinary_generated.h" +#include "cocostudio/FlatBuffersSerialize.h" +#include "cocostudio/LocalizationManager.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.h b/extensions/cocostudio/WidgetReader/ButtonReader/ButtonReader.h similarity index 95% rename from cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.h rename to extensions/cocostudio/WidgetReader/ButtonReader/ButtonReader.h index 5eda3e9eac..9a2c262382 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.h +++ b/extensions/cocostudio/WidgetReader/ButtonReader/ButtonReader.h @@ -25,8 +25,8 @@ #ifndef __TestCpp__ButtonReader__ #define __TestCpp__ButtonReader__ -#include "editor-support/cocostudio/WidgetReader/WidgetReader.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/WidgetReader/WidgetReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.cpp b/extensions/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.cpp similarity index 99% rename from cocos/editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.cpp rename to extensions/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.cpp index 28c2ea10f9..56a74dc599 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.cpp +++ b/extensions/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.cpp @@ -1,13 +1,13 @@ -#include "editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.h" +#include "cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.h" #include "ui/UICheckBox.h" #include "platform/CCFileUtils.h" #include "2d/CCSpriteFrameCache.h" -#include "editor-support/cocostudio/CocoLoader.h" -#include "editor-support/cocostudio/CSParseBinary_generated.h" -#include "editor-support/cocostudio/FlatBuffersSerialize.h" +#include "cocostudio/CocoLoader.h" +#include "cocostudio/CSParseBinary_generated.h" +#include "cocostudio/FlatBuffersSerialize.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.h b/extensions/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.h similarity index 95% rename from cocos/editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.h rename to extensions/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.h index 0b82b4f3d1..066ebf298e 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.h +++ b/extensions/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.h @@ -25,8 +25,8 @@ #ifndef __TestCpp__CheckBoxReader__ #define __TestCpp__CheckBoxReader__ -#include "editor-support/cocostudio/WidgetReader/WidgetReader.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/WidgetReader/WidgetReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.cpp b/extensions/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.cpp similarity index 95% rename from cocos/editor-support/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.cpp rename to extensions/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.cpp index ceac0c84f7..4caf31daa3 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.cpp +++ b/extensions/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.cpp @@ -22,11 +22,11 @@ THE SOFTWARE. ****************************************************************************/ -#include "editor-support/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.h" +#include "cocostudio/WidgetReader/ComAudioReader/ComAudioReader.h" -#include "editor-support/cocostudio/CCComAudio.h" -#include "editor-support/cocostudio/CSParseBinary_generated.h" -#include "editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.h" +#include "cocostudio/CCComAudio.h" +#include "cocostudio/CSParseBinary_generated.h" +#include "cocostudio/WidgetReader/NodeReader/NodeReader.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.h b/extensions/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.h similarity index 94% rename from cocos/editor-support/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.h rename to extensions/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.h index 7426a37928..5b8d309e23 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.h +++ b/extensions/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.h @@ -28,8 +28,8 @@ #include "base/CCRef.h" #include "2d/CCComponent.h" #include "2d/CCNode.h" -#include "editor-support/cocostudio/CocosStudioExport.h" -#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "cocostudio/CocosStudioExport.h" +#include "cocostudio/WidgetReader/NodeReaderProtocol.h" namespace cocostudio diff --git a/cocos/editor-support/cocostudio/WidgetReader/GameMapReader/GameMapReader.cpp b/extensions/cocostudio/WidgetReader/GameMapReader/GameMapReader.cpp similarity index 97% rename from cocos/editor-support/cocostudio/WidgetReader/GameMapReader/GameMapReader.cpp rename to extensions/cocostudio/WidgetReader/GameMapReader/GameMapReader.cpp index 051d09d3b2..5a5dfd5a4b 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/GameMapReader/GameMapReader.cpp +++ b/extensions/cocostudio/WidgetReader/GameMapReader/GameMapReader.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "editor-support/cocostudio/WidgetReader/GameMapReader/GameMapReader.h" +#include "cocostudio/WidgetReader/GameMapReader/GameMapReader.h" #include "2d/CCLabel.h" #include "2d/CCTMXXMLParser.h" @@ -30,8 +30,8 @@ #include "platform/CCFileUtils.h" #include "base/ccUTF8.h" -#include "editor-support/cocostudio/CSParseBinary_generated.h" -#include "editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.h" +#include "cocostudio/CSParseBinary_generated.h" +#include "cocostudio/WidgetReader/NodeReader/NodeReader.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/GameMapReader/GameMapReader.h b/extensions/cocostudio/WidgetReader/GameMapReader/GameMapReader.h similarity index 92% rename from cocos/editor-support/cocostudio/WidgetReader/GameMapReader/GameMapReader.h rename to extensions/cocostudio/WidgetReader/GameMapReader/GameMapReader.h index 86fd670708..ab9b760928 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/GameMapReader/GameMapReader.h +++ b/extensions/cocostudio/WidgetReader/GameMapReader/GameMapReader.h @@ -25,9 +25,9 @@ #ifndef __cocos2d_libs__GameMapReader__ #define __cocos2d_libs__GameMapReader__ -#include "editor-support/cocostudio/CocosStudioExport.h" -#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" -#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" +#include "cocostudio/CocosStudioExport.h" +#include "cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "cocostudio/WidgetReader/NodeReaderDefine.h" namespace cocostudio diff --git a/cocos/editor-support/cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.cpp b/extensions/cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.cpp similarity index 97% rename from cocos/editor-support/cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.cpp rename to extensions/cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.cpp index 67f81e5a72..3be9f0f586 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.cpp +++ b/extensions/cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.cpp @@ -22,16 +22,16 @@ THE SOFTWARE. ****************************************************************************/ -#include "editor-support/cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.h" +#include "cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.h" #include "platform/CCFileUtils.h" -#include "editor-support/cocostudio/CCComExtensionData.h" -#include "editor-support/cocostudio/CSParseBinary_generated.h" -#include "editor-support/cocostudio/CSParse3DBinary_generated.h" +#include "cocostudio/CCComExtensionData.h" +#include "cocostudio/CSParseBinary_generated.h" +#include "cocostudio/CSParse3DBinary_generated.h" -#include "editor-support/cocostudio/FlatBuffersSerialize.h" -#include "editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.h" +#include "cocostudio/FlatBuffersSerialize.h" +#include "cocostudio/WidgetReader/NodeReader/NodeReader.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.h b/extensions/cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.h similarity index 92% rename from cocos/editor-support/cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.h rename to extensions/cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.h index 4d24b66f36..72e59a808d 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.h +++ b/extensions/cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.h @@ -26,9 +26,9 @@ #define __cocos2d_libs__GameNode3DReader__ #include "2d/CCCameraBackgroundBrush.h" -#include "editor-support/cocostudio/CocosStudioExport.h" -#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" -#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" +#include "cocostudio/CocosStudioExport.h" +#include "cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "cocostudio/WidgetReader/NodeReaderDefine.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp b/extensions/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp similarity index 98% rename from cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp rename to extensions/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp index 27dbe0dcfa..55023b776d 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp +++ b/extensions/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp @@ -1,14 +1,14 @@ -#include "editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.h" +#include "cocostudio/WidgetReader/ImageViewReader/ImageViewReader.h" #include "ui/UIImageView.h" #include "platform/CCFileUtils.h" #include "2d/CCSpriteFrame.h" #include "2d/CCSpriteFrameCache.h" -#include "editor-support/cocostudio/CocoLoader.h" -#include "editor-support/cocostudio/CSParseBinary_generated.h" -#include "editor-support/cocostudio/FlatBuffersSerialize.h" +#include "cocostudio/CocoLoader.h" +#include "cocostudio/CSParseBinary_generated.h" +#include "cocostudio/FlatBuffersSerialize.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.h b/extensions/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.h similarity index 95% rename from cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.h rename to extensions/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.h index 575b2910d3..e454b89a69 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.h +++ b/extensions/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.h @@ -25,8 +25,8 @@ #ifndef __TestCpp__ImageViewReader__ #define __TestCpp__ImageViewReader__ -#include "editor-support/cocostudio/WidgetReader/WidgetReader.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/WidgetReader/WidgetReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.cpp b/extensions/cocostudio/WidgetReader/LayoutReader/LayoutReader.cpp similarity index 99% rename from cocos/editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.cpp rename to extensions/cocostudio/WidgetReader/LayoutReader/LayoutReader.cpp index 5961bb4cdd..90f1e297d9 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.cpp +++ b/extensions/cocostudio/WidgetReader/LayoutReader/LayoutReader.cpp @@ -1,14 +1,14 @@ -#include "editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.h" +#include "cocostudio/WidgetReader/LayoutReader/LayoutReader.h" #include "ui/UILayout.h" -#include "editor-support/cocostudio/CocoLoader.h" +#include "cocostudio/CocoLoader.h" #include "ui/UIScrollView.h" #include "ui/UIPageView.h" #include "ui/UIListView.h" -#include "editor-support/cocostudio/CSParseBinary_generated.h" -#include "editor-support/cocostudio/FlatBuffersSerialize.h" +#include "cocostudio/CSParseBinary_generated.h" +#include "cocostudio/FlatBuffersSerialize.h" #include "base/CCDirector.h" #include "platform/CCFileUtils.h" #include "2d/CCSpriteFrameCache.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.h b/extensions/cocostudio/WidgetReader/LayoutReader/LayoutReader.h similarity index 95% rename from cocos/editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.h rename to extensions/cocostudio/WidgetReader/LayoutReader/LayoutReader.h index 1d931bfe48..1ec7501dee 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.h +++ b/extensions/cocostudio/WidgetReader/LayoutReader/LayoutReader.h @@ -25,8 +25,8 @@ #ifndef __TestCpp__LayoutReader__ #define __TestCpp__LayoutReader__ -#include "editor-support/cocostudio/WidgetReader/WidgetReader.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/WidgetReader/WidgetReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/Light3DReader/Light3DReader.cpp b/extensions/cocostudio/WidgetReader/Light3DReader/Light3DReader.cpp similarity index 95% rename from cocos/editor-support/cocostudio/WidgetReader/Light3DReader/Light3DReader.cpp rename to extensions/cocostudio/WidgetReader/Light3DReader/Light3DReader.cpp index c98b9f8e64..1633cbb513 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/Light3DReader/Light3DReader.cpp +++ b/extensions/cocostudio/WidgetReader/Light3DReader/Light3DReader.cpp @@ -22,14 +22,14 @@ THE SOFTWARE. ****************************************************************************/ -#include "editor-support/cocostudio/WidgetReader/Light3DReader/Light3DReader.h" +#include "cocostudio/WidgetReader/Light3DReader/Light3DReader.h" #include "2d/CCLight.h" -#include "editor-support/cocostudio/CSParseBinary_generated.h" -#include "editor-support/cocostudio/CSParse3DBinary_generated.h" +#include "cocostudio/CSParseBinary_generated.h" +#include "cocostudio/CSParse3DBinary_generated.h" -#include "editor-support/cocostudio/FlatBuffersSerialize.h" -#include "editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.h" +#include "cocostudio/FlatBuffersSerialize.h" +#include "cocostudio/WidgetReader/Node3DReader/Node3DReader.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/Light3DReader/Light3DReader.h b/extensions/cocostudio/WidgetReader/Light3DReader/Light3DReader.h similarity index 92% rename from cocos/editor-support/cocostudio/WidgetReader/Light3DReader/Light3DReader.h rename to extensions/cocostudio/WidgetReader/Light3DReader/Light3DReader.h index b924c536da..5bbe1363ef 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/Light3DReader/Light3DReader.h +++ b/extensions/cocostudio/WidgetReader/Light3DReader/Light3DReader.h @@ -25,9 +25,9 @@ #ifndef __cocos2d_libs__Light3DReader__ #define __cocos2d_libs__Light3DReader__ -#include "editor-support/cocostudio/CocosStudioExport.h" -#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" -#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" +#include "cocostudio/CocosStudioExport.h" +#include "cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "cocostudio/WidgetReader/NodeReaderDefine.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.cpp b/extensions/cocostudio/WidgetReader/ListViewReader/ListViewReader.cpp similarity index 98% rename from cocos/editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.cpp rename to extensions/cocostudio/WidgetReader/ListViewReader/ListViewReader.cpp index 2709effc74..376b2d9941 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.cpp +++ b/extensions/cocostudio/WidgetReader/ListViewReader/ListViewReader.cpp @@ -1,13 +1,13 @@ -#include "editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.h" +#include "cocostudio/WidgetReader/ListViewReader/ListViewReader.h" #include "ui/UIListView.h" #include "platform/CCFileUtils.h" #include "2d/CCSpriteFrameCache.h" -#include "editor-support/cocostudio/CocoLoader.h" -#include "editor-support/cocostudio/CSParseBinary_generated.h" -#include "editor-support/cocostudio/FlatBuffersSerialize.h" +#include "cocostudio/CocoLoader.h" +#include "cocostudio/CSParseBinary_generated.h" +#include "cocostudio/FlatBuffersSerialize.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.h b/extensions/cocostudio/WidgetReader/ListViewReader/ListViewReader.h similarity index 94% rename from cocos/editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.h rename to extensions/cocostudio/WidgetReader/ListViewReader/ListViewReader.h index 223441a4e8..f07d566b2e 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.h +++ b/extensions/cocostudio/WidgetReader/ListViewReader/ListViewReader.h @@ -25,8 +25,8 @@ #ifndef __TestCpp__ListViewReader__ #define __TestCpp__ListViewReader__ -#include "editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp b/extensions/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp similarity index 98% rename from cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp rename to extensions/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp index dd157eeac0..78d7f15ff1 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp +++ b/extensions/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp @@ -1,14 +1,14 @@ -#include "editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.h" +#include "cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.h" #include "ui/UILoadingBar.h" #include "2d/CCSpriteFrameCache.h" #include "platform/CCFileUtils.h" -#include "editor-support/cocostudio/CocoLoader.h" -#include "editor-support/cocostudio/CSParseBinary_generated.h" -#include "editor-support/cocostudio/FlatBuffersSerialize.h" +#include "cocostudio/CocoLoader.h" +#include "cocostudio/CSParseBinary_generated.h" +#include "cocostudio/FlatBuffersSerialize.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.h b/extensions/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.h similarity index 95% rename from cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.h rename to extensions/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.h index 7496c4cae9..e91fc360a2 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.h +++ b/extensions/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.h @@ -25,8 +25,8 @@ #ifndef __TestCpp__LoadingBarReader__ #define __TestCpp__LoadingBarReader__ -#include "editor-support/cocostudio/WidgetReader/WidgetReader.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/WidgetReader/WidgetReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.cpp b/extensions/cocostudio/WidgetReader/Node3DReader/Node3DReader.cpp similarity index 97% rename from cocos/editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.cpp rename to extensions/cocostudio/WidgetReader/Node3DReader/Node3DReader.cpp index 92fa344cd7..0b982e7769 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.cpp +++ b/extensions/cocostudio/WidgetReader/Node3DReader/Node3DReader.cpp @@ -22,13 +22,13 @@ THE SOFTWARE. ****************************************************************************/ -#include "editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.h" +#include "cocostudio/WidgetReader/Node3DReader/Node3DReader.h" -#include "editor-support/cocostudio/CSParseBinary_generated.h" -#include "editor-support/cocostudio/CSParse3DBinary_generated.h" +#include "cocostudio/CSParseBinary_generated.h" +#include "cocostudio/CSParse3DBinary_generated.h" -#include "editor-support/cocostudio/FlatBuffersSerialize.h" -#include "editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.h" +#include "cocostudio/FlatBuffersSerialize.h" +#include "cocostudio/WidgetReader/NodeReader/NodeReader.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.h b/extensions/cocostudio/WidgetReader/Node3DReader/Node3DReader.h similarity index 93% rename from cocos/editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.h rename to extensions/cocostudio/WidgetReader/Node3DReader/Node3DReader.h index 2a5a970eaa..155975f727 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.h +++ b/extensions/cocostudio/WidgetReader/Node3DReader/Node3DReader.h @@ -26,9 +26,9 @@ #define __cocos2d_libs__Node3DReader__ #include "math/Vec3.h" -#include "editor-support/cocostudio/CocosStudioExport.h" -#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" -#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" +#include "cocostudio/CocosStudioExport.h" +#include "cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "cocostudio/WidgetReader/NodeReaderDefine.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.cpp b/extensions/cocostudio/WidgetReader/NodeReader/NodeReader.cpp similarity index 98% rename from cocos/editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.cpp rename to extensions/cocostudio/WidgetReader/NodeReader/NodeReader.cpp index dd00280516..b70340e627 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.cpp +++ b/extensions/cocostudio/WidgetReader/NodeReader/NodeReader.cpp @@ -22,11 +22,11 @@ THE SOFTWARE. ****************************************************************************/ -#include "editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.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/CCComExtensionData.h" +#include "cocostudio/CSParseBinary_generated.h" +#include "cocostudio/ActionTimeline/CCActionTimeline.h" +#include "cocostudio/CCComExtensionData.h" #include "flatbuffers/flatbuffers.h" #include "ui/UILayoutComponent.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.h b/extensions/cocostudio/WidgetReader/NodeReader/NodeReader.h similarity index 92% rename from cocos/editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.h rename to extensions/cocostudio/WidgetReader/NodeReader/NodeReader.h index d119dcd8c6..656f532c5c 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.h +++ b/extensions/cocostudio/WidgetReader/NodeReader/NodeReader.h @@ -26,9 +26,9 @@ #define __cocos2d_libs__NodeReader__ -#include "editor-support/cocostudio/CocosStudioExport.h" -#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" -#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" +#include "cocostudio/CocosStudioExport.h" +#include "cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "cocostudio/WidgetReader/NodeReaderDefine.h" namespace cocostudio { diff --git a/extensions/cocostudio/WidgetReader/NodeReaderDefine.cpp b/extensions/cocostudio/WidgetReader/NodeReaderDefine.cpp new file mode 100644 index 0000000000..94768e9c20 --- /dev/null +++ b/extensions/cocostudio/WidgetReader/NodeReaderDefine.cpp @@ -0,0 +1,3 @@ + + +#include "cocostudio/WidgetReader/NodeReaderDefine.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/NodeReaderDefine.h b/extensions/cocostudio/WidgetReader/NodeReaderDefine.h similarity index 100% rename from cocos/editor-support/cocostudio/WidgetReader/NodeReaderDefine.h rename to extensions/cocostudio/WidgetReader/NodeReaderDefine.h diff --git a/cocos/editor-support/cocostudio/WidgetReader/NodeReaderProtocol.cpp b/extensions/cocostudio/WidgetReader/NodeReaderProtocol.cpp similarity index 95% rename from cocos/editor-support/cocostudio/WidgetReader/NodeReaderProtocol.cpp rename to extensions/cocostudio/WidgetReader/NodeReaderProtocol.cpp index 0d72ed950d..c479764b63 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/NodeReaderProtocol.cpp +++ b/extensions/cocostudio/WidgetReader/NodeReaderProtocol.cpp @@ -6,12 +6,12 @@ // // -#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" -#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "cocostudio/CSParseBinary_generated.h" #include "cocos2d.h" #include "ui/CocosGUI.h" -#include "editor-support/cocostudio/CCArmature.h" -#include "editor-support/cocostudio/ActionTimeline/CCSkeletonNode.h" +#include "cocostudio/CCArmature.h" +#include "cocostudio/ActionTimeline/CCSkeletonNode.h" // x-studio365 spec, csb batch load support, assets hook functions. static bool onLoadObjectAssetDummy(cocos2d::Node*, cocos2d::ResourceData& assets, int index) diff --git a/cocos/editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h b/extensions/cocostudio/WidgetReader/NodeReaderProtocol.h similarity index 97% rename from cocos/editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h rename to extensions/cocostudio/WidgetReader/NodeReaderProtocol.h index d496abc4c0..cb34a5f1a3 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h +++ b/extensions/cocostudio/WidgetReader/NodeReaderProtocol.h @@ -25,8 +25,9 @@ #ifndef __cocos2d_libs__NodeReaderProtocol__ #define __cocos2d_libs__NodeReaderProtocol__ -#include "editor-support/cocostudio/CocosStudioExport.h" -#include "editor-support/cocostudio/CocosStudioExtension.h" +#include "ui/GUIDefine.h" +#include "cocostudio/CocosStudioExport.h" +#include "cocostudio/CocosStudioExtension.h" #include "pugixml/pugixml_imp.hpp" #include "pugixml/pugiext.hpp" diff --git a/cocos/editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.cpp b/extensions/cocostudio/WidgetReader/PageViewReader/PageViewReader.cpp similarity index 98% rename from cocos/editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.cpp rename to extensions/cocostudio/WidgetReader/PageViewReader/PageViewReader.cpp index 8301d94e4a..413c52b045 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.cpp +++ b/extensions/cocostudio/WidgetReader/PageViewReader/PageViewReader.cpp @@ -1,14 +1,14 @@ -#include "editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.h" +#include "cocostudio/WidgetReader/PageViewReader/PageViewReader.h" #include "ui/UIPageView.h" #include "ui/UILayout.h" #include "platform/CCFileUtils.h" #include "2d/CCSpriteFrameCache.h" -#include "editor-support/cocostudio/CocoLoader.h" -#include "editor-support/cocostudio/CSParseBinary_generated.h" -#include "editor-support/cocostudio/FlatBuffersSerialize.h" +#include "cocostudio/CocoLoader.h" +#include "cocostudio/CSParseBinary_generated.h" +#include "cocostudio/FlatBuffersSerialize.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.h b/extensions/cocostudio/WidgetReader/PageViewReader/PageViewReader.h similarity index 94% rename from cocos/editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.h rename to extensions/cocostudio/WidgetReader/PageViewReader/PageViewReader.h index b98142f5af..91616e113d 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.h +++ b/extensions/cocostudio/WidgetReader/PageViewReader/PageViewReader.h @@ -25,8 +25,8 @@ #ifndef __TestCpp__PageViewReader__ #define __TestCpp__PageViewReader__ -#include "editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/WidgetReader/LayoutReader/LayoutReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.cpp b/extensions/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.cpp similarity index 93% rename from cocos/editor-support/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.cpp rename to extensions/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.cpp index cf4bf270ed..a6e31ea155 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.cpp +++ b/extensions/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.cpp @@ -23,12 +23,12 @@ ****************************************************************************/ #include "platform/CCFileUtils.h" -#include "editor-support/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.h" +#include "cocostudio/WidgetReader/Particle3DReader/Particle3DReader.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 "cocostudio/CSParseBinary_generated.h" +#include "cocostudio/CSParse3DBinary_generated.h" +#include "cocostudio/FlatBuffersSerialize.h" +#include "cocostudio/WidgetReader/Node3DReader/Node3DReader.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.h b/extensions/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.h similarity index 92% rename from cocos/editor-support/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.h rename to extensions/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.h index efda65b1fe..01841f9288 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.h +++ b/extensions/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.h @@ -25,9 +25,9 @@ #ifndef __cocos2d_libs__Particle3DReader__ #define __cocos2d_libs__Particle3DReader__ -#include "editor-support/cocostudio/CocosStudioExport.h" -#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" -#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" +#include "cocostudio/CocosStudioExport.h" +#include "cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "cocostudio/WidgetReader/NodeReaderDefine.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/ParticleReader/ParticleReader.cpp b/extensions/cocostudio/WidgetReader/ParticleReader/ParticleReader.cpp similarity index 97% rename from cocos/editor-support/cocostudio/WidgetReader/ParticleReader/ParticleReader.cpp rename to extensions/cocostudio/WidgetReader/ParticleReader/ParticleReader.cpp index 82c8325e3a..f230fb60cc 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ParticleReader/ParticleReader.cpp +++ b/extensions/cocostudio/WidgetReader/ParticleReader/ParticleReader.cpp @@ -22,14 +22,14 @@ THE SOFTWARE. ****************************************************************************/ -#include "editor-support/cocostudio/WidgetReader/ParticleReader/ParticleReader.h" +#include "cocostudio/WidgetReader/ParticleReader/ParticleReader.h" #include "base/ccTypes.h" #include "base/ccUtils.h" #include "2d/CCParticleSystemQuad.h" #include "platform/CCFileUtils.h" -#include "editor-support/cocostudio/CSParseBinary_generated.h" -#include "editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.h" +#include "cocostudio/CSParseBinary_generated.h" +#include "cocostudio/WidgetReader/NodeReader/NodeReader.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/ParticleReader/ParticleReader.h b/extensions/cocostudio/WidgetReader/ParticleReader/ParticleReader.h similarity index 92% rename from cocos/editor-support/cocostudio/WidgetReader/ParticleReader/ParticleReader.h rename to extensions/cocostudio/WidgetReader/ParticleReader/ParticleReader.h index 5ae740b17b..8756b37270 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ParticleReader/ParticleReader.h +++ b/extensions/cocostudio/WidgetReader/ParticleReader/ParticleReader.h @@ -25,9 +25,9 @@ #ifndef __cocos2d_libs__ParticleReader__ #define __cocos2d_libs__ParticleReader__ -#include "editor-support/cocostudio/CocosStudioExport.h" -#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" -#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" +#include "cocostudio/CocosStudioExport.h" +#include "cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "cocostudio/WidgetReader/NodeReaderDefine.h" namespace cocostudio diff --git a/cocos/editor-support/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.cpp b/extensions/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.cpp similarity index 95% rename from cocos/editor-support/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.cpp rename to extensions/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.cpp index cbfe14fcb8..808688fb76 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.cpp +++ b/extensions/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.cpp @@ -22,10 +22,10 @@ THE SOFTWARE. ****************************************************************************/ -#include "editor-support/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.h" +#include "cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.h" -#include "editor-support/cocostudio/CSParseBinary_generated.h" -#include "editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.h" +#include "cocostudio/CSParseBinary_generated.h" +#include "cocostudio/WidgetReader/NodeReader/NodeReader.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.h b/extensions/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.h similarity index 94% rename from cocos/editor-support/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.h rename to extensions/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.h index 3169a77c62..e493ae9c08 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.h +++ b/extensions/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.h @@ -26,8 +26,8 @@ #define __cocos2d_libs__ProjectNodeReader__ #include "base/CCRef.h" -#include "editor-support/cocostudio/CocosStudioExport.h" -#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "cocostudio/CocosStudioExport.h" +#include "cocostudio/WidgetReader/NodeReaderProtocol.h" namespace cocostudio diff --git a/cocos/editor-support/cocostudio/WidgetReader/RadioButtonReader/RadioButtonGroupReader.cpp b/extensions/cocostudio/WidgetReader/RadioButtonReader/RadioButtonGroupReader.cpp similarity index 93% rename from cocos/editor-support/cocostudio/WidgetReader/RadioButtonReader/RadioButtonGroupReader.cpp rename to extensions/cocostudio/WidgetReader/RadioButtonReader/RadioButtonGroupReader.cpp index 565aa50abe..7638856ac2 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/RadioButtonReader/RadioButtonGroupReader.cpp +++ b/extensions/cocostudio/WidgetReader/RadioButtonReader/RadioButtonGroupReader.cpp @@ -1,14 +1,14 @@ -#include "editor-support/cocostudio/WidgetReader/RadioButtonReader/RadioButtonGroupReader.h" +#include "cocostudio/WidgetReader/RadioButtonReader/RadioButtonGroupReader.h" #include "ui/UIRadioButton.h" #include "platform/CCFileUtils.h" #include "2d/CCSpriteFrame.h" #include "2d/CCSpriteFrameCache.h" -#include "editor-support/cocostudio/CocoLoader.h" -#include "editor-support/cocostudio/CSParseBinary_generated.h" -#include "editor-support/cocostudio/FlatBuffersSerialize.h" +#include "cocostudio/CocoLoader.h" +#include "cocostudio/CSParseBinary_generated.h" +#include "cocostudio/FlatBuffersSerialize.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/RadioButtonReader/RadioButtonGroupReader.h b/extensions/cocostudio/WidgetReader/RadioButtonReader/RadioButtonGroupReader.h similarity index 95% rename from cocos/editor-support/cocostudio/WidgetReader/RadioButtonReader/RadioButtonGroupReader.h rename to extensions/cocostudio/WidgetReader/RadioButtonReader/RadioButtonGroupReader.h index 58cc6e8631..722e8b3ce3 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/RadioButtonReader/RadioButtonGroupReader.h +++ b/extensions/cocostudio/WidgetReader/RadioButtonReader/RadioButtonGroupReader.h @@ -25,8 +25,8 @@ #ifndef __X365LIBS__RadioButtonGroupReader__ #define __X365LIBS__RadioButtonGroupReader__ -#include "editor-support/cocostudio/WidgetReader/WidgetReader.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/WidgetReader/WidgetReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/RadioButtonReader/RadioButtonReader.cpp b/extensions/cocostudio/WidgetReader/RadioButtonReader/RadioButtonReader.cpp similarity index 98% rename from cocos/editor-support/cocostudio/WidgetReader/RadioButtonReader/RadioButtonReader.cpp rename to extensions/cocostudio/WidgetReader/RadioButtonReader/RadioButtonReader.cpp index 9f6647dbcc..1d98c528ef 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/RadioButtonReader/RadioButtonReader.cpp +++ b/extensions/cocostudio/WidgetReader/RadioButtonReader/RadioButtonReader.cpp @@ -1,13 +1,13 @@ -#include "editor-support/cocostudio/WidgetReader/RadioButtonReader/RadioButtonReader.h" +#include "cocostudio/WidgetReader/RadioButtonReader/RadioButtonReader.h" #include "ui/UIRadioButton.h" #include "platform/CCFileUtils.h" #include "2d/CCSpriteFrameCache.h" -#include "editor-support/cocostudio/CocoLoader.h" -#include "editor-support/cocostudio/CSParseBinary_generated.h" -#include "editor-support/cocostudio/FlatBuffersSerialize.h" +#include "cocostudio/CocoLoader.h" +#include "cocostudio/CSParseBinary_generated.h" +#include "cocostudio/FlatBuffersSerialize.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/RadioButtonReader/RadioButtonReader.h b/extensions/cocostudio/WidgetReader/RadioButtonReader/RadioButtonReader.h similarity index 95% rename from cocos/editor-support/cocostudio/WidgetReader/RadioButtonReader/RadioButtonReader.h rename to extensions/cocostudio/WidgetReader/RadioButtonReader/RadioButtonReader.h index 710f5c7593..70fa4feee1 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/RadioButtonReader/RadioButtonReader.h +++ b/extensions/cocostudio/WidgetReader/RadioButtonReader/RadioButtonReader.h @@ -25,8 +25,8 @@ #ifndef __X365LIBS__RadioButtonReader__ #define __X365LIBS__RadioButtonReader__ -#include "editor-support/cocostudio/WidgetReader/WidgetReader.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/WidgetReader/WidgetReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/RichTextReader/RichTextReader.cpp b/extensions/cocostudio/WidgetReader/RichTextReader/RichTextReader.cpp similarity index 92% rename from cocos/editor-support/cocostudio/WidgetReader/RichTextReader/RichTextReader.cpp rename to extensions/cocostudio/WidgetReader/RichTextReader/RichTextReader.cpp index 03630f5820..8a59064027 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/RichTextReader/RichTextReader.cpp +++ b/extensions/cocostudio/WidgetReader/RichTextReader/RichTextReader.cpp @@ -1,13 +1,13 @@ -#include "editor-support/cocostudio/WidgetReader/RichTextReader/RichTextReader.h" +#include "cocostudio/WidgetReader/RichTextReader/RichTextReader.h" #include "2d/CCFontAtlasCache.h" #include "ui/UIRichText.h" #include "platform/CCFileUtils.h" -#include "editor-support/cocostudio/CocoLoader.h" -#include "editor-support/cocostudio/CSParseBinary_generated.h" -#include "editor-support/cocostudio/LocalizationManager.h" +#include "cocostudio/CocoLoader.h" +#include "cocostudio/CSParseBinary_generated.h" +#include "cocostudio/LocalizationManager.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/RichTextReader/RichTextReader.h b/extensions/cocostudio/WidgetReader/RichTextReader/RichTextReader.h similarity index 94% rename from cocos/editor-support/cocostudio/WidgetReader/RichTextReader/RichTextReader.h rename to extensions/cocostudio/WidgetReader/RichTextReader/RichTextReader.h index 6f8c851971..3b7410c62e 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/RichTextReader/RichTextReader.h +++ b/extensions/cocostudio/WidgetReader/RichTextReader/RichTextReader.h @@ -25,8 +25,8 @@ #ifndef __xssd__RichTextReader__ #define __xssd__RichTextReader__ -#include "editor-support/cocostudio/WidgetReader/WidgetReader.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/WidgetReader/WidgetReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.cpp b/extensions/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.cpp similarity index 98% rename from cocos/editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.cpp rename to extensions/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.cpp index d2e8882091..4a1b075315 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.cpp +++ b/extensions/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.cpp @@ -1,13 +1,13 @@ -#include "editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.h" +#include "cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.h" #include "ui/UIScrollView.h" #include "platform/CCFileUtils.h" #include "2d/CCSpriteFrameCache.h" -#include "editor-support/cocostudio/CocoLoader.h" -#include "editor-support/cocostudio/CSParseBinary_generated.h" -#include "editor-support/cocostudio/FlatBuffersSerialize.h" +#include "cocostudio/CocoLoader.h" +#include "cocostudio/CSParseBinary_generated.h" +#include "cocostudio/FlatBuffersSerialize.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.h b/extensions/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.h similarity index 95% rename from cocos/editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.h rename to extensions/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.h index f0f813a855..19ef861158 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.h +++ b/extensions/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.h @@ -25,8 +25,8 @@ #ifndef __TestCpp__ScrollViewReader__ #define __TestCpp__ScrollViewReader__ -#include "editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/WidgetReader/LayoutReader/LayoutReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.cpp b/extensions/cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.cpp similarity index 91% rename from cocos/editor-support/cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.cpp rename to extensions/cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.cpp index 13fe685b51..cfaa938559 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.cpp +++ b/extensions/cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.cpp @@ -22,11 +22,11 @@ THE SOFTWARE. ****************************************************************************/ -#include "editor-support/cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.h" +#include "cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.h" -#include "editor-support/cocostudio/CSParseBinary_generated.h" -#include "editor-support/cocostudio/ActionTimeline/CCActionTimeline.h" -#include "editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.h" +#include "cocostudio/CSParseBinary_generated.h" +#include "cocostudio/ActionTimeline/CCActionTimeline.h" +#include "cocostudio/WidgetReader/NodeReader/NodeReader.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.h b/extensions/cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.h similarity index 92% rename from cocos/editor-support/cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.h rename to extensions/cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.h index 379e0d0264..92e926626f 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.h +++ b/extensions/cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.h @@ -25,9 +25,9 @@ #ifndef __cocos2d_libs__SingleNodeReader__ #define __cocos2d_libs__SingleNodeReader__ -#include "editor-support/cocostudio/CocosStudioExport.h" -#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" -#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" +#include "cocostudio/CocosStudioExport.h" +#include "cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "cocostudio/WidgetReader/NodeReaderDefine.h" namespace cocostudio diff --git a/cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.cpp b/extensions/cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.cpp similarity index 92% rename from cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.cpp rename to extensions/cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.cpp index fe269f237a..bd584bc2b4 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.cpp +++ b/extensions/cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.cpp @@ -24,11 +24,11 @@ THE SOFTWARE. ****************************************************************************/ #include "flatbuffers/flatbuffers.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" +#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 "base/ccUtils.h" USING_NS_CC; diff --git a/cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.h b/extensions/cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.h similarity index 93% rename from cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.h rename to extensions/cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.h index 07eada1913..7af2b0c2c9 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.h +++ b/extensions/cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.h @@ -25,8 +25,8 @@ THE SOFTWARE. #ifndef __BONENODEREADER_H_ #define __BONENODEREADER_H_ -#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" -#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" +#include "cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "cocostudio/WidgetReader/NodeReaderDefine.h" class BoneNodeReader : public cocos2d::Ref, public cocostudio::NodeReaderProtocol { diff --git a/cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/CSBoneBinary_generated.h b/extensions/cocostudio/WidgetReader/SkeletonReader/CSBoneBinary_generated.h similarity index 97% rename from cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/CSBoneBinary_generated.h rename to extensions/cocostudio/WidgetReader/SkeletonReader/CSBoneBinary_generated.h index 43a1436160..c0ca5d8c5a 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/CSBoneBinary_generated.h +++ b/extensions/cocostudio/WidgetReader/SkeletonReader/CSBoneBinary_generated.h @@ -5,7 +5,7 @@ #include "flatbuffers/flatbuffers.h" -#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "cocostudio/CSParseBinary_generated.h" namespace flatbuffers { diff --git a/cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.cpp b/extensions/cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.cpp similarity index 86% rename from cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.cpp rename to extensions/cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.cpp index 4eed3938bc..21e5e9da97 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.cpp +++ b/extensions/cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.cpp @@ -23,11 +23,11 @@ THE SOFTWARE. ****************************************************************************/ #include "flatbuffers/flatbuffers.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" +#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" USING_NS_CC; USING_NS_TIMELINE; diff --git a/cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.h b/extensions/cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.h similarity index 93% rename from cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.h rename to extensions/cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.h index 7a0f738b05..95db06691d 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.h +++ b/extensions/cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.h @@ -25,7 +25,7 @@ THE SOFTWARE. #ifndef _SKELETONNODEREADER_H_ #define _SKELETONNODEREADER_H_ -#include "editor-support/cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.h" +#include "cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.h" class SkeletonNodeReader : public BoneNodeReader { diff --git a/cocos/editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.cpp b/extensions/cocostudio/WidgetReader/SliderReader/SliderReader.cpp similarity index 99% rename from cocos/editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.cpp rename to extensions/cocostudio/WidgetReader/SliderReader/SliderReader.cpp index 2411d3b6d5..7d05481569 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.cpp +++ b/extensions/cocostudio/WidgetReader/SliderReader/SliderReader.cpp @@ -1,14 +1,14 @@ -#include "editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.h" +#include "cocostudio/WidgetReader/SliderReader/SliderReader.h" #include "ui/UISlider.h" #include "2d/CCSpriteFrameCache.h" #include "platform/CCFileUtils.h" -#include "editor-support/cocostudio/CocoLoader.h" -#include "editor-support/cocostudio/CSParseBinary_generated.h" -#include "editor-support/cocostudio/FlatBuffersSerialize.h" +#include "cocostudio/CocoLoader.h" +#include "cocostudio/CSParseBinary_generated.h" +#include "cocostudio/FlatBuffersSerialize.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.h b/extensions/cocostudio/WidgetReader/SliderReader/SliderReader.h similarity index 95% rename from cocos/editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.h rename to extensions/cocostudio/WidgetReader/SliderReader/SliderReader.h index 0809c6ba31..0ce480a197 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.h +++ b/extensions/cocostudio/WidgetReader/SliderReader/SliderReader.h @@ -25,8 +25,8 @@ #ifndef __TestCpp__SliderReader__ #define __TestCpp__SliderReader__ -#include "editor-support/cocostudio/WidgetReader/WidgetReader.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/WidgetReader/WidgetReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/SpineSkeletonReader/SpineSkeletonReader.cpp b/extensions/cocostudio/WidgetReader/SpineSkeletonReader/SpineSkeletonReader.cpp similarity index 95% rename from cocos/editor-support/cocostudio/WidgetReader/SpineSkeletonReader/SpineSkeletonReader.cpp rename to extensions/cocostudio/WidgetReader/SpineSkeletonReader/SpineSkeletonReader.cpp index 68187a7f2d..9e2f58147c 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/SpineSkeletonReader/SpineSkeletonReader.cpp +++ b/extensions/cocostudio/WidgetReader/SpineSkeletonReader/SpineSkeletonReader.cpp @@ -22,16 +22,16 @@ THE SOFTWARE. ****************************************************************************/ -#include "editor-support/cocostudio/WidgetReader/SpineSkeletonReader/SpineSkeletonReader.h" -#include "editor-support/cocostudio/ext/SpineSkeletonDataCache.h" +#include "cocostudio/WidgetReader/SpineSkeletonReader/SpineSkeletonReader.h" +#include "cocostudio/ext/SpineSkeletonDataCache.h" #include "2d/CCSprite.h" #include "2d/CCSpriteFrameCache.h" #include "platform/CCFileUtils.h" -#include "editor-support/cocostudio/CSParseBinary_generated.h" -#include "editor-support/cocostudio/FlatBuffersSerialize.h" -#include "editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.h" +#include "cocostudio/CSParseBinary_generated.h" +#include "cocostudio/FlatBuffersSerialize.h" +#include "cocostudio/WidgetReader/NodeReader/NodeReader.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/SpineSkeletonReader/SpineSkeletonReader.h b/extensions/cocostudio/WidgetReader/SpineSkeletonReader/SpineSkeletonReader.h similarity index 92% rename from cocos/editor-support/cocostudio/WidgetReader/SpineSkeletonReader/SpineSkeletonReader.h rename to extensions/cocostudio/WidgetReader/SpineSkeletonReader/SpineSkeletonReader.h index 1162562dce..14008e88aa 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/SpineSkeletonReader/SpineSkeletonReader.h +++ b/extensions/cocostudio/WidgetReader/SpineSkeletonReader/SpineSkeletonReader.h @@ -25,9 +25,9 @@ #ifndef __X365LIBS__SpineSkeletonReader__ #define __X365LIBS__SpineSkeletonReader__ -#include "editor-support/cocostudio/CocosStudioExport.h" -#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" -#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" +#include "cocostudio/CocosStudioExport.h" +#include "cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "cocostudio/WidgetReader/NodeReaderDefine.h" namespace cocostudio diff --git a/cocos/editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.cpp b/extensions/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.cpp similarity index 96% rename from cocos/editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.cpp rename to extensions/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.cpp index 4d65a85a83..e1e9417cab 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.cpp +++ b/extensions/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.cpp @@ -28,13 +28,13 @@ #include "3d/CCAnimate3D.h" #include "3d/CCAnimation3D.h" #include "platform/CCFileUtils.h" -#include "editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.h" +#include "cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.h" -#include "editor-support/cocostudio/CSParseBinary_generated.h" -#include "editor-support/cocostudio/CSParse3DBinary_generated.h" +#include "cocostudio/CSParseBinary_generated.h" +#include "cocostudio/CSParse3DBinary_generated.h" -#include "editor-support/cocostudio/FlatBuffersSerialize.h" -#include "editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.h" +#include "cocostudio/FlatBuffersSerialize.h" +#include "cocostudio/WidgetReader/Node3DReader/Node3DReader.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.h b/extensions/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.h similarity index 92% rename from cocos/editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.h rename to extensions/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.h index 1ab9572c07..ab371bfa3b 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.h +++ b/extensions/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.h @@ -26,9 +26,9 @@ #define __cocos2d_libs__Sprite3DReader__ #include "math/Vec2.h" -#include "editor-support/cocostudio/CocosStudioExport.h" -#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" -#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" +#include "cocostudio/CocosStudioExport.h" +#include "cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "cocostudio/WidgetReader/NodeReaderDefine.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/SpriteReader/SpriteReader.cpp b/extensions/cocostudio/WidgetReader/SpriteReader/SpriteReader.cpp similarity index 97% rename from cocos/editor-support/cocostudio/WidgetReader/SpriteReader/SpriteReader.cpp rename to extensions/cocostudio/WidgetReader/SpriteReader/SpriteReader.cpp index 85bdf47433..c370be3187 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/SpriteReader/SpriteReader.cpp +++ b/extensions/cocostudio/WidgetReader/SpriteReader/SpriteReader.cpp @@ -24,20 +24,20 @@ THE SOFTWARE. ****************************************************************************/ -#include "editor-support/cocostudio/WidgetReader/SpriteReader/SpriteReader.h" +#include "cocostudio/WidgetReader/SpriteReader/SpriteReader.h" #include "base/ccUtils.h" #include "2d/CCSprite.h" #include "2d/CCSpriteFrameCache.h" #include "platform/CCFileUtils.h" -#include "editor-support/cocostudio/CSParseBinary_generated.h" -#include "editor-support/cocostudio/FlatBuffersSerialize.h" -#include "editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.h" +#include "cocostudio/CSParseBinary_generated.h" +#include "cocostudio/FlatBuffersSerialize.h" +#include "cocostudio/WidgetReader/NodeReader/NodeReader.h" #include "flatbuffers/flatbuffers.h" -#include "editor-support/cocostudio/ext/glslutils.hpp" +#include "cocostudio/ext/glslutils.hpp" USING_NS_CC; using namespace flatbuffers; diff --git a/cocos/editor-support/cocostudio/WidgetReader/SpriteReader/SpriteReader.h b/extensions/cocostudio/WidgetReader/SpriteReader/SpriteReader.h similarity index 92% rename from cocos/editor-support/cocostudio/WidgetReader/SpriteReader/SpriteReader.h rename to extensions/cocostudio/WidgetReader/SpriteReader/SpriteReader.h index 8246bdafb6..eadaacd94e 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/SpriteReader/SpriteReader.h +++ b/extensions/cocostudio/WidgetReader/SpriteReader/SpriteReader.h @@ -25,9 +25,9 @@ #ifndef __cocos2d_libs__SpriteReader__ #define __cocos2d_libs__SpriteReader__ -#include "editor-support/cocostudio/CocosStudioExport.h" -#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" -#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" +#include "cocostudio/CocosStudioExport.h" +#include "cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "cocostudio/WidgetReader/NodeReaderDefine.h" namespace cocostudio diff --git a/cocos/editor-support/cocostudio/WidgetReader/TabControlReader/CSTabControl_generated.h b/extensions/cocostudio/WidgetReader/TabControlReader/CSTabControl_generated.h similarity index 99% rename from cocos/editor-support/cocostudio/WidgetReader/TabControlReader/CSTabControl_generated.h rename to extensions/cocostudio/WidgetReader/TabControlReader/CSTabControl_generated.h index 4bcfa8e4ae..fa1ce5774c 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/TabControlReader/CSTabControl_generated.h +++ b/extensions/cocostudio/WidgetReader/TabControlReader/CSTabControl_generated.h @@ -6,7 +6,7 @@ #include "flatbuffers/flatbuffers.h" -#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "cocostudio/CSParseBinary_generated.h" namespace flatbuffers { diff --git a/cocos/editor-support/cocostudio/WidgetReader/TabControlReader/TabControlReader.cpp b/extensions/cocostudio/WidgetReader/TabControlReader/TabControlReader.cpp similarity index 99% rename from cocos/editor-support/cocostudio/WidgetReader/TabControlReader/TabControlReader.cpp rename to extensions/cocostudio/WidgetReader/TabControlReader/TabControlReader.cpp index 4a98194e2f..ab193cb0ef 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/TabControlReader/TabControlReader.cpp +++ b/extensions/cocostudio/WidgetReader/TabControlReader/TabControlReader.cpp @@ -24,11 +24,11 @@ #include "flatbuffers/flatbuffers.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 "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 "ui/UITabControl.h" #include "platform/CCFileUtils.h" #include "2d/CCSpriteFrameCache.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/TabControlReader/TabControlReader.h b/extensions/cocostudio/WidgetReader/TabControlReader/TabControlReader.h similarity index 93% rename from cocos/editor-support/cocostudio/WidgetReader/TabControlReader/TabControlReader.h rename to extensions/cocostudio/WidgetReader/TabControlReader/TabControlReader.h index d78ebe28fc..9a5170b742 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/TabControlReader/TabControlReader.h +++ b/extensions/cocostudio/WidgetReader/TabControlReader/TabControlReader.h @@ -25,9 +25,9 @@ #ifndef __TABCONTROLREADER_H_ #define __TABCONTROLREADER_H_ -#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" -#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" -#include "editor-support/cocostudio/WidgetReader/TabControlReader/CSTabControl_generated.h" +#include "cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "cocostudio/WidgetReader/NodeReaderDefine.h" +#include "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/extensions/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.cpp similarity index 97% rename from cocos/editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.cpp rename to extensions/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.cpp index d59c66b747..fa12c8c36e 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.cpp +++ b/extensions/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.cpp @@ -1,13 +1,13 @@ -#include "editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.h" +#include "cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.h" #include "ui/UITextAtlas.h" #include "platform/CCFileUtils.h" -#include "editor-support/cocostudio/CocoLoader.h" -#include "editor-support/cocostudio/CSParseBinary_generated.h" -#include "editor-support/cocostudio/FlatBuffersSerialize.h" +#include "cocostudio/CocoLoader.h" +#include "cocostudio/CSParseBinary_generated.h" +#include "cocostudio/FlatBuffersSerialize.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.h b/extensions/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.h similarity index 95% rename from cocos/editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.h rename to extensions/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.h index a265dc0395..4755517a83 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.h +++ b/extensions/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.h @@ -25,8 +25,8 @@ #ifndef __TestCpp__TextAtlasReader__ #define __TestCpp__TextAtlasReader__ -#include "editor-support/cocostudio/WidgetReader/WidgetReader.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/WidgetReader/WidgetReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.cpp b/extensions/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.cpp similarity index 97% rename from cocos/editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.cpp rename to extensions/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.cpp index 35ddf0358f..adb3ab49dc 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.cpp +++ b/extensions/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.cpp @@ -1,13 +1,13 @@ -#include "editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.h" +#include "cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.h" #include "2d/CCFontAtlasCache.h" #include "ui/UITextBMFont.h" #include "platform/CCFileUtils.h" -#include "editor-support/cocostudio/CocoLoader.h" -#include "editor-support/cocostudio/CSParseBinary_generated.h" -#include "editor-support/cocostudio/LocalizationManager.h" +#include "cocostudio/CocoLoader.h" +#include "cocostudio/CSParseBinary_generated.h" +#include "cocostudio/LocalizationManager.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.h b/extensions/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.h similarity index 95% rename from cocos/editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.h rename to extensions/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.h index d291a8258a..30efbf67a9 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.h +++ b/extensions/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.h @@ -25,8 +25,8 @@ #ifndef __TestCpp__TextBMFontReader__ #define __TestCpp__TextBMFontReader__ -#include "editor-support/cocostudio/WidgetReader/WidgetReader.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/WidgetReader/WidgetReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldExReader.cpp b/extensions/cocostudio/WidgetReader/TextFieldReader/TextFieldExReader.cpp similarity index 96% rename from cocos/editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldExReader.cpp rename to extensions/cocostudio/WidgetReader/TextFieldReader/TextFieldExReader.cpp index 38adb52ea0..a78629a546 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldExReader.cpp +++ b/extensions/cocostudio/WidgetReader/TextFieldReader/TextFieldExReader.cpp @@ -1,14 +1,14 @@ -#include "editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldExReader.h" +#include "cocostudio/WidgetReader/TextFieldReader/TextFieldExReader.h" -#include "editor-support/cocostudio/ext/UITextFieldEx.h" +#include "cocostudio/ext/UITextFieldEx.h" #include "platform/CCFileUtils.h" -#include "editor-support/cocostudio/CocoLoader.h" -#include "editor-support/cocostudio/CSParseBinary_generated.h" -#include "editor-support/cocostudio/LocalizationManager.h" +#include "cocostudio/CocoLoader.h" +#include "cocostudio/CSParseBinary_generated.h" +#include "cocostudio/LocalizationManager.h" -#include "editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.h" +#include "cocostudio/WidgetReader/NodeReader/NodeReader.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldExReader.h b/extensions/cocostudio/WidgetReader/TextFieldReader/TextFieldExReader.h similarity index 94% rename from cocos/editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldExReader.h rename to extensions/cocostudio/WidgetReader/TextFieldReader/TextFieldExReader.h index 80e11b5ae1..7958fdf3c4 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldExReader.h +++ b/extensions/cocostudio/WidgetReader/TextFieldReader/TextFieldExReader.h @@ -25,8 +25,8 @@ #ifndef __TestCpp__TextFieldExReader__ #define __TestCpp__TextFieldExReader__ -#include "editor-support/cocostudio/WidgetReader/WidgetReader.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/WidgetReader/WidgetReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.cpp b/extensions/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.cpp similarity index 98% rename from cocos/editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.cpp rename to extensions/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.cpp index c2303ede8c..4180c49f90 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.cpp +++ b/extensions/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.cpp @@ -1,12 +1,12 @@ -#include "editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.h" +#include "cocostudio/WidgetReader/TextFieldReader/TextFieldReader.h" #include "ui/UITextField.h" #include "platform/CCFileUtils.h" -#include "editor-support/cocostudio/CocoLoader.h" -#include "editor-support/cocostudio/CSParseBinary_generated.h" -#include "editor-support/cocostudio/LocalizationManager.h" +#include "cocostudio/CocoLoader.h" +#include "cocostudio/CSParseBinary_generated.h" +#include "cocostudio/LocalizationManager.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.h b/extensions/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.h similarity index 95% rename from cocos/editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.h rename to extensions/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.h index d4aed2124c..80040aadf1 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.h +++ b/extensions/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.h @@ -25,8 +25,8 @@ #ifndef __TestCpp__TextFieldReader__ #define __TestCpp__TextFieldReader__ -#include "editor-support/cocostudio/WidgetReader/WidgetReader.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/WidgetReader/WidgetReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp b/extensions/cocostudio/WidgetReader/TextReader/TextReader.cpp similarity index 98% rename from cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp rename to extensions/cocostudio/WidgetReader/TextReader/TextReader.cpp index 75ec77a3c7..1f1b41b7be 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp +++ b/extensions/cocostudio/WidgetReader/TextReader/TextReader.cpp @@ -1,14 +1,14 @@ -#include "editor-support/cocostudio/WidgetReader/TextReader/TextReader.h" +#include "cocostudio/WidgetReader/TextReader/TextReader.h" #include "ui/UIText.h" #include "2d/CCLabel.h" #include "platform/CCFileUtils.h" -#include "editor-support/cocostudio/CocoLoader.h" -#include "editor-support/cocostudio/CSParseBinary_generated.h" -#include "editor-support/cocostudio/LocalizationManager.h" +#include "cocostudio/CocoLoader.h" +#include "cocostudio/CSParseBinary_generated.h" +#include "cocostudio/LocalizationManager.h" #include "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.h b/extensions/cocostudio/WidgetReader/TextReader/TextReader.h similarity index 95% rename from cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.h rename to extensions/cocostudio/WidgetReader/TextReader/TextReader.h index 16db0e6d77..df6454c0c1 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.h +++ b/extensions/cocostudio/WidgetReader/TextReader/TextReader.h @@ -25,8 +25,8 @@ #ifndef __TestCpp__TextReader__ #define __TestCpp__TextReader__ -#include "editor-support/cocostudio/WidgetReader/WidgetReader.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/WidgetReader/WidgetReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.cpp b/extensions/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.cpp similarity index 97% rename from cocos/editor-support/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.cpp rename to extensions/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.cpp index 545fb5f0de..0916928ec8 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.cpp +++ b/extensions/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.cpp @@ -25,13 +25,13 @@ #include "base/CCDirector.h" #include "2d/CCCamera.h" #include "platform/CCFileUtils.h" -#include "editor-support/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.h" +#include "cocostudio/WidgetReader/UserCameraReader/UserCameraReader.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 "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 "flatbuffers/flatbuffers.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.h b/extensions/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.h similarity index 92% rename from cocos/editor-support/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.h rename to extensions/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.h index 6c7f7f184c..18313776b1 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.h +++ b/extensions/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.h @@ -26,9 +26,9 @@ #define __cocos2d_libs__UserCameraReader__ #include "math/Vec2.h" -#include "editor-support/cocostudio/CocosStudioExport.h" -#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" -#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" +#include "cocostudio/CocosStudioExport.h" +#include "cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "cocostudio/WidgetReader/NodeReaderDefine.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp b/extensions/cocostudio/WidgetReader/WidgetReader.cpp similarity index 99% rename from cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp rename to extensions/cocostudio/WidgetReader/WidgetReader.cpp index 10781d83aa..fcf0a79f71 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp +++ b/extensions/cocostudio/WidgetReader/WidgetReader.cpp @@ -1,16 +1,16 @@ -#include "editor-support/cocostudio/WidgetReader/WidgetReader.h" +#include "cocostudio/WidgetReader/WidgetReader.h" -#include "editor-support/cocostudio/CocoLoader.h" +#include "cocostudio/CocoLoader.h" #include "ui/UIButton.h" -#include "editor-support/cocostudio/ActionTimeline/CCActionTimeline.h" -#include "editor-support/cocostudio/CCComExtensionData.h" -#include "editor-support/cocostudio/CSParseBinary_generated.h" +#include "cocostudio/ActionTimeline/CCActionTimeline.h" +#include "cocostudio/CCComExtensionData.h" +#include "cocostudio/CSParseBinary_generated.h" #include "flatbuffers/flatbuffers.h" #include "ui/UILayoutComponent.h" -#include "editor-support/cocostudio/ActionTimeline/CSLoader.h" +#include "cocostudio/ActionTimeline/CSLoader.h" #include "base/ccUtils.h" #include "base/CCDirector.h" diff --git a/cocos/editor-support/cocostudio/WidgetReader/WidgetReader.h b/extensions/cocostudio/WidgetReader/WidgetReader.h similarity index 97% rename from cocos/editor-support/cocostudio/WidgetReader/WidgetReader.h rename to extensions/cocostudio/WidgetReader/WidgetReader.h index 0d314fe77a..e8cc499a7c 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/WidgetReader.h +++ b/extensions/cocostudio/WidgetReader/WidgetReader.h @@ -25,12 +25,12 @@ #ifndef __TestCpp__WidgetReader__ #define __TestCpp__WidgetReader__ -#include "editor-support/cocostudio/WidgetReader/WidgetReaderProtocol.h" -#include "editor-support/cocostudio/CCSGUIReader.h" +#include "cocostudio/WidgetReader/WidgetReaderProtocol.h" +#include "cocostudio/CCSGUIReader.h" #include "ui/GUIDefine.h" -#include "editor-support/cocostudio/CocosStudioExport.h" -#include "editor-support/cocostudio/WidgetReader/NodeReaderProtocol.h" -#include "editor-support/cocostudio/WidgetReader/NodeReaderDefine.h" +#include "cocostudio/CocosStudioExport.h" +#include "cocostudio/WidgetReader/NodeReaderProtocol.h" +#include "cocostudio/WidgetReader/NodeReaderDefine.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/WidgetReader/WidgetReaderProtocol.h b/extensions/cocostudio/WidgetReader/WidgetReaderProtocol.h similarity index 94% rename from cocos/editor-support/cocostudio/WidgetReader/WidgetReaderProtocol.h rename to extensions/cocostudio/WidgetReader/WidgetReaderProtocol.h index a8b08dc0e9..c1beb567d9 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/WidgetReaderProtocol.h +++ b/extensions/cocostudio/WidgetReader/WidgetReaderProtocol.h @@ -26,8 +26,8 @@ #define __TestCpp__WidgetReaderProtocol__ -#include "editor-support/cocostudio/DictionaryHelper.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/DictionaryHelper.h" +#include "cocostudio/CocosStudioExport.h" #include "pugixml/pugixml_imp.hpp" #include "pugixml/pugiext.hpp" diff --git a/cocos/editor-support/cocostudio/ext/LayoutHelper.cpp b/extensions/cocostudio/ext/LayoutHelper.cpp similarity index 100% rename from cocos/editor-support/cocostudio/ext/LayoutHelper.cpp rename to extensions/cocostudio/ext/LayoutHelper.cpp diff --git a/cocos/editor-support/cocostudio/ext/LayoutHelper.h b/extensions/cocostudio/ext/LayoutHelper.h similarity index 99% rename from cocos/editor-support/cocostudio/ext/LayoutHelper.h rename to extensions/cocostudio/ext/LayoutHelper.h index 81131ca8d3..c6517e844f 100644 --- a/cocos/editor-support/cocostudio/ext/LayoutHelper.h +++ b/extensions/cocostudio/ext/LayoutHelper.h @@ -12,7 +12,7 @@ #define _NXNODESLAYOUT_H_ #include "cocos2d.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/CocosStudioExport.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/ext/SimpleTimer.cpp b/extensions/cocostudio/ext/SimpleTimer.cpp similarity index 100% rename from cocos/editor-support/cocostudio/ext/SimpleTimer.cpp rename to extensions/cocostudio/ext/SimpleTimer.cpp diff --git a/cocos/editor-support/cocostudio/ext/SimpleTimer.h b/extensions/cocostudio/ext/SimpleTimer.h similarity index 91% rename from cocos/editor-support/cocostudio/ext/SimpleTimer.h rename to extensions/cocostudio/ext/SimpleTimer.h index feba068012..b293de3058 100644 --- a/cocos/editor-support/cocostudio/ext/SimpleTimer.h +++ b/extensions/cocostudio/ext/SimpleTimer.h @@ -4,7 +4,7 @@ #ifndef _SIMPLE_TIMER_H_ #define _SIMPLE_TIMER_H_ -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/CocosStudioExport.h" #include namespace stimer { diff --git a/cocos/editor-support/cocostudio/ext/SpineSkeletonDataCache.cpp b/extensions/cocostudio/ext/SpineSkeletonDataCache.cpp similarity index 100% rename from cocos/editor-support/cocostudio/ext/SpineSkeletonDataCache.cpp rename to extensions/cocostudio/ext/SpineSkeletonDataCache.cpp diff --git a/cocos/editor-support/cocostudio/ext/SpineSkeletonDataCache.h b/extensions/cocostudio/ext/SpineSkeletonDataCache.h similarity index 94% rename from cocos/editor-support/cocostudio/ext/SpineSkeletonDataCache.h rename to extensions/cocostudio/ext/SpineSkeletonDataCache.h index 4546d5f683..2bd0df3e78 100644 --- a/cocos/editor-support/cocostudio/ext/SpineSkeletonDataCache.h +++ b/extensions/cocostudio/ext/SpineSkeletonDataCache.h @@ -3,7 +3,7 @@ #include #include "spine/spine.h" #include "spine/spine-cocos2dx.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/CocosStudioExport.h" #include class CC_STUDIO_DLL SpineSkeletonDataCache diff --git a/cocos/editor-support/cocostudio/ext/UITextFieldEx.cpp b/extensions/cocostudio/ext/UITextFieldEx.cpp similarity index 100% rename from cocos/editor-support/cocostudio/ext/UITextFieldEx.cpp rename to extensions/cocostudio/ext/UITextFieldEx.cpp diff --git a/cocos/editor-support/cocostudio/ext/UITextFieldEx.h b/extensions/cocostudio/ext/UITextFieldEx.h similarity index 99% rename from cocos/editor-support/cocostudio/ext/UITextFieldEx.h rename to extensions/cocostudio/ext/UITextFieldEx.h index f0dabe81ae..7766f6c92b 100644 --- a/cocos/editor-support/cocostudio/ext/UITextFieldEx.h +++ b/extensions/cocostudio/ext/UITextFieldEx.h @@ -5,7 +5,7 @@ #define _UITEXTFIELDEX_H_ #include "cocos2d.h" -#include "editor-support/cocostudio/CocosStudioExport.h" +#include "cocostudio/CocosStudioExport.h" #include "SimpleTimer.h" diff --git a/cocos/editor-support/cocostudio/ext/glslutils.cpp b/extensions/cocostudio/ext/glslutils.cpp similarity index 100% rename from cocos/editor-support/cocostudio/ext/glslutils.cpp rename to extensions/cocostudio/ext/glslutils.cpp diff --git a/cocos/editor-support/cocostudio/ext/glslutils.hpp b/extensions/cocostudio/ext/glslutils.hpp similarity index 100% rename from cocos/editor-support/cocostudio/ext/glslutils.hpp rename to extensions/cocostudio/ext/glslutils.hpp diff --git a/cocos/editor-support/cocostudio/ext/matrix3f.hpp b/extensions/cocostudio/ext/matrix3f.hpp similarity index 100% rename from cocos/editor-support/cocostudio/ext/matrix3f.hpp rename to extensions/cocostudio/ext/matrix3f.hpp diff --git a/cocos/editor-support/dragonBones/CCArmatureDisplay.cpp b/extensions/dragonbones/CCArmatureDisplay.cpp similarity index 100% rename from cocos/editor-support/dragonBones/CCArmatureDisplay.cpp rename to extensions/dragonbones/CCArmatureDisplay.cpp diff --git a/cocos/editor-support/dragonBones/CCArmatureDisplay.h b/extensions/dragonbones/CCArmatureDisplay.h similarity index 100% rename from cocos/editor-support/dragonBones/CCArmatureDisplay.h rename to extensions/dragonbones/CCArmatureDisplay.h diff --git a/cocos/editor-support/dragonBones/CCDragonBonesHeaders.h b/extensions/dragonbones/CCDragonBonesHeaders.h similarity index 100% rename from cocos/editor-support/dragonBones/CCDragonBonesHeaders.h rename to extensions/dragonbones/CCDragonBonesHeaders.h diff --git a/cocos/editor-support/dragonBones/CCFactory.cpp b/extensions/dragonbones/CCFactory.cpp similarity index 100% rename from cocos/editor-support/dragonBones/CCFactory.cpp rename to extensions/dragonbones/CCFactory.cpp diff --git a/cocos/editor-support/dragonBones/CCFactory.h b/extensions/dragonbones/CCFactory.h similarity index 100% rename from cocos/editor-support/dragonBones/CCFactory.h rename to extensions/dragonbones/CCFactory.h diff --git a/cocos/editor-support/dragonBones/CCSlot.cpp b/extensions/dragonbones/CCSlot.cpp similarity index 100% rename from cocos/editor-support/dragonBones/CCSlot.cpp rename to extensions/dragonbones/CCSlot.cpp diff --git a/cocos/editor-support/dragonBones/CCSlot.h b/extensions/dragonbones/CCSlot.h similarity index 100% rename from cocos/editor-support/dragonBones/CCSlot.h rename to extensions/dragonbones/CCSlot.h diff --git a/cocos/editor-support/dragonBones/CCTextureAtlasData.cpp b/extensions/dragonbones/CCTextureAtlasData.cpp similarity index 100% rename from cocos/editor-support/dragonBones/CCTextureAtlasData.cpp rename to extensions/dragonbones/CCTextureAtlasData.cpp diff --git a/cocos/editor-support/dragonBones/CCTextureAtlasData.h b/extensions/dragonbones/CCTextureAtlasData.h similarity index 100% rename from cocos/editor-support/dragonBones/CCTextureAtlasData.h rename to extensions/dragonbones/CCTextureAtlasData.h diff --git a/extensions/dragonbones/CMakeLists.txt b/extensions/dragonbones/CMakeLists.txt new file mode 100644 index 0000000000..86d61bae6d --- /dev/null +++ b/extensions/dragonbones/CMakeLists.txt @@ -0,0 +1,16 @@ +set(target_name dragonbones) + +FILE(GLOB_RECURSE DRAGONBONES_SOURCES ./*.h;./*.cpp) + +add_library(${dragonbones} STATIC ${DRAGONBONES_SOURCES}) + +target_link_libraries(${target_name} cocos2d) +set(CC_EXTENSION_LIBS "${target_name};${CC_EXTENSION_LIBS}" CACHE INTERNAL "extensions for auto link to target application") + +set_target_properties(${target_name} + PROPERTIES + ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + FOLDER "Extensions" +) + diff --git a/cocos/editor-support/dragonBones/DragonBonesHeaders.h b/extensions/dragonbones/DragonBonesHeaders.h similarity index 100% rename from cocos/editor-support/dragonBones/DragonBonesHeaders.h rename to extensions/dragonbones/DragonBonesHeaders.h diff --git a/cocos/editor-support/dragonBones/animation/Animation.cpp b/extensions/dragonbones/animation/Animation.cpp similarity index 100% rename from cocos/editor-support/dragonBones/animation/Animation.cpp rename to extensions/dragonbones/animation/Animation.cpp diff --git a/cocos/editor-support/dragonBones/animation/Animation.h b/extensions/dragonbones/animation/Animation.h similarity index 100% rename from cocos/editor-support/dragonBones/animation/Animation.h rename to extensions/dragonbones/animation/Animation.h diff --git a/cocos/editor-support/dragonBones/animation/AnimationState.cpp b/extensions/dragonbones/animation/AnimationState.cpp similarity index 100% rename from cocos/editor-support/dragonBones/animation/AnimationState.cpp rename to extensions/dragonbones/animation/AnimationState.cpp diff --git a/cocos/editor-support/dragonBones/animation/AnimationState.h b/extensions/dragonbones/animation/AnimationState.h similarity index 100% rename from cocos/editor-support/dragonBones/animation/AnimationState.h rename to extensions/dragonbones/animation/AnimationState.h diff --git a/cocos/editor-support/dragonBones/animation/BaseTimelineState.cpp b/extensions/dragonbones/animation/BaseTimelineState.cpp similarity index 100% rename from cocos/editor-support/dragonBones/animation/BaseTimelineState.cpp rename to extensions/dragonbones/animation/BaseTimelineState.cpp diff --git a/cocos/editor-support/dragonBones/animation/BaseTimelineState.h b/extensions/dragonbones/animation/BaseTimelineState.h similarity index 100% rename from cocos/editor-support/dragonBones/animation/BaseTimelineState.h rename to extensions/dragonbones/animation/BaseTimelineState.h diff --git a/cocos/editor-support/dragonBones/animation/IAnimatable.h b/extensions/dragonbones/animation/IAnimatable.h similarity index 100% rename from cocos/editor-support/dragonBones/animation/IAnimatable.h rename to extensions/dragonbones/animation/IAnimatable.h diff --git a/cocos/editor-support/dragonBones/animation/TimelineState.cpp b/extensions/dragonbones/animation/TimelineState.cpp similarity index 100% rename from cocos/editor-support/dragonBones/animation/TimelineState.cpp rename to extensions/dragonbones/animation/TimelineState.cpp diff --git a/cocos/editor-support/dragonBones/animation/TimelineState.h b/extensions/dragonbones/animation/TimelineState.h similarity index 100% rename from cocos/editor-support/dragonBones/animation/TimelineState.h rename to extensions/dragonbones/animation/TimelineState.h diff --git a/cocos/editor-support/dragonBones/animation/WorldClock.cpp b/extensions/dragonbones/animation/WorldClock.cpp similarity index 100% rename from cocos/editor-support/dragonBones/animation/WorldClock.cpp rename to extensions/dragonbones/animation/WorldClock.cpp diff --git a/cocos/editor-support/dragonBones/animation/WorldClock.h b/extensions/dragonbones/animation/WorldClock.h similarity index 100% rename from cocos/editor-support/dragonBones/animation/WorldClock.h rename to extensions/dragonbones/animation/WorldClock.h diff --git a/cocos/editor-support/dragonBones/armature/Armature.cpp b/extensions/dragonbones/armature/Armature.cpp similarity index 100% rename from cocos/editor-support/dragonBones/armature/Armature.cpp rename to extensions/dragonbones/armature/Armature.cpp diff --git a/cocos/editor-support/dragonBones/armature/Armature.h b/extensions/dragonbones/armature/Armature.h similarity index 100% rename from cocos/editor-support/dragonBones/armature/Armature.h rename to extensions/dragonbones/armature/Armature.h diff --git a/cocos/editor-support/dragonBones/armature/Bone.cpp b/extensions/dragonbones/armature/Bone.cpp similarity index 100% rename from cocos/editor-support/dragonBones/armature/Bone.cpp rename to extensions/dragonbones/armature/Bone.cpp diff --git a/cocos/editor-support/dragonBones/armature/Bone.h b/extensions/dragonbones/armature/Bone.h similarity index 100% rename from cocos/editor-support/dragonBones/armature/Bone.h rename to extensions/dragonbones/armature/Bone.h diff --git a/cocos/editor-support/dragonBones/armature/Constraint.cpp b/extensions/dragonbones/armature/Constraint.cpp similarity index 100% rename from cocos/editor-support/dragonBones/armature/Constraint.cpp rename to extensions/dragonbones/armature/Constraint.cpp diff --git a/cocos/editor-support/dragonBones/armature/Constraint.h b/extensions/dragonbones/armature/Constraint.h similarity index 100% rename from cocos/editor-support/dragonBones/armature/Constraint.h rename to extensions/dragonbones/armature/Constraint.h diff --git a/cocos/editor-support/dragonBones/armature/DeformVertices.cpp b/extensions/dragonbones/armature/DeformVertices.cpp similarity index 100% rename from cocos/editor-support/dragonBones/armature/DeformVertices.cpp rename to extensions/dragonbones/armature/DeformVertices.cpp diff --git a/cocos/editor-support/dragonBones/armature/DeformVertices.h b/extensions/dragonbones/armature/DeformVertices.h similarity index 100% rename from cocos/editor-support/dragonBones/armature/DeformVertices.h rename to extensions/dragonbones/armature/DeformVertices.h diff --git a/cocos/editor-support/dragonBones/armature/IArmatureProxy.h b/extensions/dragonbones/armature/IArmatureProxy.h similarity index 100% rename from cocos/editor-support/dragonBones/armature/IArmatureProxy.h rename to extensions/dragonbones/armature/IArmatureProxy.h diff --git a/cocos/editor-support/dragonBones/armature/Slot.cpp b/extensions/dragonbones/armature/Slot.cpp similarity index 100% rename from cocos/editor-support/dragonBones/armature/Slot.cpp rename to extensions/dragonbones/armature/Slot.cpp diff --git a/cocos/editor-support/dragonBones/armature/Slot.h b/extensions/dragonbones/armature/Slot.h similarity index 100% rename from cocos/editor-support/dragonBones/armature/Slot.h rename to extensions/dragonbones/armature/Slot.h diff --git a/cocos/editor-support/dragonBones/armature/TransformObject.cpp b/extensions/dragonbones/armature/TransformObject.cpp similarity index 100% rename from cocos/editor-support/dragonBones/armature/TransformObject.cpp rename to extensions/dragonbones/armature/TransformObject.cpp diff --git a/cocos/editor-support/dragonBones/armature/TransformObject.h b/extensions/dragonbones/armature/TransformObject.h similarity index 100% rename from cocos/editor-support/dragonBones/armature/TransformObject.h rename to extensions/dragonbones/armature/TransformObject.h diff --git a/cocos/editor-support/dragonBones/core/BaseObject.cpp b/extensions/dragonbones/core/BaseObject.cpp similarity index 100% rename from cocos/editor-support/dragonBones/core/BaseObject.cpp rename to extensions/dragonbones/core/BaseObject.cpp diff --git a/cocos/editor-support/dragonBones/core/BaseObject.h b/extensions/dragonbones/core/BaseObject.h similarity index 100% rename from cocos/editor-support/dragonBones/core/BaseObject.h rename to extensions/dragonbones/core/BaseObject.h diff --git a/cocos/editor-support/dragonBones/core/DragonBones.cpp b/extensions/dragonbones/core/DragonBones.cpp similarity index 100% rename from cocos/editor-support/dragonBones/core/DragonBones.cpp rename to extensions/dragonbones/core/DragonBones.cpp diff --git a/cocos/editor-support/dragonBones/core/DragonBones.h b/extensions/dragonbones/core/DragonBones.h similarity index 100% rename from cocos/editor-support/dragonBones/core/DragonBones.h rename to extensions/dragonbones/core/DragonBones.h diff --git a/cocos/editor-support/dragonBones/event/EventObject.cpp b/extensions/dragonbones/event/EventObject.cpp similarity index 100% rename from cocos/editor-support/dragonBones/event/EventObject.cpp rename to extensions/dragonbones/event/EventObject.cpp diff --git a/cocos/editor-support/dragonBones/event/EventObject.h b/extensions/dragonbones/event/EventObject.h similarity index 100% rename from cocos/editor-support/dragonBones/event/EventObject.h rename to extensions/dragonbones/event/EventObject.h diff --git a/cocos/editor-support/dragonBones/event/IEventDispatcher.h b/extensions/dragonbones/event/IEventDispatcher.h similarity index 100% rename from cocos/editor-support/dragonBones/event/IEventDispatcher.h rename to extensions/dragonbones/event/IEventDispatcher.h diff --git a/cocos/editor-support/dragonBones/factory/BaseFactory.cpp b/extensions/dragonbones/factory/BaseFactory.cpp similarity index 100% rename from cocos/editor-support/dragonBones/factory/BaseFactory.cpp rename to extensions/dragonbones/factory/BaseFactory.cpp diff --git a/cocos/editor-support/dragonBones/factory/BaseFactory.h b/extensions/dragonbones/factory/BaseFactory.h similarity index 100% rename from cocos/editor-support/dragonBones/factory/BaseFactory.h rename to extensions/dragonbones/factory/BaseFactory.h diff --git a/cocos/editor-support/dragonBones/geom/ColorTransform.h b/extensions/dragonbones/geom/ColorTransform.h similarity index 100% rename from cocos/editor-support/dragonBones/geom/ColorTransform.h rename to extensions/dragonbones/geom/ColorTransform.h diff --git a/cocos/editor-support/dragonBones/geom/Matrix.h b/extensions/dragonbones/geom/Matrix.h similarity index 100% rename from cocos/editor-support/dragonBones/geom/Matrix.h rename to extensions/dragonbones/geom/Matrix.h diff --git a/cocos/editor-support/dragonBones/geom/Point.cpp b/extensions/dragonbones/geom/Point.cpp similarity index 100% rename from cocos/editor-support/dragonBones/geom/Point.cpp rename to extensions/dragonbones/geom/Point.cpp diff --git a/cocos/editor-support/dragonBones/geom/Point.h b/extensions/dragonbones/geom/Point.h similarity index 100% rename from cocos/editor-support/dragonBones/geom/Point.h rename to extensions/dragonbones/geom/Point.h diff --git a/cocos/editor-support/dragonBones/geom/Rectangle.h b/extensions/dragonbones/geom/Rectangle.h similarity index 100% rename from cocos/editor-support/dragonBones/geom/Rectangle.h rename to extensions/dragonbones/geom/Rectangle.h diff --git a/cocos/editor-support/dragonBones/geom/Transform.cpp b/extensions/dragonbones/geom/Transform.cpp similarity index 100% rename from cocos/editor-support/dragonBones/geom/Transform.cpp rename to extensions/dragonbones/geom/Transform.cpp diff --git a/cocos/editor-support/dragonBones/geom/Transform.h b/extensions/dragonbones/geom/Transform.h similarity index 100% rename from cocos/editor-support/dragonBones/geom/Transform.h rename to extensions/dragonbones/geom/Transform.h diff --git a/cocos/editor-support/dragonBones/model/AnimationConfig.cpp b/extensions/dragonbones/model/AnimationConfig.cpp similarity index 100% rename from cocos/editor-support/dragonBones/model/AnimationConfig.cpp rename to extensions/dragonbones/model/AnimationConfig.cpp diff --git a/cocos/editor-support/dragonBones/model/AnimationConfig.h b/extensions/dragonbones/model/AnimationConfig.h similarity index 100% rename from cocos/editor-support/dragonBones/model/AnimationConfig.h rename to extensions/dragonbones/model/AnimationConfig.h diff --git a/cocos/editor-support/dragonBones/model/AnimationData.cpp b/extensions/dragonbones/model/AnimationData.cpp similarity index 100% rename from cocos/editor-support/dragonBones/model/AnimationData.cpp rename to extensions/dragonbones/model/AnimationData.cpp diff --git a/cocos/editor-support/dragonBones/model/AnimationData.h b/extensions/dragonbones/model/AnimationData.h similarity index 100% rename from cocos/editor-support/dragonBones/model/AnimationData.h rename to extensions/dragonbones/model/AnimationData.h diff --git a/cocos/editor-support/dragonBones/model/ArmatureData.cpp b/extensions/dragonbones/model/ArmatureData.cpp similarity index 100% rename from cocos/editor-support/dragonBones/model/ArmatureData.cpp rename to extensions/dragonbones/model/ArmatureData.cpp diff --git a/cocos/editor-support/dragonBones/model/ArmatureData.h b/extensions/dragonbones/model/ArmatureData.h similarity index 100% rename from cocos/editor-support/dragonBones/model/ArmatureData.h rename to extensions/dragonbones/model/ArmatureData.h diff --git a/cocos/editor-support/dragonBones/model/BoundingBoxData.cpp b/extensions/dragonbones/model/BoundingBoxData.cpp similarity index 100% rename from cocos/editor-support/dragonBones/model/BoundingBoxData.cpp rename to extensions/dragonbones/model/BoundingBoxData.cpp diff --git a/cocos/editor-support/dragonBones/model/BoundingBoxData.h b/extensions/dragonbones/model/BoundingBoxData.h similarity index 100% rename from cocos/editor-support/dragonBones/model/BoundingBoxData.h rename to extensions/dragonbones/model/BoundingBoxData.h diff --git a/cocos/editor-support/dragonBones/model/CanvasData.cpp b/extensions/dragonbones/model/CanvasData.cpp similarity index 100% rename from cocos/editor-support/dragonBones/model/CanvasData.cpp rename to extensions/dragonbones/model/CanvasData.cpp diff --git a/cocos/editor-support/dragonBones/model/CanvasData.h b/extensions/dragonbones/model/CanvasData.h similarity index 100% rename from cocos/editor-support/dragonBones/model/CanvasData.h rename to extensions/dragonbones/model/CanvasData.h diff --git a/cocos/editor-support/dragonBones/model/ConstraintData.cpp b/extensions/dragonbones/model/ConstraintData.cpp similarity index 100% rename from cocos/editor-support/dragonBones/model/ConstraintData.cpp rename to extensions/dragonbones/model/ConstraintData.cpp diff --git a/cocos/editor-support/dragonBones/model/ConstraintData.h b/extensions/dragonbones/model/ConstraintData.h similarity index 100% rename from cocos/editor-support/dragonBones/model/ConstraintData.h rename to extensions/dragonbones/model/ConstraintData.h diff --git a/cocos/editor-support/dragonBones/model/DisplayData.cpp b/extensions/dragonbones/model/DisplayData.cpp similarity index 100% rename from cocos/editor-support/dragonBones/model/DisplayData.cpp rename to extensions/dragonbones/model/DisplayData.cpp diff --git a/cocos/editor-support/dragonBones/model/DisplayData.h b/extensions/dragonbones/model/DisplayData.h similarity index 100% rename from cocos/editor-support/dragonBones/model/DisplayData.h rename to extensions/dragonbones/model/DisplayData.h diff --git a/cocos/editor-support/dragonBones/model/DragonBonesData.cpp b/extensions/dragonbones/model/DragonBonesData.cpp similarity index 100% rename from cocos/editor-support/dragonBones/model/DragonBonesData.cpp rename to extensions/dragonbones/model/DragonBonesData.cpp diff --git a/cocos/editor-support/dragonBones/model/DragonBonesData.h b/extensions/dragonbones/model/DragonBonesData.h similarity index 100% rename from cocos/editor-support/dragonBones/model/DragonBonesData.h rename to extensions/dragonbones/model/DragonBonesData.h diff --git a/cocos/editor-support/dragonBones/model/SkinData.cpp b/extensions/dragonbones/model/SkinData.cpp similarity index 100% rename from cocos/editor-support/dragonBones/model/SkinData.cpp rename to extensions/dragonbones/model/SkinData.cpp diff --git a/cocos/editor-support/dragonBones/model/SkinData.h b/extensions/dragonbones/model/SkinData.h similarity index 100% rename from cocos/editor-support/dragonBones/model/SkinData.h rename to extensions/dragonbones/model/SkinData.h diff --git a/cocos/editor-support/dragonBones/model/TextureAtlasData.cpp b/extensions/dragonbones/model/TextureAtlasData.cpp similarity index 100% rename from cocos/editor-support/dragonBones/model/TextureAtlasData.cpp rename to extensions/dragonbones/model/TextureAtlasData.cpp diff --git a/cocos/editor-support/dragonBones/model/TextureAtlasData.h b/extensions/dragonbones/model/TextureAtlasData.h similarity index 100% rename from cocos/editor-support/dragonBones/model/TextureAtlasData.h rename to extensions/dragonbones/model/TextureAtlasData.h diff --git a/cocos/editor-support/dragonBones/model/UserData.cpp b/extensions/dragonbones/model/UserData.cpp similarity index 100% rename from cocos/editor-support/dragonBones/model/UserData.cpp rename to extensions/dragonbones/model/UserData.cpp diff --git a/cocos/editor-support/dragonBones/model/UserData.h b/extensions/dragonbones/model/UserData.h similarity index 100% rename from cocos/editor-support/dragonBones/model/UserData.h rename to extensions/dragonbones/model/UserData.h diff --git a/cocos/editor-support/dragonBones/parser/BinaryDataParser.cpp b/extensions/dragonbones/parser/BinaryDataParser.cpp similarity index 100% rename from cocos/editor-support/dragonBones/parser/BinaryDataParser.cpp rename to extensions/dragonbones/parser/BinaryDataParser.cpp diff --git a/cocos/editor-support/dragonBones/parser/BinaryDataParser.h b/extensions/dragonbones/parser/BinaryDataParser.h similarity index 100% rename from cocos/editor-support/dragonBones/parser/BinaryDataParser.h rename to extensions/dragonbones/parser/BinaryDataParser.h diff --git a/cocos/editor-support/dragonBones/parser/DataParser.cpp b/extensions/dragonbones/parser/DataParser.cpp similarity index 100% rename from cocos/editor-support/dragonBones/parser/DataParser.cpp rename to extensions/dragonbones/parser/DataParser.cpp diff --git a/cocos/editor-support/dragonBones/parser/DataParser.h b/extensions/dragonbones/parser/DataParser.h similarity index 100% rename from cocos/editor-support/dragonBones/parser/DataParser.h rename to extensions/dragonbones/parser/DataParser.h diff --git a/cocos/editor-support/dragonBones/parser/JSONDataParser.cpp b/extensions/dragonbones/parser/JSONDataParser.cpp similarity index 100% rename from cocos/editor-support/dragonBones/parser/JSONDataParser.cpp rename to extensions/dragonbones/parser/JSONDataParser.cpp diff --git a/cocos/editor-support/dragonBones/parser/JSONDataParser.h b/extensions/dragonbones/parser/JSONDataParser.h similarity index 100% rename from cocos/editor-support/dragonBones/parser/JSONDataParser.h rename to extensions/dragonbones/parser/JSONDataParser.h diff --git a/extensions/physics-nodes/CMakeLists.txt b/extensions/physics-nodes/CMakeLists.txt new file mode 100644 index 0000000000..6f1cc1af8f --- /dev/null +++ b/extensions/physics-nodes/CMakeLists.txt @@ -0,0 +1,16 @@ +set(target_name physics-nodes) + +FILE(GLOB PHYSICS_NODES_SOURCES *.h;*.cpp;./**/*.h;./**/*.cpp) + +add_library(${target_name} STATIC ${PHYSICS_NODES_SOURCES}) + +target_link_libraries(${target_name} cocos2d) + +set(CC_EXTENSION_LIBS "${target_name};${CC_EXTENSION_LIBS}" CACHE INTERNAL "extensions for auto link to target application") + +set_target_properties(${target_name} + PROPERTIES + ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + FOLDER "Extensions" +) diff --git a/cocos/editor-support/spine/AttachmentVertices.cpp b/extensions/spine/AttachmentVertices.cpp similarity index 100% rename from cocos/editor-support/spine/AttachmentVertices.cpp rename to extensions/spine/AttachmentVertices.cpp diff --git a/cocos/editor-support/spine/AttachmentVertices.h b/extensions/spine/AttachmentVertices.h similarity index 100% rename from cocos/editor-support/spine/AttachmentVertices.h rename to extensions/spine/AttachmentVertices.h diff --git a/extensions/spine/CMakeLists.txt b/extensions/spine/CMakeLists.txt new file mode 100644 index 0000000000..34dacfce21 --- /dev/null +++ b/extensions/spine/CMakeLists.txt @@ -0,0 +1,25 @@ + +set(target_name spine) + +file(GLOB_RECURSE COCOS_SPINE_SRC + ${CMAKE_CURRENT_LIST_DIR}/*.cpp + ${CMAKE_CURRENT_LIST_DIR}/**/*.cpp +) + +file(GLOB_RECURSE COCOS_SPINE_HEADER + ${CMAKE_CURRENT_LIST_DIR}/*.h + ${CMAKE_CURRENT_LIST_DIR}/**/*.h +) + +add_library(${target_name} STATIC ${COCOS_SPINE_HEADER} ${COCOS_SPINE_SRC}) + +target_link_libraries(${target_name} cocos2d) + +set(CC_EXTENSION_LIBS "${target_name};${CC_EXTENSION_LIBS}" CACHE INTERNAL "extensions for auto link to target application") + +set_target_properties(${target_name} + PROPERTIES + ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + FOLDER "Extensions" +) diff --git a/cocos/editor-support/spine/SkeletonAnimation.cpp b/extensions/spine/SkeletonAnimation.cpp similarity index 100% rename from cocos/editor-support/spine/SkeletonAnimation.cpp rename to extensions/spine/SkeletonAnimation.cpp diff --git a/cocos/editor-support/spine/SkeletonAnimation.h b/extensions/spine/SkeletonAnimation.h similarity index 100% rename from cocos/editor-support/spine/SkeletonAnimation.h rename to extensions/spine/SkeletonAnimation.h diff --git a/cocos/editor-support/spine/SkeletonRenderer.cpp b/extensions/spine/SkeletonRenderer.cpp similarity index 100% rename from cocos/editor-support/spine/SkeletonRenderer.cpp rename to extensions/spine/SkeletonRenderer.cpp diff --git a/cocos/editor-support/spine/SkeletonRenderer.h b/extensions/spine/SkeletonRenderer.h similarity index 100% rename from cocos/editor-support/spine/SkeletonRenderer.h rename to extensions/spine/SkeletonRenderer.h diff --git a/cocos/editor-support/spine/spine-cocos2dx.cpp b/extensions/spine/spine-cocos2dx.cpp similarity index 100% rename from cocos/editor-support/spine/spine-cocos2dx.cpp rename to extensions/spine/spine-cocos2dx.cpp diff --git a/cocos/editor-support/spine/spine-cocos2dx.h b/extensions/spine/spine-cocos2dx.h similarity index 100% rename from cocos/editor-support/spine/spine-cocos2dx.h rename to extensions/spine/spine-cocos2dx.h diff --git a/cocos/editor-support/spine/v3/SkeletonBatch.cpp b/extensions/spine/v3/SkeletonBatch.cpp similarity index 100% rename from cocos/editor-support/spine/v3/SkeletonBatch.cpp rename to extensions/spine/v3/SkeletonBatch.cpp diff --git a/cocos/editor-support/spine/v3/SkeletonBatch.h b/extensions/spine/v3/SkeletonBatch.h similarity index 100% rename from cocos/editor-support/spine/v3/SkeletonBatch.h rename to extensions/spine/v3/SkeletonBatch.h diff --git a/cocos/editor-support/spine/v3/SkeletonTwoColorBatch.cpp b/extensions/spine/v3/SkeletonTwoColorBatch.cpp similarity index 100% rename from cocos/editor-support/spine/v3/SkeletonTwoColorBatch.cpp rename to extensions/spine/v3/SkeletonTwoColorBatch.cpp diff --git a/cocos/editor-support/spine/v3/SkeletonTwoColorBatch.h b/extensions/spine/v3/SkeletonTwoColorBatch.h similarity index 100% rename from cocos/editor-support/spine/v3/SkeletonTwoColorBatch.h rename to extensions/spine/v3/SkeletonTwoColorBatch.h diff --git a/cocos/editor-support/spine/v4/SkeletonBatch.cpp b/extensions/spine/v4/SkeletonBatch.cpp similarity index 100% rename from cocos/editor-support/spine/v4/SkeletonBatch.cpp rename to extensions/spine/v4/SkeletonBatch.cpp diff --git a/cocos/editor-support/spine/v4/SkeletonBatch.h b/extensions/spine/v4/SkeletonBatch.h similarity index 100% rename from cocos/editor-support/spine/v4/SkeletonBatch.h rename to extensions/spine/v4/SkeletonBatch.h diff --git a/cocos/editor-support/spine/v4/SkeletonTwoColorBatch.cpp b/extensions/spine/v4/SkeletonTwoColorBatch.cpp similarity index 100% rename from cocos/editor-support/spine/v4/SkeletonTwoColorBatch.cpp rename to extensions/spine/v4/SkeletonTwoColorBatch.cpp diff --git a/cocos/editor-support/spine/v4/SkeletonTwoColorBatch.h b/extensions/spine/v4/SkeletonTwoColorBatch.h similarity index 100% rename from cocos/editor-support/spine/v4/SkeletonTwoColorBatch.h rename to extensions/spine/v4/SkeletonTwoColorBatch.h diff --git a/tests/cpp-tests/Classes/LabelTest/LabelTestNew.h b/tests/cpp-tests/Classes/LabelTest/LabelTestNew.h index 9c416ef1f0..681bd57841 100644 --- a/tests/cpp-tests/Classes/LabelTest/LabelTestNew.h +++ b/tests/cpp-tests/Classes/LabelTest/LabelTestNew.h @@ -29,7 +29,7 @@ #include "renderer/CCCustomCommand.h" #include "ui/CocosGUI.h" #include "extensions/cocos-ext.h" -#include "editor-support/cocostudio/LocalizationManager.h" +#include "cocostudio/LocalizationManager.h" DEFINE_TEST_SUITE(NewLabelTests); diff --git a/tests/cpp-tests/Classes/ParticleTest/ParticleTest.cpp b/tests/cpp-tests/Classes/ParticleTest/ParticleTest.cpp index c22299983a..edd75d3864 100644 --- a/tests/cpp-tests/Classes/ParticleTest/ParticleTest.cpp +++ b/tests/cpp-tests/Classes/ParticleTest/ParticleTest.cpp @@ -24,7 +24,7 @@ #include "ParticleTest.h" #include "../testResource.h" -#include "editor-support/cocostudio/CocosStudioExtension.h" +#include "cocostudio/CocosStudioExtension.h" USING_NS_CC; diff --git a/tests/cpp-tests/Classes/SpriteTest/SpriteTest.cpp b/tests/cpp-tests/Classes/SpriteTest/SpriteTest.cpp index fc7344cdca..69f60d0e6e 100644 --- a/tests/cpp-tests/Classes/SpriteTest/SpriteTest.cpp +++ b/tests/cpp-tests/Classes/SpriteTest/SpriteTest.cpp @@ -30,7 +30,7 @@ #include #include "../testResource.h" -#include "editor-support/cocostudio/CocosStudioExtension.h" +#include "cocostudio/CocosStudioExtension.h" USING_NS_CC; diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.cpp index f562adbdb0..40d546abb5 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.cpp @@ -23,8 +23,8 @@ THE SOFTWARE. ****************************************************************************/ #include "UIRichTextTest.h" -#include "editor-support/cocostudio/CCArmatureDataManager.h" -#include "editor-support/cocostudio/CCArmature.h" +#include "cocostudio/CCArmatureDataManager.h" +#include "cocostudio/CCArmature.h" USING_NS_CC; using namespace cocos2d::ui; diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScene.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScene.cpp index 2372bb1bd0..cba747ec8e 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScene.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScene.cpp @@ -25,7 +25,7 @@ #include "extensions/cocos-ext.h" #include "UIScene.h" #include "UISceneManager.h" -#include "editor-support/cocostudio/CCSGUIReader.h" +#include "cocostudio/CCSGUIReader.h" #include "CocosGUIScene.h" USING_NS_CC;