diff --git a/CMakeLists.txt b/CMakeLists.txt index 3faaee653d..502be6ed2a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -246,8 +246,8 @@ add_subdirectory(cocos/storage) endif(BUILD_STORAGE) if(BUILD_GUI) -# gui -add_subdirectory(cocos/gui) +# ui +add_subdirectory(cocos/ui) endif(BUILD_GUI) if(BUILD_NETWORK) diff --git a/build/cocos2d-win32.vc2012.sln b/build/cocos2d-win32.vc2012.sln index 8b0bce5dbe..ca13181a46 100644 --- a/build/cocos2d-win32.vc2012.sln +++ b/build/cocos2d-win32.vc2012.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Express 2012 for Windows Desktop +# Visual Studio 2012 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libAudio", "..\cocos\audio\proj.win32\CocosDenshion.vcxproj", "{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\cocos\2d\cocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}" @@ -17,8 +17,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosBuilder", "..\cocos EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosStudio", "..\cocos\editor-support\cocostudio\proj.win32\libCocosStudio.vcxproj", "{B57CF53F-2E49-4031-9822-047CC0E6BDE2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGUI", "..\cocos\gui\proj.win32\libGUI.vcxproj", "{7E06E92C-537A-442B-9E4A-4761C84F8A1A}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libNetwork", "..\cocos\network\proj.win32\libNetwork.vcxproj", "{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}" @@ -29,6 +27,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "..\cocos\scriptin EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLua", "..\tests\lua-tests\project\proj.win32\TestLua.win32.vcxproj", "{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGUI", "..\cocos\ui\proj.win32\libGUI.vcxproj", "{7E06E92C-537A-442B-9E4A-4761C84F8A1A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -67,10 +67,6 @@ Global {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Debug|Win32.Build.0 = Debug|Win32 {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Release|Win32.ActiveCfg = Release|Win32 {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Release|Win32.Build.0 = Release|Win32 - {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.ActiveCfg = Debug|Win32 - {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.Build.0 = Debug|Win32 - {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.ActiveCfg = Release|Win32 - {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.Build.0 = Release|Win32 {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Debug|Win32.ActiveCfg = Debug|Win32 {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Debug|Win32.Build.0 = Debug|Win32 {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Release|Win32.ActiveCfg = Release|Win32 @@ -91,6 +87,10 @@ Global {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Debug|Win32.Build.0 = Debug|Win32 {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Release|Win32.ActiveCfg = Release|Win32 {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Release|Win32.Build.0 = Release|Win32 + {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.ActiveCfg = Debug|Win32 + {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.Build.0 = Debug|Win32 + {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.ActiveCfg = Release|Win32 + {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id b/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id index 5ba3bf781e..f04874a8ec 100644 --- a/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -c9621114b4eae679324c1a95f5ae9a1b7e9acc17 \ No newline at end of file +71a61fb97a4db05adaabc4cc03035fe419cc35d6 \ No newline at end of file diff --git a/build/cocos2d_tests.xcodeproj/project.pbxproj.REMOVED.git-id b/build/cocos2d_tests.xcodeproj/project.pbxproj.REMOVED.git-id index 75ce22c5ee..82864a9aa4 100644 --- a/build/cocos2d_tests.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/build/cocos2d_tests.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -1c0cfb1ac4272e26690b9265c721c0a7e5ae83c3 \ No newline at end of file +08fd638cd925dfad54a49df207a72130942102d3 \ No newline at end of file diff --git a/cocos/editor-support/cocostudio/Android.mk b/cocos/editor-support/cocostudio/Android.mk index 019af9d284..6cb98d869c 100644 --- a/cocos/editor-support/cocostudio/Android.mk +++ b/cocos/editor-support/cocostudio/Android.mk @@ -68,11 +68,11 @@ LOCAL_EXPORT_CFLAGS += -Wno-psabi LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static -LOCAL_WHOLE_STATIC_LIBRARIES += cocos_gui_static +LOCAL_WHOLE_STATIC_LIBRARIES += cocos_ui_static include $(BUILD_STATIC_LIBRARY) $(call import-module,2d) $(call import-module,audio/android) -$(call import-module,gui) +$(call import-module,ui) diff --git a/cocos/editor-support/cocostudio/CCActionNode.cpp b/cocos/editor-support/cocostudio/CCActionNode.cpp index ff4969566c..d615b11c46 100644 --- a/cocos/editor-support/cocostudio/CCActionNode.cpp +++ b/cocos/editor-support/cocostudio/CCActionNode.cpp @@ -25,8 +25,8 @@ THE SOFTWARE. #include "cocostudio/CCActionNode.h" #include "cocostudio/CCActionFrameEasing.h" #include "cocostudio/DictionaryHelper.h" -#include "gui/UIWidget.h" -#include "gui/UIHelper.h" +#include "ui/UIWidget.h" +#include "ui/UIHelper.h" using namespace cocos2d; using namespace ui; diff --git a/cocos/editor-support/cocostudio/CCSGUIReader.cpp b/cocos/editor-support/cocostudio/CCSGUIReader.cpp index 1787772d07..740598b2dc 100644 --- a/cocos/editor-support/cocostudio/CCSGUIReader.cpp +++ b/cocos/editor-support/cocostudio/CCSGUIReader.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ #include "cocostudio/CCSGUIReader.h" -#include "gui/CocosGUI.h" +#include "ui/CocosGUI.h" #include "cocostudio/CCActionManagerEx.h" #include #include diff --git a/cocos/editor-support/cocostudio/CCSGUIReader.h b/cocos/editor-support/cocostudio/CCSGUIReader.h index 50e569049a..737126f85b 100644 --- a/cocos/editor-support/cocostudio/CCSGUIReader.h +++ b/cocos/editor-support/cocostudio/CCSGUIReader.h @@ -25,7 +25,7 @@ THE SOFTWARE. #ifndef __CCSGUIREADER_H__ #define __CCSGUIREADER_H__ -#include "gui/UIWidget.h" +#include "ui/UIWidget.h" #include "cocostudio/DictionaryHelper.h" #include "WidgetReader/WidgetReaderProtocol.h" #include "ObjectFactory.h" diff --git a/cocos/editor-support/cocostudio/CCSSceneReader.cpp b/cocos/editor-support/cocostudio/CCSSceneReader.cpp index aa7f514101..9d92d25e5d 100644 --- a/cocos/editor-support/cocostudio/CCSSceneReader.cpp +++ b/cocos/editor-support/cocostudio/CCSSceneReader.cpp @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ #include "cocostudio/CocoStudio.h" -#include "gui/CocosGUI.h" +#include "ui/CocosGUI.h" #include "SimpleAudioEngine.h" #include "ObjectFactory.h" diff --git a/cocos/editor-support/cocostudio/ObjectFactory.cpp b/cocos/editor-support/cocostudio/ObjectFactory.cpp index 9f5978c0d3..87b724b984 100644 --- a/cocos/editor-support/cocostudio/ObjectFactory.cpp +++ b/cocos/editor-support/cocostudio/ObjectFactory.cpp @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ #include "ObjectFactory.h" -#include "gui/UIWidget.h" +#include "ui/UIWidget.h" #include "cocostudio/WidgetReader/WidgetReaderProtocol.h" using namespace cocos2d; @@ -199,4 +199,4 @@ void ObjectFactory::registerType(const TInfo &t) _typeMap.insert(std::make_pair(t._class, t)); } -} \ No newline at end of file +} diff --git a/cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp index bf3edc9dc5..96f7f96ebe 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp @@ -1,7 +1,7 @@ #include "ButtonReader.h" -#include "gui/UIButton.h" +#include "ui/UIButton.h" USING_NS_CC; using namespace ui; diff --git a/cocos/editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.cpp index 3b34767867..8bd0898f8b 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.cpp @@ -1,7 +1,7 @@ #include "CheckBoxReader.h" -#include "gui/UICheckBox.h" +#include "ui/UICheckBox.h" USING_NS_CC; using namespace ui; diff --git a/cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp index 0ccd858240..ea2755c8fc 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp @@ -1,7 +1,7 @@ #include "ImageViewReader.h" -#include "gui/UIImageView.h" +#include "ui/UIImageView.h" USING_NS_CC; using namespace ui; diff --git a/cocos/editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.cpp index b8c86cbf38..3bb361d7e0 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.cpp @@ -1,7 +1,7 @@ #include "LayoutReader.h" -#include "gui/UILayout.h" +#include "ui/UILayout.h" USING_NS_CC; using namespace ui; diff --git a/cocos/editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.cpp index bbbdb9b14a..42444720dd 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.cpp @@ -1,7 +1,7 @@ #include "ListViewReader.h" -#include "gui/UIListView.h" +#include "ui/UIListView.h" USING_NS_CC; using namespace ui; diff --git a/cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp index 97720ed9b2..db62cc4cac 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp @@ -1,7 +1,7 @@ #include "LoadingBarReader.h" -#include "gui/UILoadingBar.h" +#include "ui/UILoadingBar.h" USING_NS_CC; using namespace ui; diff --git a/cocos/editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.cpp index 30ae81de31..a5111906be 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.cpp @@ -1,7 +1,7 @@ #include "PageViewReader.h" -#include "gui/UIPageView.h" +#include "ui/UIPageView.h" USING_NS_CC; using namespace ui; diff --git a/cocos/editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.cpp index 8df1963597..436eb8b981 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.cpp @@ -1,7 +1,7 @@ #include "ScrollViewReader.h" -#include "gui/UIScrollView.h" +#include "ui/UIScrollView.h" USING_NS_CC; using namespace ui; diff --git a/cocos/editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.cpp index 616dad40d3..6d3793a226 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.cpp @@ -1,7 +1,7 @@ #include "SliderReader.h" -#include "gui/UISlider.h" +#include "ui/UISlider.h" USING_NS_CC; using namespace ui; diff --git a/cocos/editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.cpp index 731b8c1a48..c7ef7ebcd2 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.cpp @@ -1,7 +1,7 @@ #include "TextAtlasReader.h" -#include "gui/UITextAtlas.h" +#include "ui/UITextAtlas.h" USING_NS_CC; using namespace ui; diff --git a/cocos/editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.cpp index c95d0cd778..cd5ca3d85b 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.cpp @@ -1,7 +1,7 @@ #include "TextBMFontReader.h" -#include "gui/UITextBMFont.h" +#include "ui/UITextBMFont.h" USING_NS_CC; using namespace ui; diff --git a/cocos/editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.cpp index 483b13d35d..634c34c1c8 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.cpp @@ -1,7 +1,7 @@ #include "TextFieldReader.h" -#include "gui/UITextField.h" +#include "ui/UITextField.h" USING_NS_CC; using namespace ui; diff --git a/cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp index d9406425c1..76db3ff6f1 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp @@ -1,7 +1,7 @@ #include "TextReader.h" -#include "gui/UIText.h" +#include "ui/UIText.h" USING_NS_CC; using namespace ui; diff --git a/cocos/editor-support/cocostudio/WidgetReader/WidgetReader.h b/cocos/editor-support/cocostudio/WidgetReader/WidgetReader.h index 346739b3fc..fbd2c28411 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/WidgetReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/WidgetReader.h @@ -27,8 +27,8 @@ #include "WidgetReaderProtocol.h" #include "../CCSGUIReader.h" -#include "gui/GUIDefine.h" -#include "gui/UIWidget.h" +#include "ui/GUIDefine.h" +#include "ui/UIWidget.h" namespace cocostudio { diff --git a/cocos/scripting/lua-bindings/Android.mk b/cocos/scripting/lua-bindings/Android.mk index 0c148e9ab8..134c453f88 100644 --- a/cocos/scripting/lua-bindings/Android.mk +++ b/cocos/scripting/lua-bindings/Android.mk @@ -20,7 +20,7 @@ LOCAL_SRC_FILES := manual/CCLuaBridge.cpp \ manual/lua_cocos2dx_manual.cpp \ manual/lua_cocos2dx_extension_manual.cpp \ manual/lua_cocos2dx_coco_studio_manual.cpp \ - manual/lua_cocos2dx_gui_manual.cpp \ + manual/lua_cocos2dx_ui_manual.cpp \ manual/lua_cocos2dx_spine_manual.cpp \ manual/lua_cocos2dx_physics_manual.cpp \ manual/lua_cocos2dx_deprecated.cpp \ @@ -32,7 +32,7 @@ LOCAL_SRC_FILES := manual/CCLuaBridge.cpp \ auto/lua_cocos2dx_auto.cpp \ auto/lua_cocos2dx_extension_auto.cpp \ auto/lua_cocos2dx_studio_auto.cpp \ - auto/lua_cocos2dx_gui_auto.cpp \ + auto/lua_cocos2dx_ui_auto.cpp \ auto/lua_cocos2dx_spine_auto.cpp \ auto/lua_cocos2dx_physics_auto.cpp \ ../../../external/lua/tolua/tolua_event.c \ @@ -65,7 +65,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../external/lua/tolua \ $(LOCAL_PATH)/../../editor-support/spine \ $(LOCAL_PATH)/../../editor-support/cocosbuilder \ $(LOCAL_PATH)/../../editor-support/cocostudio \ - $(LOCAL_PATH)/../../gui \ + $(LOCAL_PATH)/../../ui \ $(LOCAL_PATH)/auto \ $(LOCAL_PATH)/manual \ $(LOCAL_PATH)/manual/platform/android \ diff --git a/cocos/scripting/lua-bindings/CMakeLists.txt b/cocos/scripting/lua-bindings/CMakeLists.txt index d854cdff76..30d215e573 100644 --- a/cocos/scripting/lua-bindings/CMakeLists.txt +++ b/cocos/scripting/lua-bindings/CMakeLists.txt @@ -2,7 +2,7 @@ set(LUABINDING_SRC auto/lua_cocos2dx_auto.cpp auto/lua_cocos2dx_extension_auto.cpp auto/lua_cocos2dx_studio_auto.cpp - auto/lua_cocos2dx_gui_auto.cpp + auto/lua_cocos2dx_ui_auto.cpp auto/lua_cocos2dx_spine_auto.cpp auto/lua_cocos2dx_physics_auto.cpp manual/tolua_fix.cpp @@ -18,7 +18,7 @@ set(LUABINDING_SRC manual/lua_cocos2dx_manual.cpp manual/lua_cocos2dx_extension_manual.cpp manual/lua_cocos2dx_coco_studio_manual.cpp - manual/lua_cocos2dx_gui_manual.cpp + manual/lua_cocos2dx_ui_manual.cpp manual/lua_cocos2dx_spine_manual.cpp manual/lua_cocos2dx_physics_manual.cpp manual/lua_cocos2dx_deprecated.cpp @@ -32,7 +32,7 @@ include_directories( ../../editor-support/cocosbuilder ../../editor-support/cocostudio ../../editor-support/spine - ../../gui + ../../ui ../../../external/lua/lua ../../../external/lua/tolua ) diff --git a/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_gui_auto_api.lua b/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_gui_auto_api.lua deleted file mode 100644 index 918cb1f330..0000000000 --- a/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_gui_auto_api.lua +++ /dev/null @@ -1,94 +0,0 @@ --------------------------------- --- @module ccui - --------------------------------------------------------- --- the ccui LayoutParameter --- @field [parent=#ccui] LayoutParameter#LayoutParameter LayoutParameter preloaded module - - --------------------------------------------------------- --- the ccui LinearLayoutParameter --- @field [parent=#ccui] LinearLayoutParameter#LinearLayoutParameter LinearLayoutParameter preloaded module - - --------------------------------------------------------- --- the ccui RelativeLayoutParameter --- @field [parent=#ccui] RelativeLayoutParameter#RelativeLayoutParameter RelativeLayoutParameter preloaded module - - --------------------------------------------------------- --- the ccui Widget --- @field [parent=#ccui] Widget#Widget Widget preloaded module - - --------------------------------------------------------- --- the ccui Layout --- @field [parent=#ccui] Layout#Layout Layout preloaded module - - --------------------------------------------------------- --- the ccui Button --- @field [parent=#ccui] Button#Button Button preloaded module - - --------------------------------------------------------- --- the ccui CheckBox --- @field [parent=#ccui] CheckBox#CheckBox CheckBox preloaded module - - --------------------------------------------------------- --- the ccui ImageView --- @field [parent=#ccui] ImageView#ImageView ImageView preloaded module - - --------------------------------------------------------- --- the ccui Text --- @field [parent=#ccui] Text#Text Text preloaded module - - --------------------------------------------------------- --- the ccui TextAtlas --- @field [parent=#ccui] TextAtlas#TextAtlas TextAtlas preloaded module - - --------------------------------------------------------- --- the ccui LoadingBar --- @field [parent=#ccui] LoadingBar#LoadingBar LoadingBar preloaded module - - --------------------------------------------------------- --- the ccui ScrollView --- @field [parent=#ccui] ScrollView#ScrollView ScrollView preloaded module - - --------------------------------------------------------- --- the ccui ListView --- @field [parent=#ccui] ListView#ListView ListView preloaded module - - --------------------------------------------------------- --- the ccui Slider --- @field [parent=#ccui] Slider#Slider Slider preloaded module - - --------------------------------------------------------- --- the ccui TextField --- @field [parent=#ccui] TextField#TextField TextField preloaded module - - --------------------------------------------------------- --- the ccui TextBMFont --- @field [parent=#ccui] TextBMFont#TextBMFont TextBMFont preloaded module - - --------------------------------------------------------- --- the ccui PageView --- @field [parent=#ccui] PageView#PageView PageView preloaded module - - --------------------------------------------------------- --- the ccui Helper --- @field [parent=#ccui] Helper#Helper Helper preloaded module - - -return nil diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_gui_auto.cpp.REMOVED.git-id b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_gui_auto.cpp.REMOVED.git-id deleted file mode 100644 index f894d8b69c..0000000000 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_gui_auto.cpp.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -8a35e56a7f283d9816a34997ab75c41201e1c1da \ No newline at end of file diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp.REMOVED.git-id b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp.REMOVED.git-id new file mode 100644 index 0000000000..ca4e93a680 --- /dev/null +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp.REMOVED.git-id @@ -0,0 +1 @@ +7ce0f269261b418b148cd10d428bafe18a36d58e \ No newline at end of file diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_gui_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp similarity index 100% rename from cocos/scripting/lua-bindings/auto/lua_cocos2dx_gui_auto.hpp rename to cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp diff --git a/cocos/scripting/lua-bindings/manual/CCLuaEngine.cpp b/cocos/scripting/lua-bindings/manual/CCLuaEngine.cpp index a37c5017e6..d0e9eefc94 100644 --- a/cocos/scripting/lua-bindings/manual/CCLuaEngine.cpp +++ b/cocos/scripting/lua-bindings/manual/CCLuaEngine.cpp @@ -33,7 +33,7 @@ #include "lua_cocos2dx_manual.hpp" #include "lua_cocos2dx_extension_manual.h" #include "lua_cocos2dx_coco_studio_manual.hpp" -#include "lua_cocos2dx_gui_manual.hpp" +#include "lua_cocos2dx_ui_manual.hpp" NS_CC_BEGIN diff --git a/cocos/scripting/lua-bindings/manual/CCLuaStack.cpp b/cocos/scripting/lua-bindings/manual/CCLuaStack.cpp index 4d325bf430..3a37f471c7 100644 --- a/cocos/scripting/lua-bindings/manual/CCLuaStack.cpp +++ b/cocos/scripting/lua-bindings/manual/CCLuaStack.cpp @@ -63,8 +63,8 @@ extern "C" { #include "lua_cocos2dx_spine_manual.hpp" #include "lua_cocos2dx_physics_auto.hpp" #include "lua_cocos2dx_physics_manual.hpp" -#include "lua_cocos2dx_gui_auto.hpp" -#include "lua_cocos2dx_gui_manual.hpp" +#include "lua_cocos2dx_ui_auto.hpp" +#include "lua_cocos2dx_ui_manual.hpp" namespace { int lua_print(lua_State * luastate) diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_gui_manual.cpp b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_ui_manual.cpp similarity index 99% rename from cocos/scripting/lua-bindings/manual/lua_cocos2dx_gui_manual.cpp rename to cocos/scripting/lua-bindings/manual/lua_cocos2dx_ui_manual.cpp index 2fb9b15452..5d27bc7a50 100644 --- a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_gui_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_ui_manual.cpp @@ -21,13 +21,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "lua_cocos2dx_gui_manual.hpp" +#include "lua_cocos2dx_ui_manual.hpp" #include "cocos2d.h" #include "tolua_fix.h" #include "LuaBasicConversions.h" #include "LuaScriptHandlerMgr.h" #include "CCLuaValue.h" -#include "CocosGUI.h" +#include "ui/CocosGUI.h" #include "CCLuaEngine.h" using namespace ui; diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_gui_manual.hpp b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_ui_manual.hpp similarity index 100% rename from cocos/scripting/lua-bindings/manual/lua_cocos2dx_gui_manual.hpp rename to cocos/scripting/lua-bindings/manual/lua_cocos2dx_ui_manual.hpp diff --git a/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj b/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj index 74c7a9210d..64c6b685f2 100644 --- a/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj +++ b/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj @@ -17,10 +17,6 @@ 1AACE7BC18BC45C200215002 /* lua_cocos2dx_extension_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE74C18BC45C200215002 /* lua_cocos2dx_extension_auto.cpp */; }; 1AACE7BD18BC45C200215002 /* lua_cocos2dx_extension_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE74D18BC45C200215002 /* lua_cocos2dx_extension_auto.hpp */; }; 1AACE7BE18BC45C200215002 /* lua_cocos2dx_extension_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE74D18BC45C200215002 /* lua_cocos2dx_extension_auto.hpp */; }; - 1AACE7C118BC45C200215002 /* lua_cocos2dx_gui_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE74F18BC45C200215002 /* lua_cocos2dx_gui_auto.cpp */; }; - 1AACE7C218BC45C200215002 /* lua_cocos2dx_gui_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE74F18BC45C200215002 /* lua_cocos2dx_gui_auto.cpp */; }; - 1AACE7C318BC45C200215002 /* lua_cocos2dx_gui_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE75018BC45C200215002 /* lua_cocos2dx_gui_auto.hpp */; }; - 1AACE7C418BC45C200215002 /* lua_cocos2dx_gui_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE75018BC45C200215002 /* lua_cocos2dx_gui_auto.hpp */; }; 1AACE7C718BC45C200215002 /* lua_cocos2dx_physics_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE75218BC45C200215002 /* lua_cocos2dx_physics_auto.cpp */; }; 1AACE7C818BC45C200215002 /* lua_cocos2dx_physics_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE75218BC45C200215002 /* lua_cocos2dx_physics_auto.cpp */; }; 1AACE7C918BC45C200215002 /* lua_cocos2dx_physics_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE75318BC45C200215002 /* lua_cocos2dx_physics_auto.hpp */; }; @@ -69,10 +65,6 @@ 1AACE7FA18BC45C200215002 /* lua_cocos2dx_extension_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE76E18BC45C200215002 /* lua_cocos2dx_extension_manual.cpp */; }; 1AACE7FB18BC45C200215002 /* lua_cocos2dx_extension_manual.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE76F18BC45C200215002 /* lua_cocos2dx_extension_manual.h */; }; 1AACE7FC18BC45C200215002 /* lua_cocos2dx_extension_manual.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE76F18BC45C200215002 /* lua_cocos2dx_extension_manual.h */; }; - 1AACE7FD18BC45C200215002 /* lua_cocos2dx_gui_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE77018BC45C200215002 /* lua_cocos2dx_gui_manual.cpp */; }; - 1AACE7FE18BC45C200215002 /* lua_cocos2dx_gui_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE77018BC45C200215002 /* lua_cocos2dx_gui_manual.cpp */; }; - 1AACE7FF18BC45C200215002 /* lua_cocos2dx_gui_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE77118BC45C200215002 /* lua_cocos2dx_gui_manual.hpp */; }; - 1AACE80018BC45C200215002 /* lua_cocos2dx_gui_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE77118BC45C200215002 /* lua_cocos2dx_gui_manual.hpp */; }; 1AACE80118BC45C200215002 /* lua_cocos2dx_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE77218BC45C200215002 /* lua_cocos2dx_manual.cpp */; }; 1AACE80218BC45C200215002 /* lua_cocos2dx_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE77218BC45C200215002 /* lua_cocos2dx_manual.cpp */; }; 1AACE80318BC45C200215002 /* lua_cocos2dx_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE77318BC45C200215002 /* lua_cocos2dx_manual.hpp */; }; @@ -207,6 +199,14 @@ 1ABCA26F18CD8F7D0087CE3A /* usocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA22E18CD8F7D0087CE3A /* usocket.h */; }; 1ABCA27018CD8F7D0087CE3A /* usocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA22E18CD8F7D0087CE3A /* usocket.h */; }; 1ABCA36318CD9D7F0087CE3A /* libluajit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA1F618CD8F5F0087CE3A /* libluajit.a */; }; + 2905FAD018CF12E600240AA3 /* lua_cocos2dx_ui_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FACE18CF12E600240AA3 /* lua_cocos2dx_ui_auto.cpp */; }; + 2905FAD118CF12E600240AA3 /* lua_cocos2dx_ui_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FACE18CF12E600240AA3 /* lua_cocos2dx_ui_auto.cpp */; }; + 2905FAD218CF12E600240AA3 /* lua_cocos2dx_ui_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 2905FACF18CF12E600240AA3 /* lua_cocos2dx_ui_auto.hpp */; }; + 2905FAD318CF12E600240AA3 /* lua_cocos2dx_ui_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 2905FACF18CF12E600240AA3 /* lua_cocos2dx_ui_auto.hpp */; }; + 2905FAD618CF143800240AA3 /* lua_cocos2dx_ui_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FAD418CF143800240AA3 /* lua_cocos2dx_ui_manual.cpp */; }; + 2905FAD718CF143800240AA3 /* lua_cocos2dx_ui_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FAD418CF143800240AA3 /* lua_cocos2dx_ui_manual.cpp */; }; + 2905FAD818CF143800240AA3 /* lua_cocos2dx_ui_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 2905FAD518CF143800240AA3 /* lua_cocos2dx_ui_manual.hpp */; }; + 2905FAD918CF143800240AA3 /* lua_cocos2dx_ui_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 2905FAD518CF143800240AA3 /* lua_cocos2dx_ui_manual.hpp */; }; C0FEF4D618BE0E70001F446C /* lua_debugger.c in Sources */ = {isa = PBXBuildFile; fileRef = C0FEF4D418BE0E70001F446C /* lua_debugger.c */; }; C0FEF4D718BE0E70001F446C /* lua_debugger.c in Sources */ = {isa = PBXBuildFile; fileRef = C0FEF4D418BE0E70001F446C /* lua_debugger.c */; }; C0FEF4D818BE0E70001F446C /* lua_debugger.h in Headers */ = {isa = PBXBuildFile; fileRef = C0FEF4D518BE0E70001F446C /* lua_debugger.h */; }; @@ -221,8 +221,6 @@ 1AACE74A18BC45C200215002 /* lua_cocos2dx_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_auto.hpp; sourceTree = ""; }; 1AACE74C18BC45C200215002 /* lua_cocos2dx_extension_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_extension_auto.cpp; sourceTree = ""; }; 1AACE74D18BC45C200215002 /* lua_cocos2dx_extension_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_extension_auto.hpp; sourceTree = ""; }; - 1AACE74F18BC45C200215002 /* lua_cocos2dx_gui_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_gui_auto.cpp; sourceTree = ""; }; - 1AACE75018BC45C200215002 /* lua_cocos2dx_gui_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_gui_auto.hpp; sourceTree = ""; }; 1AACE75218BC45C200215002 /* lua_cocos2dx_physics_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_physics_auto.cpp; sourceTree = ""; }; 1AACE75318BC45C200215002 /* lua_cocos2dx_physics_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_physics_auto.hpp; sourceTree = ""; }; 1AACE75518BC45C200215002 /* lua_cocos2dx_spine_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_spine_auto.cpp; sourceTree = ""; }; @@ -247,8 +245,6 @@ 1AACE76D18BC45C200215002 /* lua_cocos2dx_deprecated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_cocos2dx_deprecated.h; sourceTree = ""; }; 1AACE76E18BC45C200215002 /* lua_cocos2dx_extension_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_extension_manual.cpp; sourceTree = ""; }; 1AACE76F18BC45C200215002 /* lua_cocos2dx_extension_manual.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_cocos2dx_extension_manual.h; sourceTree = ""; }; - 1AACE77018BC45C200215002 /* lua_cocos2dx_gui_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_gui_manual.cpp; sourceTree = ""; }; - 1AACE77118BC45C200215002 /* lua_cocos2dx_gui_manual.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_gui_manual.hpp; sourceTree = ""; }; 1AACE77218BC45C200215002 /* lua_cocos2dx_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_manual.cpp; sourceTree = ""; }; 1AACE77318BC45C200215002 /* lua_cocos2dx_manual.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_manual.hpp; sourceTree = ""; }; 1AACE77418BC45C200215002 /* lua_cocos2dx_physics_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_physics_manual.cpp; sourceTree = ""; }; @@ -317,6 +313,10 @@ 1ABCA22C18CD8F7D0087CE3A /* unix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unix.h; sourceTree = ""; }; 1ABCA22D18CD8F7D0087CE3A /* usocket.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = usocket.c; sourceTree = ""; }; 1ABCA22E18CD8F7D0087CE3A /* usocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = usocket.h; sourceTree = ""; }; + 2905FACE18CF12E600240AA3 /* lua_cocos2dx_ui_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_ui_auto.cpp; sourceTree = ""; }; + 2905FACF18CF12E600240AA3 /* lua_cocos2dx_ui_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_ui_auto.hpp; sourceTree = ""; }; + 2905FAD418CF143800240AA3 /* lua_cocos2dx_ui_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_ui_manual.cpp; sourceTree = ""; }; + 2905FAD518CF143800240AA3 /* lua_cocos2dx_ui_manual.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_ui_manual.hpp; sourceTree = ""; }; C0FEF4D418BE0E70001F446C /* lua_debugger.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lua_debugger.c; sourceTree = ""; }; C0FEF4D518BE0E70001F446C /* lua_debugger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_debugger.h; sourceTree = ""; }; /* End PBXFileReference section */ @@ -355,12 +355,12 @@ 1AACE74818BC45C200215002 /* auto */ = { isa = PBXGroup; children = ( + 2905FACE18CF12E600240AA3 /* lua_cocos2dx_ui_auto.cpp */, + 2905FACF18CF12E600240AA3 /* lua_cocos2dx_ui_auto.hpp */, 1AACE74918BC45C200215002 /* lua_cocos2dx_auto.cpp */, 1AACE74A18BC45C200215002 /* lua_cocos2dx_auto.hpp */, 1AACE74C18BC45C200215002 /* lua_cocos2dx_extension_auto.cpp */, 1AACE74D18BC45C200215002 /* lua_cocos2dx_extension_auto.hpp */, - 1AACE74F18BC45C200215002 /* lua_cocos2dx_gui_auto.cpp */, - 1AACE75018BC45C200215002 /* lua_cocos2dx_gui_auto.hpp */, 1AACE75218BC45C200215002 /* lua_cocos2dx_physics_auto.cpp */, 1AACE75318BC45C200215002 /* lua_cocos2dx_physics_auto.hpp */, 1AACE75518BC45C200215002 /* lua_cocos2dx_spine_auto.cpp */, @@ -375,6 +375,8 @@ 1AACE75B18BC45C200215002 /* manual */ = { isa = PBXGroup; children = ( + 2905FAD418CF143800240AA3 /* lua_cocos2dx_ui_manual.cpp */, + 2905FAD518CF143800240AA3 /* lua_cocos2dx_ui_manual.hpp */, 1AACE75E18BC45C200215002 /* CCBProxy.cpp */, C0FEF4D418BE0E70001F446C /* lua_debugger.c */, C0FEF4D518BE0E70001F446C /* lua_debugger.h */, @@ -395,8 +397,6 @@ 1AACE76D18BC45C200215002 /* lua_cocos2dx_deprecated.h */, 1AACE76E18BC45C200215002 /* lua_cocos2dx_extension_manual.cpp */, 1AACE76F18BC45C200215002 /* lua_cocos2dx_extension_manual.h */, - 1AACE77018BC45C200215002 /* lua_cocos2dx_gui_manual.cpp */, - 1AACE77118BC45C200215002 /* lua_cocos2dx_gui_manual.hpp */, 1AACE77218BC45C200215002 /* lua_cocos2dx_manual.cpp */, 1AACE77318BC45C200215002 /* lua_cocos2dx_manual.hpp */, 1AACE77418BC45C200215002 /* lua_cocos2dx_physics_manual.cpp */, @@ -581,10 +581,10 @@ 1ABCA24418CD8F7D0087CE3A /* luasocket_buffer.h in Headers */, 1AACE82418BC45C200215002 /* LuaScriptHandlerMgr.h in Headers */, 1AACE7FC18BC45C200215002 /* lua_cocos2dx_extension_manual.h in Headers */, - 1AACE80018BC45C200215002 /* lua_cocos2dx_gui_manual.hpp in Headers */, + 2905FAD318CF12E600240AA3 /* lua_cocos2dx_ui_auto.hpp in Headers */, 1AACE7EC18BC45C200215002 /* CCLuaValue.h in Headers */, + 2905FAD918CF143800240AA3 /* lua_cocos2dx_ui_manual.hpp in Headers */, 1AACE80C18BC45C200215002 /* lua_cocos2dx_spine_manual.hpp in Headers */, - 1AACE7C418BC45C200215002 /* lua_cocos2dx_gui_auto.hpp in Headers */, 1ABCA25018CD8F7D0087CE3A /* options.h in Headers */, 1ABCA1F118CD8F470087CE3A /* lualib.h in Headers */, 1ABCA20318CD8F6E0087CE3A /* tolua_event.h in Headers */, @@ -639,10 +639,10 @@ 1ABCA24318CD8F7D0087CE3A /* luasocket_buffer.h in Headers */, 1AACE82318BC45C200215002 /* LuaScriptHandlerMgr.h in Headers */, 1AACE7FB18BC45C200215002 /* lua_cocos2dx_extension_manual.h in Headers */, - 1AACE7FF18BC45C200215002 /* lua_cocos2dx_gui_manual.hpp in Headers */, + 2905FAD218CF12E600240AA3 /* lua_cocos2dx_ui_auto.hpp in Headers */, 1AACE7EB18BC45C200215002 /* CCLuaValue.h in Headers */, + 2905FAD818CF143800240AA3 /* lua_cocos2dx_ui_manual.hpp in Headers */, 1AACE80B18BC45C200215002 /* lua_cocos2dx_spine_manual.hpp in Headers */, - 1AACE7C318BC45C200215002 /* lua_cocos2dx_gui_auto.hpp in Headers */, 1ABCA24F18CD8F7D0087CE3A /* options.h in Headers */, 1ABCA1F018CD8F470087CE3A /* lualib.h in Headers */, 1ABCA20218CD8F6E0087CE3A /* tolua_event.h in Headers */, @@ -741,7 +741,6 @@ 1ABCA24E18CD8F7D0087CE3A /* options.c in Sources */, 1A262AB918BEEF5900D2DB92 /* tolua_fix.cpp in Sources */, 1AACE81E18BC45C200215002 /* LuaOpengl.cpp in Sources */, - 1AACE7C218BC45C200215002 /* lua_cocos2dx_gui_auto.cpp in Sources */, 1AACE7CE18BC45C200215002 /* lua_cocos2dx_spine_auto.cpp in Sources */, 1AACE80218BC45C200215002 /* lua_cocos2dx_manual.cpp in Sources */, 1ABCA24618CD8F7D0087CE3A /* luasocket_io.c in Sources */, @@ -752,6 +751,7 @@ 1ABCA26618CD8F7D0087CE3A /* udp.c in Sources */, 1AACE82218BC45C200215002 /* LuaScriptHandlerMgr.cpp in Sources */, 1ABCA23618CD8F7D0087CE3A /* except.c in Sources */, + 2905FAD718CF143800240AA3 /* lua_cocos2dx_ui_manual.cpp in Sources */, 1ABCA26A18CD8F7D0087CE3A /* unix.c in Sources */, 1AACE7F218BC45C200215002 /* lua_cocos2dx_coco_studio_manual.cpp in Sources */, 1AACE80E18BC45C200215002 /* lua_extensions.c in Sources */, @@ -769,6 +769,7 @@ 1AACE7DA18BC45C200215002 /* CCBProxy.cpp in Sources */, 1AACE81618BC45C200215002 /* lua_xml_http_request.cpp in Sources */, 1ABCA23A18CD8F7D0087CE3A /* inet.c in Sources */, + 2905FAD118CF12E600240AA3 /* lua_cocos2dx_ui_auto.cpp in Sources */, 1AACE7E218BC45C200215002 /* CCLuaEngine.cpp in Sources */, 1ABCA26E18CD8F7D0087CE3A /* usocket.c in Sources */, 1AACE81218BC45C200215002 /* Lua_web_socket.cpp in Sources */, @@ -783,7 +784,6 @@ 1ABCA20718CD8F6E0087CE3A /* tolua_map.c in Sources */, 1ABCA25618CD8F7D0087CE3A /* serial.c in Sources */, 1ABCA20B18CD8F6E0087CE3A /* tolua_to.c in Sources */, - 1AACE7FE18BC45C200215002 /* lua_cocos2dx_gui_manual.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -798,7 +798,6 @@ 1ABCA24D18CD8F7D0087CE3A /* options.c in Sources */, 1A262AB818BEEF5900D2DB92 /* tolua_fix.cpp in Sources */, 1AACE81D18BC45C200215002 /* LuaOpengl.cpp in Sources */, - 1AACE7C118BC45C200215002 /* lua_cocos2dx_gui_auto.cpp in Sources */, 1AACE7CD18BC45C200215002 /* lua_cocos2dx_spine_auto.cpp in Sources */, 1AACE80118BC45C200215002 /* lua_cocos2dx_manual.cpp in Sources */, 1ABCA24518CD8F7D0087CE3A /* luasocket_io.c in Sources */, @@ -809,6 +808,7 @@ 1ABCA26518CD8F7D0087CE3A /* udp.c in Sources */, 1AACE82118BC45C200215002 /* LuaScriptHandlerMgr.cpp in Sources */, 1ABCA23518CD8F7D0087CE3A /* except.c in Sources */, + 2905FAD618CF143800240AA3 /* lua_cocos2dx_ui_manual.cpp in Sources */, 1ABCA26918CD8F7D0087CE3A /* unix.c in Sources */, 1AACE7F118BC45C200215002 /* lua_cocos2dx_coco_studio_manual.cpp in Sources */, 1AACE80D18BC45C200215002 /* lua_extensions.c in Sources */, @@ -826,6 +826,7 @@ 1AACE7D918BC45C200215002 /* CCBProxy.cpp in Sources */, 1AACE81518BC45C200215002 /* lua_xml_http_request.cpp in Sources */, 1ABCA23918CD8F7D0087CE3A /* inet.c in Sources */, + 2905FAD018CF12E600240AA3 /* lua_cocos2dx_ui_auto.cpp in Sources */, 1AACE7E118BC45C200215002 /* CCLuaEngine.cpp in Sources */, 1ABCA26D18CD8F7D0087CE3A /* usocket.c in Sources */, 1AACE81118BC45C200215002 /* Lua_web_socket.cpp in Sources */, @@ -840,7 +841,6 @@ 1ABCA20618CD8F6E0087CE3A /* tolua_map.c in Sources */, 1ABCA25518CD8F7D0087CE3A /* serial.c in Sources */, 1ABCA20A18CD8F6E0087CE3A /* tolua_to.c in Sources */, - 1AACE7FD18BC45C200215002 /* lua_cocos2dx_gui_manual.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -881,7 +881,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; SKIP_INSTALL = YES; - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../.. $(SRCROOT)/../../.. $(SRCROOT)/../../../base $(SRCROOT)/../../../2d $(SRCROOT)/../../../physics $(SRCROOT)/../../../math/kazmath $(SRCROOT)/../../../2d/platform $(SRCROOT)/../../../audio/include $(SRCROOT)/../../../editor-support $(SRCROOT)/../../../editor-support/spine $(SRCROOT)/../../../editor-support/cocostudio $(SRCROOT)/../../../editor-support/cocosbuilder $(SRCROOT)/../../../gui $(SRCROOT)/../../../storage $(SRCROOT)/../../../../extensions $(SRCROOT)/../../../../external $(SRCROOT)/../../../../external/chipmunk/include/chipmunk $(SRCROOT)/../../../../external/lua $(SRCROOT)/../../../../external/lua/luajit/include $(SRCROOT)/../../../../external/lua/tolua"; + USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../.. $(SRCROOT)/../../.. $(SRCROOT)/../../../base $(SRCROOT)/../../../2d $(SRCROOT)/../../../physics $(SRCROOT)/../../../math/kazmath $(SRCROOT)/../../../2d/platform $(SRCROOT)/../../../audio/include $(SRCROOT)/../../../editor-support $(SRCROOT)/../../../editor-support/spine $(SRCROOT)/../../../editor-support/cocostudio $(SRCROOT)/../../../editor-support/cocosbuilder $(SRCROOT)/../../../ui $(SRCROOT)/../../../storage $(SRCROOT)/../../../../extensions $(SRCROOT)/../../../../external $(SRCROOT)/../../../../external/chipmunk/include/chipmunk $(SRCROOT)/../../../../external/lua $(SRCROOT)/../../../../external/lua/luajit/include $(SRCROOT)/../../../../external/lua/tolua"; }; name = Debug; }; @@ -914,7 +914,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; SKIP_INSTALL = YES; - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../.. $(SRCROOT)/../../.. $(SRCROOT)/../../../base $(SRCROOT)/../../../2d $(SRCROOT)/../../../physics $(SRCROOT)/../../../math/kazmath $(SRCROOT)/../../../2d/platform $(SRCROOT)/../../../audio/include $(SRCROOT)/../../../editor-support $(SRCROOT)/../../../editor-support/spine $(SRCROOT)/../../../editor-support/cocostudio $(SRCROOT)/../../../editor-support/cocosbuilder $(SRCROOT)/../../../gui $(SRCROOT)/../../../storage $(SRCROOT)/../../../../extensions $(SRCROOT)/../../../../external $(SRCROOT)/../../../../external/chipmunk/include/chipmunk $(SRCROOT)/../../../../external/lua $(SRCROOT)/../../../../external/lua/luajit/include $(SRCROOT)/../../../../external/lua/tolua"; + USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../.. $(SRCROOT)/../../.. $(SRCROOT)/../../../base $(SRCROOT)/../../../2d $(SRCROOT)/../../../physics $(SRCROOT)/../../../math/kazmath $(SRCROOT)/../../../2d/platform $(SRCROOT)/../../../audio/include $(SRCROOT)/../../../editor-support $(SRCROOT)/../../../editor-support/spine $(SRCROOT)/../../../editor-support/cocostudio $(SRCROOT)/../../../editor-support/cocosbuilder $(SRCROOT)/../../../ui $(SRCROOT)/../../../storage $(SRCROOT)/../../../../extensions $(SRCROOT)/../../../../external $(SRCROOT)/../../../../external/chipmunk/include/chipmunk $(SRCROOT)/../../../../external/lua $(SRCROOT)/../../../../external/lua/luajit/include $(SRCROOT)/../../../../external/lua/tolua"; VALIDATE_PRODUCT = YES; }; name = Release; diff --git a/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj b/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj index b736737153..978d03e99f 100644 --- a/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj +++ b/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj @@ -32,10 +32,10 @@ - + @@ -49,10 +49,10 @@ - + @@ -83,10 +83,10 @@ - + @@ -100,10 +100,10 @@ - + diff --git a/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj.filters b/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj.filters index c6c7a4dc80..5f1a7e127e 100644 --- a/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj.filters +++ b/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj.filters @@ -21,7 +21,7 @@ auto - + auto @@ -60,7 +60,7 @@ manual - + manual @@ -164,7 +164,7 @@ auto - + auto @@ -203,7 +203,7 @@ manual - + manual @@ -362,4 +362,4 @@ script - \ No newline at end of file + diff --git a/cocos/gui/Android.mk b/cocos/ui/Android.mk similarity index 93% rename from cocos/gui/Android.mk rename to cocos/ui/Android.mk index ba8a3dcf17..ed93d6060a 100644 --- a/cocos/gui/Android.mk +++ b/cocos/ui/Android.mk @@ -1,9 +1,9 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := cocos_gui_static +LOCAL_MODULE := cocos_ui_static -LOCAL_MODULE_FILENAME := libgui +LOCAL_MODULE_FILENAME := libui LOCAL_SRC_FILES := \ UIWidget.cpp \ diff --git a/cocos/gui/CMakeLists.txt b/cocos/ui/CMakeLists.txt similarity index 90% rename from cocos/gui/CMakeLists.txt rename to cocos/ui/CMakeLists.txt index 4b78830596..8843bed83e 100644 --- a/cocos/gui/CMakeLists.txt +++ b/cocos/ui/CMakeLists.txt @@ -20,11 +20,11 @@ set(GUI_SRC UIRichText.cpp ) -add_library(gui STATIC +add_library(ui STATIC ${GUI_SRC} ) -set_target_properties(gui +set_target_properties(ui PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" diff --git a/cocos/gui/CocosGUI.cpp b/cocos/ui/CocosGUI.cpp similarity index 98% rename from cocos/gui/CocosGUI.cpp rename to cocos/ui/CocosGUI.cpp index 59a4f1a45d..efcd0e017e 100644 --- a/cocos/gui/CocosGUI.cpp +++ b/cocos/ui/CocosGUI.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "gui/CocosGUI.h" +#include "ui/CocosGUI.h" NS_CC_BEGIN diff --git a/cocos/gui/CocosGUI.h b/cocos/ui/CocosGUI.h similarity index 76% rename from cocos/gui/CocosGUI.h rename to cocos/ui/CocosGUI.h index e390c0c4fd..a4e6ac7ce8 100644 --- a/cocos/gui/CocosGUI.h +++ b/cocos/ui/CocosGUI.h @@ -26,22 +26,22 @@ THE SOFTWARE. #define __COCOSGUI_H__ -#include "gui/UIWidget.h" -#include "gui/UILayout.h" -#include "gui/UIButton.h" -#include "gui/UICheckBox.h" -#include "gui/UIImageView.h" -#include "gui/UIText.h" -#include "gui/UITextAtlas.h" -#include "gui/UILoadingBar.h" -#include "gui/UIScrollView.h" -#include "gui/UIListView.h" -#include "gui/UISlider.h" -#include "gui/UITextField.h" -#include "gui/UITextBMFont.h" -#include "gui/UIPageView.h" -#include "gui/UIHelper.h" -#include "gui/UIRichText.h" +#include "ui/UIWidget.h" +#include "ui/UILayout.h" +#include "ui/UIButton.h" +#include "ui/UICheckBox.h" +#include "ui/UIImageView.h" +#include "ui/UIText.h" +#include "ui/UITextAtlas.h" +#include "ui/UILoadingBar.h" +#include "ui/UIScrollView.h" +#include "ui/UIListView.h" +#include "ui/UISlider.h" +#include "ui/UITextField.h" +#include "ui/UITextBMFont.h" +#include "ui/UIPageView.h" +#include "ui/UIHelper.h" +#include "ui/UIRichText.h" NS_CC_BEGIN namespace ui { diff --git a/cocos/gui/GUIDefine.h b/cocos/ui/GUIDefine.h similarity index 100% rename from cocos/gui/GUIDefine.h rename to cocos/ui/GUIDefine.h diff --git a/cocos/gui/UIButton.cpp b/cocos/ui/UIButton.cpp similarity index 99% rename from cocos/gui/UIButton.cpp rename to cocos/ui/UIButton.cpp index 99586097ac..941bdf0b46 100644 --- a/cocos/gui/UIButton.cpp +++ b/cocos/ui/UIButton.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "gui/UIButton.h" +#include "ui/UIButton.h" #include "extensions/GUI/CCControlExtension/CCScale9Sprite.h" NS_CC_BEGIN diff --git a/cocos/gui/UIButton.h b/cocos/ui/UIButton.h similarity index 99% rename from cocos/gui/UIButton.h rename to cocos/ui/UIButton.h index 3411c20af8..7e4dc758e1 100644 --- a/cocos/gui/UIButton.h +++ b/cocos/ui/UIButton.h @@ -25,7 +25,7 @@ THE SOFTWARE. #ifndef __UIBUTTON_H__ #define __UIBUTTON_H__ -#include "gui/UIWidget.h" +#include "ui/UIWidget.h" NS_CC_BEGIN diff --git a/cocos/gui/UICheckBox.cpp b/cocos/ui/UICheckBox.cpp similarity index 99% rename from cocos/gui/UICheckBox.cpp rename to cocos/ui/UICheckBox.cpp index 45664c99e8..86cf8ed815 100644 --- a/cocos/gui/UICheckBox.cpp +++ b/cocos/ui/UICheckBox.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "gui/UICheckBox.h" +#include "ui/UICheckBox.h" NS_CC_BEGIN diff --git a/cocos/gui/UICheckBox.h b/cocos/ui/UICheckBox.h similarity index 99% rename from cocos/gui/UICheckBox.h rename to cocos/ui/UICheckBox.h index 40ac36eacf..0ee94c6eaf 100644 --- a/cocos/gui/UICheckBox.h +++ b/cocos/ui/UICheckBox.h @@ -25,7 +25,7 @@ THE SOFTWARE. #ifndef __UICHECKBOX_H__ #define __UICHECKBOX_H__ -#include "gui/UIWidget.h" +#include "ui/UIWidget.h" NS_CC_BEGIN diff --git a/cocos/gui/UIHelper.cpp b/cocos/ui/UIHelper.cpp similarity index 100% rename from cocos/gui/UIHelper.cpp rename to cocos/ui/UIHelper.cpp diff --git a/cocos/gui/UIHelper.h b/cocos/ui/UIHelper.h similarity index 100% rename from cocos/gui/UIHelper.h rename to cocos/ui/UIHelper.h diff --git a/cocos/gui/UIImageView.cpp b/cocos/ui/UIImageView.cpp similarity index 99% rename from cocos/gui/UIImageView.cpp rename to cocos/ui/UIImageView.cpp index e42fe3d070..83d93b06b3 100644 --- a/cocos/gui/UIImageView.cpp +++ b/cocos/ui/UIImageView.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "gui/UIImageView.h" +#include "ui/UIImageView.h" #include "extensions/GUI/CCControlExtension/CCScale9Sprite.h" NS_CC_BEGIN diff --git a/cocos/gui/UIImageView.h b/cocos/ui/UIImageView.h similarity index 99% rename from cocos/gui/UIImageView.h rename to cocos/ui/UIImageView.h index 644372d9cc..24d0d481a3 100644 --- a/cocos/gui/UIImageView.h +++ b/cocos/ui/UIImageView.h @@ -25,7 +25,7 @@ THE SOFTWARE. #ifndef __UIIMAGEVIEW_H__ #define __UIIMAGEVIEW_H__ -#include "gui/UIWidget.h" +#include "ui/UIWidget.h" NS_CC_BEGIN diff --git a/cocos/gui/UILayout.cpp b/cocos/ui/UILayout.cpp similarity index 99% rename from cocos/gui/UILayout.cpp rename to cocos/ui/UILayout.cpp index 7460c03723..1c488618d4 100644 --- a/cocos/gui/UILayout.cpp +++ b/cocos/ui/UILayout.cpp @@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "gui/UILayout.h" -#include "gui/UIHelper.h" +#include "ui/UILayout.h" +#include "ui/UIHelper.h" #include "extensions/GUI/CCControlExtension/CCScale9Sprite.h" #include "kazmath/GL/matrix.h" #include "CCGLProgram.h" diff --git a/cocos/gui/UILayout.h b/cocos/ui/UILayout.h similarity index 99% rename from cocos/gui/UILayout.h rename to cocos/ui/UILayout.h index 479e14bee1..f525ab870a 100644 --- a/cocos/gui/UILayout.h +++ b/cocos/ui/UILayout.h @@ -25,7 +25,7 @@ THE SOFTWARE. #ifndef __LAYOUT_H__ #define __LAYOUT_H__ -#include "gui/UIWidget.h" +#include "ui/UIWidget.h" NS_CC_BEGIN diff --git a/cocos/gui/UILayoutDefine.cpp b/cocos/ui/UILayoutDefine.cpp similarity index 100% rename from cocos/gui/UILayoutDefine.cpp rename to cocos/ui/UILayoutDefine.cpp diff --git a/cocos/gui/UILayoutDefine.h b/cocos/ui/UILayoutDefine.h similarity index 100% rename from cocos/gui/UILayoutDefine.h rename to cocos/ui/UILayoutDefine.h diff --git a/cocos/gui/UILayoutParameter.cpp b/cocos/ui/UILayoutParameter.cpp similarity index 98% rename from cocos/gui/UILayoutParameter.cpp rename to cocos/ui/UILayoutParameter.cpp index 93ba0edf31..0957980f74 100644 --- a/cocos/gui/UILayoutParameter.cpp +++ b/cocos/ui/UILayoutParameter.cpp @@ -22,8 +22,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "gui/UILayoutParameter.h" -#include "gui/UILayout.h" +#include "ui/UILayoutParameter.h" +#include "ui/UILayout.h" NS_CC_BEGIN diff --git a/cocos/gui/UILayoutParameter.h b/cocos/ui/UILayoutParameter.h similarity index 99% rename from cocos/gui/UILayoutParameter.h rename to cocos/ui/UILayoutParameter.h index bf3dae2d6a..c0f0f5dea6 100644 --- a/cocos/gui/UILayoutParameter.h +++ b/cocos/ui/UILayoutParameter.h @@ -25,7 +25,7 @@ #ifndef __LAYOUTPARMETER_H__ #define __LAYOUTPARMETER_H__ -#include "gui/UILayoutDefine.h" +#include "ui/UILayoutDefine.h" NS_CC_BEGIN diff --git a/cocos/gui/UIListView.cpp b/cocos/ui/UIListView.cpp similarity index 99% rename from cocos/gui/UIListView.cpp rename to cocos/ui/UIListView.cpp index ba3b3084bb..c58f3592db 100644 --- a/cocos/gui/UIListView.cpp +++ b/cocos/ui/UIListView.cpp @@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "gui/UIListView.h" -#include "gui/UIHelper.h" +#include "ui/UIListView.h" +#include "ui/UIHelper.h" #include "extensions/GUI/CCControlExtension/CCScale9Sprite.h" NS_CC_BEGIN diff --git a/cocos/gui/UIListView.h b/cocos/ui/UIListView.h similarity index 99% rename from cocos/gui/UIListView.h rename to cocos/ui/UIListView.h index 58cf81ff46..bcc2682e23 100644 --- a/cocos/gui/UIListView.h +++ b/cocos/ui/UIListView.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __UILISTVIEW_H__ #define __UILISTVIEW_H__ -#include "gui/UIScrollView.h" +#include "ui/UIScrollView.h" NS_CC_BEGIN diff --git a/cocos/gui/UILoadingBar.cpp b/cocos/ui/UILoadingBar.cpp similarity index 99% rename from cocos/gui/UILoadingBar.cpp rename to cocos/ui/UILoadingBar.cpp index 1b41e50721..643ff18a47 100644 --- a/cocos/gui/UILoadingBar.cpp +++ b/cocos/ui/UILoadingBar.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "gui/UILoadingBar.h" +#include "ui/UILoadingBar.h" #include "extensions/GUI/CCControlExtension/CCScale9Sprite.h" NS_CC_BEGIN diff --git a/cocos/gui/UILoadingBar.h b/cocos/ui/UILoadingBar.h similarity index 99% rename from cocos/gui/UILoadingBar.h rename to cocos/ui/UILoadingBar.h index 7694280680..b6eaeed234 100644 --- a/cocos/gui/UILoadingBar.h +++ b/cocos/ui/UILoadingBar.h @@ -25,7 +25,7 @@ THE SOFTWARE. #ifndef __UILOADINGBAR_H__ #define __UILOADINGBAR_H__ -#include "gui/UIWidget.h" +#include "ui/UIWidget.h" NS_CC_BEGIN diff --git a/cocos/gui/UIPageView.cpp b/cocos/ui/UIPageView.cpp similarity index 99% rename from cocos/gui/UIPageView.cpp rename to cocos/ui/UIPageView.cpp index d230faeccb..6ca5b60cac 100644 --- a/cocos/gui/UIPageView.cpp +++ b/cocos/ui/UIPageView.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "gui/UIPageView.h" +#include "ui/UIPageView.h" NS_CC_BEGIN diff --git a/cocos/gui/UIPageView.h b/cocos/ui/UIPageView.h similarity index 99% rename from cocos/gui/UIPageView.h rename to cocos/ui/UIPageView.h index 94dad0536e..80b1274719 100644 --- a/cocos/gui/UIPageView.h +++ b/cocos/ui/UIPageView.h @@ -25,8 +25,8 @@ THE SOFTWARE. #ifndef __UIPAGEVIEW_H__ #define __UIPAGEVIEW_H__ -#include "gui/UILayout.h" -#include "gui/UIScrollInterface.h" +#include "ui/UILayout.h" +#include "ui/UIScrollInterface.h" NS_CC_BEGIN diff --git a/cocos/gui/UIRichText.cpp b/cocos/ui/UIRichText.cpp similarity index 100% rename from cocos/gui/UIRichText.cpp rename to cocos/ui/UIRichText.cpp diff --git a/cocos/gui/UIRichText.h b/cocos/ui/UIRichText.h similarity index 99% rename from cocos/gui/UIRichText.h rename to cocos/ui/UIRichText.h index 444c8fd03a..6958c07cbc 100644 --- a/cocos/gui/UIRichText.h +++ b/cocos/ui/UIRichText.h @@ -25,7 +25,7 @@ #ifndef __UIRICHTEXT_H__ #define __UIRICHTEXT_H__ -#include "gui/UIWidget.h" +#include "ui/UIWidget.h" NS_CC_BEGIN diff --git a/cocos/gui/UIScrollInterface.h b/cocos/ui/UIScrollInterface.h similarity index 98% rename from cocos/gui/UIScrollInterface.h rename to cocos/ui/UIScrollInterface.h index cb9101118a..2acaab5759 100644 --- a/cocos/gui/UIScrollInterface.h +++ b/cocos/ui/UIScrollInterface.h @@ -25,7 +25,7 @@ THE SOFTWARE. #ifndef __UISCROLLDELEGATE_H__ #define __UISCROLLDELEGATE_H__ -#include "gui/UIWidget.h" +#include "ui/UIWidget.h" NS_CC_BEGIN diff --git a/cocos/gui/UIScrollView.cpp b/cocos/ui/UIScrollView.cpp similarity index 99% rename from cocos/gui/UIScrollView.cpp rename to cocos/ui/UIScrollView.cpp index 754baccd2b..f286c9ba29 100644 --- a/cocos/gui/UIScrollView.cpp +++ b/cocos/ui/UIScrollView.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "gui/UIScrollView.h" +#include "ui/UIScrollView.h" NS_CC_BEGIN diff --git a/cocos/gui/UIScrollView.h b/cocos/ui/UIScrollView.h similarity index 99% rename from cocos/gui/UIScrollView.h rename to cocos/ui/UIScrollView.h index 267d444f01..1f0150e2ea 100644 --- a/cocos/gui/UIScrollView.h +++ b/cocos/ui/UIScrollView.h @@ -25,8 +25,8 @@ THE SOFTWARE. #ifndef __UISCROLLVIEW_H__ #define __UISCROLLVIEW_H__ -#include "gui/UILayout.h" -#include "gui/UIScrollInterface.h" +#include "ui/UILayout.h" +#include "ui/UIScrollInterface.h" NS_CC_BEGIN diff --git a/cocos/gui/UISlider.cpp b/cocos/ui/UISlider.cpp similarity index 99% rename from cocos/gui/UISlider.cpp rename to cocos/ui/UISlider.cpp index 1fdc8524fb..3b0737ef0e 100644 --- a/cocos/gui/UISlider.cpp +++ b/cocos/ui/UISlider.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "gui/UISlider.h" +#include "ui/UISlider.h" #include "extensions/GUI/CCControlExtension/CCScale9Sprite.h" NS_CC_BEGIN diff --git a/cocos/gui/UISlider.h b/cocos/ui/UISlider.h similarity index 99% rename from cocos/gui/UISlider.h rename to cocos/ui/UISlider.h index 9ceb50e849..267120b3fc 100644 --- a/cocos/gui/UISlider.h +++ b/cocos/ui/UISlider.h @@ -25,7 +25,7 @@ THE SOFTWARE. #ifndef __UISLIDER_H__ #define __UISLIDER_H__ -#include "gui/UIWidget.h" +#include "ui/UIWidget.h" NS_CC_BEGIN diff --git a/cocos/gui/UIText.cpp b/cocos/ui/UIText.cpp similarity index 99% rename from cocos/gui/UIText.cpp rename to cocos/ui/UIText.cpp index 429228935e..be67c99905 100644 --- a/cocos/gui/UIText.cpp +++ b/cocos/ui/UIText.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "gui/UIText.h" +#include "ui/UIText.h" NS_CC_BEGIN diff --git a/cocos/gui/UIText.h b/cocos/ui/UIText.h similarity index 99% rename from cocos/gui/UIText.h rename to cocos/ui/UIText.h index d811a59bcc..46faa4d183 100644 --- a/cocos/gui/UIText.h +++ b/cocos/ui/UIText.h @@ -25,7 +25,7 @@ THE SOFTWARE. #ifndef __UILABEL_H__ #define __UILABEL_H__ -#include "gui/UIWidget.h" +#include "ui/UIWidget.h" NS_CC_BEGIN diff --git a/cocos/gui/UITextAtlas.cpp b/cocos/ui/UITextAtlas.cpp similarity index 99% rename from cocos/gui/UITextAtlas.cpp rename to cocos/ui/UITextAtlas.cpp index 1dd49fce11..2258be841a 100644 --- a/cocos/gui/UITextAtlas.cpp +++ b/cocos/ui/UITextAtlas.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "gui/UITextAtlas.h" +#include "ui/UITextAtlas.h" NS_CC_BEGIN diff --git a/cocos/gui/UITextAtlas.h b/cocos/ui/UITextAtlas.h similarity index 99% rename from cocos/gui/UITextAtlas.h rename to cocos/ui/UITextAtlas.h index f169598d8a..f6530c315f 100644 --- a/cocos/gui/UITextAtlas.h +++ b/cocos/ui/UITextAtlas.h @@ -25,7 +25,7 @@ THE SOFTWARE. #ifndef __UILABELATLAS_H__ #define __UILABELATLAS_H__ -#include "gui/UIWidget.h" +#include "ui/UIWidget.h" NS_CC_BEGIN diff --git a/cocos/gui/UITextBMFont.cpp b/cocos/ui/UITextBMFont.cpp similarity index 99% rename from cocos/gui/UITextBMFont.cpp rename to cocos/ui/UITextBMFont.cpp index 485801fa2d..80906e85d2 100644 --- a/cocos/gui/UITextBMFont.cpp +++ b/cocos/ui/UITextBMFont.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "gui/UITextBMFont.h" +#include "ui/UITextBMFont.h" NS_CC_BEGIN diff --git a/cocos/gui/UITextBMFont.h b/cocos/ui/UITextBMFont.h similarity index 99% rename from cocos/gui/UITextBMFont.h rename to cocos/ui/UITextBMFont.h index 3ef62803c1..45c4355d30 100644 --- a/cocos/gui/UITextBMFont.h +++ b/cocos/ui/UITextBMFont.h @@ -25,7 +25,7 @@ THE SOFTWARE. #ifndef __UILABELBMFONT_H__ #define __UILABELBMFONT_H__ -#include "gui/UIWidget.h" +#include "ui/UIWidget.h" NS_CC_BEGIN diff --git a/cocos/gui/UITextField.cpp b/cocos/ui/UITextField.cpp similarity index 99% rename from cocos/gui/UITextField.cpp rename to cocos/ui/UITextField.cpp index b07baf43f3..30f633503c 100644 --- a/cocos/gui/UITextField.cpp +++ b/cocos/ui/UITextField.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "gui/UITextField.h" +#include "ui/UITextField.h" NS_CC_BEGIN diff --git a/cocos/gui/UITextField.h b/cocos/ui/UITextField.h similarity index 99% rename from cocos/gui/UITextField.h rename to cocos/ui/UITextField.h index 06cc3bcc60..2c61d2724e 100644 --- a/cocos/gui/UITextField.h +++ b/cocos/ui/UITextField.h @@ -25,7 +25,7 @@ THE SOFTWARE. #ifndef __UITEXTFIELD_H__ #define __UITEXTFIELD_H__ -#include "gui/UIWidget.h" +#include "ui/UIWidget.h" NS_CC_BEGIN diff --git a/cocos/gui/UIWidget.cpp b/cocos/ui/UIWidget.cpp similarity index 99% rename from cocos/gui/UIWidget.cpp rename to cocos/ui/UIWidget.cpp index a1984c95d0..9b7f613a51 100644 --- a/cocos/gui/UIWidget.cpp +++ b/cocos/ui/UIWidget.cpp @@ -22,9 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "gui/UIWidget.h" -#include "gui/UILayout.h" -#include "gui/UIHelper.h" +#include "ui/UIWidget.h" +#include "ui/UILayout.h" +#include "ui/UIHelper.h" NS_CC_BEGIN diff --git a/cocos/gui/UIWidget.h b/cocos/ui/UIWidget.h similarity index 99% rename from cocos/gui/UIWidget.h rename to cocos/ui/UIWidget.h index 38b19bcceb..eaa4bb692e 100644 --- a/cocos/gui/UIWidget.h +++ b/cocos/ui/UIWidget.h @@ -26,9 +26,9 @@ THE SOFTWARE. #define __UIWIDGET_H__ #include "CCNode.h" -#include "gui/UILayoutDefine.h" -#include "gui/UILayoutParameter.h" -#include "gui/GUIDefine.h" +#include "ui/UILayoutDefine.h" +#include "ui/UILayoutParameter.h" +#include "ui/GUIDefine.h" NS_CC_BEGIN diff --git a/cocos/gui/WidgetReader/ButtonReader/ButtonReader.cpp b/cocos/ui/WidgetReader/ButtonReader/ButtonReader.cpp similarity index 99% rename from cocos/gui/WidgetReader/ButtonReader/ButtonReader.cpp rename to cocos/ui/WidgetReader/ButtonReader/ButtonReader.cpp index 94222c55d8..5bf321dc84 100644 --- a/cocos/gui/WidgetReader/ButtonReader/ButtonReader.cpp +++ b/cocos/ui/WidgetReader/ButtonReader/ButtonReader.cpp @@ -1,7 +1,7 @@ #include "ButtonReader.h" -#include "gui/UIButton.h" +#include "ui/UIButton.h" namespace cocostudio { diff --git a/cocos/gui/WidgetReader/ButtonReader/ButtonReader.h b/cocos/ui/WidgetReader/ButtonReader/ButtonReader.h similarity index 100% rename from cocos/gui/WidgetReader/ButtonReader/ButtonReader.h rename to cocos/ui/WidgetReader/ButtonReader/ButtonReader.h diff --git a/cocos/gui/WidgetReader/CheckBoxReader/CheckBoxReader.cpp b/cocos/ui/WidgetReader/CheckBoxReader/CheckBoxReader.cpp similarity index 99% rename from cocos/gui/WidgetReader/CheckBoxReader/CheckBoxReader.cpp rename to cocos/ui/WidgetReader/CheckBoxReader/CheckBoxReader.cpp index 2e22dad751..06ac1bc0a7 100644 --- a/cocos/gui/WidgetReader/CheckBoxReader/CheckBoxReader.cpp +++ b/cocos/ui/WidgetReader/CheckBoxReader/CheckBoxReader.cpp @@ -1,12 +1,12 @@ #include "CheckBoxReader.h" -#include "gui/UICheckBox.h" +#include "ui/UICheckBox.h" namespace cocostudio { static CheckBoxReader* instanceCheckBoxReader = NULL; - + using cocos2d::ui::CheckBox; IMPLEMENT_CLASS_WIDGET_READER_INFO(CheckBoxReader) CheckBoxReader::CheckBoxReader() diff --git a/cocos/gui/WidgetReader/CheckBoxReader/CheckBoxReader.h b/cocos/ui/WidgetReader/CheckBoxReader/CheckBoxReader.h similarity index 100% rename from cocos/gui/WidgetReader/CheckBoxReader/CheckBoxReader.h rename to cocos/ui/WidgetReader/CheckBoxReader/CheckBoxReader.h diff --git a/cocos/gui/WidgetReader/ImageViewReader/ImageViewReader.cpp b/cocos/ui/WidgetReader/ImageViewReader/ImageViewReader.cpp similarity index 99% rename from cocos/gui/WidgetReader/ImageViewReader/ImageViewReader.cpp rename to cocos/ui/WidgetReader/ImageViewReader/ImageViewReader.cpp index 46089a8b4e..083d81f261 100644 --- a/cocos/gui/WidgetReader/ImageViewReader/ImageViewReader.cpp +++ b/cocos/ui/WidgetReader/ImageViewReader/ImageViewReader.cpp @@ -1,7 +1,7 @@ #include "ImageViewReader.h" -#include "gui/UIImageView.h" +#include "ui/UIImageView.h" namespace cocostudio { diff --git a/cocos/gui/WidgetReader/ImageViewReader/ImageViewReader.h b/cocos/ui/WidgetReader/ImageViewReader/ImageViewReader.h similarity index 100% rename from cocos/gui/WidgetReader/ImageViewReader/ImageViewReader.h rename to cocos/ui/WidgetReader/ImageViewReader/ImageViewReader.h diff --git a/cocos/gui/WidgetReader/LayoutReader/LayoutReader.cpp b/cocos/ui/WidgetReader/LayoutReader/LayoutReader.cpp similarity index 97% rename from cocos/gui/WidgetReader/LayoutReader/LayoutReader.cpp rename to cocos/ui/WidgetReader/LayoutReader/LayoutReader.cpp index 40908d7f2b..ec137e7ca4 100644 --- a/cocos/gui/WidgetReader/LayoutReader/LayoutReader.cpp +++ b/cocos/ui/WidgetReader/LayoutReader/LayoutReader.cpp @@ -1,7 +1,7 @@ #include "LayoutReader.h" -#include "gui/UILayout.h" +#include "ui/UILayout.h" namespace cocostudio { @@ -28,7 +28,7 @@ namespace cocostudio return instanceLayoutReader; } - void LayoutReader::setPropsFromJsonDictionary(gui::Widget *widget, const rapidjson::Value &options) + void LayoutReader::setPropsFromJsonDictionary(ui::Widget *widget, const rapidjson::Value &options) { WidgetReader::setPropsFromJsonDictionary(widget, options); diff --git a/cocos/gui/WidgetReader/LayoutReader/LayoutReader.h b/cocos/ui/WidgetReader/LayoutReader/LayoutReader.h similarity index 100% rename from cocos/gui/WidgetReader/LayoutReader/LayoutReader.h rename to cocos/ui/WidgetReader/LayoutReader/LayoutReader.h diff --git a/cocos/gui/WidgetReader/ListViewReader/ListViewReader.cpp b/cocos/ui/WidgetReader/ListViewReader/ListViewReader.cpp similarity index 89% rename from cocos/gui/WidgetReader/ListViewReader/ListViewReader.cpp rename to cocos/ui/WidgetReader/ListViewReader/ListViewReader.cpp index 788b7a271d..44a58941b5 100644 --- a/cocos/gui/WidgetReader/ListViewReader/ListViewReader.cpp +++ b/cocos/ui/WidgetReader/ListViewReader/ListViewReader.cpp @@ -1,7 +1,7 @@ #include "ListViewReader.h" -#include "gui/UIListView.h" +#include "ui/UIListView.h" namespace cocostudio { @@ -28,7 +28,7 @@ namespace cocostudio return instanceListViewReader; } - void ListViewReader::setPropsFromJsonDictionary(gui::Widget *widget, const rapidjson::Value &options) + void ListViewReader::setPropsFromJsonDictionary(ui::Widget *widget, const rapidjson::Value &options) { ScrollViewReader::setPropsFromJsonDictionary(widget, options); diff --git a/cocos/gui/WidgetReader/ListViewReader/ListViewReader.h b/cocos/ui/WidgetReader/ListViewReader/ListViewReader.h similarity index 100% rename from cocos/gui/WidgetReader/ListViewReader/ListViewReader.h rename to cocos/ui/WidgetReader/ListViewReader/ListViewReader.h diff --git a/cocos/gui/WidgetReader/LoadingBarReader/LoadingBarReader.cpp b/cocos/ui/WidgetReader/LoadingBarReader/LoadingBarReader.cpp similarity index 99% rename from cocos/gui/WidgetReader/LoadingBarReader/LoadingBarReader.cpp rename to cocos/ui/WidgetReader/LoadingBarReader/LoadingBarReader.cpp index 92b10fa845..864e19a473 100644 --- a/cocos/gui/WidgetReader/LoadingBarReader/LoadingBarReader.cpp +++ b/cocos/ui/WidgetReader/LoadingBarReader/LoadingBarReader.cpp @@ -1,7 +1,7 @@ #include "LoadingBarReader.h" -#include "gui/UILoadingBar.h" +#include "ui/UILoadingBar.h" namespace cocostudio { diff --git a/cocos/gui/WidgetReader/LoadingBarReader/LoadingBarReader.h b/cocos/ui/WidgetReader/LoadingBarReader/LoadingBarReader.h similarity index 100% rename from cocos/gui/WidgetReader/LoadingBarReader/LoadingBarReader.h rename to cocos/ui/WidgetReader/LoadingBarReader/LoadingBarReader.h diff --git a/cocos/gui/WidgetReader/PageViewReader/PageViewReader.cpp b/cocos/ui/WidgetReader/PageViewReader/PageViewReader.cpp similarity index 81% rename from cocos/gui/WidgetReader/PageViewReader/PageViewReader.cpp rename to cocos/ui/WidgetReader/PageViewReader/PageViewReader.cpp index aa58079ef9..c5692277e2 100644 --- a/cocos/gui/WidgetReader/PageViewReader/PageViewReader.cpp +++ b/cocos/ui/WidgetReader/PageViewReader/PageViewReader.cpp @@ -1,7 +1,7 @@ #include "PageViewReader.h" -#include "gui/UIPageView.h" +#include "ui/UIPageView.h" namespace cocostudio { @@ -28,7 +28,7 @@ namespace cocostudio return instancePageViewReader; } - void PageViewReader::setPropsFromJsonDictionary(gui::Widget *widget, const rapidjson::Value &options) + void PageViewReader::setPropsFromJsonDictionary(ui::Widget *widget, const rapidjson::Value &options) { LayoutReader::setPropsFromJsonDictionary(widget, options); } diff --git a/cocos/gui/WidgetReader/PageViewReader/PageViewReader.h b/cocos/ui/WidgetReader/PageViewReader/PageViewReader.h similarity index 94% rename from cocos/gui/WidgetReader/PageViewReader/PageViewReader.h rename to cocos/ui/WidgetReader/PageViewReader/PageViewReader.h index 5b58c8cfad..07b7719565 100644 --- a/cocos/gui/WidgetReader/PageViewReader/PageViewReader.h +++ b/cocos/ui/WidgetReader/PageViewReader/PageViewReader.h @@ -40,7 +40,7 @@ namespace cocostudio static PageViewReader* getInstance(); static void purge(); - virtual void setPropsFromJsonDictionary(gui::Widget* widget, const rapidjson::Value& options); + virtual void setPropsFromJsonDictionary(ui::Widget* widget, const rapidjson::Value& options); }; } diff --git a/cocos/gui/WidgetReader/ScrollViewReader/ScrollViewReader.cpp b/cocos/ui/WidgetReader/ScrollViewReader/ScrollViewReader.cpp similarity index 97% rename from cocos/gui/WidgetReader/ScrollViewReader/ScrollViewReader.cpp rename to cocos/ui/WidgetReader/ScrollViewReader/ScrollViewReader.cpp index 2b726a3eab..a09480d8e1 100644 --- a/cocos/gui/WidgetReader/ScrollViewReader/ScrollViewReader.cpp +++ b/cocos/ui/WidgetReader/ScrollViewReader/ScrollViewReader.cpp @@ -1,7 +1,7 @@ #include "ScrollViewReader.h" -#include "gui/UIScrollView.h" +#include "ui/UIScrollView.h" namespace cocostudio { diff --git a/cocos/gui/WidgetReader/ScrollViewReader/ScrollViewReader.h b/cocos/ui/WidgetReader/ScrollViewReader/ScrollViewReader.h similarity index 100% rename from cocos/gui/WidgetReader/ScrollViewReader/ScrollViewReader.h rename to cocos/ui/WidgetReader/ScrollViewReader/ScrollViewReader.h diff --git a/cocos/gui/WidgetReader/SliderReader/SliderReader.cpp b/cocos/ui/WidgetReader/SliderReader/SliderReader.cpp similarity index 99% rename from cocos/gui/WidgetReader/SliderReader/SliderReader.cpp rename to cocos/ui/WidgetReader/SliderReader/SliderReader.cpp index 08d9516add..9e290d28e3 100644 --- a/cocos/gui/WidgetReader/SliderReader/SliderReader.cpp +++ b/cocos/ui/WidgetReader/SliderReader/SliderReader.cpp @@ -1,7 +1,7 @@ #include "SliderReader.h" -#include "gui/UISlider.h" +#include "ui/UISlider.h" namespace cocostudio { diff --git a/cocos/gui/WidgetReader/SliderReader/SliderReader.h b/cocos/ui/WidgetReader/SliderReader/SliderReader.h similarity index 100% rename from cocos/gui/WidgetReader/SliderReader/SliderReader.h rename to cocos/ui/WidgetReader/SliderReader/SliderReader.h diff --git a/cocos/gui/WidgetReader/TextAtlasReader/TextAtlasReader.cpp b/cocos/ui/WidgetReader/TextAtlasReader/TextAtlasReader.cpp similarity index 98% rename from cocos/gui/WidgetReader/TextAtlasReader/TextAtlasReader.cpp rename to cocos/ui/WidgetReader/TextAtlasReader/TextAtlasReader.cpp index e59c6ef492..9fd20de2f2 100644 --- a/cocos/gui/WidgetReader/TextAtlasReader/TextAtlasReader.cpp +++ b/cocos/ui/WidgetReader/TextAtlasReader/TextAtlasReader.cpp @@ -1,7 +1,7 @@ #include "TextAtlasReader.h" -#include "gui/UITextAtlas.h" +#include "ui/UITextAtlas.h" namespace cocostudio { diff --git a/cocos/gui/WidgetReader/TextAtlasReader/TextAtlasReader.h b/cocos/ui/WidgetReader/TextAtlasReader/TextAtlasReader.h similarity index 100% rename from cocos/gui/WidgetReader/TextAtlasReader/TextAtlasReader.h rename to cocos/ui/WidgetReader/TextAtlasReader/TextAtlasReader.h diff --git a/cocos/gui/WidgetReader/TextBMFontReader/TextBMFontReader.cpp b/cocos/ui/WidgetReader/TextBMFontReader/TextBMFontReader.cpp similarity index 98% rename from cocos/gui/WidgetReader/TextBMFontReader/TextBMFontReader.cpp rename to cocos/ui/WidgetReader/TextBMFontReader/TextBMFontReader.cpp index 90186522e2..daec7016a0 100644 --- a/cocos/gui/WidgetReader/TextBMFontReader/TextBMFontReader.cpp +++ b/cocos/ui/WidgetReader/TextBMFontReader/TextBMFontReader.cpp @@ -1,7 +1,7 @@ #include "TextBMFontReader.h" -#include "gui/UITextBMFont.h" +#include "ui/UITextBMFont.h" namespace cocostudio { diff --git a/cocos/gui/WidgetReader/TextBMFontReader/TextBMFontReader.h b/cocos/ui/WidgetReader/TextBMFontReader/TextBMFontReader.h similarity index 100% rename from cocos/gui/WidgetReader/TextBMFontReader/TextBMFontReader.h rename to cocos/ui/WidgetReader/TextBMFontReader/TextBMFontReader.h diff --git a/cocos/gui/WidgetReader/TextFieldReader/TextFieldReader.cpp b/cocos/ui/WidgetReader/TextFieldReader/TextFieldReader.cpp similarity index 98% rename from cocos/gui/WidgetReader/TextFieldReader/TextFieldReader.cpp rename to cocos/ui/WidgetReader/TextFieldReader/TextFieldReader.cpp index 301ae2da38..0066e796fc 100644 --- a/cocos/gui/WidgetReader/TextFieldReader/TextFieldReader.cpp +++ b/cocos/ui/WidgetReader/TextFieldReader/TextFieldReader.cpp @@ -1,7 +1,7 @@ #include "TextFieldReader.h" -#include "gui/UITextField.h" +#include "ui/UITextField.h" namespace cocostudio { diff --git a/cocos/gui/WidgetReader/TextFieldReader/TextFieldReader.h b/cocos/ui/WidgetReader/TextFieldReader/TextFieldReader.h similarity index 100% rename from cocos/gui/WidgetReader/TextFieldReader/TextFieldReader.h rename to cocos/ui/WidgetReader/TextFieldReader/TextFieldReader.h diff --git a/cocos/gui/WidgetReader/TextReader/TextReader.cpp b/cocos/ui/WidgetReader/TextReader/TextReader.cpp similarity index 98% rename from cocos/gui/WidgetReader/TextReader/TextReader.cpp rename to cocos/ui/WidgetReader/TextReader/TextReader.cpp index 36d8f23ede..5910122767 100644 --- a/cocos/gui/WidgetReader/TextReader/TextReader.cpp +++ b/cocos/ui/WidgetReader/TextReader/TextReader.cpp @@ -1,7 +1,7 @@ #include "TextReader.h" -#include "gui/UIText.h" +#include "ui/UIText.h" namespace cocostudio { diff --git a/cocos/gui/WidgetReader/TextReader/TextReader.h b/cocos/ui/WidgetReader/TextReader/TextReader.h similarity index 100% rename from cocos/gui/WidgetReader/TextReader/TextReader.h rename to cocos/ui/WidgetReader/TextReader/TextReader.h diff --git a/cocos/gui/WidgetReader/WidgetReader.cpp b/cocos/ui/WidgetReader/WidgetReader.cpp similarity index 96% rename from cocos/gui/WidgetReader/WidgetReader.cpp rename to cocos/ui/WidgetReader/WidgetReader.cpp index 60dfb43a0c..29570ecff3 100644 --- a/cocos/gui/WidgetReader/WidgetReader.cpp +++ b/cocos/ui/WidgetReader/WidgetReader.cpp @@ -4,6 +4,7 @@ namespace cocostudio { + using namespace cocos2d::ui; static WidgetReader* instanceWidgetReader = NULL; IMPLEMENT_CLASS_WIDGET_READER_INFO(WidgetReader) @@ -32,7 +33,7 @@ namespace cocostudio CC_SAFE_DELETE(instanceWidgetReader); } - void WidgetReader::setPropsFromJsonDictionary(cocos2d::gui::Widget *widget, const rapidjson::Value &options) + void WidgetReader::setPropsFromJsonDictionary(cocos2d::ui::Widget *widget, const rapidjson::Value &options) { bool ignoreSizeExsit = DICTOOL->checkObjectExist_json(options, "ignoreSize"); if (ignoreSizeExsit) @@ -145,7 +146,7 @@ namespace cocostudio } } - void WidgetReader::setColorPropsFromJsonDictionary(gui::Widget *widget, const rapidjson::Value &options) + void WidgetReader::setColorPropsFromJsonDictionary(ui::Widget *widget, const rapidjson::Value &options) { bool op = DICTOOL->checkObjectExist_json(options, "opacity"); if (op) diff --git a/cocos/gui/WidgetReader/WidgetReader.h b/cocos/ui/WidgetReader/WidgetReader.h similarity index 95% rename from cocos/gui/WidgetReader/WidgetReader.h rename to cocos/ui/WidgetReader/WidgetReader.h index 9c9e994d66..7e10cfd8ef 100644 --- a/cocos/gui/WidgetReader/WidgetReader.h +++ b/cocos/ui/WidgetReader/WidgetReader.h @@ -26,9 +26,9 @@ #define __TestCpp__WidgetReader__ #include "WidgetReaderProtocol.h" -#include "../CCSGUIReader.h" -#include "gui/GUIDefine.h" -#include "gui/UIWidget.h" +#include "CCSGUIReader.h" +#include "ui/GUIDefine.h" +#include "ui/UIWidget.h" namespace cocostudio { diff --git a/cocos/gui/WidgetReader/WidgetReaderProtocol.h b/cocos/ui/WidgetReader/WidgetReaderProtocol.h similarity index 97% rename from cocos/gui/WidgetReader/WidgetReaderProtocol.h rename to cocos/ui/WidgetReader/WidgetReaderProtocol.h index e910bb1827..574262743a 100644 --- a/cocos/gui/WidgetReader/WidgetReaderProtocol.h +++ b/cocos/ui/WidgetReader/WidgetReaderProtocol.h @@ -30,14 +30,14 @@ namespace cocos2d { - namespace gui + namespace ui { class Widget; } } USING_NS_CC; -using namespace cocos2d::gui; +using namespace cocos2d::ui; namespace cocostudio { diff --git a/cocos/gui/proj.win32/libGUI.vcxproj b/cocos/ui/proj.win32/libGUI.vcxproj similarity index 100% rename from cocos/gui/proj.win32/libGUI.vcxproj rename to cocos/ui/proj.win32/libGUI.vcxproj diff --git a/cocos/gui/proj.win32/libGUI.vcxproj.filters b/cocos/ui/proj.win32/libGUI.vcxproj.filters similarity index 100% rename from cocos/gui/proj.win32/libGUI.vcxproj.filters rename to cocos/ui/proj.win32/libGUI.vcxproj.filters diff --git a/cocos/gui/proj.win32/libGUI.vcxproj.user b/cocos/ui/proj.win32/libGUI.vcxproj.user similarity index 100% rename from cocos/gui/proj.win32/libGUI.vcxproj.user rename to cocos/ui/proj.win32/libGUI.vcxproj.user diff --git a/templates/cocos2dx_files.json.REMOVED.git-id b/templates/cocos2dx_files.json.REMOVED.git-id index 251bec07e4..15d6dd3dcc 100644 --- a/templates/cocos2dx_files.json.REMOVED.git-id +++ b/templates/cocos2dx_files.json.REMOVED.git-id @@ -1 +1 @@ -e4f656f3e06fc5c267880b95d80deba8b2640c77 \ No newline at end of file +ac17b42db61c1dee0e31ae7df7bcb2fa33e899d1 \ No newline at end of file diff --git a/templates/cpp-template-default/CMakeLists.txt b/templates/cpp-template-default/CMakeLists.txt index b04b06c1b2..302399de3a 100644 --- a/templates/cpp-template-default/CMakeLists.txt +++ b/templates/cpp-template-default/CMakeLists.txt @@ -114,8 +114,8 @@ add_subdirectory(${COCOS2D_ROOT}/cocos/2d) # cocos storage add_subdirectory(${COCOS2D_ROOT}/cocos/storage) -# gui -add_subdirectory(${COCOS2D_ROOT}/cocos/gui) +# ui +add_subdirectory(${COCOS2D_ROOT}/cocos/ui) # network add_subdirectory(${COCOS2D_ROOT}/cocos/network) @@ -146,7 +146,7 @@ set(FMOD_LIB "fmodex") endif() target_link_libraries(${APP_NAME} - gui + ui network storage spine diff --git a/templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj b/templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj index 4ad489f766..83a4e2ebe7 100644 --- a/templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj +++ b/templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj @@ -933,7 +933,7 @@ "$(SRCROOT)/../cocos2d/cocos/physics", "$(SRCROOT)/../cocos2d/cocos/math/kazmath", "$(SRCROOT)/../cocos2d/cocos/2d", - "$(SRCROOT)/../cocos2d/cocos/gui", + "$(SRCROOT)/../cocos2d/cocos/ui", "$(SRCROOT)/../cocos2d/cocos/network", "$(SRCROOT)/../cocos2d/cocos/audio/include", "$(SRCROOT)/../cocos2d/cocos/editor-support", @@ -961,7 +961,7 @@ "$(SRCROOT)/../cocos2d/cocos/physics", "$(SRCROOT)/../cocos2d/cocos/math/kazmath", "$(SRCROOT)/../cocos2d/cocos/2d", - "$(SRCROOT)/../cocos2d/cocos/gui", + "$(SRCROOT)/../cocos2d/cocos/ui", "$(SRCROOT)/../cocos2d/cocos/network", "$(SRCROOT)/../cocos2d/cocos/audio/include", "$(SRCROOT)/../cocos2d/cocos/editor-support", diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj index 58b62f1160..e894d09394 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj +++ b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj @@ -978,7 +978,7 @@ HEADER_SEARCH_PATHS = ""; ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = "$(TARGET_NAME)"; - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d-x $(SRCROOT)/../../cocos2d-x/cocos $(SRCROOT)/../../cocos2d-x/cocos/base $(SRCROOT)/../../cocos2d-x/cocos/physics $(SRCROOT)/../../cocos2d-x/cocos/math/kazmath $(SRCROOT)/../../cocos2d-x/cocos/2d $(SRCROOT)/../../cocos2d-x/cocos/gui $(SRCROOT)/../../cocos2d-x/cocos/network $(SRCROOT)/../../cocos2d-x/cocos/audio/include $(SRCROOT)/../../cocos2d-x/cocos/editor-support $(SRCROOT)/../../cocos2d-x/extensions $(SRCROOT)/../../cocos2d-x/external $(SRCROOT)/../../cocos2d-x/external/chipmunk/include/chipmunk $(SRCROOT)/../../cocos2d-x/external/lua/luajit/include $(SRCROOT)/../../cocos2d-x/external/lua/tolua $(SRCROOT)/../../cocos2d-x/cocos/scripting/lua-bindings/manual $(SRCROOT)/../../cocos2d-x/cocos/scripting/lua-bindings/auto"; + USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d-x $(SRCROOT)/../../cocos2d-x/cocos $(SRCROOT)/../../cocos2d-x/cocos/base $(SRCROOT)/../../cocos2d-x/cocos/physics $(SRCROOT)/../../cocos2d-x/cocos/math/kazmath $(SRCROOT)/../../cocos2d-x/cocos/2d $(SRCROOT)/../../cocos2d-x/cocos/ui $(SRCROOT)/../../cocos2d-x/cocos/network $(SRCROOT)/../../cocos2d-x/cocos/audio/include $(SRCROOT)/../../cocos2d-x/cocos/editor-support $(SRCROOT)/../../cocos2d-x/extensions $(SRCROOT)/../../cocos2d-x/external $(SRCROOT)/../../cocos2d-x/external/chipmunk/include/chipmunk $(SRCROOT)/../../cocos2d-x/external/lua/luajit/include $(SRCROOT)/../../cocos2d-x/external/lua/tolua $(SRCROOT)/../../cocos2d-x/cocos/scripting/lua-bindings/manual $(SRCROOT)/../../cocos2d-x/cocos/scripting/lua-bindings/auto"; }; name = Debug; }; @@ -999,7 +999,7 @@ HEADER_SEARCH_PATHS = ""; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; PRODUCT_NAME = "$(TARGET_NAME)"; - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d-x $(SRCROOT)/../../cocos2d-x/cocos $(SRCROOT)/../../cocos2d-x/cocos/base $(SRCROOT)/../../cocos2d-x/cocos/physics $(SRCROOT)/../../cocos2d-x/cocos/math/kazmath $(SRCROOT)/../../cocos2d-x/cocos/2d $(SRCROOT)/../../cocos2d-x/cocos/gui $(SRCROOT)/../../cocos2d-x/cocos/network $(SRCROOT)/../../cocos2d-x/cocos/audio/include $(SRCROOT)/../../cocos2d-x/cocos/editor-support $(SRCROOT)/../../cocos2d-x/extensions $(SRCROOT)/../../cocos2d-x/external $(SRCROOT)/../../cocos2d-x/external/chipmunk/include/chipmunk $(SRCROOT)/../../cocos2d-x/external/lua/luajit/include $(SRCROOT)/../../cocos2d-x/external/lua/tolua $(SRCROOT)/../../cocos2d-x/cocos/scripting/lua-bindings/manual $(SRCROOT)/../../cocos2d-x/cocos/scripting/lua-bindings/auto"; + USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d-x $(SRCROOT)/../../cocos2d-x/cocos $(SRCROOT)/../../cocos2d-x/cocos/base $(SRCROOT)/../../cocos2d-x/cocos/physics $(SRCROOT)/../../cocos2d-x/cocos/math/kazmath $(SRCROOT)/../../cocos2d-x/cocos/2d $(SRCROOT)/../../cocos2d-x/cocos/ui $(SRCROOT)/../../cocos2d-x/cocos/network $(SRCROOT)/../../cocos2d-x/cocos/audio/include $(SRCROOT)/../../cocos2d-x/cocos/editor-support $(SRCROOT)/../../cocos2d-x/extensions $(SRCROOT)/../../cocos2d-x/external $(SRCROOT)/../../cocos2d-x/external/chipmunk/include/chipmunk $(SRCROOT)/../../cocos2d-x/external/lua/luajit/include $(SRCROOT)/../../cocos2d-x/external/lua/tolua $(SRCROOT)/../../cocos2d-x/cocos/scripting/lua-bindings/manual $(SRCROOT)/../../cocos2d-x/cocos/scripting/lua-bindings/auto"; VALIDATE_PRODUCT = YES; }; name = Release; diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.sln b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.sln index 96979213d0..47be636d6c 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.sln +++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.sln @@ -30,7 +30,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosBuilder", "..\..\co EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosStudio", "..\..\cocos2d-x\cocos\editor-support\cocostudio\proj.win32\libCocosStudio.vcxproj", "{B57CF53F-2E49-4031-9822-047CC0E6BDE2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGUI", "..\..\cocos2d-x\cocos\gui\proj.win32\libGUI.vcxproj", "{7E06E92C-537A-442B-9E4A-4761C84F8A1A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGUI", "..\..\cocos2d-x\cocos\ui\proj.win32\libGUI.vcxproj", "{7E06E92C-537A-442B-9E4A-4761C84F8A1A}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\..\cocos2d-x\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}" EndProject diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj index 36985508d8..ed405aed3a 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj +++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj @@ -201,7 +201,7 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" {b7c2a162-dec9-4418-972e-240ab3cbfcae} - + {7e06e92c-537a-442b-9e4a-4761c84f8a1a} @@ -226,4 +226,4 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" - \ No newline at end of file + diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj index 325c617515..f81659bdb7 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj @@ -1018,7 +1018,7 @@ HEADER_SEARCH_PATHS = ""; ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = "$(TARGET_NAME)"; - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d-x $(SRCROOT)/../../cocos2d-x/cocos $(SRCROOT)/../../cocos2d-x/cocos/base $(SRCROOT)/../../cocos2d-x/cocos/physics $(SRCROOT)/../../cocos2d-x/cocos/math/kazmath $(SRCROOT)/../../cocos2d-x/cocos/2d $(SRCROOT)/../../cocos2d-x/cocos/gui $(SRCROOT)/../../cocos2d-x/cocos/network $(SRCROOT)/../../cocos2d-x/cocos/audio/include $(SRCROOT)/../../cocos2d-x/cocos/editor-support $(SRCROOT)/../../cocos2d-x/extensions $(SRCROOT)/../../cocos2d-x/external $(SRCROOT)/../../cocos2d-x/external/chipmunk/include/chipmunk $(SRCROOT)/../../cocos2d-x/external/lua/luajit/include $(SRCROOT)/../../cocos2d-x/external/lua/tolua $(SRCROOT)/../../cocos2d-x/cocos/scripting/lua-bindings/manual $(SRCROOT)/../../cocos2d-x/cocos/scripting/lua-bindings/auto"; + USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d-x $(SRCROOT)/../../cocos2d-x/cocos $(SRCROOT)/../../cocos2d-x/cocos/base $(SRCROOT)/../../cocos2d-x/cocos/physics $(SRCROOT)/../../cocos2d-x/cocos/math/kazmath $(SRCROOT)/../../cocos2d-x/cocos/2d $(SRCROOT)/../../cocos2d-x/cocos/ui $(SRCROOT)/../../cocos2d-x/cocos/network $(SRCROOT)/../../cocos2d-x/cocos/audio/include $(SRCROOT)/../../cocos2d-x/cocos/editor-support $(SRCROOT)/../../cocos2d-x/extensions $(SRCROOT)/../../cocos2d-x/external $(SRCROOT)/../../cocos2d-x/external/chipmunk/include/chipmunk $(SRCROOT)/../../cocos2d-x/external/lua/luajit/include $(SRCROOT)/../../cocos2d-x/external/lua/tolua $(SRCROOT)/../../cocos2d-x/cocos/scripting/lua-bindings/manual $(SRCROOT)/../../cocos2d-x/cocos/scripting/lua-bindings/auto"; }; name = Debug; }; @@ -1039,7 +1039,7 @@ HEADER_SEARCH_PATHS = ""; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; PRODUCT_NAME = "$(TARGET_NAME)"; - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d-x $(SRCROOT)/../../cocos2d-x/cocos $(SRCROOT)/../../cocos2d-x/cocos/base $(SRCROOT)/../../cocos2d-x/cocos/physics $(SRCROOT)/../../cocos2d-x/cocos/math/kazmath $(SRCROOT)/../../cocos2d-x/cocos/2d $(SRCROOT)/../../cocos2d-x/cocos/gui $(SRCROOT)/../../cocos2d-x/cocos/network $(SRCROOT)/../../cocos2d-x/cocos/audio/include $(SRCROOT)/../../cocos2d-x/cocos/editor-support $(SRCROOT)/../../cocos2d-x/extensions $(SRCROOT)/../../cocos2d-x/external $(SRCROOT)/../../cocos2d-x/external/chipmunk/include/chipmunk $(SRCROOT)/../../cocos2d-x/external/lua/luajit/include $(SRCROOT)/../../cocos2d-x/external/lua/tolua $(SRCROOT)/../../cocos2d-x/cocos/scripting/lua-bindings/manual $(SRCROOT)/../../cocos2d-x/cocos/scripting/lua-bindings/auto"; + USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d-x $(SRCROOT)/../../cocos2d-x/cocos $(SRCROOT)/../../cocos2d-x/cocos/base $(SRCROOT)/../../cocos2d-x/cocos/physics $(SRCROOT)/../../cocos2d-x/cocos/math/kazmath $(SRCROOT)/../../cocos2d-x/cocos/2d $(SRCROOT)/../../cocos2d-x/cocos/ui $(SRCROOT)/../../cocos2d-x/cocos/network $(SRCROOT)/../../cocos2d-x/cocos/audio/include $(SRCROOT)/../../cocos2d-x/cocos/editor-support $(SRCROOT)/../../cocos2d-x/extensions $(SRCROOT)/../../cocos2d-x/external $(SRCROOT)/../../cocos2d-x/external/chipmunk/include/chipmunk $(SRCROOT)/../../cocos2d-x/external/lua/luajit/include $(SRCROOT)/../../cocos2d-x/external/lua/tolua $(SRCROOT)/../../cocos2d-x/cocos/scripting/lua-bindings/manual $(SRCROOT)/../../cocos2d-x/cocos/scripting/lua-bindings/auto"; VALIDATE_PRODUCT = YES; }; name = Release; diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.sln b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.sln index 96979213d0..47be636d6c 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.sln +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.sln @@ -30,7 +30,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosBuilder", "..\..\co EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosStudio", "..\..\cocos2d-x\cocos\editor-support\cocostudio\proj.win32\libCocosStudio.vcxproj", "{B57CF53F-2E49-4031-9822-047CC0E6BDE2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGUI", "..\..\cocos2d-x\cocos\gui\proj.win32\libGUI.vcxproj", "{7E06E92C-537A-442B-9E4A-4761C84F8A1A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGUI", "..\..\cocos2d-x\cocos\ui\proj.win32\libGUI.vcxproj", "{7E06E92C-537A-442B-9E4A-4761C84F8A1A}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\..\cocos2d-x\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}" EndProject diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.vcxproj b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.vcxproj index 8e1830ec70..1c05d2dffb 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.vcxproj +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.vcxproj @@ -206,7 +206,7 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" {b7c2a162-dec9-4418-972e-240ab3cbfcae} - + {7e06e92c-537a-442b-9e4a-4761c84f8a1a} @@ -231,4 +231,4 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" - \ No newline at end of file + diff --git a/tests/cpp-tests/CMakeLists.txt b/tests/cpp-tests/CMakeLists.txt index ad5230d7c3..7a36508532 100644 --- a/tests/cpp-tests/CMakeLists.txt +++ b/tests/cpp-tests/CMakeLists.txt @@ -191,7 +191,7 @@ add_executable(${APP_NAME} ) target_link_libraries(${APP_NAME} - gui + ui network spine cocostudio diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.h index fdf27379ac..c85f123379 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.h @@ -28,7 +28,7 @@ #include "cocos2d.h" #include "extensions/cocos-ext.h" #include "../../testBasic.h" -#include "gui/CocosGUI.h" +#include "ui/CocosGUI.h" USING_NS_CC; USING_NS_CC_EXT; diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomGUIScene.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomGUIScene.h index 5bd3d1ae25..140eee49de 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomGUIScene.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomGUIScene.h @@ -6,7 +6,7 @@ #include "cocos2d.h" #include "extensions/cocos-ext.h" #include "../../testBasic.h" -#include "gui/CocosGUI.h" +#include "ui/CocosGUI.h" USING_NS_CC; USING_NS_CC_EXT; diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomImageTest/CustomImageTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomImageTest/CustomImageTest.cpp index 467df7b239..4c65ddaae0 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomImageTest/CustomImageTest.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomImageTest/CustomImageTest.cpp @@ -24,7 +24,7 @@ void CustomImageLayer::onEnter() CustomImageViewReader::getInstance(), parseselector(CustomImageViewReader::setProperties)); - Layout* layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosgui/CustomImageViewTest/NewProject_2_1.ExportJson")); + Layout* layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/CustomImageViewTest/NewProject_2_1.ExportJson")); addChild(layout); } diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageView.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageView.h index 2e2630045e..f45c583413 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageView.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageView.h @@ -2,7 +2,7 @@ #ifndef __TestCpp__CustomImageView__ #define __TestCpp__CustomImageView__ -#include "gui/CocosGUI.h" +#include "ui/CocosGUI.h" class CustomImageView : public cocos2d::ui::ImageView { diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageViewReader.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageViewReader.h index 94f6773494..b11c7ab39f 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageViewReader.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageViewReader.h @@ -5,7 +5,7 @@ #include "extensions/cocos-ext.h" #include "cocostudio/DictionaryHelper.h" -#include "gui/CocosGUI.h" +#include "ui/CocosGUI.h" class CustomImageViewReader : public cocos2d::Ref { diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.h index dee49860a8..acf68fbb91 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.h @@ -9,7 +9,7 @@ #ifndef __CustomUI__CustomParticleWidget__ #define __CustomUI__CustomParticleWidget__ -#include "gui/CocosGUI.h" +#include "ui/CocosGUI.h" class CustomParticleWidget : public cocos2d::ui::Widget { diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidgetReader.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidgetReader.h index 04fa832189..8685271969 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidgetReader.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidgetReader.h @@ -11,7 +11,7 @@ #include "extensions/cocos-ext.h" #include "cocostudio/DictionaryHelper.h" -#include "gui/CocosGUI.h" +#include "ui/CocosGUI.h" class CustomParticleWidgetReader : public cocos2d::Ref { diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomReader.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomReader.h index 7eb141d3cd..f788d0ab6f 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomReader.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomReader.h @@ -5,7 +5,7 @@ #include "extensions/cocos-ext.h" #include "cocostudio/DictionaryHelper.h" -#include "gui/CocosGUI.h" +#include "ui/CocosGUI.h" USING_NS_CC; USING_NS_CC_EXT; diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp index 44baad70af..bf98d36b3d 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp @@ -42,7 +42,7 @@ bool UIButtonTest::init() // Create the button Button* button = Button::create(); button->setTouchEnabled(true); - button->loadTextures("cocosgui/animationbuttonnormal.png", "cocosgui/animationbuttonpressed.png", ""); + button->loadTextures("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png", ""); button->setPosition(Point(widgetSize.width / 2.0f, widgetSize.height / 2.0f)); button->addTouchEventListener(this, toucheventselector(UIButtonTest::touchEvent)); _uiLayer->addChild(button); @@ -119,7 +119,7 @@ bool UIButtonTest_Scale9::init() button->setTouchEnabled(true); // open scale9 render button->setScale9Enabled(true); - button->loadTextures("cocosgui/button.png", "cocosgui/buttonHighlighted.png", ""); + button->loadTextures("cocosui/button.png", "cocosui/buttonHighlighted.png", ""); button->setPosition(Point(widgetSize.width / 2.0f, widgetSize.height / 2.0f)); button->setSize(Size(150, button->getContentSize().height * 1.5f)); button->addTouchEventListener(this, toucheventselector(UIButtonTest_Scale9::touchEvent)); @@ -194,7 +194,7 @@ bool UIButtonTest_PressedAction::init() Button* button = Button::create(); button->setTouchEnabled(true); button->setPressedActionEnabled(true); - button->loadTextures("cocosgui/animationbuttonnormal.png", "cocosgui/animationbuttonpressed.png", ""); + button->loadTextures("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png", ""); button->setPosition(Point(widgetSize.width / 2.0f, widgetSize.height / 2.0f)); button->addTouchEventListener(this, toucheventselector(UIButtonTest_PressedAction::touchEvent)); _uiLayer->addChild(button); @@ -267,7 +267,7 @@ bool UIButtonTest_Title::init() // Create the button with title Button* button = Button::create(); button->setTouchEnabled(true); - button->loadTextures("cocosgui/backtotoppressed.png", "cocosgui/backtotopnormal.png", ""); + button->loadTextures("cocosui/backtotoppressed.png", "cocosui/backtotopnormal.png", ""); button->setTitleText("Title Button"); button->setPosition(Point(widgetSize.width / 2.0f, widgetSize.height / 2.0f)); button->addTouchEventListener(this, toucheventselector(UIButtonTest_Title::touchEvent)); @@ -302,4 +302,4 @@ void UIButtonTest_Title::touchEvent(Ref *pSender, TouchEventType type) default: break; } -} \ No newline at end of file +} diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp index 4b35914424..bdc0d86570 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp @@ -20,7 +20,7 @@ bool UIButtonTest_Editor::init() { if (UIScene_Editor::init()) { - _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosgui/UIEditorTest/UIButton_Editor/UIButton_Editor_1.json")); + _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UIEditorTest/UIButton_Editor/UIButton_Editor_1.json")); _touchGroup->addChild(_layout); Size screenSize = CCDirector::getInstance()->getWinSize(); Size rootSize = _layout->getSize(); diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp index 58384998ea..c636efd573 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp @@ -41,11 +41,11 @@ bool UICheckBoxTest::init() // Create the checkbox CheckBox* checkBox = CheckBox::create(); checkBox->setTouchEnabled(true); - checkBox->loadTextures("cocosgui/check_box_normal.png", - "cocosgui/check_box_normal_press.png", - "cocosgui/check_box_active.png", - "cocosgui/check_box_normal_disable.png", - "cocosgui/check_box_active_disable.png"); + checkBox->loadTextures("cocosui/check_box_normal.png", + "cocosui/check_box_normal_press.png", + "cocosui/check_box_active.png", + "cocosui/check_box_normal_disable.png", + "cocosui/check_box_active_disable.png"); checkBox->setPosition(Point(widgetSize.width / 2.0f, widgetSize.height / 2.0f)); checkBox->addEventListenerCheckBox(this, checkboxselectedeventselector(UICheckBoxTest::selectedEvent)); @@ -72,4 +72,4 @@ void UICheckBoxTest::selectedEvent(Ref* pSender,CheckBoxEventType type) break; } -} \ No newline at end of file +} diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp index cae646ed9f..345bbe0ebd 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp @@ -20,7 +20,7 @@ bool UICheckBoxTest_Editor::init() { if (UIScene_Editor::init()) { - _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosgui/UIEditorTest/UICheckBox_Editor/ui_checkbox_editor_1.json")); + _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UIEditorTest/UICheckBox_Editor/ui_checkbox_editor_1.json")); _touchGroup->addChild(_layout); Size screenSize = CCDirector::getInstance()->getWinSize(); Size rootSize = _layout->getSize(); diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp index 3a996e2d8e..6833df8b89 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp @@ -21,7 +21,7 @@ bool UIImageViewTest::init() // Create the imageview ImageView* imageView = ImageView::create(); - imageView->loadTexture("cocosgui/ccicon.png"); + imageView->loadTexture("cocosui/ccicon.png"); imageView->setPosition(Point(widgetSize.width / 2.0f, widgetSize.height / 2.0f + imageView->getSize().height / 4.0f)); // imageView->setOpacity(64); @@ -31,7 +31,7 @@ bool UIImageViewTest::init() NodeRGBA* root = NodeRGBA::create(); root->setCascadeOpacityEnabled(true); NodeRGBA* render = Sprite::create(); - static_cast(render)->setTexture("cocosgui/ccicon.png"); + static_cast(render)->setTexture("cocosui/ccicon.png"); root->addChild(render); // root->setOpacity(64); root->setPosition(Point(200, 180)); @@ -41,7 +41,7 @@ bool UIImageViewTest::init() /* NodeRGBA* nodergba = NodeRGBA::create(); Sprite* child = Sprite::create(); - child->setTexture("cocosgui/ccicon.png"); + child->setTexture("cocosui/ccicon.png"); nodergba->addChild(child); nodergba->setPosition(Point(120, 80)); nodergba->setOpacity(64); @@ -50,7 +50,7 @@ bool UIImageViewTest::init() /* Sprite* sprite = Sprite::create(); - sprite->setTexture("cocosgui/ccicon.png"); + sprite->setTexture("cocosui/ccicon.png"); sprite->setPosition(Point(200, 180)); // sprite->setOpacity(64); _uiLayer->addChild(sprite); @@ -83,7 +83,7 @@ bool UIImageViewTest_Scale9::init() // Create the imageview ImageView* imageView = ImageView::create(); imageView->setScale9Enabled(true); - imageView->loadTexture("cocosgui/buttonHighlighted.png"); + imageView->loadTexture("cocosui/buttonHighlighted.png"); imageView->setSize(Size(200, 85)); imageView->setPosition(Point(widgetSize.width / 2.0f, widgetSize.height / 2.0f + imageView->getSize().height / 4.0f)); _uiLayer->addChild(imageView); @@ -91,4 +91,4 @@ bool UIImageViewTest_Scale9::init() return true; } return false; -} \ No newline at end of file +} diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest_Editor.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest_Editor.cpp index b2d2fd0748..3243d913f5 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest_Editor.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest_Editor.cpp @@ -9,7 +9,7 @@ bool UIImageViewTest_Editor::init() { if (UIScene_Editor::init()) { - _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosgui/UIEditorTest/UIImageView_Editor/ui_ImageView_editor_1.json")); + _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UIEditorTest/UIImageView_Editor/ui_ImageView_editor_1.json")); _touchGroup->addChild(_layout); Size screenSize = CCDirector::getInstance()->getWinSize(); Size rootSize = _layout->getSize(); diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp index 0cc59d688f..afc6ac6543 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp @@ -44,20 +44,20 @@ bool UILayoutTest::init() Button* button = Button::create(); button->setTouchEnabled(true); - button->loadTextures("cocosgui/animationbuttonnormal.png", "cocosgui/animationbuttonpressed.png", ""); + button->loadTextures("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png", ""); button->setPosition(Point(button->getSize().width / 2.0f, layout->getSize().height - button->getSize().height / 2.0f)); layout->addChild(button); Button* titleButton = Button::create(); titleButton->setTouchEnabled(true); - titleButton->loadTextures("cocosgui/backtotopnormal.png", "cocosgui/backtotoppressed.png", ""); + titleButton->loadTextures("cocosui/backtotopnormal.png", "cocosui/backtotoppressed.png", ""); titleButton->setTitleText("Title Button"); titleButton->setPosition(Point(layout->getSize().width / 2.0f, layout->getSize().height / 2.0f)); layout->addChild(titleButton); Button* button_scale9 = Button::create(); button_scale9->setTouchEnabled(true); - button_scale9->loadTextures("cocosgui/button.png", "cocosgui/buttonHighlighted.png", ""); + button_scale9->loadTextures("cocosui/button.png", "cocosui/buttonHighlighted.png", ""); button_scale9->setScale9Enabled(true); button_scale9->setSize(Size(100.0f, button_scale9->getContentSize().height)); button_scale9->setPosition(Point(layout->getSize().width - button_scale9->getSize().width / 2.0f, button_scale9->getSize().height / 2.0f)); @@ -112,20 +112,20 @@ bool UILayoutTest_Color::init() Button* button = Button::create(); button->setTouchEnabled(true); - button->loadTextures("cocosgui/animationbuttonnormal.png", "cocosgui/animationbuttonpressed.png", ""); + button->loadTextures("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png", ""); button->setPosition(Point(button->getSize().width / 2.0f, layout->getSize().height - button->getSize().height / 2.0f)); layout->addChild(button); Button* titleButton = Button::create(); titleButton->setTouchEnabled(true); - titleButton->loadTextures("cocosgui/backtotopnormal.png", "cocosgui/backtotoppressed.png", ""); + titleButton->loadTextures("cocosui/backtotopnormal.png", "cocosui/backtotoppressed.png", ""); titleButton->setTitleText("Title Button"); titleButton->setPosition(Point(layout->getSize().width / 2.0f, layout->getSize().height / 2.0f)); layout->addChild(titleButton); Button* button_scale9 = Button::create(); button_scale9->setTouchEnabled(true); - button_scale9->loadTextures("cocosgui/button.png", "cocosgui/buttonHighlighted.png", ""); + button_scale9->loadTextures("cocosui/button.png", "cocosui/buttonHighlighted.png", ""); button_scale9->setScale9Enabled(true); button_scale9->setSize(Size(100.0f, button_scale9->getContentSize().height)); button_scale9->setPosition(Point(layout->getSize().width - button_scale9->getSize().width / 2.0f, button_scale9->getSize().height / 2.0f)); @@ -179,20 +179,20 @@ bool UILayoutTest_Gradient::init() Button* button = Button::create(); button->setTouchEnabled(true); - button->loadTextures("cocosgui/animationbuttonnormal.png", "cocosgui/animationbuttonpressed.png", ""); + button->loadTextures("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png", ""); button->setPosition(Point(button->getSize().width / 2.0f, layout->getSize().height - button->getSize().height / 2.0f)); layout->addChild(button); Button* titleButton = Button::create(); titleButton->setTouchEnabled(true); - titleButton->loadTextures("cocosgui/backtotopnormal.png", "cocosgui/backtotoppressed.png", ""); + titleButton->loadTextures("cocosui/backtotopnormal.png", "cocosui/backtotoppressed.png", ""); titleButton->setTitleText("Title Button"); titleButton->setPosition(Point(layout->getSize().width / 2.0f, layout->getSize().height / 2.0f)); layout->addChild(titleButton); Button* button_scale9 = Button::create(); button_scale9->setTouchEnabled(true); - button_scale9->loadTextures("cocosgui/button.png", "cocosgui/buttonHighlighted.png", ""); + button_scale9->loadTextures("cocosui/button.png", "cocosui/buttonHighlighted.png", ""); button_scale9->setScale9Enabled(true); button_scale9->setSize(Size(100.0f, button_scale9->getContentSize().height)); button_scale9->setPosition(Point(layout->getSize().width - button_scale9->getSize().width / 2.0f, button_scale9->getSize().height / 2.0f)); @@ -235,7 +235,7 @@ bool UILayoutTest_BackGroundImage::init() // Create the layout with background image Layout* layout = Layout::create(); layout->setClippingEnabled(true); - layout->setBackGroundImage("cocosgui/Hello.png"); + layout->setBackGroundImage("cocosui/Hello.png"); layout->setSize(Size(280, 150)); Size backgroundSize = background->getContentSize(); layout->setPosition(Point((widgetSize.width - backgroundSize.width) / 2.0f + @@ -246,20 +246,20 @@ bool UILayoutTest_BackGroundImage::init() Button* button = Button::create(); button->setTouchEnabled(true); - button->loadTextures("cocosgui/animationbuttonnormal.png", "cocosgui/animationbuttonpressed.png", ""); + button->loadTextures("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png", ""); button->setPosition(Point(button->getSize().width / 2.0f, layout->getSize().height - button->getSize().height / 2.0f)); layout->addChild(button); Button* titleButton = Button::create(); titleButton->setTouchEnabled(true); - titleButton->loadTextures("cocosgui/backtotopnormal.png", "cocosgui/backtotoppressed.png", ""); + titleButton->loadTextures("cocosui/backtotopnormal.png", "cocosui/backtotoppressed.png", ""); titleButton->setTitleText("Title Button"); titleButton->setPosition(Point(layout->getSize().width / 2.0f, layout->getSize().height / 2.0f)); layout->addChild(titleButton); Button* button_scale9 = Button::create(); button_scale9->setTouchEnabled(true); - button_scale9->loadTextures("cocosgui/button.png", "cocosgui/buttonHighlighted.png", ""); + button_scale9->loadTextures("cocosui/button.png", "cocosui/buttonHighlighted.png", ""); button_scale9->setScale9Enabled(true); button_scale9->setSize(Size(100.0f, button_scale9->getContentSize().height)); button_scale9->setPosition(Point(layout->getSize().width - button_scale9->getSize().width / 2.0f, button_scale9->getSize().height / 2.0f)); @@ -302,7 +302,7 @@ bool UILayoutTest_BackGroundImage_Scale9::init() // Create the layout with background image Layout* layout = Layout::create(); layout->setBackGroundImageScale9Enabled(true); - layout->setBackGroundImage("cocosgui/green_edit.png"); + layout->setBackGroundImage("cocosui/green_edit.png"); layout->setSize(Size(280, 150)); Size backgroundSize = background->getContentSize(); layout->setPosition(Point((widgetSize.width - backgroundSize.width) / 2.0f + @@ -313,20 +313,20 @@ bool UILayoutTest_BackGroundImage_Scale9::init() Button* button = Button::create(); button->setTouchEnabled(true); - button->loadTextures("cocosgui/animationbuttonnormal.png", "cocosgui/animationbuttonpressed.png", ""); + button->loadTextures("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png", ""); button->setPosition(Point(button->getSize().width / 2.0f, layout->getSize().height - button->getSize().height / 2.0f)); layout->addChild(button); Button* titleButton = Button::create(); titleButton->setTouchEnabled(true); - titleButton->loadTextures("cocosgui/backtotopnormal.png", "cocosgui/backtotoppressed.png", ""); + titleButton->loadTextures("cocosui/backtotopnormal.png", "cocosui/backtotoppressed.png", ""); titleButton->setTitleText("Title Button"); titleButton->setPosition(Point(layout->getSize().width / 2.0f, layout->getSize().height / 2.0f)); layout->addChild(titleButton); Button* button_scale9 = Button::create(); button_scale9->setTouchEnabled(true); - button_scale9->loadTextures("cocosgui/button.png", "cocosgui/buttonHighlighted.png", ""); + button_scale9->loadTextures("cocosui/button.png", "cocosui/buttonHighlighted.png", ""); button_scale9->setScale9Enabled(true); button_scale9->setSize(Size(100.0f, button_scale9->getContentSize().height)); button_scale9->setPosition(Point(layout->getSize().width - button_scale9->getSize().width / 2.0f, button_scale9->getSize().height / 2.0f)); @@ -380,7 +380,7 @@ bool UILayoutTest_Layout_Linear_Vertical::init() Button* button = Button::create(); button->setTouchEnabled(true); - button->loadTextures("cocosgui/animationbuttonnormal.png", "cocosgui/animationbuttonpressed.png", ""); + button->loadTextures("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png", ""); layout->addChild(button); LinearLayoutParameter* lp1 = LinearLayoutParameter::create(); @@ -391,7 +391,7 @@ bool UILayoutTest_Layout_Linear_Vertical::init() Button* titleButton = Button::create(); titleButton->setTouchEnabled(true); - titleButton->loadTextures("cocosgui/backtotopnormal.png", "cocosgui/backtotoppressed.png", ""); + titleButton->loadTextures("cocosui/backtotopnormal.png", "cocosui/backtotoppressed.png", ""); titleButton->setTitleText("Title Button"); layout->addChild(titleButton); @@ -403,7 +403,7 @@ bool UILayoutTest_Layout_Linear_Vertical::init() Button* button_scale9 = Button::create(); button_scale9->setTouchEnabled(true); - button_scale9->loadTextures("cocosgui/button.png", "cocosgui/buttonHighlighted.png", ""); + button_scale9->loadTextures("cocosui/button.png", "cocosui/buttonHighlighted.png", ""); button_scale9->setScale9Enabled(true); button_scale9->setSize(Size(100.0f, button_scale9->getContentSize().height)); layout->addChild(button_scale9); @@ -465,7 +465,7 @@ bool UILayoutTest_Layout_Linear_Horizontal::init() Button* button = Button::create(); button->setTouchEnabled(true); - button->loadTextures("cocosgui/animationbuttonnormal.png", "cocosgui/animationbuttonpressed.png", ""); + button->loadTextures("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png", ""); layout->addChild(button); LinearLayoutParameter* lp1 = LinearLayoutParameter::create(); @@ -476,7 +476,7 @@ bool UILayoutTest_Layout_Linear_Horizontal::init() Button* titleButton = Button::create(); titleButton->setTouchEnabled(true); - titleButton->loadTextures("cocosgui/backtotopnormal.png", "cocosgui/backtotoppressed.png", ""); + titleButton->loadTextures("cocosui/backtotopnormal.png", "cocosui/backtotoppressed.png", ""); titleButton->setTitleText("Title Button"); layout->addChild(titleButton); @@ -488,7 +488,7 @@ bool UILayoutTest_Layout_Linear_Horizontal::init() Button* button_scale9 = Button::create(); button_scale9->setTouchEnabled(true); - button_scale9->loadTextures("cocosgui/button.png", "cocosgui/buttonHighlighted.png", ""); + button_scale9->loadTextures("cocosui/button.png", "cocosui/buttonHighlighted.png", ""); button_scale9->setScale9Enabled(true); button_scale9->setSize(Size(100.0f, button_scale9->getContentSize().height)); layout->addChild(button_scale9); @@ -552,7 +552,7 @@ bool UILayoutTest_Layout_Relative_Align_Parent::init() // top left Button* button_TopLeft = Button::create(); button_TopLeft->setTouchEnabled(true); - button_TopLeft->loadTextures("cocosgui/animationbuttonnormal.png", "cocosgui/animationbuttonpressed.png", ""); + button_TopLeft->loadTextures("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png", ""); layout->addChild(button_TopLeft); RelativeLayoutParameter* rp_TopLeft = RelativeLayoutParameter::create(); @@ -563,7 +563,7 @@ bool UILayoutTest_Layout_Relative_Align_Parent::init() // top center horizontal Button* button_TopCenter = Button::create(); button_TopCenter->setTouchEnabled(true); - button_TopCenter->loadTextures("cocosgui/animationbuttonnormal.png", "cocosgui/animationbuttonpressed.png", ""); + button_TopCenter->loadTextures("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png", ""); layout->addChild(button_TopCenter); RelativeLayoutParameter* rp_TopCenter = RelativeLayoutParameter::create(); @@ -574,7 +574,7 @@ bool UILayoutTest_Layout_Relative_Align_Parent::init() // top right Button* button_TopRight = Button::create(); button_TopRight->setTouchEnabled(true); - button_TopRight->loadTextures("cocosgui/animationbuttonnormal.png", "cocosgui/animationbuttonpressed.png", ""); + button_TopRight->loadTextures("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png", ""); layout->addChild(button_TopRight); RelativeLayoutParameter* rp_TopRight = RelativeLayoutParameter::create(); @@ -585,7 +585,7 @@ bool UILayoutTest_Layout_Relative_Align_Parent::init() // left center Button* button_LeftCenter = Button::create(); button_LeftCenter->setTouchEnabled(true); - button_LeftCenter->loadTextures("cocosgui/animationbuttonnormal.png", "cocosgui/animationbuttonpressed.png", ""); + button_LeftCenter->loadTextures("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png", ""); layout->addChild(button_LeftCenter); RelativeLayoutParameter* rp_LeftCenter = RelativeLayoutParameter::create(); @@ -596,7 +596,7 @@ bool UILayoutTest_Layout_Relative_Align_Parent::init() // center Button* buttonCenter = Button::create(); buttonCenter->setTouchEnabled(true); - buttonCenter->loadTextures("cocosgui/animationbuttonnormal.png", "cocosgui/animationbuttonpressed.png", ""); + buttonCenter->loadTextures("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png", ""); layout->addChild(buttonCenter); RelativeLayoutParameter* rpCenter = RelativeLayoutParameter::create(); @@ -607,7 +607,7 @@ bool UILayoutTest_Layout_Relative_Align_Parent::init() // right center Button* button_RightCenter = Button::create(); button_RightCenter->setTouchEnabled(true); - button_RightCenter->loadTextures("cocosgui/animationbuttonnormal.png", "cocosgui/animationbuttonpressed.png", ""); + button_RightCenter->loadTextures("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png", ""); layout->addChild(button_RightCenter); RelativeLayoutParameter* rp_RightCenter = RelativeLayoutParameter::create(); @@ -618,7 +618,7 @@ bool UILayoutTest_Layout_Relative_Align_Parent::init() // left bottom Button* button_LeftBottom = Button::create(); button_LeftBottom->setTouchEnabled(true); - button_LeftBottom->loadTextures("cocosgui/animationbuttonnormal.png", "cocosgui/animationbuttonpressed.png", ""); + button_LeftBottom->loadTextures("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png", ""); layout->addChild(button_LeftBottom); RelativeLayoutParameter* rp_LeftBottom = RelativeLayoutParameter::create(); @@ -629,7 +629,7 @@ bool UILayoutTest_Layout_Relative_Align_Parent::init() // bottom center Button* button_BottomCenter = Button::create(); button_BottomCenter->setTouchEnabled(true); - button_BottomCenter->loadTextures("cocosgui/animationbuttonnormal.png", "cocosgui/animationbuttonpressed.png", ""); + button_BottomCenter->loadTextures("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png", ""); layout->addChild(button_BottomCenter); RelativeLayoutParameter* rp_BottomCenter = RelativeLayoutParameter::create(); @@ -640,7 +640,7 @@ bool UILayoutTest_Layout_Relative_Align_Parent::init() // right bottom Button* button_RightBottom = Button::create(); button_RightBottom->setTouchEnabled(true); - button_RightBottom->loadTextures("cocosgui/animationbuttonnormal.png", "cocosgui/animationbuttonpressed.png", ""); + button_RightBottom->loadTextures("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png", ""); layout->addChild(button_RightBottom); RelativeLayoutParameter* rp_RightBottom = RelativeLayoutParameter::create(); @@ -698,7 +698,7 @@ bool UILayoutTest_Layout_Relative_Location::init() // center ImageView* imageView_Center = ImageView::create(); - imageView_Center->loadTexture("cocosgui/scrollviewbg.png"); + imageView_Center->loadTexture("cocosui/scrollviewbg.png"); layout->addChild(imageView_Center); RelativeLayoutParameter* rp_Center = RelativeLayoutParameter::create(); @@ -709,7 +709,7 @@ bool UILayoutTest_Layout_Relative_Location::init() // above center ImageView* imageView_AboveCenter = ImageView::create(); - imageView_AboveCenter->loadTexture("cocosgui/switch-mask.png"); + imageView_AboveCenter->loadTexture("cocosui/switch-mask.png"); layout->addChild(imageView_AboveCenter); RelativeLayoutParameter* rp_AboveCenter = RelativeLayoutParameter::create(); @@ -720,7 +720,7 @@ bool UILayoutTest_Layout_Relative_Location::init() // below center ImageView* imageView_BelowCenter = ImageView::create(); - imageView_BelowCenter->loadTexture("cocosgui/switch-mask.png"); + imageView_BelowCenter->loadTexture("cocosui/switch-mask.png"); layout->addChild(imageView_BelowCenter); RelativeLayoutParameter* rp_BelowCenter = RelativeLayoutParameter::create(); @@ -731,7 +731,7 @@ bool UILayoutTest_Layout_Relative_Location::init() // left center ImageView* imageView_LeftCenter = ImageView::create(); - imageView_LeftCenter->loadTexture("cocosgui/switch-mask.png"); + imageView_LeftCenter->loadTexture("cocosui/switch-mask.png"); layout->addChild(imageView_LeftCenter); RelativeLayoutParameter* rp_LeftCenter = RelativeLayoutParameter::create(); @@ -743,7 +743,7 @@ bool UILayoutTest_Layout_Relative_Location::init() // right center ImageView* imageView_RightCenter = ImageView::create(); - imageView_RightCenter->loadTexture("cocosgui/switch-mask.png"); + imageView_RightCenter->loadTexture("cocosui/switch-mask.png"); layout->addChild(imageView_RightCenter); RelativeLayoutParameter* rp_RightCenter = RelativeLayoutParameter::create(); @@ -807,7 +807,7 @@ bool UILayoutTest_Layout_Grid::init() Button* button = Button::create(); button->setName("TextButton"); button->setTouchEnabled(true); - button->loadTextures("cocosgui/button.png", "cocosgui/buttonHighlighted.png", ""); + button->loadTextures("cocosui/button.png", "cocosui/buttonHighlighted.png", ""); button->setScale9Enabled(true); AffineTransform transform = AffineTransformMakeIdentity(); transform = AffineTransformScale(transform, 3.0f, 1.3f); diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest_Editor.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest_Editor.cpp index 147a25a794..5780b30a08 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest_Editor.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest_Editor.cpp @@ -19,7 +19,7 @@ bool UILayoutTest_Editor::init() { if (UIScene_Editor::init()) { - _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/ui_layout_editor_1.json")); + _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/ui_layout_editor_1.json")); _touchGroup->addChild(_layout); Size screenSize = CCDirector::getInstance()->getWinSize(); Size rootSize = _layout->getSize(); @@ -74,7 +74,7 @@ bool UILayoutTest_Color_Editor::init() { if (UIScene_Editor::init()) { - _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/ui_layout_color_editor_1.json")); + _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/ui_layout_color_editor_1.json")); _touchGroup->addChild(_layout); Size screenSize = CCDirector::getInstance()->getWinSize(); Size rootSize = _layout->getSize(); @@ -129,7 +129,7 @@ bool UILayoutTest_Gradient_Editor::init() { if (UIScene_Editor::init()) { - _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/ui_layout_gradient_color_editor_1_0.json")); + _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/ui_layout_gradient_color_editor_1_0.json")); _touchGroup->addChild(_layout); Size screenSize = CCDirector::getInstance()->getWinSize(); Size rootSize = _layout->getSize(); @@ -184,7 +184,7 @@ bool UILayoutTest_BackGroundImage_Editor::init() { if (UIScene_Editor::init()) { - _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/ui_layout_backgroundimage_editor_1_0_0.json")); + _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/ui_layout_backgroundimage_editor_1_0_0.json")); _touchGroup->addChild(_layout); Size screenSize = CCDirector::getInstance()->getWinSize(); Size rootSize = _layout->getSize(); @@ -239,7 +239,7 @@ bool UILayoutTest_BackGroundImage_Scale9_Editor::init() { if (UIScene_Editor::init()) { - _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/ui_layout_scale9_backgroundimage_editor.json")); + _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/ui_layout_scale9_backgroundimage_editor.json")); _touchGroup->addChild(_layout); Size screenSize = CCDirector::getInstance()->getWinSize(); Size rootSize = _layout->getSize(); @@ -294,7 +294,7 @@ bool UILayoutTest_Layout_Linear_Vertical_Editor::init() { if (UIScene_Editor::init()) { - _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/ui_layout_linear_vertical_layout_editor.json")); + _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/ui_layout_linear_vertical_layout_editor.json")); _touchGroup->addChild(_layout); Size screenSize = CCDirector::getInstance()->getWinSize(); Size rootSize = _layout->getSize(); @@ -349,7 +349,7 @@ bool UILayoutTest_Layout_Linear_Horizontal_Editor::init() { if (UIScene_Editor::init()) { - _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/ui_layout_linear_horizontal_layout_editor.json")); + _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/ui_layout_linear_horizontal_layout_editor.json")); _touchGroup->addChild(_layout); Size screenSize = CCDirector::getInstance()->getWinSize(); Size rootSize = _layout->getSize(); @@ -405,7 +405,7 @@ bool UILayoutTest_Layout_Relative_Align_Parent_Editor::init() { if (UIScene_Editor::init()) { - _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/ui_layout_relative_align_parent_editor.json")); + _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/ui_layout_relative_align_parent_editor.json")); _touchGroup->addChild(_layout); Size screenSize = CCDirector::getInstance()->getWinSize(); Size rootSize = _layout->getSize(); @@ -460,7 +460,7 @@ bool UILayoutTest_Layout_Relative_Location_Editor::init() { if (UIScene_Editor::init()) { - _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/ui_layout_relative_align_location_editor.json")); + _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/ui_layout_relative_align_location_editor.json")); _touchGroup->addChild(_layout); Size screenSize = CCDirector::getInstance()->getWinSize(); Size rootSize = _layout->getSize(); diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp index 3939de5b26..f8a61c82df 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp @@ -6,7 +6,7 @@ const char* font_UIListViewTest = #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) "Marker Felt"; #else -"cocosgui/Marker Felt.ttf"; +"cocosui/Marker Felt.ttf"; #endif // UIListViewTest_Vertical @@ -68,7 +68,7 @@ bool UIListViewTest_Vertical::init() listView->setDirection(SCROLLVIEW_DIR_VERTICAL); listView->setTouchEnabled(true); listView->setBounceEnabled(true); - listView->setBackGroundImage("cocosgui/green_edit.png"); + listView->setBackGroundImage("cocosui/green_edit.png"); listView->setBackGroundImageScale9Enabled(true); listView->setSize(Size(240, 130)); listView->setPosition(Point((widgetSize.width - backgroundSize.width) / 2.0f + @@ -83,7 +83,7 @@ bool UIListViewTest_Vertical::init() Button* default_button = Button::create(); default_button->setName("Title Button"); default_button->setTouchEnabled(true); - default_button->loadTextures("cocosgui/backtotoppressed.png", "cocosgui/backtotopnormal.png", ""); + default_button->loadTextures("cocosui/backtotoppressed.png", "cocosui/backtotopnormal.png", ""); Layout* default_item = Layout::create(); default_item->setTouchEnabled(true); @@ -112,7 +112,7 @@ bool UIListViewTest_Vertical::init() Button* custom_button = Button::create(); custom_button->setName("Title Button"); custom_button->setTouchEnabled(true); - custom_button->loadTextures("cocosgui/button.png", "cocosgui/buttonHighlighted.png", ""); + custom_button->loadTextures("cocosui/button.png", "cocosui/buttonHighlighted.png", ""); custom_button->setScale9Enabled(true); custom_button->setSize(default_button->getSize()); @@ -131,7 +131,7 @@ bool UIListViewTest_Vertical::init() Button* custom_button = Button::create(); custom_button->setName("Title Button"); custom_button->setTouchEnabled(true); - custom_button->loadTextures("cocosgui/button.png", "cocosgui/buttonHighlighted.png", ""); + custom_button->loadTextures("cocosui/button.png", "cocosui/buttonHighlighted.png", ""); custom_button->setScale9Enabled(true); custom_button->setSize(default_button->getSize()); @@ -246,7 +246,7 @@ bool UIListViewTest_Horizontal::init() listView->setDirection(SCROLLVIEW_DIR_HORIZONTAL); listView->setTouchEnabled(true); listView->setBounceEnabled(true); - listView->setBackGroundImage("cocosgui/green_edit.png"); + listView->setBackGroundImage("cocosui/green_edit.png"); listView->setBackGroundImageScale9Enabled(true); listView->setSize(Size(240, 130)); listView->setPosition(Point((widgetSize.width - backgroundSize.width) / 2.0f + @@ -261,7 +261,7 @@ bool UIListViewTest_Horizontal::init() Button* default_button = Button::create(); default_button->setName("Title Button"); default_button->setTouchEnabled(true); - default_button->loadTextures("cocosgui/backtotoppressed.png", "cocosgui/backtotopnormal.png", ""); + default_button->loadTextures("cocosui/backtotoppressed.png", "cocosui/backtotopnormal.png", ""); Layout *default_item = Layout::create(); default_item->setTouchEnabled(true); @@ -290,7 +290,7 @@ bool UIListViewTest_Horizontal::init() Button* custom_button = Button::create(); custom_button->setName("Title Button"); custom_button->setTouchEnabled(true); - custom_button->loadTextures("cocosgui/button.png", "cocosgui/buttonHighlighted.png", ""); + custom_button->loadTextures("cocosui/button.png", "cocosui/buttonHighlighted.png", ""); custom_button->setScale9Enabled(true); custom_button->setSize(default_button->getSize()); @@ -309,7 +309,7 @@ bool UIListViewTest_Horizontal::init() Button* custom_button = Button::create(); custom_button->setName("Title Button"); custom_button->setTouchEnabled(true); - custom_button->loadTextures("cocosgui/button.png", "cocosgui/buttonHighlighted.png", ""); + custom_button->loadTextures("cocosui/button.png", "cocosui/buttonHighlighted.png", ""); custom_button->setScale9Enabled(true); custom_button->setSize(default_button->getSize()); diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest_Editor.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest_Editor.cpp index c4fd8c603e..83cfeccd19 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest_Editor.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest_Editor.cpp @@ -19,7 +19,7 @@ bool UIListViewTest_Vertical_Editor::init() { if (UIScene_Editor::init()) { - _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/ui_listview_editor_1.json")); + _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/ui_listview_editor_1.json")); _touchGroup->addChild(_layout); Size screenSize = CCDirector::getInstance()->getWinSize(); Size rootSize = _layout->getSize(); @@ -78,7 +78,7 @@ bool UIListViewTest_Horizontal_Editor::init() { if (UIScene_Editor::init()) { - _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/ui_listview_horizontal_editor_1.json")); + _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/ui_listview_horizontal_editor_1.json")); _touchGroup->addChild(_layout); Size screenSize = CCDirector::getInstance()->getWinSize(); Size rootSize = _layout->getSize(); @@ -113,4 +113,4 @@ bool UIListViewTest_Horizontal_Editor::init() } return false; -} \ No newline at end of file +} diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp index 09ae16aa62..044052ee99 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp @@ -36,7 +36,7 @@ bool UILoadingBarTest_Left::init() // Create the loading bar LoadingBar* loadingBar = LoadingBar::create(); loadingBar->setTag(0); - loadingBar->loadTexture("cocosgui/sliderProgress.png"); + loadingBar->loadTexture("cocosui/sliderProgress.png"); loadingBar->setPercent(0); loadingBar->setPosition(Point(widgetSize.width / 2.0f, widgetSize.height / 2.0f + loadingBar->getSize().height / 4.0f)); @@ -118,7 +118,7 @@ bool UILoadingBarTest_Right::init() // Create the loading bar LoadingBar* loadingBar = LoadingBar::create(); loadingBar->setTag(0); - loadingBar->loadTexture("cocosgui/sliderProgress.png"); + loadingBar->loadTexture("cocosui/sliderProgress.png"); loadingBar->setDirection(LoadingBarTypeRight); loadingBar->setPercent(0); @@ -201,7 +201,7 @@ bool UILoadingBarTest_Left_Scale9::init() // Create the loading bar LoadingBar* loadingBar = LoadingBar::create(); loadingBar->setTag(0); - loadingBar->loadTexture("cocosgui/slider_bar_active_9patch.png"); + loadingBar->loadTexture("cocosui/slider_bar_active_9patch.png"); loadingBar->setScale9Enabled(true); loadingBar->setCapInsets(Rect(0, 0, 0, 0)); loadingBar->setSize(Size(300, loadingBar->getContentSize().height)); @@ -286,7 +286,7 @@ bool UILoadingBarTest_Right_Scale9::init() // Create the loading bar LoadingBar* loadingBar = LoadingBar::create(); loadingBar->setTag(0); - loadingBar->loadTexture("cocosgui/slider_bar_active_9patch.png"); + loadingBar->loadTexture("cocosui/slider_bar_active_9patch.png"); loadingBar->setScale9Enabled(true); loadingBar->setCapInsets(Rect(0, 0, 0, 0)); loadingBar->setSize(Size(300, loadingBar->getContentSize().height)); @@ -337,4 +337,4 @@ void UILoadingBarTest_Right_Scale9::nextCallback(Ref* sender, TouchEventType typ unscheduleUpdate(); UIScene::nextCallback(sender, type); } -} \ No newline at end of file +} diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest_Editor.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest_Editor.cpp index 37a72a9209..d61602028f 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest_Editor.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest_Editor.cpp @@ -21,7 +21,7 @@ bool UILoadingBarTest_Editor::init() { scheduleUpdate(); - _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosgui/UIEditorTest/UILoadingBar_Editor/ui_loadingbar_editor_1.json")); + _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UIEditorTest/UILoadingBar_Editor/ui_loadingbar_editor_1.json")); _touchGroup->addChild(_layout); Size screenSize = CCDirector::getInstance()->getWinSize(); Size rootSize = _layout->getSize(); @@ -79,4 +79,4 @@ void UILoadingBarTest_Editor::toCocosGUITestScene(Ref *sender, TouchEventType ty default: break; } -} \ No newline at end of file +} diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp index dccf9ff599..d510ba32c2 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp @@ -60,7 +60,7 @@ bool UIPageViewTest::init() ImageView* imageView = ImageView::create(); imageView->setTouchEnabled(true); imageView->setScale9Enabled(true); - imageView->loadTexture("cocosgui/scrollviewbg.png"); + imageView->loadTexture("cocosui/scrollviewbg.png"); imageView->setSize(Size(240, 130)); imageView->setPosition(Point(layout->getSize().width / 2.0f, layout->getSize().height / 2.0f)); layout->addChild(imageView); diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest_Editor.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest_Editor.cpp index 1e56645d68..743b5fc1f7 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest_Editor.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest_Editor.cpp @@ -20,7 +20,7 @@ bool UIPageViewTest_Editor::init() { if (UIScene_Editor::init()) { - _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosgui/UIEditorTest/UIPageView_Editor/ui_pageview_editor_1.json")); + _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UIEditorTest/UIPageView_Editor/ui_pageview_editor_1.json")); _touchGroup->addChild(_layout); Size screenSize = CCDirector::getInstance()->getWinSize(); Size rootSize = _layout->getSize(); @@ -56,4 +56,4 @@ bool UIPageViewTest_Editor::init() } return false; -} \ No newline at end of file +} diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.cpp index 27dbadffb7..afd0e47ba8 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.cpp @@ -32,7 +32,7 @@ bool UIRichTextTest::init() Button* button = Button::create(); button->setTouchEnabled(true); - button->loadTextures("cocosgui/animationbuttonnormal.png", "cocosgui/animationbuttonpressed.png", ""); + button->loadTextures("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png", ""); button->setTitleText("switch"); button->setPosition(Point(widgetSize.width / 2.0f, widgetSize.height / 2.0f + button->getSize().height * 2.5)); button->addTouchEventListener(this, toucheventselector(UIRichTextTest::touchEvent)); @@ -51,9 +51,9 @@ bool UIRichTextTest::init() RichElementText* re4 = RichElementText::create(4, Color3B::GREEN, 255, "And green. ", "Helvetica", 10); RichElementText* re5 = RichElementText::create(5, Color3B::RED, 255, "Last one is red ", "Helvetica", 10); - RichElementImage* reimg = RichElementImage::create(6, Color3B::WHITE, 255, "cocosgui/sliderballnormal.png"); + RichElementImage* reimg = RichElementImage::create(6, Color3B::WHITE, 255, "cocosui/sliderballnormal.png"); - cocostudio::ArmatureDataManager::getInstance()->addArmatureFileInfo("cocosgui/100/100.ExportJson"); + cocostudio::ArmatureDataManager::getInstance()->addArmatureFileInfo("cocosui/100/100.ExportJson"); cocostudio::Armature *pAr = cocostudio::Armature::create("100"); pAr->getAnimation()->play("Animation1"); @@ -100,4 +100,4 @@ void UIRichTextTest::touchEvent(Ref *pSender, TouchEventType type) default: break; } -} \ No newline at end of file +} diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp index b11e03ff8b..464f7d955c 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp @@ -27,7 +27,7 @@ bool UIScene::init() _uiLayer = Layer::create(); addChild(_uiLayer); - _widget = dynamic_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosgui/UITest/UITest.json")); + _widget = dynamic_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UITest/UITest.json")); _uiLayer->addChild(_widget); Size screenSize = CCDirector::getInstance()->getWinSize(); diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.h index e24518bb82..99b0ae12ee 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.h @@ -27,7 +27,7 @@ #include "cocos2d.h" #include "extensions/cocos-ext.h" -#include "gui/CocosGUI.h" +#include "ui/CocosGUI.h" USING_NS_CC; USING_NS_CC_EXT; diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene_Editor.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene_Editor.cpp index 1f1dc8f503..889a182c0e 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene_Editor.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene_Editor.cpp @@ -2,7 +2,7 @@ #include "UIScene_Editor.h" #include "GUIEditorTest.h" -#include "gui/CocosGUI.h" +#include "ui/CocosGUI.h" #include "UISceneManager_Editor.h" diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene_Editor.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene_Editor.h index 03bfb76160..cf3ce97fab 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene_Editor.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene_Editor.h @@ -27,7 +27,7 @@ #include "cocos2d.h" #include "extensions/cocos-ext.h" -#include "gui/CocosGUI.h" +#include "ui/CocosGUI.h" #include "cocostudio/CocoStudio.h" USING_NS_CC; diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp index 5a6f73c66e..0ae7c15314 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp @@ -54,7 +54,7 @@ bool UIScrollViewTest_Vertical::init() _uiLayer->addChild(scrollView); ImageView* imageView = ImageView::create(); - imageView->loadTexture("cocosgui/ccicon.png"); + imageView->loadTexture("cocosui/ccicon.png"); float innerWidth = scrollView->getSize().width; float innerHeight = scrollView->getSize().height + imageView->getSize().height; @@ -63,13 +63,13 @@ bool UIScrollViewTest_Vertical::init() Button* button = Button::create(); button->setTouchEnabled(true); - button->loadTextures("cocosgui/animationbuttonnormal.png", "cocosgui/animationbuttonpressed.png", ""); + button->loadTextures("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png", ""); button->setPosition(Point(innerWidth / 2.0f, scrollView->getInnerContainerSize().height - button->getSize().height / 2.0f)); scrollView->addChild(button); Button* titleButton = Button::create(); titleButton->setTouchEnabled(true); - titleButton->loadTextures("cocosgui/backtotopnormal.png", "cocosgui/backtotoppressed.png", ""); + titleButton->loadTextures("cocosui/backtotopnormal.png", "cocosui/backtotoppressed.png", ""); titleButton->setTitleText("Title Button"); titleButton->setPosition(Point(innerWidth / 2.0f, button->getBottomInParent() - button->getSize().height)); scrollView->addChild(titleButton); @@ -77,7 +77,7 @@ bool UIScrollViewTest_Vertical::init() Button* button_scale9 = Button::create(); button_scale9->setTouchEnabled(true); button_scale9->setScale9Enabled(true); - button_scale9->loadTextures("cocosgui/button.png", "cocosgui/buttonHighlighted.png", ""); + button_scale9->loadTextures("cocosui/button.png", "cocosui/buttonHighlighted.png", ""); button_scale9->setSize(Size(100.0f, button_scale9->getContentSize().height)); button_scale9->setPosition(Point(innerWidth / 2.0f, titleButton->getBottomInParent() - titleButton->getSize().height)); scrollView->addChild(button_scale9); @@ -144,7 +144,7 @@ bool UIScrollViewTest_Horizontal::init() _uiLayer->addChild(scrollView); ImageView* imageView = ImageView::create(); - imageView->loadTexture("cocosgui/ccicon.png"); + imageView->loadTexture("cocosui/ccicon.png"); float innerWidth = scrollView->getSize().width + imageView->getSize().width; float innerHeight = scrollView->getSize().height; @@ -153,14 +153,14 @@ bool UIScrollViewTest_Horizontal::init() Button* button = Button::create(); button->setTouchEnabled(true); - button->loadTextures("cocosgui/animationbuttonnormal.png", "cocosgui/animationbuttonpressed.png", ""); + button->loadTextures("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png", ""); button->setPosition(Point(button->getSize().width / 2.0f, scrollView->getInnerContainerSize().height - button->getSize().height / 2.0f)); scrollView->addChild(button); Button* titleButton = Button::create(); titleButton->setTouchEnabled(true); - titleButton->loadTextures("cocosgui/backtotopnormal.png", "cocosgui/backtotoppressed.png", ""); + titleButton->loadTextures("cocosui/backtotopnormal.png", "cocosui/backtotoppressed.png", ""); titleButton->setTitleText("Title Button"); titleButton->setPosition(Point(button->getRightInParent() + button->getSize().width / 2.0f, button->getBottomInParent() - button->getSize().height / 2.0f)); @@ -169,7 +169,7 @@ bool UIScrollViewTest_Horizontal::init() Button* button_scale9 = Button::create(); button_scale9->setTouchEnabled(true); button_scale9->setScale9Enabled(true); - button_scale9->loadTextures("cocosgui/button.png", "cocosgui/buttonHighlighted.png", ""); + button_scale9->loadTextures("cocosui/button.png", "cocosui/buttonHighlighted.png", ""); button_scale9->setSize(Size(100.0f, button_scale9->getContentSize().height)); button_scale9->setPosition(Point(titleButton->getRightInParent() + titleButton->getSize().width / 2.0f, titleButton->getBottomInParent() - titleButton->getSize().height / 2.0f)); @@ -230,7 +230,7 @@ bool UIScrollViewTest_Both::init() scrollView->setTouchEnabled(true); scrollView->setBounceEnabled(true); scrollView->setBackGroundImageScale9Enabled(true); - scrollView->setBackGroundImage("cocosgui/green_edit.png"); + scrollView->setBackGroundImage("cocosui/green_edit.png"); scrollView->setSize(Size(210, 122.5)); Size backgroundSize = background->getContentSize(); scrollView->setPosition(Point((widgetSize.width - backgroundSize.width) / 2.0f + @@ -306,7 +306,7 @@ bool UIScrollViewTest_ScrollToPercentBothDirection::init() (backgroundSize.height - sc->getSize().height) / 2.0f)); sc->scrollToPercentBothDirection(Point(50, 50), 1, true); ImageView* iv = ImageView::create(); - iv->loadTexture("cocosgui/Hello.png"); + iv->loadTexture("cocosui/Hello.png"); iv->setPosition(Point(240, 160)); sc->addChild(iv); _uiLayer->addChild(sc); @@ -369,7 +369,7 @@ bool UIScrollViewTest_ScrollToPercentBothDirection_Bounce::init() (backgroundSize.height - sc->getSize().height) / 2.0f)); sc->scrollToPercentBothDirection(Point(50, 50), 1, true); ImageView* iv = ImageView::create(); - iv->loadTexture("cocosgui/Hello.png"); + iv->loadTexture("cocosui/Hello.png"); iv->setPosition(Point(240, 160)); sc->addChild(iv); _uiLayer->addChild(sc); diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest_Editor.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest_Editor.cpp index 1d1d9dde30..d9a0d53e55 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest_Editor.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest_Editor.cpp @@ -19,7 +19,7 @@ bool UIScrollViewTest_Vertical_Editor::init() { if (UIScene_Editor::init()) { - _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/ui_scrollview_editor_1.json")); + _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/ui_scrollview_editor_1.json")); _touchGroup->addChild(_layout); Size screenSize = CCDirector::getInstance()->getWinSize(); Size rootSize = _layout->getSize(); @@ -74,7 +74,7 @@ bool UIScrollViewTest_Horizontal_Editor::init() { if (UIScene_Editor::init()) { - _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/ui_scrollview_horizontal_editor_1.json")); + _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/ui_scrollview_horizontal_editor_1.json")); _touchGroup->addChild(_layout); Size screenSize = CCDirector::getInstance()->getWinSize(); Size rootSize = _layout->getSize(); @@ -129,7 +129,7 @@ bool UIScrollViewTest_Both_Editor::init() { if (UIScene_Editor::init()) { - _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/ui_scrollview_both_editor_1.json")); + _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/ui_scrollview_both_editor_1.json")); _touchGroup->addChild(_layout); Size screenSize = CCDirector::getInstance()->getWinSize(); Size rootSize = _layout->getSize(); @@ -184,7 +184,7 @@ bool UIScrollViewTest_ScrollToPercentBothDirection_Editor::init() { if (UIScene_Editor::init()) { - _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosgui/UITest/UITest.json")); + _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UITest/UITest.json")); _touchGroup->addChild(_layout); Size screenSize = CCDirector::getInstance()->getWinSize(); Size rootSize = _layout->getSize(); @@ -230,7 +230,7 @@ bool UIScrollViewTest_ScrollToPercentBothDirection_Bounce_Editor::init() { if (UIScene_Editor::init()) { - _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosgui/UITest/UITest.json")); + _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UITest/UITest.json")); _touchGroup->addChild(_layout); Size screenSize = CCDirector::getInstance()->getWinSize(); Size rootSize = _layout->getSize(); diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp index d740e1cf65..db7071f578 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp @@ -42,9 +42,9 @@ bool UISliderTest::init() // Create the slider Slider* slider = Slider::create(); slider->setTouchEnabled(true); - slider->loadBarTexture("cocosgui/sliderTrack.png"); - slider->loadSlidBallTextures("cocosgui/sliderThumb.png", "cocosgui/sliderThumb.png", ""); - slider->loadProgressBarTexture("cocosgui/sliderProgress.png"); + slider->loadBarTexture("cocosui/sliderTrack.png"); + slider->loadSlidBallTextures("cocosui/sliderThumb.png", "cocosui/sliderThumb.png", ""); + slider->loadProgressBarTexture("cocosui/sliderProgress.png"); slider->setPosition(Point(widgetSize.width / 2.0f, widgetSize.height / 2.0f/* + slider->getSize().height * 2.0f*/)); slider->addEventListenerSlider(this, sliderpercentchangedselector(UISliderTest::sliderEvent)); _uiLayer->addChild(slider); @@ -55,9 +55,9 @@ bool UISliderTest::init() // sliderAllow->setMinAllowPercent(20); // sliderAllow->setMaxAllowPercent(80); sliderAllow->setTouchEnabled(true); - sliderAllow->loadBarTexture("cocosgui/sliderTrack.png"); - sliderAllow->loadSlidBallTextures("cocosgui/sliderThumb.png", "cocosgui/sliderThumb.png", ""); - sliderAllow->loadProgressBarTexture("cocosgui/sliderProgress.png"); + sliderAllow->loadBarTexture("cocosui/sliderTrack.png"); + sliderAllow->loadSlidBallTextures("cocosui/sliderThumb.png", "cocosui/sliderThumb.png", ""); + sliderAllow->loadProgressBarTexture("cocosui/sliderProgress.png"); sliderAllow->setPosition(Point(widgetSize.width / 2.0f, widgetSize.height / 2.0f - sliderAllow->getSize().height * 2.0f)); sliderAllow->addEventListenerSlider(this, sliderpercentchangedselector(UISliderTest::sliderEvent)); _uiLayer->addChild(sliderAllow); @@ -117,9 +117,9 @@ bool UISliderTest_Scale9::init() // Create the slider Slider* slider = Slider::create(); slider->setTouchEnabled(true); - slider->loadBarTexture("cocosgui/sliderTrack2.png"); - slider->loadSlidBallTextures("cocosgui/sliderThumb.png", "cocosgui/sliderThumb.png", ""); - slider->loadProgressBarTexture("cocosgui/slider_bar_active_9patch.png"); + slider->loadBarTexture("cocosui/sliderTrack2.png"); + slider->loadSlidBallTextures("cocosui/sliderThumb.png", "cocosui/sliderThumb.png", ""); + slider->loadProgressBarTexture("cocosui/slider_bar_active_9patch.png"); slider->setScale9Enabled(true); slider->setCapInsets(Rect(0, 0, 0, 0)); slider->setSize(Size(250.0f, 19)); @@ -133,9 +133,9 @@ bool UISliderTest_Scale9::init() // sliderAllow->setMinAllowPercent(20); // sliderAllow->setMaxAllowPercent(80); sliderAllow->setTouchEnabled(true); - sliderAllow->loadBarTexture("cocosgui/sliderTrack2.png"); - sliderAllow->loadSlidBallTextures("cocosgui/sliderThumb.png", "cocosgui/sliderThumb.png", ""); - sliderAllow->loadProgressBarTexture("cocosgui/slider_bar_active_9patch.png"); + sliderAllow->loadBarTexture("cocosui/sliderTrack2.png"); + sliderAllow->loadSlidBallTextures("cocosui/sliderThumb.png", "cocosui/sliderThumb.png", ""); + sliderAllow->loadProgressBarTexture("cocosui/slider_bar_active_9patch.png"); sliderAllow->setScale9Enabled(true); sliderAllow->setCapInsets(Rect(0, 0, 0, 0)); sliderAllow->setSize(Size(250.0f, 10.0f / Director::getInstance()->getContentScaleFactor())); @@ -157,4 +157,4 @@ void UISliderTest_Scale9::sliderEvent(Ref *pSender, SliderEventType type) int percent = slider->getPercent(); _displayValueLabel->setText(String::createWithFormat("Percent %d", percent)->getCString()); } -} \ No newline at end of file +} diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp index 8225aa0d07..1c65ab219e 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp @@ -20,7 +20,7 @@ bool UISliderTest_Editor::init() { if (UIScene_Editor::init()) { - _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosgui/UIEditorTest/UISlider_Editor/ui_slider_editor_1.json")); + _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UIEditorTest/UISlider_Editor/ui_slider_editor_1.json")); _touchGroup->addChild(_layout); Size screenSize = CCDirector::getInstance()->getWinSize(); Size rootSize = _layout->getSize(); diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest.cpp index f9b659ef85..b752cdb56a 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest.cpp @@ -22,11 +22,11 @@ bool UITextAtlasTest::init() // Create the text atlas TextAtlas* textAtlas = TextAtlas::create(); - textAtlas->setProperty("1234567890", "cocosgui/labelatlas.png", 17, 22, "0"); + textAtlas->setProperty("1234567890", "cocosui/labelatlas.png", 17, 22, "0"); textAtlas->setPosition(Point((widgetSize.width) / 2, widgetSize.height / 2.0f)); _uiLayer->addChild(textAtlas); return true; } return false; -} \ No newline at end of file +} diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest_Editor.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest_Editor.cpp index 04f73b7a8c..32814e5006 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest_Editor.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest_Editor.cpp @@ -8,7 +8,7 @@ bool UITextAtlasTest_Editor::init() { if (UIScene_Editor::init()) { - _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosgui/UIEditorTest/UILabelAtlas_Editor/ui_labelatlas_editor_1.json")); + _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UIEditorTest/UILabelAtlas_Editor/ui_labelatlas_editor_1.json")); _touchGroup->addChild(_layout); Size screenSize = CCDirector::getInstance()->getWinSize(); Size rootSize = _layout->getSize(); diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest.cpp index b920195635..8e14c9b270 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest.cpp @@ -21,7 +21,7 @@ bool UITextBMFontTest::init() // Create the TextBMFont TextBMFont* textBMFont = TextBMFont::create(); - textBMFont->setFntFile("cocosgui/bitmapFontTest2.fnt"); + textBMFont->setFntFile("cocosui/bitmapFontTest2.fnt"); textBMFont->setText("BMFont"); textBMFont->setPosition(Point(widgetSize.width / 2, widgetSize.height / 2.0f + textBMFont->getSize().height / 8.0f)); _uiLayer->addChild(textBMFont); @@ -29,4 +29,4 @@ bool UITextBMFontTest::init() return true; } return false; -} \ No newline at end of file +} diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest_Editor.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest_Editor.cpp index 4435dc0915..8c197e1b3d 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest_Editor.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest_Editor.cpp @@ -9,7 +9,7 @@ bool UITextBMFontTest_Editor::init() { if (UIScene_Editor::init()) { - _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosgui/UIEditorTest/UILabelBMFont_Editor/ui_labelbmfont_editor_1.json")); + _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UIEditorTest/UILabelBMFont_Editor/ui_labelbmfont_editor_1.json")); _touchGroup->addChild(_layout); Size screenSize = CCDirector::getInstance()->getWinSize(); Size rootSize = _layout->getSize(); @@ -27,4 +27,4 @@ bool UITextBMFontTest_Editor::init() } return false; -} \ No newline at end of file +} diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp index 7275f84304..71f0744825 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp @@ -20,7 +20,7 @@ bool UITextFieldTest_Editor::init() { if (UIScene_Editor::init()) { - _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosgui/UIEditorTest/UITextField_Editor/ui_textfield_editor_1.json")); + _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UIEditorTest/UITextField_Editor/ui_textfield_editor_1.json")); _touchGroup->addChild(_layout); Size screenSize = CCDirector::getInstance()->getWinSize(); Size rootSize = _layout->getSize(); diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest_Editor.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest_Editor.cpp index fd43f36f61..d6fa9e0ee6 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest_Editor.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest_Editor.cpp @@ -1,7 +1,7 @@ #include "UITextTest_Editor.h" -#include "gui/CocosGUI.h" +#include "ui/CocosGUI.h" // UITextTest_Editor @@ -11,7 +11,7 @@ bool UITextTest_Editor::init() { if (UIScene_Editor::init()) { - _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosgui/UIEditorTest/UILabel_Editor/ui_label_editor_1.json")); + _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UIEditorTest/UILabel_Editor/ui_label_editor_1.json")); _touchGroup->addChild(_layout); Size screenSize = CCDirector::getInstance()->getWinSize(); Size rootSize = _layout->getSize(); @@ -29,4 +29,4 @@ bool UITextTest_Editor::init() } return false; -} \ No newline at end of file +} diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.cpp index 22261b2669..b50be77f77 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.cpp @@ -34,11 +34,11 @@ bool UIWidgetAddNodeTest::init() widget->setPosition(Point(widgetSize.width / 2.0f, widgetSize.height / 2.0f)); _uiLayer->addChild(widget); - Sprite* sprite = Sprite::create("cocosgui/ccicon.png"); + Sprite* sprite = Sprite::create("cocosui/ccicon.png"); sprite->setPosition(Point(0, sprite->getBoundingBox().size.height / 4)); widget->addNode(sprite); return true; } return false; -} \ No newline at end of file +} diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest_Editor.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest_Editor.cpp index a11f2ab147..6bc4101250 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest_Editor.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest_Editor.cpp @@ -19,7 +19,7 @@ bool UIWidgetAddNodeTest_Editor::init() { if (UIScene_Editor::init()) { - _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosgui/UIEditorTest/UIWidgetAddNode_Editor/ui_widget_add_node_editor.json")); + _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UIEditorTest/UIWidgetAddNode_Editor/ui_widget_add_node_editor.json")); _touchGroup->addChild(_layout); Size screenSize = CCDirector::getInstance()->getWinSize(); Size rootSize = _layout->getSize(); @@ -40,7 +40,7 @@ bool UIWidgetAddNodeTest_Editor::init() widget->setZOrder(_layout->getZOrder() + 1); _layout->addChild(widget); - Sprite* sprite = Sprite::create("cocosgui/ccicon.png"); + Sprite* sprite = Sprite::create("cocosui/ccicon.png"); widget->addNode(sprite); return true; diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp index eb0362dead..e8f947004e 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp @@ -3,7 +3,7 @@ #include "../ExtensionsTest.h" #include "SceneEditorTest.h" #include "cocostudio/CocoStudio.h" -#include "gui/CocosGUI.h" +#include "ui/CocosGUI.h" #include "TriggerCode/EventDef.h" #include "../../testResource.h" diff --git a/tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp b/tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp index a57c84cd36..73e4f6c2e2 100644 --- a/tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp +++ b/tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp @@ -1372,9 +1372,9 @@ LabelShadowTest::LabelShadowTest() auto slider = ui::Slider::create(); slider->setTag(1); slider->setTouchEnabled(true); - slider->loadBarTexture("cocosgui/sliderTrack.png"); - slider->loadSlidBallTextures("cocosgui/sliderThumb.png", "cocosgui/sliderThumb.png", ""); - slider->loadProgressBarTexture("cocosgui/sliderProgress.png"); + slider->loadBarTexture("cocosui/sliderTrack.png"); + slider->loadSlidBallTextures("cocosui/sliderThumb.png", "cocosui/sliderThumb.png", ""); + slider->loadProgressBarTexture("cocosui/sliderProgress.png"); slider->setPosition(Point(size.width / 2.0f, size.height * 0.15f + slider->getSize().height * 2.0f)); slider->setPercent(52); slider->addEventListenerSlider(this, sliderpercentchangedselector(LabelShadowTest::sliderEvent)); @@ -1383,9 +1383,9 @@ LabelShadowTest::LabelShadowTest() auto slider2 = ui::Slider::create(); slider2->setTag(2); slider2->setTouchEnabled(true); - slider2->loadBarTexture("cocosgui/sliderTrack.png"); - slider2->loadSlidBallTextures("cocosgui/sliderThumb.png", "cocosgui/sliderThumb.png", ""); - slider2->loadProgressBarTexture("cocosgui/sliderProgress.png"); + slider2->loadBarTexture("cocosui/sliderTrack.png"); + slider2->loadSlidBallTextures("cocosui/sliderThumb.png", "cocosui/sliderThumb.png", ""); + slider2->loadProgressBarTexture("cocosui/sliderProgress.png"); slider2->setPosition(Point(size.width * 0.15f, size.height / 2.0)); slider2->setRotation(90); slider2->setPercent(52); diff --git a/tests/cpp-tests/Classes/LabelTest/LabelTestNew.h b/tests/cpp-tests/Classes/LabelTest/LabelTestNew.h index 697adfc48b..6017b9e851 100644 --- a/tests/cpp-tests/Classes/LabelTest/LabelTestNew.h +++ b/tests/cpp-tests/Classes/LabelTest/LabelTestNew.h @@ -4,7 +4,7 @@ #include "../testBasic.h" #include "../BaseTest.h" #include "renderer/CCCustomCommand.h" -#include "gui/CocosGUI.h" +#include "ui/CocosGUI.h" class AtlasDemoNew : public BaseTest diff --git a/tests/cpp-tests/Resources/cocosgui/Hello.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosui/Hello.png.REMOVED.git-id similarity index 100% rename from tests/cpp-tests/Resources/cocosgui/Hello.png.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosui/Hello.png.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosui/UIEditorTest/UIButton_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosui/UIEditorTest/UIButton_Editor/background.png.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosui/UIEditorTest/UICheckBox_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosui/UIEditorTest/UICheckBox_Editor/background.png.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosui/UIEditorTest/UIImageView_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosui/UIEditorTest/UIImageView_Editor/background.png.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosui/UIEditorTest/UILabelAtlas_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosui/UIEditorTest/UILabelAtlas_Editor/background.png.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png.REMOVED.git-id similarity index 100% rename from tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosui/UIEditorTest/UILabelBMFont_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosui/UIEditorTest/UILabelBMFont_Editor/background.png.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosui/UIEditorTest/UILabel_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosui/UIEditorTest/UILabel_Editor/background.png.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/Hello.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/Hello.png.REMOVED.git-id similarity index 100% rename from tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/Hello.png.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/Hello.png.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/background.png.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/background.png.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/background.png.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/background.png.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/background.png.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/background.png.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/background.png.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/background.png.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/background.png.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/background.png.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/background.png.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosui/UIEditorTest/UILoadingBar_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosui/UIEditorTest/UILoadingBar_Editor/background.png.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosui/UIEditorTest/UIPageView_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosui/UIEditorTest/UIPageView_Editor/background.png.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/background.png.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/background.png.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/background.png.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/background.png.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosui/UIEditorTest/UITextField_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosui/UIEditorTest/UITextField_Editor/background.png.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosui/UIEditorTest/UIWidgetAddNode_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosui/UIEditorTest/UIWidgetAddNode_Editor/background.png.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/UITest/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosui/UITest/background.png.REMOVED.git-id similarity index 100% rename from tests/cpp-tests/Resources/cocosgui/UITest/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosui/UITest/background.png.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/b11.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosui/b11.png.REMOVED.git-id similarity index 100% rename from tests/cpp-tests/Resources/cocosgui/b11.png.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosui/b11.png.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/bitmapFontTest2.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosui/bitmapFontTest2.png.REMOVED.git-id similarity index 100% rename from tests/cpp-tests/Resources/cocosgui/bitmapFontTest2.png.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosui/bitmapFontTest2.png.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/examples/examples.json.REMOVED.git-id b/tests/cpp-tests/Resources/cocosui/examples/examples.json.REMOVED.git-id similarity index 100% rename from tests/cpp-tests/Resources/cocosgui/examples/examples.json.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosui/examples/examples.json.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosui/gui_examples/map_1/map_pve.png.REMOVED.git-id similarity index 100% rename from tests/cpp-tests/Resources/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosui/gui_examples/map_1/map_pve.png.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosui/gui_examples/page_1/background.png.REMOVED.git-id similarity index 100% rename from tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosui/gui_examples/page_1/background.png.REMOVED.git-id diff --git a/tests/cpp-tests/proj.win32/TestCpp.vcxproj b/tests/cpp-tests/proj.win32/TestCpp.vcxproj index cc185a6354..172ef28da3 100644 --- a/tests/cpp-tests/proj.win32/TestCpp.vcxproj +++ b/tests/cpp-tests/proj.win32/TestCpp.vcxproj @@ -558,7 +558,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\external\websockets\prebuilt\win32\*.*" "$(Ou {b7c2a162-dec9-4418-972e-240ab3cbfcae} - + {7e06e92c-537a-442b-9e4a-4761c84f8a1a} @@ -583,4 +583,4 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\external\websockets\prebuilt\win32\*.*" "$(Ou - \ No newline at end of file + diff --git a/tests/lua-empty-test/project/CMakeLists.txt b/tests/lua-empty-test/project/CMakeLists.txt index aaeb5b1e55..9c4544ac0c 100644 --- a/tests/lua-empty-test/project/CMakeLists.txt +++ b/tests/lua-empty-test/project/CMakeLists.txt @@ -19,7 +19,7 @@ add_executable(${APP_NAME} target_link_libraries(${APP_NAME} luabinding - gui + ui network cocostudio cocosbuilder diff --git a/tests/lua-empty-test/project/proj.win32/HelloLua.vcxproj b/tests/lua-empty-test/project/proj.win32/HelloLua.vcxproj index 6ed5cb8431..1967dfe52d 100644 --- a/tests/lua-empty-test/project/proj.win32/HelloLua.vcxproj +++ b/tests/lua-empty-test/project/proj.win32/HelloLua.vcxproj @@ -181,7 +181,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$ {b7c2a162-dec9-4418-972e-240ab3cbfcae} - + {7e06e92c-537a-442b-9e4a-4761c84f8a1a} @@ -203,4 +203,4 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$ - \ No newline at end of file + diff --git a/tests/lua-tests/project/CMakeLists.txt b/tests/lua-tests/project/CMakeLists.txt index 529f65ba26..5b3cc085c6 100644 --- a/tests/lua-tests/project/CMakeLists.txt +++ b/tests/lua-tests/project/CMakeLists.txt @@ -20,7 +20,7 @@ add_executable(${APP_NAME} target_link_libraries(${APP_NAME} luabinding - gui + ui network cocostudio cocosbuilder diff --git a/tests/lua-tests/project/proj.win32/TestLua.win32.vcxproj b/tests/lua-tests/project/proj.win32/TestLua.win32.vcxproj index 0cdffe39e5..66d853f657 100644 --- a/tests/lua-tests/project/proj.win32/TestLua.win32.vcxproj +++ b/tests/lua-tests/project/proj.win32/TestLua.win32.vcxproj @@ -202,7 +202,7 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" {b7c2a162-dec9-4418-972e-240ab3cbfcae} - + {7e06e92c-537a-442b-9e4a-4761c84f8a1a} @@ -221,4 +221,4 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" - \ No newline at end of file + diff --git a/tests/lua-tests/src/CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest.lua.REMOVED.git-id b/tests/lua-tests/src/CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest.lua.REMOVED.git-id index 0279040f69..8acb2af820 100644 --- a/tests/lua-tests/src/CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest.lua.REMOVED.git-id +++ b/tests/lua-tests/src/CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest.lua.REMOVED.git-id @@ -1 +1 @@ -09ed3c488f6d182685c416c291f8f325fb5cc2d2 \ No newline at end of file +a28b4af8f8f426d3719766b446d2fc2a18c4ba25 \ No newline at end of file diff --git a/tools/tolua/cocos2dx_spine.ini b/tools/tolua/cocos2dx_spine.ini index ff94bb0c1b..6fce549122 100644 --- a/tools/tolua/cocos2dx_spine.ini +++ b/tools/tolua/cocos2dx_spine.ini @@ -13,7 +13,7 @@ android_flags = -D_SIZE_T_DEFINED_ clang_headers = -I%(clangllvmdir)s/lib/clang/3.3/include clang_flags = -nostdinc -x c++ -std=c++11 -cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/2d -I%(cocosdir)s/cocos/base -I%(cocosdir)s/cocos/gui -I%(cocosdir)s/cocos/physics -I%(cocosdir)s/cocos/2d/platform -I%(cocosdir)s/cocos/2d/platform/android -I%(cocosdir)s/cocos/math/kazmath -I%(cocosdir)s/extensions -I%(cocosdir)s/external -I%(cocosdir)s/cocos/editor-support -I%(cocosdir)s +cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/2d -I%(cocosdir)s/cocos/base -I%(cocosdir)s/cocos/ui -I%(cocosdir)s/cocos/physics -I%(cocosdir)s/cocos/2d/platform -I%(cocosdir)s/cocos/2d/platform/android -I%(cocosdir)s/cocos/math/kazmath -I%(cocosdir)s/extensions -I%(cocosdir)s/external -I%(cocosdir)s/cocos/editor-support -I%(cocosdir)s cocos_flags = -DANDROID -DCOCOS2D_JAVASCRIPT diff --git a/tools/tolua/cocos2dx_studio.ini b/tools/tolua/cocos2dx_studio.ini index 21c49f10e9..38136febfd 100644 --- a/tools/tolua/cocos2dx_studio.ini +++ b/tools/tolua/cocos2dx_studio.ini @@ -7,7 +7,7 @@ prefix = cocos2dx_studio # all classes will be embedded in that namespace target_namespace = ccs -# the native namespace in which this module locates, this parameter is used for avoid conflict of the same class name in different modules, as "cocos2d::Label" <-> "cocos2d::gui::Label". +# the native namespace in which this module locates, this parameter is used for avoid conflict of the same class name in different modules, as "cocos2d::Label" <-> "cocos2d::ui::Label". cpp_namespace = cocostudio android_headers = -I%(androidndkdir)s/platforms/android-14/arch-arm/usr/include -I%(androidndkdir)s/sources/cxx-stl/gnu-libstdc++/4.7/libs/armeabi-v7a/include -I%(androidndkdir)s/sources/cxx-stl/gnu-libstdc++/4.7/include @@ -16,7 +16,7 @@ android_flags = -D_SIZE_T_DEFINED_ clang_headers = -I%(clangllvmdir)s/lib/clang/3.3/include clang_flags = -nostdinc -x c++ -std=c++11 -cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/2d -I%(cocosdir)s/cocos/base -I%(cocosdir)s/cocos/gui -I%(cocosdir)s/cocos/physics -I%(cocosdir)s/cocos/2d/platform -I%(cocosdir)s/cocos/2d/platform/android -I%(cocosdir)s/cocos/math/kazmath -I%(cocosdir)s/extensions -I%(cocosdir)s/external -I%(cocosdir)s/cocos/editor-support -I%(cocosdir)s +cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/2d -I%(cocosdir)s/cocos/base -I%(cocosdir)s/cocos/ui -I%(cocosdir)s/cocos/physics -I%(cocosdir)s/cocos/2d/platform -I%(cocosdir)s/cocos/2d/platform/android -I%(cocosdir)s/cocos/math/kazmath -I%(cocosdir)s/extensions -I%(cocosdir)s/external -I%(cocosdir)s/cocos/editor-support -I%(cocosdir)s cocos_flags = -DANDROID -DCOCOS2D_JAVASCRIPT diff --git a/tools/tolua/cocos2dx_gui.ini b/tools/tolua/cocos2dx_ui.ini similarity index 90% rename from tools/tolua/cocos2dx_gui.ini rename to tools/tolua/cocos2dx_ui.ini index 2e13310ce8..538a46cfb0 100644 --- a/tools/tolua/cocos2dx_gui.ini +++ b/tools/tolua/cocos2dx_ui.ini @@ -1,4 +1,4 @@ -[cocos2dx_gui] +[cocos2dx_ui] # the prefix to be added to the generated functions. You might or might not use this in your own # templates prefix = cocos2dx_ui @@ -16,7 +16,7 @@ android_flags = -D_SIZE_T_DEFINED_ clang_headers = -I%(clangllvmdir)s/lib/clang/3.3/include clang_flags = -nostdinc -x c++ -std=c++11 -cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/2d -I%(cocosdir)s/cocos/base -I%(cocosdir)s/cocos/gui -I%(cocosdir)s/cocos/physics -I%(cocosdir)s/cocos/2d/platform -I%(cocosdir)s/cocos/2d/platform/android -I%(cocosdir)s/cocos/math/kazmath -I%(cocosdir)s/extensions -I%(cocosdir)s/external -I%(cocosdir)s/cocos/editor-support -I%(cocosdir)s +cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/2d -I%(cocosdir)s/cocos/base -I%(cocosdir)s/cocos/ui -I%(cocosdir)s/cocos/physics -I%(cocosdir)s/cocos/2d/platform -I%(cocosdir)s/cocos/2d/platform/android -I%(cocosdir)s/cocos/math/kazmath -I%(cocosdir)s/extensions -I%(cocosdir)s/external -I%(cocosdir)s/cocos/editor-support -I%(cocosdir)s cocos_flags = -DANDROID -DCOCOS2D_JAVASCRIPT @@ -26,7 +26,7 @@ cxxgenerator_headers = extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s %(cocos_headers)s %(android_flags)s %(clang_flags)s %(cocos_flags)s %(extra_flags)s # what headers to parse -headers = %(cocosdir)s/cocos/gui/CocosGUI.h +headers = %(cocosdir)s/cocos/ui/CocosGUI.h # what classes to produce code for. You can use regular expressions here. When testing the regular # expression, it will be enclosed in "^$", like this: "^Menu*$". diff --git a/tools/tolua/genbindings.py b/tools/tolua/genbindings.py index 8905394f87..6e8b59c35d 100755 --- a/tools/tolua/genbindings.py +++ b/tools/tolua/genbindings.py @@ -106,7 +106,7 @@ def main(): if platform == 'win32': config.set('DEFAULT', 'extra_flags', '-D__WCHAR_MAX__=0x7fffffff -U__MINGW32__') - conf_ini_file = os.path.abspath(os.path.join(os.path.dirname(__file__), 'userconf.ini')) + conf_ini_file = os.path.abspath(os.path.join(os.path.dirname(__file__), 'userconf.ini')) print 'generating userconf.ini...' with open(conf_ini_file, 'w') as configfile: @@ -128,7 +128,7 @@ def main(): cmd_args = {'cocos2dx.ini' : ('cocos2d-x', 'lua_cocos2dx_auto'), \ 'cocos2dx_extension.ini' : ('cocos2dx_extension', 'lua_cocos2dx_extension_auto'), \ - 'cocos2dx_gui.ini' : ('cocos2dx_gui', 'lua_cocos2dx_gui_auto'), \ + 'cocos2dx_ui.ini' : ('cocos2dx_ui', 'lua_cocos2dx_ui_auto'), \ 'cocos2dx_studio.ini' : ('cocos2dx_studio', 'lua_cocos2dx_studio_auto'), \ 'cocos2dx_spine.ini' : ('cocos2dx_spine', 'lua_cocos2dx_spine_auto'), \ 'cocos2dx_physics.ini' : ('cocos2dx_physics', 'lua_cocos2dx_physics_auto'), \ @@ -158,7 +158,7 @@ def main(): sys.exit(1) else: raise - + # -------------- main -------------- if __name__ == '__main__':