From eea1ba6946532f088b97cf3d5248368317020284 Mon Sep 17 00:00:00 2001 From: Dale Stammen Date: Thu, 8 May 2014 10:11:42 -0700 Subject: [PATCH 01/11] added missing files to projects --- cocos/2d/cocos2d_wp8.vcxproj | 4 + cocos/2d/cocos2d_wp8.vcxproj.filters | 12 + cocos/ui/proj.wp8/libGUI.vcxproj | 2 + cocos/ui/proj.wp8/libGUI.vcxproj.filters | 6 + .../cpp-testsComponent.vcxproj | 180 ++--- .../cpp-testsComponent.vcxproj.filters | 650 +++++++++--------- 6 files changed, 450 insertions(+), 404 deletions(-) diff --git a/cocos/2d/cocos2d_wp8.vcxproj b/cocos/2d/cocos2d_wp8.vcxproj index a3c29778b4..0168beeb97 100644 --- a/cocos/2d/cocos2d_wp8.vcxproj +++ b/cocos/2d/cocos2d_wp8.vcxproj @@ -221,10 +221,12 @@ + + @@ -430,10 +432,12 @@ + + diff --git a/cocos/2d/cocos2d_wp8.vcxproj.filters b/cocos/2d/cocos2d_wp8.vcxproj.filters index bebc9d9acc..2fe7279e70 100644 --- a/cocos/2d/cocos2d_wp8.vcxproj.filters +++ b/cocos/2d/cocos2d_wp8.vcxproj.filters @@ -594,6 +594,12 @@ math + + base + + + base + @@ -1174,6 +1180,12 @@ math + + base + + + base + diff --git a/cocos/ui/proj.wp8/libGUI.vcxproj b/cocos/ui/proj.wp8/libGUI.vcxproj index cd78e8c2fc..d0c786a455 100644 --- a/cocos/ui/proj.wp8/libGUI.vcxproj +++ b/cocos/ui/proj.wp8/libGUI.vcxproj @@ -186,6 +186,7 @@ + @@ -209,5 +210,6 @@ + \ No newline at end of file diff --git a/cocos/ui/proj.wp8/libGUI.vcxproj.filters b/cocos/ui/proj.wp8/libGUI.vcxproj.filters index 3eca774810..5231ee912c 100644 --- a/cocos/ui/proj.wp8/libGUI.vcxproj.filters +++ b/cocos/ui/proj.wp8/libGUI.vcxproj.filters @@ -81,6 +81,9 @@ Layouts + + UIWidgets + @@ -146,5 +149,8 @@ Layouts + + UIWidgets + \ No newline at end of file diff --git a/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj b/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj index 03d3db101f..d551e26f8f 100644 --- a/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj +++ b/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj @@ -199,50 +199,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -272,6 +228,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -393,50 +395,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -467,6 +425,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters b/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters index b134df2fb4..6d346c3458 100644 --- a/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters +++ b/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters @@ -241,36 +241,6 @@ {a83cb042-e3d6-4d3b-a4f6-30a4b3fcb3e9} - - {9daecd38-37c6-4216-a999-86077af83beb} - - - {493fcd85-c749-482d-9404-905e99aa0103} - - - {2e08949f-bf73-4fdc-85e8-34b8c69aa978} - - - {c57c0453-a096-44d7-830b-1cf24c712cfd} - - - {01097388-e538-4081-8e16-d1ff3a86292a} - - - {fadff96e-c19a-41f5-a755-547cf1f8a5fb} - - - {73c268e8-3872-49d6-9204-1e679ff72a42} - - - {dedcabba-959c-40e3-9959-7ccf4e31c792} - - - {5caf2179-ae22-4040-8bac-17e9f22efbf7} - - - {24f044ee-09a6-406b-98d7-8d5d759e5bb1} - {8d7d37cd-5cc2-4a7d-9bd2-7b5c928adbb5} @@ -283,12 +253,6 @@ {688e201c-77fe-4665-931e-e508a58141f5} - - {160da6f0-a0f1-4a53-8e5e-cf0a63ee82a3} - - - {c4dbbfb3-0e91-492f-bbbf-f03fb26f3f54} - {1821914f-c088-4946-8c1e-19ab57b5eabc} @@ -298,29 +262,71 @@ {f71fab28-32be-45c9-a941-9a22b5a59e51} - - {5a8f369e-53b7-461e-9aaf-89f0931a0046} + + {03d9907b-2766-4d84-8e7d-bc81beafd83b} - - {2b92a344-8fd6-493c-bc5f-423e01abbfca} + + {d6d4d2d2-5bec-4f70-8963-cd3170490d60} - - {b9e1dc6c-3933-4dd2-b396-67f8a6a42821} + + {d92bf78a-a9d0-4941-b926-9442669856ff} - - {a2acdd59-c690-4433-919c-9438e3279cd2} + + {7aa77f11-45a0-4c5c-a164-09f7fe53baac} - - {30d5188b-85c9-4877-933a-5bf0e6d2ca54} + + {062dbbf6-506a-468d-9abf-0bc58c8457a2} - - {c3353e37-e25e-4fa2-bc37-ebd7a8854efe} + + {eac3cbd8-3ec9-4534-80c2-7b34eda8b28e} - - {8bc33078-56ce-48a6-85fd-b9d67db67c13} + + {4d78bc45-32ab-442e-8f00-3b2932bacdce} - - {f2e15a07-0d4e-407f-b4dc-d7692afe64a4} + + {b3dba85f-4bba-408e-a979-6780946bd426} + + + {52d776a5-b646-43a5-b74b-bd70e7bec25b} + + + {f7abc2f0-46b1-497a-9bda-c49fd485201c} + + + {962b7868-af67-4b6d-936c-005a461319f3} + + + {1007216a-5e75-40cf-a7c7-df751cb1a0ee} + + + {a675bafb-fa61-400c-ac72-6509996b1b1e} + + + {609689d3-b604-4fde-8751-5f27087f6711} + + + {e91c67fe-b40e-476b-b00c-d14bf63c6829} + + + {abe8f97b-a4b3-4827-82a7-98d613fcc40b} + + + {e5f9c30b-c34e-4d83-88d9-18b5864cc760} + + + {991e53ff-12c6-45d5-85ad-84a7e52a9688} + + + {0e0f4844-37a2-43a1-9aee-36a266512419} + + + {ce89f8b8-161a-4a95-9e2a-c42bccc24722} + + + {f52cefac-d258-4e9e-b1f1-ddb17b7cd9ac} + + + {085acc82-08d1-46c1-affe-74af030ce284} @@ -636,42 +642,6 @@ Classes\PhysicsTest - - Classes\ExtensionsTest\CocoStudioGUITest\UIButtonTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UICheckBoxTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UIImageViewTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UIListViewTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UILoadingBarTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UIPageViewTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UIScrollViewTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UISliderTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UITextFieldTest - - - Classes\ExtensionsTest\CocoStudioGUITest - - - Classes\ExtensionsTest\CocoStudioGUITest - - - Classes\ExtensionsTest\CocoStudioGUITest - Classes\KeyboardTest @@ -684,12 +654,6 @@ Classes\NewRendererTest - - Classes\ExtensionsTest\CocoStudioGUITest\UIWidgetAddNodeTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UILayoutTest - Classes\UnitTest @@ -717,96 +681,6 @@ Classes\PerformanceTest - - Classes\ExtensionsTest\CocoStudioGUITest - - - Classes\ExtensionsTest\CocoStudioGUITest - - - Classes\ExtensionsTest\CocoStudioGUITest - - - Classes\ExtensionsTest\CocoStudioGUITest - - - Classes\ExtensionsTest\CocoStudioGUITest - - - Classes\ExtensionsTest\CocoStudioGUITest\UIButtonTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UICheckBoxTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UIImageViewTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UITextTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UITextTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UITextBMFontTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UITextBMFontTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UITextAtlasTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UITextAtlasTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UILayoutTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UIListViewTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UILoadingBarTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UIPageViewTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UIScrollViewTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UISliderTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UITextFieldTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UIWidgetAddNodeTest - - - Classes\ExtensionsTest\CocoStudioGUITest\CustomTest\CustomImageTest - - - Classes\ExtensionsTest\CocoStudioGUITest\CustomWidget - - - Classes\ExtensionsTest\CocoStudioGUITest\CustomWidget - - - Classes\ExtensionsTest\CocoStudioGUITest\CustomWidget - - - Classes\ExtensionsTest\CocoStudioGUITest\UIRichTextTest - - - Classes\ExtensionsTest\CocoStudioGUITest\CustomWidget - - - Classes\ExtensionsTest\CocoStudioGUITest\CustomWidget - - - Classes\ExtensionsTest\CocoStudioGUITest\CustomTest\CustomParticleWidgetTest - Classes\ShaderTest @@ -837,6 +711,144 @@ Classes\UnitTest + + Classes\UITest + + + Classes\UITest\CocosStudioGUITest\CustomTest\CustomImageTest + + + Classes\UITest\CocosStudioGUITest\CustomTest\CustomParticleWidgetTest + + + Classes\UITest\CocosStudioGUITest\CustomWidget + + + Classes\UITest\CocosStudioGUITest\CustomWidget + + + Classes\UITest\CocosStudioGUITest\CustomWidget + + + Classes\UITest\CocosStudioGUITest\CustomWidget + + + Classes\UITest\CocosStudioGUITest\CustomWidget + + + Classes\UITest\CocosStudioGUITest\UIButtonTest + + + Classes\UITest\CocosStudioGUITest\UIButtonTest + + + Classes\UITest\CocosStudioGUITest\UICheckBoxTest + + + Classes\UITest\CocosStudioGUITest\UICheckBoxTest + + + Classes\UITest\CocosStudioGUITest\UIFocusTest + + + Classes\UITest\CocosStudioGUITest\UIImageViewTest + + + Classes\UITest\CocosStudioGUITest\UIImageViewTest + + + Classes\UITest\CocosStudioGUITest\UILayoutTest + + + Classes\UITest\CocosStudioGUITest\UILayoutTest + + + Classes\UITest\CocosStudioGUITest\UIListViewTest + + + Classes\UITest\CocosStudioGUITest\UIListViewTest + + + Classes\UITest\CocosStudioGUITest\UILoadingBarTest + + + Classes\UITest\CocosStudioGUITest\UILoadingBarTest + + + Classes\UITest\CocosStudioGUITest\UIPageViewTest + + + Classes\UITest\CocosStudioGUITest\UIPageViewTest + + + Classes\UITest\CocosStudioGUITest\UIRichTextTest + + + Classes\UITest\CocosStudioGUITest\UIScrollViewTest + + + Classes\UITest\CocosStudioGUITest\UIScrollViewTest + + + Classes\UITest\CocosStudioGUITest\UISliderTest + + + Classes\UITest\CocosStudioGUITest\UISliderTest + + + Classes\UITest\CocosStudioGUITest\UITextAtlasTest + + + Classes\UITest\CocosStudioGUITest\UITextAtlasTest + + + Classes\UITest\CocosStudioGUITest\UITextBMFontTest + + + Classes\UITest\CocosStudioGUITest\UITextBMFontTest + + + Classes\UITest\CocosStudioGUITest\UITextFieldTest + + + Classes\UITest\CocosStudioGUITest\UITextFieldTest + + + Classes\UITest\CocosStudioGUITest\UITextTest + + + Classes\UITest\CocosStudioGUITest\UITextTest + + + Classes\UITest\CocosStudioGUITest\UIWidgetAddNodeTest + + + Classes\UITest\CocosStudioGUITest\UIWidgetAddNodeTest + + + Classes\UITest\CocosStudioGUITest + + + Classes\UITest\CocosStudioGUITest + + + Classes\UITest\CocosStudioGUITest + + + Classes\UITest\CocosStudioGUITest + + + Classes\UITest\CocosStudioGUITest + + + Classes\UITest\CocosStudioGUITest + + + Classes\UITest\CocosStudioGUITest + + + Classes\UITest\CocosStudioGUITest + @@ -1331,42 +1343,6 @@ Classes\PhysicsTest - - Classes\ExtensionsTest\CocoStudioGUITest\UIButtonTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UICheckBoxTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UIImageViewTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UIListViewTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UILoadingBarTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UIPageViewTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UIScrollViewTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UISliderTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UITextFieldTest - - - Classes\ExtensionsTest\CocoStudioGUITest - - - Classes\ExtensionsTest\CocoStudioGUITest - - - Classes\ExtensionsTest\CocoStudioGUITest - Classes\KeyboardTest @@ -1394,12 +1370,6 @@ Classes\NewRendererTest - - Classes\ExtensionsTest\CocoStudioGUITest\UIWidgetAddNodeTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UILayoutTest - Classes\UnitTest @@ -1433,96 +1403,6 @@ Classes\PerformanceTest - - Classes\ExtensionsTest\CocoStudioGUITest - - - Classes\ExtensionsTest\CocoStudioGUITest - - - Classes\ExtensionsTest\CocoStudioGUITest - - - Classes\ExtensionsTest\CocoStudioGUITest - - - Classes\ExtensionsTest\CocoStudioGUITest - - - Classes\ExtensionsTest\CocoStudioGUITest\UIButtonTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UICheckBoxTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UIImageViewTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UITextTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UITextTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UITextBMFontTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UITextBMFontTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UITextAtlasTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UITextAtlasTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UILayoutTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UIListViewTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UILoadingBarTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UIPageViewTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UIScrollViewTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UISliderTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UITextFieldTest - - - Classes\ExtensionsTest\CocoStudioGUITest\UIWidgetAddNodeTest - - - Classes\ExtensionsTest\CocoStudioGUITest\CustomTest\CustomImageTest - - - Classes\ExtensionsTest\CocoStudioGUITest\CustomWidget - - - Classes\ExtensionsTest\CocoStudioGUITest\CustomWidget - - - Classes\ExtensionsTest\CocoStudioGUITest\CustomWidget - - - Classes\ExtensionsTest\CocoStudioGUITest\UIRichTextTest - - - Classes\ExtensionsTest\CocoStudioGUITest\CustomWidget - - - Classes\ExtensionsTest\CocoStudioGUITest\CustomWidget - - - Classes\ExtensionsTest\CocoStudioGUITest\CustomTest\CustomParticleWidgetTest - Classes\ShaderTest @@ -1551,6 +1431,144 @@ Classes\UnitTest + + Classes\UITest + + + Classes\UITest\CocosStudioGUITest\CustomTest\CustomImageTest + + + Classes\UITest\CocosStudioGUITest\CustomTest\CustomParticleWidgetTest + + + Classes\UITest\CocosStudioGUITest\CustomWidget + + + Classes\UITest\CocosStudioGUITest\CustomWidget + + + Classes\UITest\CocosStudioGUITest\CustomWidget + + + Classes\UITest\CocosStudioGUITest\CustomWidget + + + Classes\UITest\CocosStudioGUITest\CustomWidget + + + Classes\UITest\CocosStudioGUITest\UIButtonTest + + + Classes\UITest\CocosStudioGUITest\UIButtonTest + + + Classes\UITest\CocosStudioGUITest\UICheckBoxTest + + + Classes\UITest\CocosStudioGUITest\UICheckBoxTest + + + Classes\UITest\CocosStudioGUITest\UIFocusTest + + + Classes\UITest\CocosStudioGUITest\UIImageViewTest + + + Classes\UITest\CocosStudioGUITest\UIImageViewTest + + + Classes\UITest\CocosStudioGUITest\UILayoutTest + + + Classes\UITest\CocosStudioGUITest\UILayoutTest + + + Classes\UITest\CocosStudioGUITest\UIListViewTest + + + Classes\UITest\CocosStudioGUITest\UIListViewTest + + + Classes\UITest\CocosStudioGUITest\UILoadingBarTest + + + Classes\UITest\CocosStudioGUITest\UILoadingBarTest + + + Classes\UITest\CocosStudioGUITest\UIPageViewTest + + + Classes\UITest\CocosStudioGUITest\UIPageViewTest + + + Classes\UITest\CocosStudioGUITest\UIRichTextTest + + + Classes\UITest\CocosStudioGUITest\UIScrollViewTest + + + Classes\UITest\CocosStudioGUITest\UIScrollViewTest + + + Classes\UITest\CocosStudioGUITest\UISliderTest + + + Classes\UITest\CocosStudioGUITest\UISliderTest + + + Classes\UITest\CocosStudioGUITest\UITextAtlasTest + + + Classes\UITest\CocosStudioGUITest\UITextAtlasTest + + + Classes\UITest\CocosStudioGUITest\UITextBMFontTest + + + Classes\UITest\CocosStudioGUITest\UITextBMFontTest + + + Classes\UITest\CocosStudioGUITest\UITextFieldTest + + + Classes\UITest\CocosStudioGUITest\UITextFieldTest + + + Classes\UITest\CocosStudioGUITest\UITextTest + + + Classes\UITest\CocosStudioGUITest\UITextTest + + + Classes\UITest\CocosStudioGUITest\UIWidgetAddNodeTest + + + Classes\UITest\CocosStudioGUITest\UIWidgetAddNodeTest + + + Classes\UITest\CocosStudioGUITest + + + Classes\UITest\CocosStudioGUITest + + + Classes\UITest\CocosStudioGUITest + + + Classes\UITest\CocosStudioGUITest + + + Classes\UITest\CocosStudioGUITest + + + Classes\UITest\CocosStudioGUITest + + + Classes\UITest\CocosStudioGUITest + + + Classes\UITest\CocosStudioGUITest + From 06f264e87d1a5c2b82c7741b19c23b09b7f68711 Mon Sep 17 00:00:00 2001 From: Dhilan007 Date: Fri, 9 May 2014 11:30:07 +0800 Subject: [PATCH 02/11] rename VideoWidget to VideoPlayer. --- cocos/ui/Android.mk | 2 +- cocos/ui/CocosGUI.h | 2 +- cocos/ui/UIVideoPlayer.h | 113 +++++++++++++++++ ...etAndroid.cpp => UIVideoPlayerAndroid.cpp} | 92 +++++++------- ...IVideoWidgetIOS.mm => UIVideoPlayerIOS.mm} | 76 ++++++------ cocos/ui/UIVideoWidget.h | 115 ------------------ tests/cpp-tests/Android.mk | 2 +- .../CocoStudioGUITest/CocosGUIScene.cpp | 8 +- .../CocoStudioGUITest/UISceneManager.cpp | 8 +- .../UITest/CocoStudioGUITest/UISceneManager.h | 2 +- .../UIVideoPlayerTest.cpp} | 110 ++++++++--------- .../UIVideoPlayerTest.h} | 14 +-- 12 files changed, 271 insertions(+), 273 deletions(-) create mode 100644 cocos/ui/UIVideoPlayer.h rename cocos/ui/{UIVideoWidgetAndroid.cpp => UIVideoPlayerAndroid.cpp} (78%) rename cocos/ui/{UIVideoWidgetIOS.mm => UIVideoPlayerIOS.mm} (87%) delete mode 100644 cocos/ui/UIVideoWidget.h rename tests/cpp-tests/Classes/UITest/CocoStudioGUITest/{UIVideoWidgetTest/UIVideoWidgetTest.cpp => UIVideoPlayerTest/UIVideoPlayerTest.cpp} (68%) rename tests/cpp-tests/Classes/UITest/CocoStudioGUITest/{UIVideoWidgetTest/UIVideoWidgetTest.h => UIVideoPlayerTest/UIVideoPlayerTest.h} (74%) diff --git a/cocos/ui/Android.mk b/cocos/ui/Android.mk index e83f35e8ea..d80df7efa8 100644 --- a/cocos/ui/Android.mk +++ b/cocos/ui/Android.mk @@ -29,7 +29,7 @@ CCProtectedNode.cpp \ UIHBox.cpp \ UIVBox.cpp \ UIRelativeBox.cpp \ -UIVideoWidgetAndroid.cpp +UIVideoPlayerAndroid.cpp LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. \ $(LOCAL_PATH)/../editor-support diff --git a/cocos/ui/CocosGUI.h b/cocos/ui/CocosGUI.h index 992c8d910b..c9572c5af7 100644 --- a/cocos/ui/CocosGUI.h +++ b/cocos/ui/CocosGUI.h @@ -46,7 +46,7 @@ THE SOFTWARE. #include "ui/UIVBox.h" #include "ui/UIRelativeBox.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) -#include "ui/UIVideoWidget.h" +#include "ui/UIVideoPlayer.h" #endif NS_CC_BEGIN diff --git a/cocos/ui/UIVideoPlayer.h b/cocos/ui/UIVideoPlayer.h new file mode 100644 index 0000000000..b011e0f95a --- /dev/null +++ b/cocos/ui/UIVideoPlayer.h @@ -0,0 +1,113 @@ +/**************************************************************************** + Copyright (c) 2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +#ifndef __COCOS2D_UI_VIDEOWEIGTH_H_ +#define __COCOS2D_UI_VIDEOWEIGTH_H_ + +#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) + +#include "ui/UIWidget.h" + +NS_CC_BEGIN +namespace experimental{ + namespace ui{ + + class VideoPlayer : public cocos2d::ui::Widget + { + public: + enum class Event + { + PLAYING = 0, + PAUSED, + STOPPED, + COMPLETED + }; + typedef std::function EventCallback; + + CREATE_FUNC(VideoPlayer); + + //Sets local file[support assets' file on android] as a video source for VideoPlayer + virtual void setVideoFileName(const std::string& videoPath); + virtual const std::string& getVideoFileName() const { return _videoUrl;} + + //Sets network link as a video source for VideoPlayer + virtual void setVideoURL(const std::string& videoUrl); + virtual const std::string& getVideoURL() const { return _videoUrl;} + + virtual void startVideo(); + virtual void pauseVideo(); + virtual void resumeVideo(); + virtual void stopVideo(); + + virtual void seekVideoTo(float sec); + virtual bool isPlaying() const; + + virtual void setVisible(bool visible) override; + + virtual void setKeepAspectRatioEnabled(bool enable); + virtual bool isKeepAspectRatioEnabled() { return _keepAspectRatioEnabled;} + + virtual void setFullScreenEnabled(bool enabled); + virtual bool isFullScreenEnabled(); + + virtual void setEventListener(const EventCallback& callback); + + virtual void onVideoEvent(VideoPlayer::Event event); + virtual void draw(Renderer *renderer, const Matrix& transform, bool transformUpdated) override; + + protected: + VideoPlayer(); + virtual ~VideoPlayer(); + +#if CC_VIDEOPLAYER_DEBUG_DRAW + CustomCommand _customDebugDrawCommand; + void VideoPlayer::drawDebugData(); +#endif + + enum class VideoSource + { + FILENAME = 0, + URL + }; + + bool _isPlaying; + bool _fullScreenDirty; + bool _fullScreenEnabled; + bool _keepAspectRatioEnabled; + + std::string _videoUrl; + VideoSource _videoSource; + + int _videoPlayerIndex; + EventCallback _callback; + + void* _videiView; + }; + } +} + +NS_CC_END + +#endif +#endif diff --git a/cocos/ui/UIVideoWidgetAndroid.cpp b/cocos/ui/UIVideoPlayerAndroid.cpp similarity index 78% rename from cocos/ui/UIVideoWidgetAndroid.cpp rename to cocos/ui/UIVideoPlayerAndroid.cpp index 596f77b100..8942defd12 100644 --- a/cocos/ui/UIVideoWidgetAndroid.cpp +++ b/cocos/ui/UIVideoPlayerAndroid.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "UIVideoWidget.h" +#include "UIVideoPlayer.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) #include @@ -152,20 +152,20 @@ void setVideoKeepRatioEnabled(int index,bool enabled) using namespace cocos2d::experimental::ui; -static std::unordered_map s_allVideoWidgets; +static std::unordered_map s_allVideoPlayers; -VideoWidget::VideoWidget() -: _videoWidgetIndex(-1) +VideoPlayer::VideoPlayer() +: _videoPlayerIndex(-1) , _callback(nullptr) , _fullScreenEnabled(false) , _fullScreenDirty(false) , _keepAspectRatioEnabled(false) { - _videoWidgetIndex = createVideoWidgetJNI(); - s_allVideoWidgets[_videoWidgetIndex] = this; + _videoPlayerIndex = createVideoWidgetJNI(); + s_allVideoPlayers[_videoPlayerIndex] = this; auto listener = EventListenerKeyboard::create(); - listener->onKeyReleased = [&](EventKeyboard::KeyCode keycode, Event* event){ + listener->onKeyReleased = [&](EventKeyboard::KeyCode keycode, cocos2d::Event* event){ if (keycode == EventKeyboard::KeyCode::KEY_BACKSPACE && _fullScreenEnabled) { this->setFullScreenEnabled(false); @@ -175,27 +175,27 @@ VideoWidget::VideoWidget() _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this); } -VideoWidget::~VideoWidget() +VideoPlayer::~VideoPlayer() { - s_allVideoWidgets.erase(_videoWidgetIndex); - removeVideoWidgetJNI(_videoWidgetIndex); + s_allVideoPlayers.erase(_videoPlayerIndex); + removeVideoWidgetJNI(_videoPlayerIndex); } -void VideoWidget::setVideoFileName(const std::string& fileName) +void VideoPlayer::setVideoFileName(const std::string& fileName) { _videoUrl = fileName; - _videoSource = VideoWidget::VideoSource::FILENAME; - setVideoURLJNI(_videoWidgetIndex, (int)VideoSource::FILENAME,_videoUrl); + _videoSource = VideoPlayer::VideoSource::FILENAME; + setVideoURLJNI(_videoPlayerIndex, (int)VideoSource::FILENAME,_videoUrl); } -void VideoWidget::setVideoURL(const std::string& videoUrl) +void VideoPlayer::setVideoURL(const std::string& videoUrl) { _videoUrl = videoUrl; - _videoSource = VideoWidget::VideoSource::URL; - setVideoURLJNI(_videoWidgetIndex,(int)VideoSource::URL,_videoUrl); + _videoSource = VideoPlayer::VideoSource::URL; + setVideoURLJNI(_videoPlayerIndex,(int)VideoSource::URL,_videoUrl); } -void VideoWidget::draw(Renderer* renderer, const Matrix &transform, bool transformUpdated) +void VideoPlayer::draw(Renderer* renderer, const Matrix &transform, bool transformUpdated) { cocos2d::ui::Widget::draw(renderer,transform,transformUpdated); @@ -208,7 +208,7 @@ void VideoWidget::draw(Renderer* renderer, const Matrix &transform, bool transfo if (_fullScreenEnabled) { - setVideoRectJNI(_videoWidgetIndex,0,0,frameSize.width,frameSize.height); + setVideoRectJNI(_videoPlayerIndex,0,0,frameSize.width,frameSize.height); } else { @@ -220,20 +220,20 @@ void VideoWidget::draw(Renderer* renderer, const Matrix &transform, bool transfo auto uiLeft = frameSize.width / 2 + (leftBottom.x - winSize.width / 2 ) * glView->getScaleX(); auto uiTop = frameSize.height /2 - (rightTop.y - winSize.height / 2) * glView->getScaleY(); - setVideoRectJNI(_videoWidgetIndex,uiLeft,uiTop, + setVideoRectJNI(_videoPlayerIndex,uiLeft,uiTop, (rightTop.x - leftBottom.x) * glView->getScaleX(), (rightTop.y - leftBottom.y) * glView->getScaleY()); } } -#if CC_VIDEOWIDGET_DEBUG_DRAW +#if CC_VIDEOPLAYER_DEBUG_DRAW _customDebugDrawCommand.init(_globalZOrder); - _customDebugDrawCommand.func = CC_CALLBACK_0(VideoWidget::drawDebugData, this); + _customDebugDrawCommand.func = CC_CALLBACK_0(VideoPlayer::drawDebugData, this); renderer->addCommand(&_customDebugDrawCommand); #endif } -void VideoWidget::setFullScreenEnabled(bool enabled) +void VideoPlayer::setFullScreenEnabled(bool enabled) { if (_fullScreenEnabled != enabled) { @@ -242,22 +242,22 @@ void VideoWidget::setFullScreenEnabled(bool enabled) } } -bool VideoWidget::isFullScreenEnabled() +bool VideoPlayer::isFullScreenEnabled() { return _fullScreenEnabled; } -void VideoWidget::setKeepAspectRatioEnabled(bool enable) +void VideoPlayer::setKeepAspectRatioEnabled(bool enable) { if (_keepAspectRatioEnabled != enable) { _keepAspectRatioEnabled = enable; - setVideoKeepRatioEnabled(_videoWidgetIndex,enable); + setVideoKeepRatioEnabled(_videoPlayerIndex,enable); } } -#if CC_VIDEOWIDGET_DEBUG_DRAW -void VideoWidget::drawDebugData() +#if CC_VIDEOPLAYER_DEBUG_DRAW +void VideoPlayer::drawDebugData() { Director* director = Director::getInstance(); CCASSERT(nullptr != director, "Director is null when seting matrix stack"); @@ -281,69 +281,69 @@ void VideoWidget::drawDebugData() } #endif -void VideoWidget::startVideo() +void VideoPlayer::startVideo() { if (! _videoUrl.empty()) { - startVideoJNI(_videoWidgetIndex); + startVideoJNI(_videoPlayerIndex); } } -void VideoWidget::pauseVideo() +void VideoPlayer::pauseVideo() { if (! _videoUrl.empty()) { - pauseVideoJNI(_videoWidgetIndex); + pauseVideoJNI(_videoPlayerIndex); } } -void VideoWidget::resumeVideo() +void VideoPlayer::resumeVideo() { if (! _videoUrl.empty()) { - resumeVideoJNI(_videoWidgetIndex); + resumeVideoJNI(_videoPlayerIndex); } } -void VideoWidget::stopVideo() +void VideoPlayer::stopVideo() { if (! _videoUrl.empty()) { - stopVideoJNI(_videoWidgetIndex); + stopVideoJNI(_videoPlayerIndex); } } -void VideoWidget::seekVideoTo(float sec) +void VideoPlayer::seekVideoTo(float sec) { if (! _videoUrl.empty()) { - seekVideoToJNI(_videoWidgetIndex,int(sec * 1000)); + seekVideoToJNI(_videoPlayerIndex,int(sec * 1000)); } } -bool VideoWidget::isPlaying() const +bool VideoPlayer::isPlaying() const { return _isPlaying; } -void VideoWidget::setVisible(bool visible) +void VideoPlayer::setVisible(bool visible) { cocos2d::ui::Widget::setVisible(visible); if (! _videoUrl.empty()) { - setVideoVisible(_videoWidgetIndex,visible); + setVideoVisible(_videoPlayerIndex,visible); } } -void VideoWidget::setEventListener(const VideoWidgetCallback& callback) +void VideoPlayer::setEventListener(const EventCallback& callback) { _callback = callback; } -void VideoWidget::onVideoEvent(VideoWidgetEvent event) +void VideoPlayer::onVideoEvent(VideoPlayer::Event event) { - if (event == VideoWidgetEvent::PLAYING) { + if (event == VideoPlayer::Event::PLAYING) { _isPlaying = true; } else { _isPlaying = false; @@ -357,10 +357,10 @@ void VideoWidget::onVideoEvent(VideoWidgetEvent event) void executeVideoCallback(int index,int event) { - auto it = s_allVideoWidgets.find(index); - if (it != s_allVideoWidgets.end()) + auto it = s_allVideoPlayers.find(index); + if (it != s_allVideoPlayers.end()) { - s_allVideoWidgets[index]->onVideoEvent((VideoWidgetEvent)event); + s_allVideoPlayers[index]->onVideoEvent((VideoPlayer::Event)event); } } diff --git a/cocos/ui/UIVideoWidgetIOS.mm b/cocos/ui/UIVideoPlayerIOS.mm similarity index 87% rename from cocos/ui/UIVideoWidgetIOS.mm rename to cocos/ui/UIVideoPlayerIOS.mm index 361bc8d977..85b663953c 100644 --- a/cocos/ui/UIVideoWidgetIOS.mm +++ b/cocos/ui/UIVideoPlayerIOS.mm @@ -22,9 +22,11 @@ THE SOFTWARE. ****************************************************************************/ -#include "UIVideoWidget.h" +#include "UIVideoPlayer.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) + +using namespace cocos2d::experimental::ui; //------------------------------------------------------------------------------------- #include "CCEAGLView.h" #import @@ -45,7 +47,7 @@ - (void) setFullScreenEnabled:(bool) enabled; - (bool) isFullScreenEnabled; --(id) init:(void*) widget; +-(id) init:(void*) videoPlayer; -(void) videoFinished:(NSNotification*) notification; -(void) playStateChange; @@ -62,14 +64,14 @@ int _height; bool _keepRatioEnabled; - cocos2d::experimental::ui::VideoWidget* _widget; + VideoPlayer* _videoPlayer; } --(id)init:(void*)widget +-(id)init:(void*)videoPlayer { if (self = [super init]) { self.moviePlayer = nullptr; - _widget = (cocos2d::experimental::ui::VideoWidget*)widget; + _videoPlayer = (VideoPlayer*)videoPlayer; _keepRatioEnabled = false; } @@ -85,7 +87,7 @@ [self.moviePlayer stop]; [self.moviePlayer.view removeFromSuperview]; self.moviePlayer = nullptr; - _widget = nullptr; + _videoPlayer = nullptr; } [super dealloc]; } @@ -163,11 +165,11 @@ -(void) videoFinished:(NSNotification *)notification { - if(_widget != nullptr) + if(_videoPlayer != nullptr) { if([self.moviePlayer playbackState] != MPMoviePlaybackStateStopped) { - _widget->onVideoEvent(cocos2d::experimental::ui::VideoWidgetEvent::COMPLETED); + _videoPlayer->onVideoEvent(VideoPlayer::Event::COMPLETED); } } } @@ -177,13 +179,13 @@ MPMoviePlaybackState state = [self.moviePlayer playbackState]; switch (state) { case MPMoviePlaybackStatePaused: - _widget->onVideoEvent(cocos2d::experimental::ui::VideoWidgetEvent::PAUSED); + _videoPlayer->onVideoEvent(VideoPlayer::Event::PAUSED); break; case MPMoviePlaybackStateStopped: - _widget->onVideoEvent(cocos2d::experimental::ui::VideoWidgetEvent::STOPPED); + _videoPlayer->onVideoEvent(VideoPlayer::Event::STOPPED); break; case MPMoviePlaybackStatePlaying: - _widget->onVideoEvent(cocos2d::experimental::ui::VideoWidgetEvent::PLAYING); + _videoPlayer->onVideoEvent(VideoPlayer::Event::PLAYING); break; case MPMoviePlaybackStateInterrupted: break; @@ -277,10 +279,8 @@ @end //------------------------------------------------------------------------------------------------------------ -using namespace cocos2d::experimental::ui; - -VideoWidget::VideoWidget() -: _videoWidgetIndex(-1) +VideoPlayer::VideoPlayer() +: _videoPlayerIndex(-1) , _callback(nullptr) , _fullScreenEnabled(false) , _fullScreenDirty(false) @@ -290,7 +290,7 @@ VideoWidget::VideoWidget() _videiView = [[UIVideoViewWrapperIos alloc] init:this]; } -VideoWidget::~VideoWidget() +VideoPlayer::~VideoPlayer() { if(_videiView) { @@ -298,21 +298,21 @@ VideoWidget::~VideoWidget() } } -void VideoWidget::setVideoFileName(const std::string& fileName) +void VideoPlayer::setVideoFileName(const std::string& fileName) { _videoUrl = fileName; - _videoSource = VideoWidget::VideoSource::FILENAME; + _videoSource = VideoPlayer::VideoSource::FILENAME; [((UIVideoViewWrapperIos*)_videiView) setVideoURL:(int)_videoSource :_videoUrl]; } -void VideoWidget::setVideoURL(const std::string& videoUrl) +void VideoPlayer::setVideoURL(const std::string& videoUrl) { _videoUrl = videoUrl; - _videoSource = VideoWidget::VideoSource::URL; + _videoSource = VideoPlayer::VideoSource::URL; [((UIVideoViewWrapperIos*)_videiView) setVideoURL:(int)_videoSource :_videoUrl]; } -void VideoWidget::draw(Renderer* renderer, const Matrix &transform, bool transformUpdated) +void VideoPlayer::draw(Renderer* renderer, const Matrix &transform, bool transformUpdated) { cocos2d::ui::Widget::draw(renderer,transform,transformUpdated); @@ -336,24 +336,24 @@ void VideoWidget::draw(Renderer* renderer, const Matrix &transform, bool transfo :( (rightTop.y - leftBottom.y) * glView->getScaleY()/scaleFactor)]; } -#if CC_VIDEOWIDGET_DEBUG_DRAW +#if CC_VIDEOPLAYER_DEBUG_DRAW _customDebugDrawCommand.init(_globalZOrder); - _customDebugDrawCommand.func = CC_CALLBACK_0(VideoWidget::drawDebugData, this); + _customDebugDrawCommand.func = CC_CALLBACK_0(VideoPlayer::drawDebugData, this); renderer->addCommand(&_customDebugDrawCommand); #endif } -bool VideoWidget::isFullScreenEnabled() +bool VideoPlayer::isFullScreenEnabled() { return [((UIVideoViewWrapperIos*)_videiView) isFullScreenEnabled]; } -void VideoWidget::setFullScreenEnabled(bool enabled) +void VideoPlayer::setFullScreenEnabled(bool enabled) { [((UIVideoViewWrapperIos*)_videiView) setFullScreenEnabled:enabled]; } -void VideoWidget::setKeepAspectRatioEnabled(bool enable) +void VideoPlayer::setKeepAspectRatioEnabled(bool enable) { if (_keepAspectRatioEnabled != enable) { @@ -362,8 +362,8 @@ void VideoWidget::setKeepAspectRatioEnabled(bool enable) } } -#if CC_VIDEOWIDGET_DEBUG_DRAW -void VideoWidget::drawDebugData() +#if CC_VIDEOPLAYER_DEBUG_DRAW +void VideoPlayer::drawDebugData() { Director* director = Director::getInstance(); CCASSERT(nullptr != director, "Director is null when seting matrix stack"); @@ -387,7 +387,7 @@ void VideoWidget::drawDebugData() } #endif -void VideoWidget::startVideo() +void VideoPlayer::startVideo() { if (! _videoUrl.empty()) { @@ -395,7 +395,7 @@ void VideoWidget::startVideo() } } -void VideoWidget::pauseVideo() +void VideoPlayer::pauseVideo() { if (! _videoUrl.empty()) { @@ -403,7 +403,7 @@ void VideoWidget::pauseVideo() } } -void VideoWidget::resumeVideo() +void VideoPlayer::resumeVideo() { if (! _videoUrl.empty()) { @@ -411,7 +411,7 @@ void VideoWidget::resumeVideo() } } -void VideoWidget::stopVideo() +void VideoPlayer::stopVideo() { if (! _videoUrl.empty()) { @@ -419,7 +419,7 @@ void VideoWidget::stopVideo() } } -void VideoWidget::seekVideoTo(float sec) +void VideoPlayer::seekVideoTo(float sec) { if (! _videoUrl.empty()) { @@ -427,12 +427,12 @@ void VideoWidget::seekVideoTo(float sec) } } -bool VideoWidget::isPlaying() const +bool VideoPlayer::isPlaying() const { return _isPlaying; } -void VideoWidget::setVisible(bool visible) +void VideoPlayer::setVisible(bool visible) { cocos2d::ui::Widget::setVisible(visible); @@ -442,14 +442,14 @@ void VideoWidget::setVisible(bool visible) } } -void VideoWidget::setEventListener(const VideoWidgetCallback& callback) +void VideoPlayer::setEventListener(const EventCallback& callback) { _callback = callback; } -void VideoWidget::onVideoEvent(VideoWidgetEvent event) +void VideoPlayer::onVideoEvent(VideoPlayer::Event event) { - if (event == VideoWidgetEvent::PLAYING) { + if (event == VideoPlayer::Event::PLAYING) { _isPlaying = true; } else { _isPlaying = false; diff --git a/cocos/ui/UIVideoWidget.h b/cocos/ui/UIVideoWidget.h deleted file mode 100644 index 0189046784..0000000000 --- a/cocos/ui/UIVideoWidget.h +++ /dev/null @@ -1,115 +0,0 @@ -/**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. - - http://www.cocos2d-x.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -#ifndef __COCOS2D_UI_VIDEOWEIGTH_H_ -#define __COCOS2D_UI_VIDEOWEIGTH_H_ - -#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) - -#include "ui/UIWidget.h" - -NS_CC_BEGIN -namespace experimental{ -namespace ui{ - - enum class VideoWidgetEvent - { - PLAYING = 0, - PAUSED, - STOPPED, - COMPLETED - }; - - typedef std::function VideoWidgetCallback; - - class VideoWidget : public cocos2d::ui::Widget - { - public: - - CREATE_FUNC(VideoWidget); - - //Sets local file[support assets' file on android] as a video source for VideoWidget - virtual void setVideoFileName(const std::string& videoPath); - virtual const std::string& getVideoFileName() const { return _videoUrl;} - - //Sets network link as a video source for VideoWidget - virtual void setVideoURL(const std::string& videoUrl); - virtual const std::string& getVideoURL() const { return _videoUrl;} - - virtual void startVideo(); - virtual void pauseVideo(); - virtual void resumeVideo(); - virtual void stopVideo(); - - virtual void seekVideoTo(float sec); - virtual bool isPlaying() const; - - virtual void setVisible(bool visible) override; - - virtual void setKeepAspectRatioEnabled(bool enable); - virtual bool isKeepAspectRatioEnabled() { return _keepAspectRatioEnabled;} - - virtual void setFullScreenEnabled(bool enabled); - virtual bool isFullScreenEnabled(); - - virtual void setEventListener(const VideoWidgetCallback& callback); - - virtual void onVideoEvent(VideoWidgetEvent event); - virtual void draw(Renderer *renderer, const Matrix& transform, bool transformUpdated) override; - - protected: - VideoWidget(); - virtual ~VideoWidget(); - -#if CC_VIDEOWIDGET_DEBUG_DRAW - CustomCommand _customDebugDrawCommand; - void VideoWidget::drawDebugData(); -#endif - - enum class VideoSource - { - FILENAME = 0, - URL - }; - - bool _isPlaying; - bool _fullScreenDirty; - bool _fullScreenEnabled; - bool _keepAspectRatioEnabled; - - std::string _videoUrl; - VideoSource _videoSource; - - int _videoWidgetIndex; - VideoWidgetCallback _callback; - - void* _videiView; - }; -} -} - -NS_CC_END - -#endif -#endif diff --git a/tests/cpp-tests/Android.mk b/tests/cpp-tests/Android.mk index 87612034d7..8299f055bf 100644 --- a/tests/cpp-tests/Android.mk +++ b/tests/cpp-tests/Android.mk @@ -98,7 +98,7 @@ Classes/UITest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest_Editor.cpp \ Classes/UITest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest_Editor.cpp \ Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp \ Classes/UITest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest_Editor.cpp \ -Classes/UITest/CocoStudioGUITest/UIVideoWidgetTest/UIVideoWidgetTest.cpp \ +Classes/UITest/CocoStudioGUITest/UIVideoPlayerTest/UIVideoPlayerTest.cpp \ Classes/UITest/CocoStudioGUITest/CustomWidget/CustomImageView.cpp \ Classes/UITest/CocoStudioGUITest/CustomWidget/CustomImageViewReader.cpp \ Classes/UITest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.cpp \ diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp index aa56eb262b..614649a83c 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp @@ -281,13 +281,13 @@ g_guisTests[] = }, #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) { - "gui VideoWidgetTest", + "gui VideoPlayerTest", [](Ref* sender) { UISceneManager* pManager = UISceneManager::sharedUISceneManager(); - pManager->setCurrentUISceneId(kUIVideoWidgetTest); - pManager->setMinUISceneId(kUIVideoWidgetTest); - pManager->setMaxUISceneId(kUIVideoWidgetTest); + pManager->setCurrentUISceneId(kUIVideoPlayerTest); + pManager->setMinUISceneId(kUIVideoPlayerTest); + pManager->setMaxUISceneId(kUIVideoPlayerTest); Scene* pScene = pManager->currentUIScene(); Director::getInstance()->replaceScene(pScene); } diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.cpp index 65ff70cb2c..4ca3c47d53 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.cpp @@ -19,7 +19,7 @@ #include "UIRichTextTest/UIRichTextTest.h" #include "UIFocusTest/UIFocusTest.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) -#include "UIVideoWidgetTest/UIVideoWidgetTest.h" +#include "UIVideoPlayerTest/UIVideoPlayerTest.h" #endif /* #include "UISwitchTest/UISwitchTest.h" @@ -119,7 +119,7 @@ static const char* s_testArray[] = "UIFocusTest-NestedLayout2", "UIFocusTest-NestedLayout3", #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) - "UIVideoWidgetTest" + "UIVideoPlayerTest" #endif }; @@ -382,8 +382,8 @@ Scene *UISceneManager::currentUIScene() case KUIFocusTest_NestedLayout3: return UIFocusTestNestedLayout3::sceneWithTitle(s_testArray[_currentUISceneId]); #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) - case kUIVideoWidgetTest: - return VideoWidgetTest::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIVideoPlayerTest: + return VideoPlayerTest::sceneWithTitle(s_testArray[_currentUISceneId]); #endif } return NULL; diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.h index 7461440b62..b3f179b5a7 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.h +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.h @@ -107,7 +107,7 @@ enum KUIFocusTest_NestedLayout2, KUIFocusTest_NestedLayout3, #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) - kUIVideoWidgetTest, + kUIVideoPlayerTest, #endif kUITestMax }; diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIVideoWidgetTest/UIVideoWidgetTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIVideoPlayerTest/UIVideoPlayerTest.cpp similarity index 68% rename from tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIVideoWidgetTest/UIVideoWidgetTest.cpp rename to tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIVideoPlayerTest/UIVideoPlayerTest.cpp index fe859fbaf0..d3771787e9 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIVideoWidgetTest/UIVideoWidgetTest.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIVideoPlayerTest/UIVideoPlayerTest.cpp @@ -1,9 +1,9 @@ -#include "UIVideoWidgetTest.h" +#include "UIVideoPlayerTest.h" USING_NS_CC; using namespace cocos2d::experimental::ui; -bool VideoWidgetTest::init() +bool VideoPlayerTest::init() { if ( !UIScene::init() ) { @@ -14,36 +14,36 @@ bool VideoWidgetTest::init() MenuItemFont::setFontSize(16); - auto fullSwitch = MenuItemFont::create("FullScreenSwitch", CC_CALLBACK_1(VideoWidgetTest::menuFullScreenCallback, this)); + auto fullSwitch = MenuItemFont::create("FullScreenSwitch", CC_CALLBACK_1(VideoPlayerTest::menuFullScreenCallback, this)); fullSwitch->setAnchorPoint(Vector2::ANCHOR_BOTTOM_LEFT); fullSwitch->setPosition(Vector2(_visibleRect.origin.x + 10,_visibleRect.origin.y + 50)); - auto pauseItem = MenuItemFont::create("Pause", CC_CALLBACK_1(VideoWidgetTest::menuPauseCallback, this)); + auto pauseItem = MenuItemFont::create("Pause", CC_CALLBACK_1(VideoPlayerTest::menuPauseCallback, this)); pauseItem->setAnchorPoint(Vector2::ANCHOR_BOTTOM_LEFT); pauseItem->setPosition(Vector2(_visibleRect.origin.x + 10,_visibleRect.origin.y + 100)); - auto resumeItem = MenuItemFont::create("Resume", CC_CALLBACK_1(VideoWidgetTest::menuResumeCallback, this)); + auto resumeItem = MenuItemFont::create("Resume", CC_CALLBACK_1(VideoPlayerTest::menuResumeCallback, this)); resumeItem->setAnchorPoint(Vector2::ANCHOR_BOTTOM_LEFT); resumeItem->setPosition(Vector2(_visibleRect.origin.x + 10,_visibleRect.origin.y + 150)); - auto stopItem = MenuItemFont::create("Stop", CC_CALLBACK_1(VideoWidgetTest::menuStopCallback, this)); + auto stopItem = MenuItemFont::create("Stop", CC_CALLBACK_1(VideoPlayerTest::menuStopCallback, this)); stopItem->setAnchorPoint(Vector2::ANCHOR_BOTTOM_LEFT); stopItem->setPosition(Vector2(_visibleRect.origin.x + 10,_visibleRect.origin.y + 200)); - auto hintItem = MenuItemFont::create("Hint", CC_CALLBACK_1(VideoWidgetTest::menuHintCallback, this)); + auto hintItem = MenuItemFont::create("Hint", CC_CALLBACK_1(VideoPlayerTest::menuHintCallback, this)); hintItem->setAnchorPoint(Vector2::ANCHOR_BOTTOM_LEFT); hintItem->setPosition(Vector2(_visibleRect.origin.x + 10,_visibleRect.origin.y + 250)); //------------------------------------------------------------------------------------------------------------------- - auto resourceVideo = MenuItemFont::create("Play resource video", CC_CALLBACK_1(VideoWidgetTest::menuResourceVideoCallback, this)); + auto resourceVideo = MenuItemFont::create("Play resource video", CC_CALLBACK_1(VideoPlayerTest::menuResourceVideoCallback, this)); resourceVideo->setAnchorPoint(Vector2::ANCHOR_MIDDLE_RIGHT); resourceVideo->setPosition(Vector2(_visibleRect.origin.x + _visibleRect.size.width - 10,_visibleRect.origin.y + 50)); - auto onlineVideo = MenuItemFont::create("Play online video", CC_CALLBACK_1(VideoWidgetTest::menuOnlineVideoCallback, this)); + auto onlineVideo = MenuItemFont::create("Play online video", CC_CALLBACK_1(VideoPlayerTest::menuOnlineVideoCallback, this)); onlineVideo->setAnchorPoint(Vector2::ANCHOR_MIDDLE_RIGHT); onlineVideo->setPosition(Vector2(_visibleRect.origin.x + _visibleRect.size.width - 10,_visibleRect.origin.y + 100)); - auto ratioSwitch = MenuItemFont::create("KeepRatioSwitch", CC_CALLBACK_1(VideoWidgetTest::menuRatioCallback, this)); + auto ratioSwitch = MenuItemFont::create("KeepRatioSwitch", CC_CALLBACK_1(VideoPlayerTest::menuRatioCallback, this)); ratioSwitch->setAnchorPoint(Vector2::ANCHOR_MIDDLE_RIGHT); ratioSwitch->setPosition(Vector2(_visibleRect.origin.x + _visibleRect.size.width - 10,_visibleRect.origin.y + 150)); @@ -60,7 +60,7 @@ bool VideoWidgetTest::init() return true; } -void VideoWidgetTest::menuCloseCallback(Ref* sender) +void VideoPlayerTest::menuCloseCallback(Ref* sender) { Director::getInstance()->end(); @@ -69,88 +69,88 @@ void VideoWidgetTest::menuCloseCallback(Ref* sender) #endif } -void VideoWidgetTest::menuFullScreenCallback(Ref* sender) +void VideoPlayerTest::menuFullScreenCallback(Ref* sender) { - if (_videoWidget) + if (_videoPlayer) { - _videoWidget->setFullScreenEnabled(! _videoWidget->isFullScreenEnabled()); + _videoPlayer->setFullScreenEnabled(! _videoPlayer->isFullScreenEnabled()); } } -void VideoWidgetTest::menuRatioCallback(Ref* sender) +void VideoPlayerTest::menuRatioCallback(Ref* sender) { - if (_videoWidget) + if (_videoPlayer) { - _videoWidget->setKeepAspectRatioEnabled(! _videoWidget->isKeepAspectRatioEnabled()); + _videoPlayer->setKeepAspectRatioEnabled(! _videoPlayer->isKeepAspectRatioEnabled()); } } -void VideoWidgetTest::menuResourceVideoCallback(Ref* sender) +void VideoPlayerTest::menuResourceVideoCallback(Ref* sender) { - if (_videoWidget) + if (_videoPlayer) { - _videoWidget->setVideoFileName("cocosvideo.mp4"); - _videoWidget->startVideo(); + _videoPlayer->setVideoFileName("cocosvideo.mp4"); + _videoPlayer->startVideo(); } } -void VideoWidgetTest::menuOnlineVideoCallback(Ref* sender) +void VideoPlayerTest::menuOnlineVideoCallback(Ref* sender) { - if (_videoWidget) + if (_videoPlayer) { - _videoWidget->setVideoURL("http://video001.smgbb.cn/gslb/program/FDN/FDN1190949/HLSVodService.m3u8?_mdCode=6065719&_cdnCode=B2B_XL_TEST&_type=0&_rCode=TerOut_18865&_userId=020341000456068&_categoryCode=SMG_HUAYU&_categoryPath=SMG_1002,SMG_HUAYU,&_adPositionId=01001000&_adCategorySource=0&_flag=.m3u8&_enCode=m3u8&taskID=ysh_ps_002-ott_1397459105893_020341000456068&_client=103&_cms=ctv&_CDNToken=76C043FD4969501754DC19E54EC8DC2C"); - _videoWidget->startVideo(); + _videoPlayer->setVideoURL("http://video001.smgbb.cn/gslb/program/FDN/FDN1190949/HLSVodService.m3u8?_mdCode=6065719&_cdnCode=B2B_XL_TEST&_type=0&_rCode=TerOut_18865&_userId=020341000456068&_categoryCode=SMG_HUAYU&_categoryPath=SMG_1002,SMG_HUAYU,&_adPositionId=01001000&_adCategorySource=0&_flag=.m3u8&_enCode=m3u8&taskID=ysh_ps_002-ott_1397459105893_020341000456068&_client=103&_cms=ctv&_CDNToken=76C043FD4969501754DC19E54EC8DC2C"); + _videoPlayer->startVideo(); } } -void VideoWidgetTest::menuPauseCallback(Ref* sender) +void VideoPlayerTest::menuPauseCallback(Ref* sender) { - if (_videoWidget) + if (_videoPlayer) { - _videoWidget->pauseVideo(); + _videoPlayer->pauseVideo(); } } -void VideoWidgetTest::menuResumeCallback(Ref* sender) +void VideoPlayerTest::menuResumeCallback(Ref* sender) { - if (_videoWidget) + if (_videoPlayer) { - _videoWidget->resumeVideo(); + _videoPlayer->resumeVideo(); } } -void VideoWidgetTest::menuStopCallback(Ref* sender) +void VideoPlayerTest::menuStopCallback(Ref* sender) { - if (_videoWidget) + if (_videoPlayer) { - _videoWidget->stopVideo(); + _videoPlayer->stopVideo(); } } -void VideoWidgetTest::menuHintCallback(Ref* sender) +void VideoPlayerTest::menuHintCallback(Ref* sender) { - if (_videoWidget) + if (_videoPlayer) { - _videoWidget->setVisible(! _videoWidget->isVisible()); + _videoPlayer->setVisible(! _videoPlayer->isVisible()); } } -void VideoWidgetTest::createVideo() +void VideoPlayerTest::createVideo() { auto centerPos = Vector2(_visibleRect.origin.x + _visibleRect.size.width / 2,_visibleRect.origin.y + _visibleRect.size.height /2); auto widgetSize = _widget->getSize(); - _videoWidget = VideoWidget::create(); - _videoWidget->setPosition(centerPos); - _videoWidget->setAnchorPoint(Vector2::ANCHOR_MIDDLE); - _videoWidget->setContentSize(Size(widgetSize.width * 0.4f,widgetSize.height * 0.4f)); - _uiLayer->addChild(_videoWidget); + _videoPlayer = VideoPlayer::create(); + _videoPlayer->setPosition(centerPos); + _videoPlayer->setAnchorPoint(Vector2::ANCHOR_MIDDLE); + _videoPlayer->setContentSize(Size(widgetSize.width * 0.4f,widgetSize.height * 0.4f)); + _uiLayer->addChild(_videoPlayer); - _videoWidget->setEventListener(CC_CALLBACK_2(VideoWidgetTest::videoEventCallback, this)); + _videoPlayer->setEventListener(CC_CALLBACK_2(VideoPlayerTest::videoEventCallback, this)); } -void VideoWidgetTest::createSlider() +void VideoPlayerTest::createSlider() { auto centerPos = Vector2(_visibleRect.origin.x + _visibleRect.size.width / 2,_visibleRect.origin.y + _visibleRect.size.height /2); @@ -161,7 +161,7 @@ void VideoWidgetTest::createSlider() hSlider->loadProgressBarTexture("cocosui/sliderProgress.png"); hSlider->setPosition(Vector2(centerPos.x, _visibleRect.origin.y + _visibleRect.size.height * 0.15f)); hSlider->setPercent(50); - hSlider->addEventListenerSlider(this, sliderpercentchangedselector(VideoWidgetTest::sliderCallback)); + hSlider->addEventListenerSlider(this, sliderpercentchangedselector(VideoPlayerTest::sliderCallback)); _uiLayer->addChild(hSlider,0,1); auto vSlider = ui::Slider::create(); @@ -172,13 +172,13 @@ void VideoWidgetTest::createSlider() vSlider->setPosition(Vector2(_visibleRect.origin.x + _visibleRect.size.width * 0.15f, centerPos.y)); vSlider->setRotation(90); vSlider->setPercent(50); - vSlider->addEventListenerSlider(this, sliderpercentchangedselector(VideoWidgetTest::sliderCallback)); + vSlider->addEventListenerSlider(this, sliderpercentchangedselector(VideoPlayerTest::sliderCallback)); _uiLayer->addChild(vSlider,0,2); } -void VideoWidgetTest::sliderCallback(Ref *sender, ui::SliderEventType eventType) +void VideoPlayerTest::sliderCallback(Ref *sender, ui::SliderEventType eventType) { - if (eventType == SLIDER_PERCENTCHANGED && _videoWidget) + if (eventType == SLIDER_PERCENTCHANGED && _videoPlayer) { Slider* hSlider = (Slider*)this->getChildByTag(1); Slider* vSlider = (Slider*)this->getChildByTag(2); @@ -186,23 +186,23 @@ void VideoWidgetTest::sliderCallback(Ref *sender, ui::SliderEventType eventType) auto newPosX = _visibleRect.origin.x + _visibleRect.size.width / 2 + hSlider->getPercent() - 50; auto newPosY = _visibleRect.origin.y + _visibleRect.size.height / 2 + 50 - vSlider->getPercent(); - _videoWidget->setPosition(Vector2(newPosX,newPosY)); + _videoPlayer->setPosition(Vector2(newPosX,newPosY)); } } -void VideoWidgetTest::videoEventCallback(Ref* sender, VideoWidgetEvent eventType) +void VideoPlayerTest::videoEventCallback(Ref* sender, VideoPlayer::Event eventType) { switch (eventType) { - case VideoWidgetEvent::PLAYING: + case VideoPlayer::Event::PLAYING: _videoStateLabel->setString("PLAYING"); break; - case VideoWidgetEvent::PAUSED: + case VideoPlayer::Event::PAUSED: _videoStateLabel->setString("PAUSED"); break; - case VideoWidgetEvent::STOPPED: + case VideoPlayer::Event::STOPPED: _videoStateLabel->setString("STOPPED"); break; - case VideoWidgetEvent::COMPLETED: + case VideoPlayer::Event::COMPLETED: _videoStateLabel->setString("COMPLETED"); break; default: diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIVideoWidgetTest/UIVideoWidgetTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIVideoPlayerTest/UIVideoPlayerTest.h similarity index 74% rename from tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIVideoWidgetTest/UIVideoWidgetTest.h rename to tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIVideoPlayerTest/UIVideoPlayerTest.h index 063d398a4f..a587b5303c 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIVideoWidgetTest/UIVideoWidgetTest.h +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIVideoPlayerTest/UIVideoPlayerTest.h @@ -1,14 +1,14 @@ -#ifndef __tests__VideoWidgetTest__ -#define __tests__VideoWidgetTest__ +#ifndef __tests__VideoPlayerTest__ +#define __tests__VideoPlayerTest__ #include "../UIScene.h" USING_NS_CC; -class VideoWidgetTest : public UIScene +class VideoPlayerTest : public UIScene { public: - UI_SCENE_CREATE_FUNC(VideoWidgetTest); + UI_SCENE_CREATE_FUNC(VideoPlayerTest); virtual bool init(); @@ -26,14 +26,14 @@ public: void sliderCallback(Ref *sender, ui::SliderEventType eventType); - void videoEventCallback(Ref* sender, experimental::ui::VideoWidgetEvent eventType); + void videoEventCallback(Ref* sender, experimental::ui::VideoPlayer::Event eventType); private: void createVideo(); void createSlider(); MenuItemFont* _hintItem; - experimental::ui::VideoWidget* _videoWidget; + experimental::ui::VideoPlayer* _videoPlayer; Label* _videoStateLabel; Rect _visibleRect; @@ -41,4 +41,4 @@ private: }; -#endif // __tests__VideoWidgetTest__ +#endif // __tests__VideoPlayerTest__ From c904fff9eb3e53402e45aaf4704d78b546c139ee Mon Sep 17 00:00:00 2001 From: Dhilan007 Date: Fri, 9 May 2014 11:37:14 +0800 Subject: [PATCH 03/11] update XCode project.pbxproj --- build/cocos2d_libs.xcodeproj/project.pbxproj | 16 ++++++++-------- build/cocos2d_tests.xcodeproj/project.pbxproj | 18 +++++++++--------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj b/build/cocos2d_libs.xcodeproj/project.pbxproj index 6e77fd096a..9c1daa1267 100644 --- a/build/cocos2d_libs.xcodeproj/project.pbxproj +++ b/build/cocos2d_libs.xcodeproj/project.pbxproj @@ -1123,8 +1123,8 @@ 3E26D40518ACB5D100834404 /* CCImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E26D40418ACB5D100834404 /* CCImage.cpp */; }; 3E26D40618ACB5D100834404 /* CCImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E26D40418ACB5D100834404 /* CCImage.cpp */; }; 3E26D40818ACB63900834404 /* CCDevice.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3E26D40718ACB63900834404 /* CCDevice.mm */; }; - 3EA0FB5B191B92CC00B170C8 /* UIVideoWidget.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA0FB59191B92CC00B170C8 /* UIVideoWidget.h */; }; - 3EA0FB5C191B92CC00B170C8 /* UIVideoWidgetIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3EA0FB5A191B92CC00B170C8 /* UIVideoWidgetIOS.mm */; }; + 3EA0FB6B191C841D00B170C8 /* UIVideoPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA0FB69191C841D00B170C8 /* UIVideoPlayer.h */; }; + 3EA0FB6C191C841D00B170C8 /* UIVideoPlayerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3EA0FB6A191C841D00B170C8 /* UIVideoPlayerIOS.mm */; }; 460E468118080832000CDD6D /* cocos-ext.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A167D21807AF4D005B8026 /* cocos-ext.h */; }; 460E468218080836000CDD6D /* cocos-ext.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A167D21807AF4D005B8026 /* cocos-ext.h */; }; 460E477B180808F5000CDD6D /* ExtensionMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168321807AF4E005B8026 /* ExtensionMacros.h */; }; @@ -2316,8 +2316,8 @@ 37936A3E1869B76800E974DD /* writer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = writer.h; sourceTree = ""; }; 3E26D40418ACB5D100834404 /* CCImage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCImage.cpp; sourceTree = ""; }; 3E26D40718ACB63900834404 /* CCDevice.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCDevice.mm; sourceTree = ""; }; - 3EA0FB59191B92CC00B170C8 /* UIVideoWidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIVideoWidget.h; sourceTree = ""; }; - 3EA0FB5A191B92CC00B170C8 /* UIVideoWidgetIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UIVideoWidgetIOS.mm; sourceTree = ""; }; + 3EA0FB69191C841D00B170C8 /* UIVideoPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIVideoPlayer.h; sourceTree = ""; }; + 3EA0FB6A191C841D00B170C8 /* UIVideoPlayerIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UIVideoPlayerIOS.mm; sourceTree = ""; }; 46A15FCC1807A544005B8026 /* AUTHORS */ = {isa = PBXFileReference; lastKnownFileType = text; name = AUTHORS; path = ../AUTHORS; sourceTree = ""; }; 46A15FCE1807A544005B8026 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = text; name = README.md; path = ../README.md; sourceTree = ""; }; 46A15FE11807A56F005B8026 /* Export.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Export.h; sourceTree = ""; }; @@ -3977,8 +3977,8 @@ 2905F9E618CF08D000240AA3 /* ui */ = { isa = PBXGroup; children = ( - 3EA0FB59191B92CC00B170C8 /* UIVideoWidget.h */, - 3EA0FB5A191B92CC00B170C8 /* UIVideoWidgetIOS.mm */, + 3EA0FB69191C841D00B170C8 /* UIVideoPlayer.h */, + 3EA0FB6A191C841D00B170C8 /* UIVideoPlayerIOS.mm */, 2905F9E918CF08D000240AA3 /* CocosGUI.cpp */, 2905F9EA18CF08D000240AA3 /* CocosGUI.h */, 2905F9EB18CF08D000240AA3 /* GUIDefine.h */, @@ -5474,7 +5474,6 @@ 1A5701A0180BCB590088DEC7 /* CCFont.h in Headers */, 1A5701A4180BCB590088DEC7 /* CCFontAtlas.h in Headers */, 1A5701A8180BCB590088DEC7 /* CCFontAtlasCache.h in Headers */, - 3EA0FB5B191B92CC00B170C8 /* UIVideoWidget.h in Headers */, 500DC98919106300007B91BF /* CCNS.h in Headers */, 1A5701B4180BCB590088DEC7 /* CCFontFNT.h in Headers */, 1A5701B8180BCB5A0088DEC7 /* CCFontFreeType.h in Headers */, @@ -5618,6 +5617,7 @@ B2AF2FAC18EBAEAE00C5807C /* Vector4.h in Headers */, 5027253B190BF1B900AAF4ED /* cocos2d.h in Headers */, 1AD71DFC180E26E600808F54 /* CCNodeLoaderListener.h in Headers */, + 3EA0FB6B191C841D00B170C8 /* UIVideoPlayer.h in Headers */, 1AD71E00180E26E600808F54 /* CCParticleSystemQuadLoader.h in Headers */, 1AD71E04180E26E600808F54 /* CCScale9SpriteLoader.h in Headers */, 1AD71E08180E26E600808F54 /* CCScrollViewLoader.h in Headers */, @@ -6553,6 +6553,7 @@ 500DC92B19106300007B91BF /* atitc.cpp in Sources */, 46A170FE1807CECB005B8026 /* CCPhysicsContact.cpp in Sources */, 46A170391807CBFE005B8026 /* CCThread.cpp in Sources */, + 3EA0FB6C191C841D00B170C8 /* UIVideoPlayerIOS.mm in Sources */, 46A170421807CC07005B8026 /* CCGLView.mm in Sources */, 1A570062180BC5A10088DEC7 /* CCAction.cpp in Sources */, 1A570066180BC5A10088DEC7 /* CCActionCamera.cpp in Sources */, @@ -6564,7 +6565,6 @@ 50FCEB9818C72017004AD434 /* CheckBoxReader.cpp in Sources */, 1A570076180BC5A10088DEC7 /* CCActionGrid3D.cpp in Sources */, 500DC99D19106300007B91BF /* CCValue.cpp in Sources */, - 3EA0FB5C191B92CC00B170C8 /* UIVideoWidgetIOS.mm in Sources */, B37510851823ACA100B3BA6A /* CCPhysicsWorldInfo_chipmunk.cpp in Sources */, 1A57007A180BC5A10088DEC7 /* CCActionInstant.cpp in Sources */, 1A57007E180BC5A10088DEC7 /* CCActionInterval.cpp in Sources */, diff --git a/build/cocos2d_tests.xcodeproj/project.pbxproj b/build/cocos2d_tests.xcodeproj/project.pbxproj index 8042d5055b..52d75cef22 100644 --- a/build/cocos2d_tests.xcodeproj/project.pbxproj +++ b/build/cocos2d_tests.xcodeproj/project.pbxproj @@ -813,8 +813,8 @@ 29080DE5191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D8B191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.cpp */; }; 29080DE6191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D8B191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.cpp */; }; 3EA0FB5E191B92F100B170C8 /* cocosvideo.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 3EA0FB5D191B92F100B170C8 /* cocosvideo.mp4 */; }; - 3EA0FB64191B931500B170C8 /* UIVideoWidgetTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EA0FB62191B931500B170C8 /* UIVideoWidgetTest.cpp */; }; 3EA0FB66191B933000B170C8 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EA0FB65191B933000B170C8 /* MediaPlayer.framework */; }; + 3EA0FB72191C844400B170C8 /* UIVideoPlayerTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EA0FB70191C844400B170C8 /* UIVideoPlayerTest.cpp */; }; A05FCACA177C124500BE600E /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64822165F391E007D4F18 /* Cocoa.framework */; }; A07A521E1783A1D20073F6A7 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482E165F399D007D4F18 /* libz.dylib */; }; A07A521F1783A1D20073F6A7 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64832165F3AFD007D4F18 /* Foundation.framework */; }; @@ -1848,9 +1848,9 @@ 29080D8B191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIWidgetAddNodeTest_Editor.cpp; sourceTree = ""; }; 29080D8C191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIWidgetAddNodeTest_Editor.h; sourceTree = ""; }; 3EA0FB5D191B92F100B170C8 /* cocosvideo.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; name = cocosvideo.mp4; path = "../tests/cpp-tests/Resources/cocosvideo.mp4"; sourceTree = ""; }; - 3EA0FB62191B931500B170C8 /* UIVideoWidgetTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIVideoWidgetTest.cpp; sourceTree = ""; }; - 3EA0FB63191B931500B170C8 /* UIVideoWidgetTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIVideoWidgetTest.h; sourceTree = ""; }; 3EA0FB65191B933000B170C8 /* MediaPlayer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaPlayer.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/MediaPlayer.framework; sourceTree = DEVELOPER_DIR; }; + 3EA0FB70191C844400B170C8 /* UIVideoPlayerTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIVideoPlayerTest.cpp; sourceTree = ""; }; + 3EA0FB71191C844400B170C8 /* UIVideoPlayerTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIVideoPlayerTest.h; sourceTree = ""; }; 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = cocos2d_libs.xcodeproj; sourceTree = ""; }; A035A71117822E9E00987F6C /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; }; A07A52291783A1D20073F6A7 /* cpp-tests iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "cpp-tests iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -3471,7 +3471,7 @@ 29080D1E191B595E0066F8DF /* CocoStudioGUITest */ = { isa = PBXGroup; children = ( - 3EA0FB61191B931500B170C8 /* UIVideoWidgetTest */, + 3EA0FB6F191C844400B170C8 /* UIVideoPlayerTest */, 29080D1F191B595E0066F8DF /* CocosGUIScene.cpp */, 29080D20191B595E0066F8DF /* CocosGUIScene.h */, 29080D21191B595E0066F8DF /* CocoStudioGUITest.cpp */, @@ -3780,13 +3780,13 @@ name = Frameworks; sourceTree = ""; }; - 3EA0FB61191B931500B170C8 /* UIVideoWidgetTest */ = { + 3EA0FB6F191C844400B170C8 /* UIVideoPlayerTest */ = { isa = PBXGroup; children = ( - 3EA0FB62191B931500B170C8 /* UIVideoWidgetTest.cpp */, - 3EA0FB63191B931500B170C8 /* UIVideoWidgetTest.h */, + 3EA0FB70191C844400B170C8 /* UIVideoPlayerTest.cpp */, + 3EA0FB71191C844400B170C8 /* UIVideoPlayerTest.h */, ); - path = UIVideoWidgetTest; + path = UIVideoPlayerTest; sourceTree = ""; }; 46A15F9D1807A4F8005B8026 /* Products */ = { @@ -4795,7 +4795,6 @@ 1AC35B4218CECF0C00F37B72 /* QuestionContainerSprite.cpp in Sources */, 1AC35B6218CECF0C00F37B72 /* DrawPrimitivesTest.cpp in Sources */, 29080DDC191B595E0066F8DF /* UITextFieldTest.cpp in Sources */, - 3EA0FB64191B931500B170C8 /* UIVideoWidgetTest.cpp in Sources */, 1AC35C1818CECF0C00F37B72 /* MotionStreakTest.cpp in Sources */, 1AC35C0618CECF0C00F37B72 /* FontTest.cpp in Sources */, 1AC35C3818CECF0C00F37B72 /* PerformanceTest.cpp in Sources */, @@ -4849,6 +4848,7 @@ 1AC35C8618CECF1400F37B72 /* RootViewController.mm in Sources */, 1AC35C5C18CECF0C00F37B72 /* TileMapTest.cpp in Sources */, 29080DC2191B595E0066F8DF /* UIRichTextTest.cpp in Sources */, + 3EA0FB72191C844400B170C8 /* UIVideoPlayerTest.cpp in Sources */, 1AC35B4818CECF0C00F37B72 /* Bug-899.cpp in Sources */, 1AC35C1C18CECF0C00F37B72 /* NewEventDispatcherTest.cpp in Sources */, 1AC35C2E18CECF0C00F37B72 /* PerformanceNodeChildrenTest.cpp in Sources */, From 7d270cd1a1738b659095182127a3cf7b7e67e976 Mon Sep 17 00:00:00 2001 From: zhangbin Date: Fri, 9 May 2014 11:48:43 +0800 Subject: [PATCH 04/11] Update the reference of submodule cocos2d-console. --- tools/cocos2d-console | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cocos2d-console b/tools/cocos2d-console index 4dbfa174de..7876808788 160000 --- a/tools/cocos2d-console +++ b/tools/cocos2d-console @@ -1 +1 @@ -Subproject commit 4dbfa174debb2e98422510d7e0490b1ddb2a0b3d +Subproject commit 7876808788c0666d5f4510ea214e97e10eeaa9a8 From 224b0910c9dfbaeb279be286d8273be5b9de91ec Mon Sep 17 00:00:00 2001 From: CocosRobot Date: Fri, 9 May 2014 05:42:30 +0000 Subject: [PATCH 05/11] [AUTO][ci skip]: updating cocos2dx_files.json --- templates/cocos2dx_files.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/cocos2dx_files.json b/templates/cocos2dx_files.json index cd84c2aba2..287e5e013b 100644 --- a/templates/cocos2dx_files.json +++ b/templates/cocos2dx_files.json @@ -948,9 +948,9 @@ "cocos/ui/UITextField.h", "cocos/ui/UIVBox.cpp", "cocos/ui/UIVBox.h", - "cocos/ui/UIVideoWidget.h", - "cocos/ui/UIVideoWidgetAndroid.cpp", - "cocos/ui/UIVideoWidgetIOS.mm", + "cocos/ui/UIVideoPlayer.h", + "cocos/ui/UIVideoPlayerAndroid.cpp", + "cocos/ui/UIVideoPlayerIOS.mm", "cocos/ui/UIWidget.cpp", "cocos/ui/UIWidget.h", "cocos/ui/proj.win32/libGUI.vcxproj", From 70d7d5b493babdf9dda63ddfb11079d7140e02ca Mon Sep 17 00:00:00 2001 From: Mircea Rila Date: Fri, 9 May 2014 10:53:44 +0300 Subject: [PATCH 06/11] add VS2013 support for box2d, chipmunk --- external/Box2D/proj.win32/Box2D.vcxproj | 4 ++++ external/chipmunk/proj.win32/chipmunk.vcxproj | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/external/Box2D/proj.win32/Box2D.vcxproj b/external/Box2D/proj.win32/Box2D.vcxproj index ed59a2460d..60b7f280ea 100644 --- a/external/Box2D/proj.win32/Box2D.vcxproj +++ b/external/Box2D/proj.win32/Box2D.vcxproj @@ -23,6 +23,8 @@ v100 v110 v110_xp + v120 + v120_xp StaticLibrary @@ -30,6 +32,8 @@ v100 v110 v110_xp + v120 + v120_xp diff --git a/external/chipmunk/proj.win32/chipmunk.vcxproj b/external/chipmunk/proj.win32/chipmunk.vcxproj index 0cdc2e835b..2114cd34ec 100644 --- a/external/chipmunk/proj.win32/chipmunk.vcxproj +++ b/external/chipmunk/proj.win32/chipmunk.vcxproj @@ -22,13 +22,17 @@ v100 v110 v110_xp - + v120 + v120_xp + StaticLibrary Unicode v100 v110 v110_xp + v120 + v120_xp From ebfbf0eba3ca07913a5b19bf3e76a3e81984538b Mon Sep 17 00:00:00 2001 From: Mircea Rila Date: Fri, 9 May 2014 11:10:08 +0300 Subject: [PATCH 07/11] fix box2d win32 project --- external/Box2D/proj.win32/Box2D.vcxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/external/Box2D/proj.win32/Box2D.vcxproj b/external/Box2D/proj.win32/Box2D.vcxproj index 60b7f280ea..ba55486c3a 100644 --- a/external/Box2D/proj.win32/Box2D.vcxproj +++ b/external/Box2D/proj.win32/Box2D.vcxproj @@ -24,7 +24,7 @@ v110 v110_xp v120 - v120_xp + v120_xp StaticLibrary @@ -33,7 +33,7 @@ v110 v110_xp v120 - v120_xp + v120_xp From a986455e63cfb3e9b903149f6da43b19fe3a2e41 Mon Sep 17 00:00:00 2001 From: yangxiao Date: Fri, 9 May 2014 10:23:24 -0700 Subject: [PATCH 08/11] store useCache in GLProgramState --- cocos/renderer/CCGLProgramState.cpp | 10 ++++++++-- cocos/renderer/CCGLProgramState.h | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/cocos/renderer/CCGLProgramState.cpp b/cocos/renderer/CCGLProgramState.cpp index ef212b98bf..5e2b349f08 100644 --- a/cocos/renderer/CCGLProgramState.cpp +++ b/cocos/renderer/CCGLProgramState.cpp @@ -210,12 +210,14 @@ GLProgramState* GLProgramState::create(GLProgram *glprogram, bool useCache) if (useCache) { ret = GLProgramStateCache::getInstance()->getProgramState(glprogram); + ret->_useCache = useCache; } else { ret = new (std::nothrow) GLProgramState; if(!ret || !ret->init(glprogram)) CC_SAFE_RELEASE(ret); + ret->_useCache = useCache; } return ret; @@ -223,13 +225,17 @@ GLProgramState* GLProgramState::create(GLProgram *glprogram, bool useCache) GLProgramState::GLProgramState() : _vertexAttribsFlags(0) +, _useCache(false) +, _glprogram(nullptr) { } GLProgramState::~GLProgramState() { - GLProgramStateCache::getInstance()->removeProgramState(_glprogram); - _glprogram->release(); + if (_useCache) + GLProgramStateCache::getInstance()->removeProgramState(_glprogram); + + CC_SAFE_RELEASE(_glprogram); } bool GLProgramState::init(GLProgram* glprogram) diff --git a/cocos/renderer/CCGLProgramState.h b/cocos/renderer/CCGLProgramState.h index ee37f56635..97f4dc5a1c 100644 --- a/cocos/renderer/CCGLProgramState.h +++ b/cocos/renderer/CCGLProgramState.h @@ -170,6 +170,7 @@ protected: uint32_t _vertexAttribsFlags; GLProgram *_glprogram; + bool _useCache; }; NS_CC_END From 00834b1d6e5122c3f34d57ac5f0870fb9052d686 Mon Sep 17 00:00:00 2001 From: Ricardo Quesada Date: Fri, 9 May 2014 11:28:06 -0700 Subject: [PATCH 09/11] adds missing files for Windows --- cocos/2d/cocos2d.vcxproj.filters | 174 ++++++++++++++++++------------- cocos/renderer/ccGLStateCache.h | 2 + 2 files changed, 101 insertions(+), 75 deletions(-) diff --git a/cocos/2d/cocos2d.vcxproj.filters b/cocos/2d/cocos2d.vcxproj.filters index f60c30a84f..7a9c3e1061 100644 --- a/cocos/2d/cocos2d.vcxproj.filters +++ b/cocos/2d/cocos2d.vcxproj.filters @@ -61,9 +61,6 @@ {5b082c5c-d396-43ca-b3b1-997d0f6247d0} - - {163895ae-8a8e-46bf-bdf2-98bb2c1347fc} - {1179d205-d065-49f0-8457-bc4c3f1d0cb3} @@ -103,6 +100,9 @@ {02a21a86-8f65-441b-ae13-11dec1c45ee5} + + {406577df-e0cd-4148-8e00-9bc159e0a799} + @@ -291,18 +291,6 @@ platform - - shaders - - - shaders - - - shaders - - - shaders - sprite_nodes @@ -576,6 +564,21 @@ base + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + @@ -785,66 +788,6 @@ platform - - shaders - - - shaders - - - shaders - - - shaders - - - shaders - - - shaders - - - shaders - - - shaders - - - shaders - - - shaders - - - shaders - - - shaders - - - shaders - - - shaders - - - shaders - - - shaders - - - shaders - - - shaders - - - shaders - - - shaders - sprite_nodes @@ -1166,6 +1109,87 @@ base + + renderer\Shaders + + + renderer\Shaders + + + renderer\Shaders + + + renderer\Shaders + + + renderer\Shaders + + + renderer\Shaders + + + renderer\Shaders + + + renderer\Shaders + + + renderer\Shaders + + + renderer\Shaders + + + renderer\Shaders + + + renderer\Shaders + + + renderer\Shaders + + + renderer\Shaders + + + renderer\Shaders + + + renderer\Shaders + + + renderer\Shaders + + + renderer\Shaders + + + renderer\Shaders + + + renderer\Shaders + + + renderer\Shaders + + + renderer\Shaders + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + diff --git a/cocos/renderer/ccGLStateCache.h b/cocos/renderer/ccGLStateCache.h index dcc3cb0ec9..77cd03127e 100644 --- a/cocos/renderer/ccGLStateCache.h +++ b/cocos/renderer/ccGLStateCache.h @@ -28,6 +28,8 @@ THE SOFTWARE. #ifndef __CCGLSTATE_H__ #define __CCGLSTATE_H__ +#include + #include "CCGL.h" #include "base/CCPlatformMacros.h" From 8565e899f97cec72e83384826529163bf1081c57 Mon Sep 17 00:00:00 2001 From: Ricardo Quesada Date: Fri, 9 May 2014 11:38:43 -0700 Subject: [PATCH 10/11] adds missing files to VisualStudio --- cocos/2d/cocos2d.vcxproj | 34 ++++++++++++++++++++++ cocos/2d/cocos2d.vcxproj.filters | 50 +++++++++++++++++++++++++------- 2 files changed, 74 insertions(+), 10 deletions(-) diff --git a/cocos/2d/cocos2d.vcxproj b/cocos/2d/cocos2d.vcxproj index 511c5d4659..5ce0071f9e 100644 --- a/cocos/2d/cocos2d.vcxproj +++ b/cocos/2d/cocos2d.vcxproj @@ -234,10 +234,16 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + + + + + + @@ -410,11 +416,39 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cocos/2d/cocos2d.vcxproj.filters b/cocos/2d/cocos2d.vcxproj.filters index 7a9c3e1061..1c5ff71669 100644 --- a/cocos/2d/cocos2d.vcxproj.filters +++ b/cocos/2d/cocos2d.vcxproj.filters @@ -564,10 +564,11 @@ base - - renderer - - + + + + + renderer @@ -579,6 +580,12 @@ renderer + + renderer + + + renderer + @@ -1109,6 +1116,29 @@ base + + + + + + + + + + + + + + + + + + + + + + renderer + renderer\Shaders @@ -1175,12 +1205,6 @@ renderer\Shaders - - renderer - - - renderer - renderer @@ -1190,6 +1214,12 @@ renderer + + renderer + + + renderer + From 6727c6d19cacb5fb819c1be39d2afcf84b3d3996 Mon Sep 17 00:00:00 2001 From: Ricardo Quesada Date: Fri, 9 May 2014 11:45:12 -0700 Subject: [PATCH 11/11] Adds missing files to xcode --- build/cocos2d_libs.xcodeproj/project.pbxproj | 400 ++++++++++--------- 1 file changed, 212 insertions(+), 188 deletions(-) diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj b/build/cocos2d_libs.xcodeproj/project.pbxproj index 9c1daa1267..33a32c6c8e 100644 --- a/build/cocos2d_libs.xcodeproj/project.pbxproj +++ b/build/cocos2d_libs.xcodeproj/project.pbxproj @@ -278,44 +278,6 @@ 1A570235180BCC4D0088DEC7 /* CCScriptSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570232180BCC4D0088DEC7 /* CCScriptSupport.cpp */; }; 1A570236180BCC4D0088DEC7 /* CCScriptSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570233180BCC4D0088DEC7 /* CCScriptSupport.h */; }; 1A570237180BCC4D0088DEC7 /* CCScriptSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570233180BCC4D0088DEC7 /* CCScriptSupport.h */; }; - 1A57024D180BCC6F0088DEC7 /* ccShader_Position_uColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570239180BCC6F0088DEC7 /* ccShader_Position_uColor_frag.h */; }; - 1A57024E180BCC6F0088DEC7 /* ccShader_Position_uColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570239180BCC6F0088DEC7 /* ccShader_Position_uColor_frag.h */; }; - 1A57024F180BCC6F0088DEC7 /* ccShader_Position_uColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57023A180BCC6F0088DEC7 /* ccShader_Position_uColor_vert.h */; }; - 1A570250180BCC6F0088DEC7 /* ccShader_Position_uColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57023A180BCC6F0088DEC7 /* ccShader_Position_uColor_vert.h */; }; - 1A570251180BCC6F0088DEC7 /* ccShader_PositionColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57023B180BCC6F0088DEC7 /* ccShader_PositionColor_frag.h */; }; - 1A570252180BCC6F0088DEC7 /* ccShader_PositionColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57023B180BCC6F0088DEC7 /* ccShader_PositionColor_frag.h */; }; - 1A570253180BCC6F0088DEC7 /* ccShader_PositionColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57023C180BCC6F0088DEC7 /* ccShader_PositionColor_vert.h */; }; - 1A570254180BCC6F0088DEC7 /* ccShader_PositionColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57023C180BCC6F0088DEC7 /* ccShader_PositionColor_vert.h */; }; - 1A570255180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57023D180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_frag.h */; }; - 1A570256180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57023D180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_frag.h */; }; - 1A570257180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57023E180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_vert.h */; }; - 1A570258180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57023E180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_vert.h */; }; - 1A570259180BCC6F0088DEC7 /* ccShader_PositionTexture_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57023F180BCC6F0088DEC7 /* ccShader_PositionTexture_frag.h */; }; - 1A57025A180BCC6F0088DEC7 /* ccShader_PositionTexture_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57023F180BCC6F0088DEC7 /* ccShader_PositionTexture_frag.h */; }; - 1A57025B180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570240180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_frag.h */; }; - 1A57025C180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570240180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_frag.h */; }; - 1A57025D180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570241180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_vert.h */; }; - 1A57025E180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570241180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_vert.h */; }; - 1A57025F180BCC6F0088DEC7 /* ccShader_PositionTexture_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570242180BCC6F0088DEC7 /* ccShader_PositionTexture_vert.h */; }; - 1A570260180BCC6F0088DEC7 /* ccShader_PositionTexture_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570242180BCC6F0088DEC7 /* ccShader_PositionTexture_vert.h */; }; - 1A570261180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570243180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_frag.h */; }; - 1A570262180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570243180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_frag.h */; }; - 1A570263180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570244180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_vert.h */; }; - 1A570264180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570244180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_vert.h */; }; - 1A570265180BCC6F0088DEC7 /* ccShader_PositionTextureColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570245180BCC6F0088DEC7 /* ccShader_PositionTextureColor_frag.h */; }; - 1A570266180BCC6F0088DEC7 /* ccShader_PositionTextureColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570245180BCC6F0088DEC7 /* ccShader_PositionTextureColor_frag.h */; }; - 1A570267180BCC6F0088DEC7 /* ccShader_PositionTextureColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570246180BCC6F0088DEC7 /* ccShader_PositionTextureColor_vert.h */; }; - 1A570268180BCC6F0088DEC7 /* ccShader_PositionTextureColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570246180BCC6F0088DEC7 /* ccShader_PositionTextureColor_vert.h */; }; - 1A570269180BCC6F0088DEC7 /* ccShader_PositionTextureColorAlphaTest_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570247180BCC6F0088DEC7 /* ccShader_PositionTextureColorAlphaTest_frag.h */; }; - 1A57026A180BCC6F0088DEC7 /* ccShader_PositionTextureColorAlphaTest_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570247180BCC6F0088DEC7 /* ccShader_PositionTextureColorAlphaTest_frag.h */; }; - 1A57026B180BCC6F0088DEC7 /* CCShaderCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570248180BCC6F0088DEC7 /* CCShaderCache.cpp */; }; - 1A57026C180BCC6F0088DEC7 /* CCShaderCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570248180BCC6F0088DEC7 /* CCShaderCache.cpp */; }; - 1A57026D180BCC6F0088DEC7 /* CCShaderCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570249180BCC6F0088DEC7 /* CCShaderCache.h */; }; - 1A57026E180BCC6F0088DEC7 /* CCShaderCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570249180BCC6F0088DEC7 /* CCShaderCache.h */; }; - 1A570271180BCC6F0088DEC7 /* ccShaders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A57024B180BCC6F0088DEC7 /* ccShaders.cpp */; }; - 1A570272180BCC6F0088DEC7 /* ccShaders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A57024B180BCC6F0088DEC7 /* ccShaders.cpp */; }; - 1A570273180BCC6F0088DEC7 /* ccShaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57024C180BCC6F0088DEC7 /* ccShaders.h */; }; - 1A570274180BCC6F0088DEC7 /* ccShaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57024C180BCC6F0088DEC7 /* ccShaders.h */; }; 1A57027E180BCC900088DEC7 /* CCSprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570276180BCC900088DEC7 /* CCSprite.cpp */; }; 1A57027F180BCC900088DEC7 /* CCSprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570276180BCC900088DEC7 /* CCSprite.cpp */; }; 1A570280180BCC900088DEC7 /* CCSprite.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570277180BCC900088DEC7 /* CCSprite.h */; }; @@ -449,14 +411,6 @@ 1A5703BB180BD2800088DEC7 /* libwebp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A5703BA180BD2800088DEC7 /* libwebp.a */; }; 1A57052B180BD31F0088DEC7 /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A57052A180BD31F0088DEC7 /* libfreetype.a */; }; 1A57052E180BD3280088DEC7 /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A57052D180BD3280088DEC7 /* libfreetype.a */; }; - 1A570533180BD9500088DEC7 /* CCGLProgram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A57052F180BD9500088DEC7 /* CCGLProgram.cpp */; }; - 1A570534180BD9500088DEC7 /* CCGLProgram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A57052F180BD9500088DEC7 /* CCGLProgram.cpp */; }; - 1A570535180BD9500088DEC7 /* CCGLProgram.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570530180BD9500088DEC7 /* CCGLProgram.h */; }; - 1A570536180BD9500088DEC7 /* CCGLProgram.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570530180BD9500088DEC7 /* CCGLProgram.h */; }; - 1A570537180BD9500088DEC7 /* ccGLStateCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570531180BD9500088DEC7 /* ccGLStateCache.cpp */; }; - 1A570538180BD9500088DEC7 /* ccGLStateCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570531180BD9500088DEC7 /* ccGLStateCache.cpp */; }; - 1A570539180BD9500088DEC7 /* ccGLStateCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570532180BD9500088DEC7 /* ccGLStateCache.h */; }; - 1A57053A180BD9500088DEC7 /* ccGLStateCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570532180BD9500088DEC7 /* ccGLStateCache.h */; }; 1A8C598B180E930E00EF57C3 /* CCActionFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5948180E930E00EF57C3 /* CCActionFrame.cpp */; }; 1A8C598C180E930E00EF57C3 /* CCActionFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5948180E930E00EF57C3 /* CCActionFrame.cpp */; }; 1A8C598D180E930E00EF57C3 /* CCActionFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5949180E930E00EF57C3 /* CCActionFrame.h */; }; @@ -596,16 +550,6 @@ 1A9DCA2E180E6955007A3AD4 /* CCProtocols.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9DCA05180E6955007A3AD4 /* CCProtocols.h */; }; 1A9DCA3B180E6955007A3AD4 /* firePngData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9DCA0C180E6955007A3AD4 /* firePngData.h */; }; 1A9DCA3C180E6955007A3AD4 /* firePngData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9DCA0C180E6955007A3AD4 /* firePngData.h */; }; - 1AA95FDE18EBB8EF00AE7485 /* ccShader_Label_frag_df_glow.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA95FD918EBB8EF00AE7485 /* ccShader_Label_frag_df_glow.h */; }; - 1AA95FDF18EBB8EF00AE7485 /* ccShader_Label_frag_df_glow.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA95FD918EBB8EF00AE7485 /* ccShader_Label_frag_df_glow.h */; }; - 1AA95FE018EBB8EF00AE7485 /* ccShader_Label_frag_df.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA95FDA18EBB8EF00AE7485 /* ccShader_Label_frag_df.h */; }; - 1AA95FE118EBB8EF00AE7485 /* ccShader_Label_frag_df.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA95FDA18EBB8EF00AE7485 /* ccShader_Label_frag_df.h */; }; - 1AA95FE218EBB8EF00AE7485 /* ccShader_Label_frag_normal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA95FDB18EBB8EF00AE7485 /* ccShader_Label_frag_normal.h */; }; - 1AA95FE318EBB8EF00AE7485 /* ccShader_Label_frag_normal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA95FDB18EBB8EF00AE7485 /* ccShader_Label_frag_normal.h */; }; - 1AA95FE418EBB8EF00AE7485 /* ccShader_Label_frag_outline.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA95FDC18EBB8EF00AE7485 /* ccShader_Label_frag_outline.h */; }; - 1AA95FE518EBB8EF00AE7485 /* ccShader_Label_frag_outline.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA95FDC18EBB8EF00AE7485 /* ccShader_Label_frag_outline.h */; }; - 1AA95FE618EBB8EF00AE7485 /* ccShader_Label_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA95FDD18EBB8EF00AE7485 /* ccShader_Label_vert.h */; }; - 1AA95FE718EBB8EF00AE7485 /* ccShader_Label_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA95FDD18EBB8EF00AE7485 /* ccShader_Label_vert.h */; }; 1AAF528B180E2ECC000584C8 /* b2BroadPhase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A168B61807AF9C005B8026 /* b2BroadPhase.cpp */; }; 1AAF528C180E2ECC000584C8 /* b2BroadPhase.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168B71807AF9C005B8026 /* b2BroadPhase.h */; }; 1AAF528D180E2ECC000584C8 /* b2CollideCircle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A168B81807AF9C005B8026 /* b2CollideCircle.cpp */; }; @@ -1614,6 +1558,74 @@ 5027253B190BF1B900AAF4ED /* cocos2d.h in Headers */ = {isa = PBXBuildFile; fileRef = 50272538190BF1B900AAF4ED /* cocos2d.h */; }; 5027253C190BF1B900AAF4ED /* cocos2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50272539190BF1B900AAF4ED /* cocos2d.cpp */; }; 5027253D190BF1B900AAF4ED /* cocos2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50272539190BF1B900AAF4ED /* cocos2d.cpp */; }; + 5034CA19191D591000CE6051 /* ccShaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9F7191D591000CE6051 /* ccShaders.h */; }; + 5034CA1A191D591100CE6051 /* ccShaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9F7191D591000CE6051 /* ccShaders.h */; }; + 5034CA1B191D591100CE6051 /* ccShaders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034C9F8191D591000CE6051 /* ccShaders.cpp */; }; + 5034CA1C191D591100CE6051 /* ccShaders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034C9F8191D591000CE6051 /* ccShaders.cpp */; }; + 5034CA1D191D591100CE6051 /* CCShaderCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9F9191D591000CE6051 /* CCShaderCache.h */; }; + 5034CA1E191D591100CE6051 /* CCShaderCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9F9191D591000CE6051 /* CCShaderCache.h */; }; + 5034CA1F191D591100CE6051 /* CCShaderCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034C9FA191D591000CE6051 /* CCShaderCache.cpp */; }; + 5034CA20191D591100CE6051 /* CCShaderCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034C9FA191D591000CE6051 /* CCShaderCache.cpp */; }; + 5034CA21191D591100CE6051 /* ccShader_PositionTextureColorAlphaTest_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9FB191D591000CE6051 /* ccShader_PositionTextureColorAlphaTest_frag.h */; }; + 5034CA22191D591100CE6051 /* ccShader_PositionTextureColorAlphaTest_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9FB191D591000CE6051 /* ccShader_PositionTextureColorAlphaTest_frag.h */; }; + 5034CA23191D591100CE6051 /* ccShader_PositionTextureColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9FC191D591000CE6051 /* ccShader_PositionTextureColor_vert.h */; }; + 5034CA24191D591100CE6051 /* ccShader_PositionTextureColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9FC191D591000CE6051 /* ccShader_PositionTextureColor_vert.h */; }; + 5034CA25191D591100CE6051 /* ccShader_PositionTextureColor_noMVP_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9FD191D591000CE6051 /* ccShader_PositionTextureColor_noMVP_vert.h */; }; + 5034CA26191D591100CE6051 /* ccShader_PositionTextureColor_noMVP_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9FD191D591000CE6051 /* ccShader_PositionTextureColor_noMVP_vert.h */; }; + 5034CA27191D591100CE6051 /* ccShader_PositionTextureColor_noMVP_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9FE191D591000CE6051 /* ccShader_PositionTextureColor_noMVP_frag.h */; }; + 5034CA28191D591100CE6051 /* ccShader_PositionTextureColor_noMVP_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9FE191D591000CE6051 /* ccShader_PositionTextureColor_noMVP_frag.h */; }; + 5034CA29191D591100CE6051 /* ccShader_PositionTextureColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9FF191D591000CE6051 /* ccShader_PositionTextureColor_frag.h */; }; + 5034CA2A191D591100CE6051 /* ccShader_PositionTextureColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9FF191D591000CE6051 /* ccShader_PositionTextureColor_frag.h */; }; + 5034CA2B191D591100CE6051 /* ccShader_PositionTextureA8Color_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA00191D591000CE6051 /* ccShader_PositionTextureA8Color_vert.h */; }; + 5034CA2C191D591100CE6051 /* ccShader_PositionTextureA8Color_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA00191D591000CE6051 /* ccShader_PositionTextureA8Color_vert.h */; }; + 5034CA2D191D591100CE6051 /* ccShader_PositionTextureA8Color_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA01191D591000CE6051 /* ccShader_PositionTextureA8Color_frag.h */; }; + 5034CA2E191D591100CE6051 /* ccShader_PositionTextureA8Color_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA01191D591000CE6051 /* ccShader_PositionTextureA8Color_frag.h */; }; + 5034CA2F191D591100CE6051 /* ccShader_PositionTexture_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA02191D591000CE6051 /* ccShader_PositionTexture_vert.h */; }; + 5034CA30191D591100CE6051 /* ccShader_PositionTexture_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA02191D591000CE6051 /* ccShader_PositionTexture_vert.h */; }; + 5034CA31191D591100CE6051 /* ccShader_PositionTexture_uColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA03191D591000CE6051 /* ccShader_PositionTexture_uColor_vert.h */; }; + 5034CA32191D591100CE6051 /* ccShader_PositionTexture_uColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA03191D591000CE6051 /* ccShader_PositionTexture_uColor_vert.h */; }; + 5034CA33191D591100CE6051 /* ccShader_PositionTexture_uColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA04191D591000CE6051 /* ccShader_PositionTexture_uColor_frag.h */; }; + 5034CA34191D591100CE6051 /* ccShader_PositionTexture_uColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA04191D591000CE6051 /* ccShader_PositionTexture_uColor_frag.h */; }; + 5034CA35191D591100CE6051 /* ccShader_PositionTexture_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA05191D591000CE6051 /* ccShader_PositionTexture_frag.h */; }; + 5034CA36191D591100CE6051 /* ccShader_PositionTexture_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA05191D591000CE6051 /* ccShader_PositionTexture_frag.h */; }; + 5034CA37191D591100CE6051 /* ccShader_PositionColorLengthTexture_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA06191D591000CE6051 /* ccShader_PositionColorLengthTexture_vert.h */; }; + 5034CA38191D591100CE6051 /* ccShader_PositionColorLengthTexture_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA06191D591000CE6051 /* ccShader_PositionColorLengthTexture_vert.h */; }; + 5034CA39191D591100CE6051 /* ccShader_PositionColorLengthTexture_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA07191D591000CE6051 /* ccShader_PositionColorLengthTexture_frag.h */; }; + 5034CA3A191D591100CE6051 /* ccShader_PositionColorLengthTexture_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA07191D591000CE6051 /* ccShader_PositionColorLengthTexture_frag.h */; }; + 5034CA3B191D591100CE6051 /* ccShader_PositionColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA08191D591000CE6051 /* ccShader_PositionColor_vert.h */; }; + 5034CA3C191D591100CE6051 /* ccShader_PositionColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA08191D591000CE6051 /* ccShader_PositionColor_vert.h */; }; + 5034CA3D191D591100CE6051 /* ccShader_PositionColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA09191D591000CE6051 /* ccShader_PositionColor_frag.h */; }; + 5034CA3E191D591100CE6051 /* ccShader_PositionColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA09191D591000CE6051 /* ccShader_PositionColor_frag.h */; }; + 5034CA3F191D591100CE6051 /* ccShader_Position_uColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0A191D591000CE6051 /* ccShader_Position_uColor_vert.h */; }; + 5034CA40191D591100CE6051 /* ccShader_Position_uColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0A191D591000CE6051 /* ccShader_Position_uColor_vert.h */; }; + 5034CA41191D591100CE6051 /* ccShader_Position_uColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0B191D591000CE6051 /* ccShader_Position_uColor_frag.h */; }; + 5034CA42191D591100CE6051 /* ccShader_Position_uColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0B191D591000CE6051 /* ccShader_Position_uColor_frag.h */; }; + 5034CA43191D591100CE6051 /* ccShader_Label_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0C191D591000CE6051 /* ccShader_Label_vert.h */; }; + 5034CA44191D591100CE6051 /* ccShader_Label_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0C191D591000CE6051 /* ccShader_Label_vert.h */; }; + 5034CA45191D591100CE6051 /* ccShader_Label_frag_outline.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0D191D591000CE6051 /* ccShader_Label_frag_outline.h */; }; + 5034CA46191D591100CE6051 /* ccShader_Label_frag_outline.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0D191D591000CE6051 /* ccShader_Label_frag_outline.h */; }; + 5034CA47191D591100CE6051 /* ccShader_Label_frag_normal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0E191D591000CE6051 /* ccShader_Label_frag_normal.h */; }; + 5034CA48191D591100CE6051 /* ccShader_Label_frag_normal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0E191D591000CE6051 /* ccShader_Label_frag_normal.h */; }; + 5034CA49191D591100CE6051 /* ccShader_Label_frag_df.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0F191D591000CE6051 /* ccShader_Label_frag_df.h */; }; + 5034CA4A191D591100CE6051 /* ccShader_Label_frag_df.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0F191D591000CE6051 /* ccShader_Label_frag_df.h */; }; + 5034CA4B191D591100CE6051 /* ccShader_Label_frag_df_glow.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA10191D591000CE6051 /* ccShader_Label_frag_df_glow.h */; }; + 5034CA4C191D591100CE6051 /* ccShader_Label_frag_df_glow.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA10191D591000CE6051 /* ccShader_Label_frag_df_glow.h */; }; + 5034CA4D191D591100CE6051 /* ccGLStateCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA11191D591000CE6051 /* ccGLStateCache.h */; }; + 5034CA4E191D591100CE6051 /* ccGLStateCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA11191D591000CE6051 /* ccGLStateCache.h */; }; + 5034CA4F191D591100CE6051 /* ccGLStateCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034CA12191D591000CE6051 /* ccGLStateCache.cpp */; }; + 5034CA50191D591100CE6051 /* ccGLStateCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034CA12191D591000CE6051 /* ccGLStateCache.cpp */; }; + 5034CA51191D591100CE6051 /* CCGLProgramStateCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA13191D591000CE6051 /* CCGLProgramStateCache.h */; }; + 5034CA52191D591100CE6051 /* CCGLProgramStateCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA13191D591000CE6051 /* CCGLProgramStateCache.h */; }; + 5034CA53191D591100CE6051 /* CCGLProgramStateCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034CA14191D591000CE6051 /* CCGLProgramStateCache.cpp */; }; + 5034CA54191D591100CE6051 /* CCGLProgramStateCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034CA14191D591000CE6051 /* CCGLProgramStateCache.cpp */; }; + 5034CA55191D591100CE6051 /* CCGLProgramState.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA15191D591000CE6051 /* CCGLProgramState.h */; }; + 5034CA56191D591100CE6051 /* CCGLProgramState.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA15191D591000CE6051 /* CCGLProgramState.h */; }; + 5034CA57191D591100CE6051 /* CCGLProgramState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034CA16191D591000CE6051 /* CCGLProgramState.cpp */; }; + 5034CA58191D591100CE6051 /* CCGLProgramState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034CA16191D591000CE6051 /* CCGLProgramState.cpp */; }; + 5034CA59191D591100CE6051 /* CCGLProgram.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA17191D591000CE6051 /* CCGLProgram.h */; }; + 5034CA5A191D591100CE6051 /* CCGLProgram.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA17191D591000CE6051 /* CCGLProgram.h */; }; + 5034CA5B191D591100CE6051 /* CCGLProgram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034CA18191D591000CE6051 /* CCGLProgram.cpp */; }; + 5034CA5C191D591100CE6051 /* CCGLProgram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034CA18191D591000CE6051 /* CCGLProgram.cpp */; }; 50E6D30E18DADB5D0051CA34 /* CCProtectedNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D30C18DADB5D0051CA34 /* CCProtectedNode.cpp */; }; 50E6D30F18DADB5D0051CA34 /* CCProtectedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E6D30D18DADB5D0051CA34 /* CCProtectedNode.h */; }; 50E6D31018DAF01A0051CA34 /* CCProtectedNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D30C18DADB5D0051CA34 /* CCProtectedNode.cpp */; }; @@ -1688,10 +1700,6 @@ 50FCEBCA18C72017004AD434 /* WidgetReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB9118C72017004AD434 /* WidgetReader.h */; }; 50FCEBCB18C72017004AD434 /* WidgetReaderProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB9218C72017004AD434 /* WidgetReaderProtocol.h */; }; 50FCEBCC18C72017004AD434 /* WidgetReaderProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB9218C72017004AD434 /* WidgetReaderProtocol.h */; }; - A023FA34185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = A023FA32185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_frag.h */; }; - A023FA35185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = A023FA32185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_frag.h */; }; - A023FA36185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = A023FA33185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_vert.h */; }; - A023FA37185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = A023FA33185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_vert.h */; }; A04583F2189053B500E32FE8 /* CCGLView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A04583F0189053B500E32FE8 /* CCGLView.cpp */; }; A04583F3189053B500E32FE8 /* CCGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = A04583F1189053B500E32FE8 /* CCGLView.h */; }; A07A4CAF1783777C0073F6A7 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1551A342158F2AB200E66CFE /* Foundation.framework */; }; @@ -1964,25 +1972,6 @@ 1A570220180BCC1A0088DEC7 /* CCParticleSystemQuad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCParticleSystemQuad.h; sourceTree = ""; }; 1A570232180BCC4D0088DEC7 /* CCScriptSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCScriptSupport.cpp; sourceTree = ""; }; 1A570233180BCC4D0088DEC7 /* CCScriptSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCScriptSupport.h; sourceTree = ""; }; - 1A570239180BCC6F0088DEC7 /* ccShader_Position_uColor_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Position_uColor_frag.h; sourceTree = ""; }; - 1A57023A180BCC6F0088DEC7 /* ccShader_Position_uColor_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Position_uColor_vert.h; sourceTree = ""; }; - 1A57023B180BCC6F0088DEC7 /* ccShader_PositionColor_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionColor_frag.h; sourceTree = ""; }; - 1A57023C180BCC6F0088DEC7 /* ccShader_PositionColor_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionColor_vert.h; sourceTree = ""; }; - 1A57023D180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionColorLengthTexture_frag.h; sourceTree = ""; }; - 1A57023E180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionColorLengthTexture_vert.h; sourceTree = ""; }; - 1A57023F180BCC6F0088DEC7 /* ccShader_PositionTexture_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTexture_frag.h; sourceTree = ""; }; - 1A570240180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTexture_uColor_frag.h; sourceTree = ""; }; - 1A570241180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTexture_uColor_vert.h; sourceTree = ""; }; - 1A570242180BCC6F0088DEC7 /* ccShader_PositionTexture_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTexture_vert.h; sourceTree = ""; }; - 1A570243180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureA8Color_frag.h; sourceTree = ""; }; - 1A570244180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureA8Color_vert.h; sourceTree = ""; }; - 1A570245180BCC6F0088DEC7 /* ccShader_PositionTextureColor_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureColor_frag.h; sourceTree = ""; }; - 1A570246180BCC6F0088DEC7 /* ccShader_PositionTextureColor_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureColor_vert.h; sourceTree = ""; }; - 1A570247180BCC6F0088DEC7 /* ccShader_PositionTextureColorAlphaTest_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureColorAlphaTest_frag.h; sourceTree = ""; }; - 1A570248180BCC6F0088DEC7 /* CCShaderCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCShaderCache.cpp; sourceTree = ""; }; - 1A570249180BCC6F0088DEC7 /* CCShaderCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCShaderCache.h; sourceTree = ""; }; - 1A57024B180BCC6F0088DEC7 /* ccShaders.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ccShaders.cpp; sourceTree = ""; }; - 1A57024C180BCC6F0088DEC7 /* ccShaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShaders.h; sourceTree = ""; }; 1A570276180BCC900088DEC7 /* CCSprite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = CCSprite.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; 1A570277180BCC900088DEC7 /* CCSprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCSprite.h; sourceTree = ""; }; 1A570278180BCC900088DEC7 /* CCSpriteBatchNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCSpriteBatchNode.cpp; sourceTree = ""; }; @@ -2055,10 +2044,6 @@ 1A5703BA180BD2800088DEC7 /* libwebp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libwebp.a; sourceTree = ""; }; 1A57052A180BD31F0088DEC7 /* libfreetype.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libfreetype.a; sourceTree = ""; }; 1A57052D180BD3280088DEC7 /* libfreetype.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libfreetype.a; sourceTree = ""; }; - 1A57052F180BD9500088DEC7 /* CCGLProgram.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLProgram.cpp; sourceTree = ""; }; - 1A570530180BD9500088DEC7 /* CCGLProgram.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgram.h; sourceTree = ""; }; - 1A570531180BD9500088DEC7 /* ccGLStateCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ccGLStateCache.cpp; sourceTree = ""; }; - 1A570532180BD9500088DEC7 /* ccGLStateCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccGLStateCache.h; sourceTree = ""; }; 1A57FFF7180BC5160088DEC7 /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; lineEnding = 0; name = CHANGELOG; path = ../CHANGELOG; sourceTree = ""; }; 1A8C5948180E930E00EF57C3 /* CCActionFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCActionFrame.cpp; sourceTree = ""; }; 1A8C5949180E930E00EF57C3 /* CCActionFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCActionFrame.h; sourceTree = ""; }; @@ -2129,11 +2114,6 @@ 1A9DCA03180E6955007A3AD4 /* CCGLBufferedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLBufferedNode.h; sourceTree = ""; }; 1A9DCA05180E6955007A3AD4 /* CCProtocols.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCProtocols.h; sourceTree = ""; }; 1A9DCA0C180E6955007A3AD4 /* firePngData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = firePngData.h; sourceTree = ""; }; - 1AA95FD918EBB8EF00AE7485 /* ccShader_Label_frag_df_glow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Label_frag_df_glow.h; sourceTree = ""; }; - 1AA95FDA18EBB8EF00AE7485 /* ccShader_Label_frag_df.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Label_frag_df.h; sourceTree = ""; }; - 1AA95FDB18EBB8EF00AE7485 /* ccShader_Label_frag_normal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Label_frag_normal.h; sourceTree = ""; }; - 1AA95FDC18EBB8EF00AE7485 /* ccShader_Label_frag_outline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Label_frag_outline.h; sourceTree = ""; }; - 1AA95FDD18EBB8EF00AE7485 /* ccShader_Label_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Label_vert.h; sourceTree = ""; }; 1AAF5351180E3060000584C8 /* AssetsManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AssetsManager.cpp; sourceTree = ""; }; 1AAF5352180E3060000584C8 /* AssetsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AssetsManager.h; sourceTree = ""; }; 1AAF5362180E3374000584C8 /* HttpClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HttpClient.cpp; sourceTree = ""; }; @@ -2694,6 +2674,40 @@ 500DC9BB19106E89007B91BF /* CCProfiling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCProfiling.h; path = ../base/CCProfiling.h; sourceTree = ""; }; 50272538190BF1B900AAF4ED /* cocos2d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cocos2d.h; path = ../cocos/cocos2d.h; sourceTree = ""; }; 50272539190BF1B900AAF4ED /* cocos2d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cocos2d.cpp; path = ../cocos/cocos2d.cpp; sourceTree = ""; }; + 5034C9F7191D591000CE6051 /* ccShaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShaders.h; sourceTree = ""; }; + 5034C9F8191D591000CE6051 /* ccShaders.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ccShaders.cpp; sourceTree = ""; }; + 5034C9F9191D591000CE6051 /* CCShaderCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCShaderCache.h; sourceTree = ""; }; + 5034C9FA191D591000CE6051 /* CCShaderCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCShaderCache.cpp; sourceTree = ""; }; + 5034C9FB191D591000CE6051 /* ccShader_PositionTextureColorAlphaTest_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureColorAlphaTest_frag.h; sourceTree = ""; }; + 5034C9FC191D591000CE6051 /* ccShader_PositionTextureColor_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureColor_vert.h; sourceTree = ""; }; + 5034C9FD191D591000CE6051 /* ccShader_PositionTextureColor_noMVP_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureColor_noMVP_vert.h; sourceTree = ""; }; + 5034C9FE191D591000CE6051 /* ccShader_PositionTextureColor_noMVP_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureColor_noMVP_frag.h; sourceTree = ""; }; + 5034C9FF191D591000CE6051 /* ccShader_PositionTextureColor_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureColor_frag.h; sourceTree = ""; }; + 5034CA00191D591000CE6051 /* ccShader_PositionTextureA8Color_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureA8Color_vert.h; sourceTree = ""; }; + 5034CA01191D591000CE6051 /* ccShader_PositionTextureA8Color_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureA8Color_frag.h; sourceTree = ""; }; + 5034CA02191D591000CE6051 /* ccShader_PositionTexture_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTexture_vert.h; sourceTree = ""; }; + 5034CA03191D591000CE6051 /* ccShader_PositionTexture_uColor_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTexture_uColor_vert.h; sourceTree = ""; }; + 5034CA04191D591000CE6051 /* ccShader_PositionTexture_uColor_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTexture_uColor_frag.h; sourceTree = ""; }; + 5034CA05191D591000CE6051 /* ccShader_PositionTexture_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTexture_frag.h; sourceTree = ""; }; + 5034CA06191D591000CE6051 /* ccShader_PositionColorLengthTexture_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionColorLengthTexture_vert.h; sourceTree = ""; }; + 5034CA07191D591000CE6051 /* ccShader_PositionColorLengthTexture_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionColorLengthTexture_frag.h; sourceTree = ""; }; + 5034CA08191D591000CE6051 /* ccShader_PositionColor_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionColor_vert.h; sourceTree = ""; }; + 5034CA09191D591000CE6051 /* ccShader_PositionColor_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionColor_frag.h; sourceTree = ""; }; + 5034CA0A191D591000CE6051 /* ccShader_Position_uColor_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Position_uColor_vert.h; sourceTree = ""; }; + 5034CA0B191D591000CE6051 /* ccShader_Position_uColor_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Position_uColor_frag.h; sourceTree = ""; }; + 5034CA0C191D591000CE6051 /* ccShader_Label_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Label_vert.h; sourceTree = ""; }; + 5034CA0D191D591000CE6051 /* ccShader_Label_frag_outline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Label_frag_outline.h; sourceTree = ""; }; + 5034CA0E191D591000CE6051 /* ccShader_Label_frag_normal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Label_frag_normal.h; sourceTree = ""; }; + 5034CA0F191D591000CE6051 /* ccShader_Label_frag_df.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Label_frag_df.h; sourceTree = ""; }; + 5034CA10191D591000CE6051 /* ccShader_Label_frag_df_glow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Label_frag_df_glow.h; sourceTree = ""; }; + 5034CA11191D591000CE6051 /* ccGLStateCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccGLStateCache.h; sourceTree = ""; }; + 5034CA12191D591000CE6051 /* ccGLStateCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ccGLStateCache.cpp; sourceTree = ""; }; + 5034CA13191D591000CE6051 /* CCGLProgramStateCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgramStateCache.h; sourceTree = ""; }; + 5034CA14191D591000CE6051 /* CCGLProgramStateCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLProgramStateCache.cpp; sourceTree = ""; }; + 5034CA15191D591000CE6051 /* CCGLProgramState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgramState.h; sourceTree = ""; }; + 5034CA16191D591000CE6051 /* CCGLProgramState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLProgramState.cpp; sourceTree = ""; }; + 5034CA17191D591000CE6051 /* CCGLProgram.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgram.h; sourceTree = ""; }; + 5034CA18191D591000CE6051 /* CCGLProgram.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLProgram.cpp; sourceTree = ""; }; 50DC5180187B817900A9C23F /* RELEASE_NOTES.md */ = {isa = PBXFileReference; lastKnownFileType = text; name = RELEASE_NOTES.md; path = ../docs/RELEASE_NOTES.md; sourceTree = ""; }; 50E6D30C18DADB5D0051CA34 /* CCProtectedNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCProtectedNode.cpp; sourceTree = ""; }; 50E6D30D18DADB5D0051CA34 /* CCProtectedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCProtectedNode.h; sourceTree = ""; }; @@ -2764,8 +2778,6 @@ A0053FBE189B2BEA0035A564 /* CCPlatformDefine.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCPlatformDefine.h; sourceTree = ""; }; A0053FBF189B2BEA0035A564 /* CCStdC.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCStdC.cpp; sourceTree = ""; }; A0053FC0189B2BEA0035A564 /* CCStdC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCStdC.h; sourceTree = ""; }; - A023FA32185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureColor_noMVP_frag.h; sourceTree = ""; }; - A023FA33185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureColor_noMVP_vert.h; sourceTree = ""; }; A03F2CB81780BD04006731B9 /* libchipmunk Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libchipmunk Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; A03F2D9B1780BDF7006731B9 /* libbox2d Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libbox2d Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; A03F2ED617814268006731B9 /* libCocosDenshion Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libCocosDenshion Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -3243,43 +3255,6 @@ name = "script-support"; sourceTree = ""; }; - 1A570238180BCC580088DEC7 /* shaders */ = { - isa = PBXGroup; - children = ( - 1A57052F180BD9500088DEC7 /* CCGLProgram.cpp */, - 1A570530180BD9500088DEC7 /* CCGLProgram.h */, - 1A570531180BD9500088DEC7 /* ccGLStateCache.cpp */, - 1A570532180BD9500088DEC7 /* ccGLStateCache.h */, - 1AA95FDA18EBB8EF00AE7485 /* ccShader_Label_frag_df.h */, - 1AA95FD918EBB8EF00AE7485 /* ccShader_Label_frag_df_glow.h */, - 1AA95FDB18EBB8EF00AE7485 /* ccShader_Label_frag_normal.h */, - 1AA95FDC18EBB8EF00AE7485 /* ccShader_Label_frag_outline.h */, - 1AA95FDD18EBB8EF00AE7485 /* ccShader_Label_vert.h */, - 1A570239180BCC6F0088DEC7 /* ccShader_Position_uColor_frag.h */, - 1A57023A180BCC6F0088DEC7 /* ccShader_Position_uColor_vert.h */, - 1A57023B180BCC6F0088DEC7 /* ccShader_PositionColor_frag.h */, - 1A57023C180BCC6F0088DEC7 /* ccShader_PositionColor_vert.h */, - 1A57023D180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_frag.h */, - 1A57023E180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_vert.h */, - 1A57023F180BCC6F0088DEC7 /* ccShader_PositionTexture_frag.h */, - 1A570240180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_frag.h */, - 1A570241180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_vert.h */, - 1A570242180BCC6F0088DEC7 /* ccShader_PositionTexture_vert.h */, - 1A570243180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_frag.h */, - 1A570244180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_vert.h */, - 1A570245180BCC6F0088DEC7 /* ccShader_PositionTextureColor_frag.h */, - A023FA32185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_frag.h */, - A023FA33185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_vert.h */, - 1A570246180BCC6F0088DEC7 /* ccShader_PositionTextureColor_vert.h */, - 1A570247180BCC6F0088DEC7 /* ccShader_PositionTextureColorAlphaTest_frag.h */, - 1A570248180BCC6F0088DEC7 /* CCShaderCache.cpp */, - 1A570249180BCC6F0088DEC7 /* CCShaderCache.h */, - 1A57024B180BCC6F0088DEC7 /* ccShaders.cpp */, - 1A57024C180BCC6F0088DEC7 /* ccShaders.h */, - ); - name = shaders; - sourceTree = ""; - }; 1A570275180BCC840088DEC7 /* sprite-nodes */ = { isa = PBXGroup; children = ( @@ -4467,7 +4442,6 @@ 1A570218180BCC000088DEC7 /* particle-nodes */, 46A16A5A1807B038005B8026 /* platform */, 1A570231180BCC380088DEC7 /* script-support */, - 1A570238180BCC580088DEC7 /* shaders */, 1A570275180BCC840088DEC7 /* sprite-nodes */, 1A57029A180BCD4F0088DEC7 /* support */, 1A5702BC180BCE0A0088DEC7 /* text-input-node */, @@ -4641,6 +4615,19 @@ 500DC89819105D41007B91BF /* renderer */ = { isa = PBXGroup; children = ( + 5034CA5D191D591900CE6051 /* shaders */, + 5034C9F7191D591000CE6051 /* ccShaders.h */, + 5034C9F8191D591000CE6051 /* ccShaders.cpp */, + 5034C9F9191D591000CE6051 /* CCShaderCache.h */, + 5034C9FA191D591000CE6051 /* CCShaderCache.cpp */, + 5034CA11191D591000CE6051 /* ccGLStateCache.h */, + 5034CA12191D591000CE6051 /* ccGLStateCache.cpp */, + 5034CA13191D591000CE6051 /* CCGLProgramStateCache.h */, + 5034CA14191D591000CE6051 /* CCGLProgramStateCache.cpp */, + 5034CA15191D591000CE6051 /* CCGLProgramState.h */, + 5034CA16191D591000CE6051 /* CCGLProgramState.cpp */, + 5034CA17191D591000CE6051 /* CCGLProgram.h */, + 5034CA18191D591000CE6051 /* CCGLProgram.cpp */, 500DC89919105D41007B91BF /* CCBatchCommand.cpp */, 500DC89A19105D41007B91BF /* CCBatchCommand.h */, 500DC89B19105D41007B91BF /* CCCustomCommand.cpp */, @@ -4659,6 +4646,35 @@ path = ../cocos/renderer; sourceTree = ""; }; + 5034CA5D191D591900CE6051 /* shaders */ = { + isa = PBXGroup; + children = ( + 5034C9FB191D591000CE6051 /* ccShader_PositionTextureColorAlphaTest_frag.h */, + 5034C9FC191D591000CE6051 /* ccShader_PositionTextureColor_vert.h */, + 5034C9FD191D591000CE6051 /* ccShader_PositionTextureColor_noMVP_vert.h */, + 5034C9FE191D591000CE6051 /* ccShader_PositionTextureColor_noMVP_frag.h */, + 5034C9FF191D591000CE6051 /* ccShader_PositionTextureColor_frag.h */, + 5034CA00191D591000CE6051 /* ccShader_PositionTextureA8Color_vert.h */, + 5034CA01191D591000CE6051 /* ccShader_PositionTextureA8Color_frag.h */, + 5034CA02191D591000CE6051 /* ccShader_PositionTexture_vert.h */, + 5034CA03191D591000CE6051 /* ccShader_PositionTexture_uColor_vert.h */, + 5034CA04191D591000CE6051 /* ccShader_PositionTexture_uColor_frag.h */, + 5034CA05191D591000CE6051 /* ccShader_PositionTexture_frag.h */, + 5034CA06191D591000CE6051 /* ccShader_PositionColorLengthTexture_vert.h */, + 5034CA07191D591000CE6051 /* ccShader_PositionColorLengthTexture_frag.h */, + 5034CA08191D591000CE6051 /* ccShader_PositionColor_vert.h */, + 5034CA09191D591000CE6051 /* ccShader_PositionColor_frag.h */, + 5034CA0A191D591000CE6051 /* ccShader_Position_uColor_vert.h */, + 5034CA0B191D591000CE6051 /* ccShader_Position_uColor_frag.h */, + 5034CA0C191D591000CE6051 /* ccShader_Label_vert.h */, + 5034CA0D191D591000CE6051 /* ccShader_Label_frag_outline.h */, + 5034CA0E191D591000CE6051 /* ccShader_Label_frag_normal.h */, + 5034CA0F191D591000CE6051 /* ccShader_Label_frag_df.h */, + 5034CA10191D591000CE6051 /* ccShader_Label_frag_df_glow.h */, + ); + name = shaders; + sourceTree = ""; + }; 50FCEB6818C72017004AD434 /* WidgetReader */ = { isa = PBXGroup; children = ( @@ -4896,6 +4912,7 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( + 5034CA39191D591100CE6051 /* ccShader_PositionColorLengthTexture_frag.h in Headers */, 2AC795DF18628723005EC8E1 /* SkeletonBounds.h in Headers */, 2AC795E018628723005EC8E1 /* Event.h in Headers */, 2AC795E118628723005EC8E1 /* EventData.h in Headers */, @@ -4906,6 +4923,7 @@ 06CAAAC9186AD7EE0012A414 /* TriggerMng.h in Headers */, 2905FA6018CF08D100240AA3 /* UILayoutParameter.h in Headers */, 1ABA68B01888D700007D1BB4 /* CCFontCharMap.h in Headers */, + 5034CA3F191D591100CE6051 /* ccShader_Position_uColor_vert.h in Headers */, 500DC8B419105D41007B91BF /* CCGroupCommand.h in Headers */, 500DC8D319105F7D007B91BF /* CCAffineTransform.h in Headers */, 46A170191807CBFC005B8026 /* CCCommon.h in Headers */, @@ -4930,6 +4948,7 @@ 500DC99A19106300007B91BF /* ccTypes.h in Headers */, 46A170F01807CECA005B8026 /* CCPhysicsWorld.h in Headers */, 500DC8C219105D41007B91BF /* CCRenderCommandPool.h in Headers */, + 5034CA4D191D591100CE6051 /* ccGLStateCache.h in Headers */, 46A1705C1807CC1C005B8026 /* CCStdC.h in Headers */, 46A1704F1807CC1C005B8026 /* CCApplication.h in Headers */, 500DC98C19106300007B91BF /* CCPlatformMacros.h in Headers */, @@ -4942,16 +4961,16 @@ 1A57006F180BC5A10088DEC7 /* CCActionEase.h in Headers */, 1A570073180BC5A10088DEC7 /* CCActionGrid.h in Headers */, 50FCEBB518C72017004AD434 /* SliderReader.h in Headers */, + 5034CA3B191D591100CE6051 /* ccShader_PositionColor_vert.h in Headers */, 06CAAAD1186AD8010012A414 /* ObjectFactory.h in Headers */, - A023FA34185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_frag.h in Headers */, 1A570077180BC5A10088DEC7 /* CCActionGrid3D.h in Headers */, 1A57007B180BC5A10088DEC7 /* CCActionInstant.h in Headers */, 500DC8BC19105D41007B91BF /* CCQuadCommand.h in Headers */, 500DC94E19106300007B91BF /* CCEvent.h in Headers */, 1A57007F180BC5A10088DEC7 /* CCActionInterval.h in Headers */, 1A01C69A18F57BE800EFE3A6 /* CCSet.h in Headers */, + 5034CA23191D591100CE6051 /* ccShader_PositionTextureColor_vert.h in Headers */, 296CAD2A1915EC9900C64FBF /* CCEventListenerFocus.h in Headers */, - A023FA36185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_vert.h in Headers */, 1A570083180BC5A10088DEC7 /* CCActionManager.h in Headers */, 1A570087180BC5A10088DEC7 /* CCActionPageTurn3D.h in Headers */, ED9C6A9618599AD8000A5232 /* CCNodeGrid.h in Headers */, @@ -4980,6 +4999,7 @@ 500DC98219106300007B91BF /* ccMacros.h in Headers */, 1A57011D180BC90D0088DEC7 /* CCGrabber.h in Headers */, 1A570121180BC90D0088DEC7 /* CCGrid.h in Headers */, + 5034CA2D191D591100CE6051 /* ccShader_PositionTextureA8Color_frag.h in Headers */, 50E6D33A18E174130051CA34 /* UIRelativeBox.h in Headers */, 500DC8C619105D41007B91BF /* CCRenderer.h in Headers */, 50E6D30F18DADB5D0051CA34 /* CCProtectedNode.h in Headers */, @@ -4992,6 +5012,7 @@ 1A01C68618F57BE800EFE3A6 /* CCArray.h in Headers */, 1A5701A7180BCB590088DEC7 /* CCFontAtlasCache.h in Headers */, 1A5701B3180BCB590088DEC7 /* CCFontFNT.h in Headers */, + 5034CA47191D591100CE6051 /* ccShader_Label_frag_normal.h in Headers */, 1A5701B7180BCB5A0088DEC7 /* CCFontFreeType.h in Headers */, 500DC94219106300007B91BF /* CCData.h in Headers */, 1A5701BB180BCB5A0088DEC7 /* CCLabel.h in Headers */, @@ -4999,7 +5020,7 @@ 1A5701C3180BCB5A0088DEC7 /* CCLabelBMFont.h in Headers */, 500DC93A19106300007B91BF /* CCConfiguration.h in Headers */, 1A5701C9180BCB5A0088DEC7 /* CCLabelTextFormatter.h in Headers */, - 1AA95FE618EBB8EF00AE7485 /* ccShader_Label_vert.h in Headers */, + 5034CA37191D591100CE6051 /* ccShader_PositionColorLengthTexture_vert.h in Headers */, 1A5701CD180BCB5A0088DEC7 /* CCLabelTTF.h in Headers */, 1A5701E0180BCB8C0088DEC7 /* CCLayer.h in Headers */, 1A5701E4180BCB8C0088DEC7 /* CCScene.h in Headers */, @@ -5020,43 +5041,31 @@ 500DC99E19106300007B91BF /* CCValue.h in Headers */, 1A01C69618F57BE800EFE3A6 /* CCInteger.h in Headers */, 1A570223180BCC1A0088DEC7 /* CCParticleBatchNode.h in Headers */, + 5034CA43191D591100CE6051 /* ccShader_Label_vert.h in Headers */, 1A570227180BCC1A0088DEC7 /* CCParticleExamples.h in Headers */, 1A57022B180BCC1A0088DEC7 /* CCParticleSystem.h in Headers */, + 5034CA2F191D591100CE6051 /* ccShader_PositionTexture_vert.h in Headers */, + 5034CA4B191D591100CE6051 /* ccShader_Label_frag_df_glow.h in Headers */, 1A57022F180BCC1A0088DEC7 /* CCParticleSystemQuad.h in Headers */, 500DC96A19106300007B91BF /* CCEventListenerCustom.h in Headers */, B2AF2F9718EBAEAE00C5807C /* MathUtil.h in Headers */, 1A570236180BCC4D0088DEC7 /* CCScriptSupport.h in Headers */, - 1A57024D180BCC6F0088DEC7 /* ccShader_Position_uColor_frag.h in Headers */, - 1A57024F180BCC6F0088DEC7 /* ccShader_Position_uColor_vert.h in Headers */, - 1AA95FE418EBB8EF00AE7485 /* ccShader_Label_frag_outline.h in Headers */, 500DC95E19106300007B91BF /* CCEventKeyboard.h in Headers */, 2905FA4218CF08D100240AA3 /* CocosGUI.h in Headers */, - 1A570251180BCC6F0088DEC7 /* ccShader_PositionColor_frag.h in Headers */, 500DC95A19106300007B91BF /* CCEventDispatcher.h in Headers */, - 1A570253180BCC6F0088DEC7 /* ccShader_PositionColor_vert.h in Headers */, - 1A570255180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_frag.h in Headers */, - 1A570257180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_vert.h in Headers */, - 1A570259180BCC6F0088DEC7 /* ccShader_PositionTexture_frag.h in Headers */, - 1A57025B180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_frag.h in Headers */, + 5034CA49191D591100CE6051 /* ccShader_Label_frag_df.h in Headers */, 500DC9A019106300007B91BF /* CCVector.h in Headers */, - 1A57025D180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_vert.h in Headers */, - 1A57025F180BCC6F0088DEC7 /* ccShader_PositionTexture_vert.h in Headers */, 500DC92C19106300007B91BF /* atitc.h in Headers */, 1A01C68C18F57BE800EFE3A6 /* CCDeprecated.h in Headers */, - 1A570261180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_frag.h in Headers */, 500DC98419106300007B91BF /* CCMap.h in Headers */, - 1A570263180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_vert.h in Headers */, - 1AA95FDE18EBB8EF00AE7485 /* ccShader_Label_frag_df_glow.h in Headers */, 2905FA6418CF08D100240AA3 /* UIListView.h in Headers */, - 1A570265180BCC6F0088DEC7 /* ccShader_PositionTextureColor_frag.h in Headers */, 50FCEBB918C72017004AD434 /* TextAtlasReader.h in Headers */, - 1A570267180BCC6F0088DEC7 /* ccShader_PositionTextureColor_vert.h in Headers */, - 1A570269180BCC6F0088DEC7 /* ccShader_PositionTextureColorAlphaTest_frag.h in Headers */, - 1A57026D180BCC6F0088DEC7 /* CCShaderCache.h in Headers */, - 1A570273180BCC6F0088DEC7 /* ccShaders.h in Headers */, + 5034CA3D191D591100CE6051 /* ccShader_PositionColor_frag.h in Headers */, 1A570280180BCC900088DEC7 /* CCSprite.h in Headers */, 1A570284180BCC900088DEC7 /* CCSpriteBatchNode.h in Headers */, 500DC9A419106300007B91BF /* etc1.h in Headers */, + 5034CA55191D591100CE6051 /* CCGLProgramState.h in Headers */, + 5034CA2B191D591100CE6051 /* ccShader_PositionTextureA8Color_vert.h in Headers */, 1A570288180BCC900088DEC7 /* CCSpriteFrame.h in Headers */, 1A57028C180BCC900088DEC7 /* CCSpriteFrameCache.h in Headers */, 5027253A190BF1B900AAF4ED /* cocos2d.h in Headers */, @@ -5071,6 +5080,7 @@ 1A5702C0180BCE2A0088DEC7 /* CCIMEDelegate.h in Headers */, 2905FA7618CF08D100240AA3 /* UIScrollView.h in Headers */, 1A5702C4180BCE2A0088DEC7 /* CCIMEDispatcher.h in Headers */, + 5034CA25191D591100CE6051 /* ccShader_PositionTextureColor_noMVP_vert.h in Headers */, 1A12775B18DFCC540005F345 /* CCTweenFunction.h in Headers */, 1A5702CA180BCE370088DEC7 /* CCTextFieldTTF.h in Headers */, 1A5702D5180BCE570088DEC7 /* CCTexture2D.h in Headers */, @@ -5081,6 +5091,7 @@ 50FCEBAD18C72017004AD434 /* PageViewReader.h in Headers */, 1A5702F4180BCE750088DEC7 /* CCTMXObjectGroup.h in Headers */, 1A5702F8180BCE750088DEC7 /* CCTMXTiledMap.h in Headers */, + 5034CA21191D591100CE6051 /* ccShader_PositionTextureColorAlphaTest_frag.h in Headers */, 1A5702FC180BCE750088DEC7 /* CCTMXXMLParser.h in Headers */, 1A570302180BCE890088DEC7 /* CCParallaxNode.h in Headers */, 1A57030E180BCF190088DEC7 /* CCComponent.h in Headers */, @@ -5102,10 +5113,7 @@ 500DC99619106300007B91BF /* CCScheduler.h in Headers */, 1A57035A180BD0B00088DEC7 /* unzip.h in Headers */, 296CAD241915EC8000C64FBF /* CCEventFocus.h in Headers */, - 1A570535180BD9500088DEC7 /* CCGLProgram.h in Headers */, - 1AA95FE018EBB8EF00AE7485 /* ccShader_Label_frag_df.h in Headers */, 500DC98819106300007B91BF /* CCNS.h in Headers */, - 1A570539180BD9500088DEC7 /* ccGLStateCache.h in Headers */, 1AD71DAB180E26E600808F54 /* CCBAnimationManager.h in Headers */, 1AD71DAF180E26E600808F54 /* CCBFileLoader.h in Headers */, B37510741823AC9F00B3BA6A /* CCPhysicsContactInfo_chipmunk.h in Headers */, @@ -5115,9 +5123,12 @@ 1AD71DB9180E26E600808F54 /* CCBReader.h in Headers */, 2905FA7E18CF08D100240AA3 /* UIText.h in Headers */, 1AD71DBB180E26E600808F54 /* CCBSelectorResolver.h in Headers */, + 5034CA29191D591100CE6051 /* ccShader_PositionTextureColor_frag.h in Headers */, + 5034CA35191D591100CE6051 /* ccShader_PositionTexture_frag.h in Headers */, 500DC98019106300007B91BF /* CCEventType.h in Headers */, 1AD71DBF180E26E600808F54 /* CCBSequence.h in Headers */, 1AD71DC3180E26E600808F54 /* CCBSequenceProperty.h in Headers */, + 5034CA31191D591100CE6051 /* ccShader_PositionTexture_uColor_vert.h in Headers */, 1AD71DCB180E26E600808F54 /* CCControlButtonLoader.h in Headers */, 1AD71DCF180E26E600808F54 /* CCControlLoader.h in Headers */, 1AD71DD3180E26E600808F54 /* CCLabelBMFontLoader.h in Headers */, @@ -5139,6 +5150,7 @@ 1AD71DFB180E26E600808F54 /* CCNodeLoaderListener.h in Headers */, 1AD71DFF180E26E600808F54 /* CCParticleSystemQuadLoader.h in Headers */, 1AD71E03180E26E600808F54 /* CCScale9SpriteLoader.h in Headers */, + 5034CA51191D591100CE6051 /* CCGLProgramStateCache.h in Headers */, 1AD71E07180E26E600808F54 /* CCScrollViewLoader.h in Headers */, 1AD71E0B180E26E600808F54 /* CCSpriteLoader.h in Headers */, 1AD71E0D180E26E600808F54 /* CocosBuilder.h in Headers */, @@ -5167,8 +5179,10 @@ 500DC8D919105F7D007B91BF /* CCMathBase.h in Headers */, 06CAAACD186AD7F90012A414 /* TriggerBase.h in Headers */, 1AD71ECB180E26E600808F54 /* RegionAttachment.h in Headers */, + 5034CA27191D591100CE6051 /* ccShader_PositionTextureColor_noMVP_frag.h in Headers */, 2905FA8618CF08D100240AA3 /* UITextBMFont.h in Headers */, 1AD71ECF180E26E600808F54 /* Skeleton.h in Headers */, + 5034CA41191D591100CE6051 /* ccShader_Position_uColor_frag.h in Headers */, 1A01C69E18F57BE800EFE3A6 /* CCString.h in Headers */, 500DC9B819106E6D007B91BF /* TransformUtils.h in Headers */, 1AD71ED3180E26E600808F54 /* SkeletonData.h in Headers */, @@ -5193,10 +5207,10 @@ 1A9DCA2D180E6955007A3AD4 /* CCProtocols.h in Headers */, 50FCEBB118C72017004AD434 /* ScrollViewReader.h in Headers */, 500DC98A19106300007B91BF /* CCPlatformConfig.h in Headers */, + 5034CA19191D591000CE6051 /* ccShaders.h in Headers */, 1A9DCA3B180E6955007A3AD4 /* firePngData.h in Headers */, B37510721823AC9F00B3BA6A /* CCPhysicsBodyInfo_chipmunk.h in Headers */, 50FCEBA518C72017004AD434 /* ListViewReader.h in Headers */, - 1AA95FE218EBB8EF00AE7485 /* ccShader_Label_frag_normal.h in Headers */, 1A8C598D180E930E00EF57C3 /* CCActionFrame.h in Headers */, 1A8C5991180E930E00EF57C3 /* CCActionFrameEasing.h in Headers */, 1A8C5995180E930E00EF57C3 /* CCActionManagerEx.h in Headers */, @@ -5211,6 +5225,7 @@ 1A8C59B1180E930E00EF57C3 /* CCBatchNode.h in Headers */, 2905FA5418CF08D100240AA3 /* UIImageView.h in Headers */, 1A8C59B5180E930E00EF57C3 /* CCBone.h in Headers */, + 5034CA45191D591100CE6051 /* ccShader_Label_frag_outline.h in Headers */, 500DC96219106300007B91BF /* CCEventListener.h in Headers */, 1A8C59B9180E930E00EF57C3 /* CCColliderDetector.h in Headers */, 1A8C59BD180E930E00EF57C3 /* CCComAttribute.h in Headers */, @@ -5218,6 +5233,7 @@ B2AF2FB118EBBDA100C5807C /* CCMath.h in Headers */, 1A8C59C5180E930E00EF57C3 /* CCComController.h in Headers */, 1A8C59C9180E930E00EF57C3 /* CCComRender.h in Headers */, + 5034CA59191D591100CE6051 /* CCGLProgram.h in Headers */, 1A8C59CD180E930E00EF57C3 /* CCDataReaderHelper.h in Headers */, 1A8C59D1180E930E00EF57C3 /* CCDatas.h in Headers */, 1A8C59D5180E930E00EF57C3 /* CCDecorativeDisplay.h in Headers */, @@ -5226,7 +5242,9 @@ 1A8C59E1180E930E00EF57C3 /* CCInputDelegate.h in Headers */, 1A8C59E5180E930E00EF57C3 /* CCProcessBase.h in Headers */, 1A8C59E9180E930E00EF57C3 /* CCSGUIReader.h in Headers */, + 5034CA33191D591100CE6051 /* ccShader_PositionTexture_uColor_frag.h in Headers */, 1A8C59ED180E930E00EF57C3 /* CCSkin.h in Headers */, + 5034CA1D191D591100CE6051 /* CCShaderCache.h in Headers */, 1A8C59F1180E930E00EF57C3 /* CCSpriteFrameCacheHelper.h in Headers */, 1A8C59F5180E930E00EF57C3 /* CCSSceneReader.h in Headers */, 1A8C59F9180E930E00EF57C3 /* CCTransformHelp.h in Headers */, @@ -5389,6 +5407,7 @@ 2AC795E91862875D005EC8E1 /* EventData.h in Headers */, 2AC795EA1862875D005EC8E1 /* BoundingBoxAttachment.h in Headers */, 500DC93519106300007B91BF /* CCAutoreleasePool.h in Headers */, + 5034CA1A191D591100CE6051 /* ccShaders.h in Headers */, 46A1702D1807CBFE005B8026 /* CCCommon.h in Headers */, 46A170FF1807CECB005B8026 /* CCPhysicsContact.h in Headers */, 46A171041807CECB005B8026 /* CCPhysicsShape.h in Headers */, @@ -5400,6 +5419,7 @@ 50FCEBAE18C72017004AD434 /* PageViewReader.h in Headers */, 46A1703F1807CC07005B8026 /* CCDirectorCaller.h in Headers */, 46A170381807CBFE005B8026 /* CCSAXParser.h in Headers */, + 5034CA38191D591100CE6051 /* ccShader_PositionColorLengthTexture_vert.h in Headers */, 500DC97319106300007B91BF /* CCEventListenerMouse.h in Headers */, 500DC99319106300007B91BF /* CCRefPtr.h in Headers */, 46A1702E1807CBFE005B8026 /* CCDevice.h in Headers */, @@ -5407,9 +5427,8 @@ 46A170451807CC07005B8026 /* CCESRenderer.h in Headers */, 46A171011807CECB005B8026 /* CCPhysicsJoint.h in Headers */, 46A170411807CC07005B8026 /* CCGLView.h in Headers */, - A023FA37185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_vert.h in Headers */, - 1AA95FE118EBB8EF00AE7485 /* ccShader_Label_frag_df.h in Headers */, 46A170301807CBFE005B8026 /* CCGLViewProtocol.h in Headers */, + 5034CA4E191D591100CE6051 /* ccGLStateCache.h in Headers */, 500DC8B119105D41007B91BF /* CCCustomCommand.h in Headers */, 500DC8DA19105F7D007B91BF /* CCMathBase.h in Headers */, 46A170321807CBFE005B8026 /* CCFileUtils.h in Headers */, @@ -5423,7 +5442,9 @@ 46A170271807CBFE005B8026 /* CCFileUtilsApple.h in Headers */, 46A170431807CC07005B8026 /* CCES2Renderer.h in Headers */, 46A170331807CBFE005B8026 /* CCImage.h in Headers */, + 5034CA40191D591100CE6051 /* ccShader_Position_uColor_vert.h in Headers */, 2905FA5518CF08D100240AA3 /* UIImageView.h in Headers */, + 5034CA28191D591100CE6051 /* ccShader_PositionTextureColor_noMVP_frag.h in Headers */, 46A170481807CC07005B8026 /* CCPlatformDefine.h in Headers */, 46A1704C1807CC07005B8026 /* OpenGL_Internal.h in Headers */, 46A1702C1807CBFE005B8026 /* CCApplicationProtocol.h in Headers */, @@ -5433,9 +5454,11 @@ 50FCEBC218C72017004AD434 /* TextFieldReader.h in Headers */, 1A570068180BC5A10088DEC7 /* CCActionCamera.h in Headers */, 1A57006C180BC5A10088DEC7 /* CCActionCatmullRom.h in Headers */, + 5034CA3A191D591100CE6051 /* ccShader_PositionColorLengthTexture_frag.h in Headers */, 1A570070180BC5A10088DEC7 /* CCActionEase.h in Headers */, 1A570074180BC5A10088DEC7 /* CCActionGrid.h in Headers */, B37510841823ACA100B3BA6A /* CCPhysicsShapeInfo_chipmunk.h in Headers */, + 5034CA46191D591100CE6051 /* ccShader_Label_frag_outline.h in Headers */, 1A570078180BC5A10088DEC7 /* CCActionGrid3D.h in Headers */, 1A01C68918F57BE800EFE3A6 /* CCBool.h in Headers */, 1A57007C180BC5A10088DEC7 /* CCActionInstant.h in Headers */, @@ -5457,6 +5480,7 @@ 2905FA6D18CF08D100240AA3 /* UIPageView.h in Headers */, 2905FA7318CF08D100240AA3 /* UIScrollInterface.h in Headers */, 2905FA4318CF08D100240AA3 /* CocosGUI.h in Headers */, + 5034CA30191D591100CE6051 /* ccShader_PositionTexture_vert.h in Headers */, 500DC93119106300007B91BF /* base64.h in Headers */, B2AF2FA018EBAEAE00C5807C /* Quaternion.h in Headers */, 50E6D33718E174130051CA34 /* UIHBox.h in Headers */, @@ -5468,9 +5492,11 @@ 1A57011E180BC90D0088DEC7 /* CCGrabber.h in Headers */, 1A570122180BC90D0088DEC7 /* CCGrid.h in Headers */, 500DC8C319105D41007B91BF /* CCRenderCommandPool.h in Headers */, + 5034CA52191D591100CE6051 /* CCGLProgramStateCache.h in Headers */, 500DC8C719105D41007B91BF /* CCRenderer.h in Headers */, 500DC98519106300007B91BF /* CCMap.h in Headers */, 50FCEBBA18C72017004AD434 /* TextAtlasReader.h in Headers */, + 5034CA2E191D591100CE6051 /* ccShader_PositionTextureA8Color_frag.h in Headers */, 1A5701A0180BCB590088DEC7 /* CCFont.h in Headers */, 1A5701A4180BCB590088DEC7 /* CCFontAtlas.h in Headers */, 1A5701A8180BCB590088DEC7 /* CCFontAtlasCache.h in Headers */, @@ -5479,13 +5505,14 @@ 1A5701B8180BCB5A0088DEC7 /* CCFontFreeType.h in Headers */, 1A5701BC180BCB5A0088DEC7 /* CCLabel.h in Headers */, 1A5701C0180BCB5A0088DEC7 /* CCLabelAtlas.h in Headers */, + 5034CA42191D591100CE6051 /* ccShader_Position_uColor_frag.h in Headers */, 500DC97719106300007B91BF /* CCEventListenerTouch.h in Headers */, 500DC93F19106300007B91BF /* CCConsole.h in Headers */, 1A5701C4180BCB5A0088DEC7 /* CCLabelBMFont.h in Headers */, 1A01C69518F57BE800EFE3A6 /* CCFloat.h in Headers */, 1A5701CA180BCB5A0088DEC7 /* CCLabelTextFormatter.h in Headers */, 2905FA7B18CF08D100240AA3 /* UISlider.h in Headers */, - 1AA95FE318EBB8EF00AE7485 /* ccShader_Label_frag_normal.h in Headers */, + 5034CA22191D591100CE6051 /* ccShader_PositionTextureColorAlphaTest_frag.h in Headers */, 1A5701CE180BCB5A0088DEC7 /* CCLabelTTF.h in Headers */, 296CAD251915EC8000C64FBF /* CCEventFocus.h in Headers */, 50FCEBCA18C72017004AD434 /* WidgetReader.h in Headers */, @@ -5500,43 +5527,30 @@ 50FCEBBE18C72017004AD434 /* TextBMFontReader.h in Headers */, 1A5701FE180BCBAD0088DEC7 /* CCMenuItem.h in Headers */, 1A570205180BCBD40088DEC7 /* CCClippingNode.h in Headers */, + 5034CA34191D591100CE6051 /* ccShader_PositionTexture_uColor_frag.h in Headers */, 1A57020B180BCBDF0088DEC7 /* CCMotionStreak.h in Headers */, 1A570213180BCBF40088DEC7 /* CCProgressTimer.h in Headers */, B37510821823ACA100B3BA6A /* CCPhysicsJointInfo_chipmunk.h in Headers */, 1A570217180BCBF40088DEC7 /* CCRenderTexture.h in Headers */, 1A570224180BCC1A0088DEC7 /* CCParticleBatchNode.h in Headers */, 500DC95F19106300007B91BF /* CCEventKeyboard.h in Headers */, - 1AA95FE518EBB8EF00AE7485 /* ccShader_Label_frag_outline.h in Headers */, 500DC95B19106300007B91BF /* CCEventDispatcher.h in Headers */, 373B912A187891FB00198F86 /* CCComBase.h in Headers */, 500DC8D419105F7D007B91BF /* CCAffineTransform.h in Headers */, 1A570228180BCC1A0088DEC7 /* CCParticleExamples.h in Headers */, 1A57022C180BCC1A0088DEC7 /* CCParticleSystem.h in Headers */, 1A570230180BCC1A0088DEC7 /* CCParticleSystemQuad.h in Headers */, + 5034CA24191D591100CE6051 /* ccShader_PositionTextureColor_vert.h in Headers */, + 5034CA2C191D591100CE6051 /* ccShader_PositionTextureA8Color_vert.h in Headers */, 1A570237180BCC4D0088DEC7 /* CCScriptSupport.h in Headers */, - 1A57024E180BCC6F0088DEC7 /* ccShader_Position_uColor_frag.h in Headers */, - 1A570250180BCC6F0088DEC7 /* ccShader_Position_uColor_vert.h in Headers */, 2905FA8B18CF08D100240AA3 /* UITextField.h in Headers */, - 1A570252180BCC6F0088DEC7 /* ccShader_PositionColor_frag.h in Headers */, - 1A570254180BCC6F0088DEC7 /* ccShader_PositionColor_vert.h in Headers */, + 5034CA26191D591100CE6051 /* ccShader_PositionTextureColor_noMVP_vert.h in Headers */, 500DC96F19106300007B91BF /* CCEventListenerKeyboard.h in Headers */, - 1A570256180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_frag.h in Headers */, - 1A570258180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_vert.h in Headers */, 500DC8B519105D41007B91BF /* CCGroupCommand.h in Headers */, 50FCEBA618C72017004AD434 /* ListViewReader.h in Headers */, - 1A57025A180BCC6F0088DEC7 /* ccShader_PositionTexture_frag.h in Headers */, 500DC9B919106E6D007B91BF /* TransformUtils.h in Headers */, - 1A57025C180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_frag.h in Headers */, - 1A57025E180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_vert.h in Headers */, - 1A570260180BCC6F0088DEC7 /* ccShader_PositionTexture_vert.h in Headers */, - 1A570262180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_frag.h in Headers */, + 5034CA4A191D591100CE6051 /* ccShader_Label_frag_df.h in Headers */, 500DC99119106300007B91BF /* CCRef.h in Headers */, - 1A570264180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_vert.h in Headers */, - 1A570266180BCC6F0088DEC7 /* ccShader_PositionTextureColor_frag.h in Headers */, - 1A570268180BCC6F0088DEC7 /* ccShader_PositionTextureColor_vert.h in Headers */, - 1A57026A180BCC6F0088DEC7 /* ccShader_PositionTextureColorAlphaTest_frag.h in Headers */, - 1A57026E180BCC6F0088DEC7 /* CCShaderCache.h in Headers */, - 1A570274180BCC6F0088DEC7 /* ccShaders.h in Headers */, 1A570281180BCC900088DEC7 /* CCSprite.h in Headers */, 1A570285180BCC900088DEC7 /* CCSpriteBatchNode.h in Headers */, 1A570289180BCC900088DEC7 /* CCSpriteFrame.h in Headers */, @@ -5551,6 +5565,7 @@ 2905FA6918CF08D100240AA3 /* UILoadingBar.h in Headers */, 2905FA8F18CF08D100240AA3 /* UIWidget.h in Headers */, 1A5702C5180BCE2A0088DEC7 /* CCIMEDispatcher.h in Headers */, + 5034CA1E191D591100CE6051 /* CCShaderCache.h in Headers */, 50FCEB9A18C72017004AD434 /* CheckBoxReader.h in Headers */, 500DC8AD19105D41007B91BF /* CCBatchCommand.h in Headers */, 1A5702CB180BCE370088DEC7 /* CCTextFieldTTF.h in Headers */, @@ -5561,6 +5576,7 @@ 1A5702ED180BCE750088DEC7 /* CCTileMapAtlas.h in Headers */, 500DC99F19106300007B91BF /* CCValue.h in Headers */, 1A5702F1180BCE750088DEC7 /* CCTMXLayer.h in Headers */, + 5034CA44191D591100CE6051 /* ccShader_Label_vert.h in Headers */, 1A5702F5180BCE750088DEC7 /* CCTMXObjectGroup.h in Headers */, 1A5702F9180BCE750088DEC7 /* CCTMXTiledMap.h in Headers */, 500DC9A119106300007B91BF /* CCVector.h in Headers */, @@ -5582,16 +5598,15 @@ 1A570327180BCF660088DEC7 /* TGAlib.h in Headers */, 1A570332180BCFD50088DEC7 /* CCUserDefault.h in Headers */, 500DC94319106300007B91BF /* CCData.h in Headers */, - 1AA95FE718EBB8EF00AE7485 /* ccShader_Label_vert.h in Headers */, 1A57034E180BD09B0088DEC7 /* tinyxml2.h in Headers */, 1A570357180BD0B00088DEC7 /* ioapi.h in Headers */, 1A01C69B18F57BE800EFE3A6 /* CCSet.h in Headers */, 1A57035B180BD0B00088DEC7 /* unzip.h in Headers */, - 1A570536180BD9500088DEC7 /* CCGLProgram.h in Headers */, - 1A57053A180BD9500088DEC7 /* ccGLStateCache.h in Headers */, + 5034CA48191D591100CE6051 /* ccShader_Label_frag_normal.h in Headers */, 1AD71DAC180E26E600808F54 /* CCBAnimationManager.h in Headers */, 1AD71DB0180E26E600808F54 /* CCBFileLoader.h in Headers */, 1AD71DB4180E26E600808F54 /* CCBKeyframe.h in Headers */, + 5034CA3E191D591100CE6051 /* ccShader_PositionColor_frag.h in Headers */, 1AD71DB6180E26E600808F54 /* CCBMemberVariableAssigner.h in Headers */, 1AD71DBA180E26E600808F54 /* CCBReader.h in Headers */, 1AD71DBC180E26E600808F54 /* CCBSelectorResolver.h in Headers */, @@ -5601,7 +5616,9 @@ 1AD71DCC180E26E600808F54 /* CCControlButtonLoader.h in Headers */, 1AD71DD0180E26E600808F54 /* CCControlLoader.h in Headers */, 1AD71DD4180E26E600808F54 /* CCLabelBMFontLoader.h in Headers */, + 5034CA3C191D591100CE6051 /* ccShader_PositionColor_vert.h in Headers */, 46C02E0A18E91123004B7456 /* xxhash.h in Headers */, + 5034CA4C191D591100CE6051 /* ccShader_Label_frag_df_glow.h in Headers */, 50E6D33B18E174130051CA34 /* UIRelativeBox.h in Headers */, 1AD71DD8180E26E600808F54 /* CCLabelTTFLoader.h in Headers */, 1AD71DDC180E26E600808F54 /* CCLayerColorLoader.h in Headers */, @@ -5618,6 +5635,7 @@ 5027253B190BF1B900AAF4ED /* cocos2d.h in Headers */, 1AD71DFC180E26E600808F54 /* CCNodeLoaderListener.h in Headers */, 3EA0FB6B191C841D00B170C8 /* UIVideoPlayer.h in Headers */, + 5034CA2A191D591100CE6051 /* ccShader_PositionTextureColor_frag.h in Headers */, 1AD71E00180E26E600808F54 /* CCParticleSystemQuadLoader.h in Headers */, 1AD71E04180E26E600808F54 /* CCScale9SpriteLoader.h in Headers */, 1AD71E08180E26E600808F54 /* CCScrollViewLoader.h in Headers */, @@ -5637,6 +5655,7 @@ 2905FA4918CF08D100240AA3 /* UIButton.h in Headers */, 500DC96719106300007B91BF /* CCEventListenerAcceleration.h in Headers */, 1AD71EB0180E26E600808F54 /* AttachmentLoader.h in Headers */, + 5034CA32191D591100CE6051 /* ccShader_PositionTexture_uColor_vert.h in Headers */, 1AD71EB4180E26E600808F54 /* Bone.h in Headers */, 1AD71EB8180E26E600808F54 /* BoneData.h in Headers */, 06CAAACA186AD7EF0012A414 /* TriggerMng.h in Headers */, @@ -5666,18 +5685,20 @@ 1AAF5379180E3374000584C8 /* WebSocket.h in Headers */, 1AAF5852180E40B9000584C8 /* LocalStorage.h in Headers */, 1A9DCA26180E6955007A3AD4 /* ccFPSImages.h in Headers */, + 5034CA5A191D591100CE6051 /* CCGLProgram.h in Headers */, 1A9DCA2A180E6955007A3AD4 /* CCGLBufferedNode.h in Headers */, 1A0DB7321823827C0025743D /* CCGL.h in Headers */, 1A9DCA2E180E6955007A3AD4 /* CCProtocols.h in Headers */, 500DC96B19106300007B91BF /* CCEventListenerCustom.h in Headers */, 1A9DCA3C180E6955007A3AD4 /* firePngData.h in Headers */, - 1AA95FDF18EBB8EF00AE7485 /* ccShader_Label_frag_df_glow.h in Headers */, 1A01C69F18F57BE800EFE3A6 /* CCString.h in Headers */, 296CAD2B1915EC9900C64FBF /* CCEventListenerFocus.h in Headers */, 1A01C69118F57BE800EFE3A6 /* CCDictionary.h in Headers */, 500DC99B19106300007B91BF /* ccTypes.h in Headers */, 1A8C598E180E930E00EF57C3 /* CCActionFrame.h in Headers */, 1A8C5992180E930E00EF57C3 /* CCActionFrameEasing.h in Headers */, + 5034CA36191D591100CE6051 /* ccShader_PositionTexture_frag.h in Headers */, + 5034CA56191D591100CE6051 /* CCGLProgramState.h in Headers */, 1A8C5996180E930E00EF57C3 /* CCActionManagerEx.h in Headers */, 2905FA4D18CF08D100240AA3 /* UICheckBox.h in Headers */, 500DC9A519106300007B91BF /* etc1.h in Headers */, @@ -5722,7 +5743,6 @@ 1A8C59EE180E930E00EF57C3 /* CCSkin.h in Headers */, B37510801823ACA100B3BA6A /* CCPhysicsHelper_chipmunk.h in Headers */, 500DC94B19106300007B91BF /* CCDirector.h in Headers */, - A023FA35185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_frag.h in Headers */, 50FCEBA218C72017004AD434 /* LayoutReader.h in Headers */, 1A8C59F2180E930E00EF57C3 /* CCSpriteFrameCacheHelper.h in Headers */, 1A8C59F6180E930E00EF57C3 /* CCSSceneReader.h in Headers */, @@ -6119,6 +6139,7 @@ 46A170E81807CECA005B8026 /* CCPhysicsContact.cpp in Sources */, 46A170251807CBFC005B8026 /* CCThread.cpp in Sources */, 1A570061180BC5A10088DEC7 /* CCAction.cpp in Sources */, + 5034CA4F191D591100CE6051 /* ccGLStateCache.cpp in Sources */, 50FCEB9718C72017004AD434 /* CheckBoxReader.cpp in Sources */, 1A570065180BC5A10088DEC7 /* CCActionCamera.cpp in Sources */, 500DC8BE19105D41007B91BF /* CCRenderCommand.cpp in Sources */, @@ -6158,14 +6179,17 @@ 1A57011F180BC90D0088DEC7 /* CCGrid.cpp in Sources */, 50FCEBA718C72017004AD434 /* LoadingBarReader.cpp in Sources */, 06C0F2EF186AD822003594D5 /* ObjectFactory.cpp in Sources */, + 5034CA53191D591100CE6051 /* CCGLProgramStateCache.cpp in Sources */, 500DC96419106300007B91BF /* CCEventListenerAcceleration.cpp in Sources */, 1A57019D180BCB590088DEC7 /* CCFont.cpp in Sources */, 1A5701A1180BCB590088DEC7 /* CCFontAtlas.cpp in Sources */, 1A5701A5180BCB590088DEC7 /* CCFontAtlasCache.cpp in Sources */, 500DC96819106300007B91BF /* CCEventListenerCustom.cpp in Sources */, 500DC95019106300007B91BF /* CCEventAcceleration.cpp in Sources */, + 5034CA1B191D591100CE6051 /* ccShaders.cpp in Sources */, 1A5701B1180BCB590088DEC7 /* CCFontFNT.cpp in Sources */, 1A5701B5180BCB590088DEC7 /* CCFontFreeType.cpp in Sources */, + 5034CA1F191D591100CE6051 /* CCShaderCache.cpp in Sources */, 1A5701B9180BCB5A0088DEC7 /* CCLabel.cpp in Sources */, 500DC93819106300007B91BF /* CCConfiguration.cpp in Sources */, 500DC9A619106300007B91BF /* s3tc.cpp in Sources */, @@ -6200,8 +6224,6 @@ 50FCEB9B18C72017004AD434 /* ImageViewReader.cpp in Sources */, 500DC9AA19106300007B91BF /* ZipUtils.cpp in Sources */, 1A570234180BCC4D0088DEC7 /* CCScriptSupport.cpp in Sources */, - 1A57026B180BCC6F0088DEC7 /* CCShaderCache.cpp in Sources */, - 1A570271180BCC6F0088DEC7 /* ccShaders.cpp in Sources */, 1A57027E180BCC900088DEC7 /* CCSprite.cpp in Sources */, 1A570282180BCC900088DEC7 /* CCSpriteBatchNode.cpp in Sources */, 1A570286180BCC900088DEC7 /* CCSpriteFrame.cpp in Sources */, @@ -6246,8 +6268,6 @@ 1A57034B180BD09B0088DEC7 /* tinyxml2.cpp in Sources */, 1A570354180BD0B00088DEC7 /* ioapi.cpp in Sources */, 1A570358180BD0B00088DEC7 /* unzip.cpp in Sources */, - 1A570533180BD9500088DEC7 /* CCGLProgram.cpp in Sources */, - 1A570537180BD9500088DEC7 /* ccGLStateCache.cpp in Sources */, 1AD71DA9180E26E600808F54 /* CCBAnimationManager.cpp in Sources */, 500DC95419106300007B91BF /* CCEventCustom.cpp in Sources */, 1AD71DAD180E26E600808F54 /* CCBFileLoader.cpp in Sources */, @@ -6277,6 +6297,7 @@ 1AD71DF7180E26E600808F54 /* CCNodeLoaderLibrary.cpp in Sources */, 1AD71DFD180E26E600808F54 /* CCParticleSystemQuadLoader.cpp in Sources */, 50FCEB9318C72017004AD434 /* ButtonReader.cpp in Sources */, + 5034CA57191D591100CE6051 /* CCGLProgramState.cpp in Sources */, 1AD71E01180E26E600808F54 /* CCScale9SpriteLoader.cpp in Sources */, 1AD71E05180E26E600808F54 /* CCScrollViewLoader.cpp in Sources */, 1AD71E09180E26E600808F54 /* CCSpriteLoader.cpp in Sources */, @@ -6339,6 +6360,7 @@ 1A8C59AF180E930E00EF57C3 /* CCBatchNode.cpp in Sources */, 1A8C59B3180E930E00EF57C3 /* CCBone.cpp in Sources */, 1A8C59B7180E930E00EF57C3 /* CCColliderDetector.cpp in Sources */, + 5034CA5B191D591100CE6051 /* CCGLProgram.cpp in Sources */, 1A8C59BB180E930E00EF57C3 /* CCComAttribute.cpp in Sources */, 1A8C59BF180E930E00EF57C3 /* CCComAudio.cpp in Sources */, 1A8C59C3180E930E00EF57C3 /* CCComController.cpp in Sources */, @@ -6606,6 +6628,7 @@ 1A5701DF180BCB8C0088DEC7 /* CCLayer.cpp in Sources */, 1A5701E3180BCB8C0088DEC7 /* CCScene.cpp in Sources */, 500DC95119106300007B91BF /* CCEventAcceleration.cpp in Sources */, + 5034CA5C191D591100CE6051 /* CCGLProgram.cpp in Sources */, 500DC9B11910633C007B91BF /* CCTouch.cpp in Sources */, 1A5701E7180BCB8C0088DEC7 /* CCTransition.cpp in Sources */, 1A5701EB180BCB8C0088DEC7 /* CCTransitionPageTurn.cpp in Sources */, @@ -6628,8 +6651,6 @@ 2905FA5718CF08D100240AA3 /* UILayout.cpp in Sources */, 2905FA7D18CF08D100240AA3 /* UIText.cpp in Sources */, 50E6D33D18E174130051CA34 /* UIVBox.cpp in Sources */, - 1A57026C180BCC6F0088DEC7 /* CCShaderCache.cpp in Sources */, - 1A570272180BCC6F0088DEC7 /* ccShaders.cpp in Sources */, 1A57027F180BCC900088DEC7 /* CCSprite.cpp in Sources */, 500DC93319106300007B91BF /* CCAutoreleasePool.cpp in Sources */, 1A570283180BCC900088DEC7 /* CCSpriteBatchNode.cpp in Sources */, @@ -6674,9 +6695,7 @@ 1A57034C180BD09B0088DEC7 /* tinyxml2.cpp in Sources */, 1A570355180BD0B00088DEC7 /* ioapi.cpp in Sources */, 1A570359180BD0B00088DEC7 /* unzip.cpp in Sources */, - 1A570534180BD9500088DEC7 /* CCGLProgram.cpp in Sources */, 500DC96519106300007B91BF /* CCEventListenerAcceleration.cpp in Sources */, - 1A570538180BD9500088DEC7 /* ccGLStateCache.cpp in Sources */, 500DC94D19106300007B91BF /* CCEvent.cpp in Sources */, 1AD71DAA180E26E600808F54 /* CCBAnimationManager.cpp in Sources */, 1AD71DAE180E26E600808F54 /* CCBFileLoader.cpp in Sources */, @@ -6701,9 +6720,11 @@ 06CAAAC8186AD7EB0012A414 /* TriggerObj.cpp in Sources */, 1AD71DF0180E26E600808F54 /* CCNode+CCBRelativePositioning.cpp in Sources */, 5027253D190BF1B900AAF4ED /* cocos2d.cpp in Sources */, + 5034CA50191D591100CE6051 /* ccGLStateCache.cpp in Sources */, 1AD71DF4180E26E600808F54 /* CCNodeLoader.cpp in Sources */, 1AD71DF8180E26E600808F54 /* CCNodeLoaderLibrary.cpp in Sources */, 1AD71DFE180E26E600808F54 /* CCParticleSystemQuadLoader.cpp in Sources */, + 5034CA54191D591100CE6051 /* CCGLProgramStateCache.cpp in Sources */, 1AD71E02180E26E600808F54 /* CCScale9SpriteLoader.cpp in Sources */, 1AD71E06180E26E600808F54 /* CCScrollViewLoader.cpp in Sources */, 1AD71E0A180E26E600808F54 /* CCSpriteLoader.cpp in Sources */, @@ -6748,11 +6769,13 @@ 1AAF5377180E3374000584C8 /* WebSocket.cpp in Sources */, 500DC93D19106300007B91BF /* CCConsole.cpp in Sources */, 1AAF5850180E40B9000584C8 /* LocalStorage.cpp in Sources */, + 5034CA58191D591100CE6051 /* CCGLProgramState.cpp in Sources */, 1AAF5854180E40B9000584C8 /* LocalStorageAndroid.cpp in Sources */, 1A9DCA24180E6955007A3AD4 /* ccFPSImages.c in Sources */, 1A9DCA28180E6955007A3AD4 /* CCGLBufferedNode.cpp in Sources */, 50FCEBA018C72017004AD434 /* LayoutReader.cpp in Sources */, 50E6D33518E174130051CA34 /* UIHBox.cpp in Sources */, + 5034CA1C191D591100CE6051 /* ccShaders.cpp in Sources */, 500DC98F19106300007B91BF /* CCRef.cpp in Sources */, 50FCEBB018C72017004AD434 /* ScrollViewReader.cpp in Sources */, 50FCEBAC18C72017004AD434 /* PageViewReader.cpp in Sources */, @@ -6787,6 +6810,7 @@ 46C02E0818E91123004B7456 /* xxhash.c in Sources */, 500DC95D19106300007B91BF /* CCEventKeyboard.cpp in Sources */, 2905FA4118CF08D100240AA3 /* CocosGUI.cpp in Sources */, + 5034CA20191D591100CE6051 /* CCShaderCache.cpp in Sources */, 1A01C68518F57BE800EFE3A6 /* CCArray.cpp in Sources */, 1A8C59DC180E930E00EF57C3 /* CCDisplayManager.cpp in Sources */, 1A8C59E0180E930E00EF57C3 /* CCInputDelegate.cpp in Sources */,