diff --git a/extensions/CocoStudio/GUI/Layouts/Layout.cpp b/extensions/CocoStudio/GUI/Layouts/Layout.cpp
index 779ff73616..17e90a2108 100644
--- a/extensions/CocoStudio/GUI/Layouts/Layout.cpp
+++ b/extensions/CocoStudio/GUI/Layouts/Layout.cpp
@@ -462,7 +462,7 @@ bool RectClippingNode::init()
rect[2] = Point(_clippingSize.width, _clippingSize.height);
rect[3] = Point(0, _clippingSize.height);
- Color4F green = {0, 1, 0, 1};
+ Color4F green(0, 1, 0, 1);
m_pInnerStencil->drawPolygon(rect, 4, green, 0, green);
if (CCClippingNode::init(m_pInnerStencil))
{
@@ -480,7 +480,7 @@ void RectClippingNode::setClippingSize(const Size &size)
rect[1] = Point(_clippingSize.width, 0);
rect[2] = Point(_clippingSize.width, _clippingSize.height);
rect[3] = Point(0, _clippingSize.height);
- Color4F green = {0, 1, 0, 1};
+ Color4F green(0, 1, 0, 1);
m_pInnerStencil->clear();
m_pInnerStencil->drawPolygon(rect, 4, green, 0, green);
}
diff --git a/samples/Cpp/TestCpp/Resources/cocosgui/Hello.png.REMOVED.git-id b/samples/Cpp/TestCpp/Resources/cocosgui/Hello.png.REMOVED.git-id
new file mode 100644
index 0000000000..f02d84fd8f
--- /dev/null
+++ b/samples/Cpp/TestCpp/Resources/cocosgui/Hello.png.REMOVED.git-id
@@ -0,0 +1 @@
+5fe89fb5bd58cedf13b0363f97b20e3ea7ff255d
\ No newline at end of file
diff --git a/samples/Cpp/TestCpp/Resources/cocosgui/UITest/background.png.REMOVED.git-id b/samples/Cpp/TestCpp/Resources/cocosgui/UITest/background.png.REMOVED.git-id
new file mode 100644
index 0000000000..746e4e19e9
--- /dev/null
+++ b/samples/Cpp/TestCpp/Resources/cocosgui/UITest/background.png.REMOVED.git-id
@@ -0,0 +1 @@
+500d95937f3fd81659da66d2099b6c80d988a6b5
\ No newline at end of file
diff --git a/samples/Cpp/TestCpp/Resources/cocosgui/b11.png.REMOVED.git-id b/samples/Cpp/TestCpp/Resources/cocosgui/b11.png.REMOVED.git-id
new file mode 100644
index 0000000000..0b4502562c
--- /dev/null
+++ b/samples/Cpp/TestCpp/Resources/cocosgui/b11.png.REMOVED.git-id
@@ -0,0 +1 @@
+39179659c7b94b213b6ab7b24372c96378f61062
\ No newline at end of file
diff --git a/samples/Cpp/TestCpp/Resources/cocosgui/bitmapFontTest2.png.REMOVED.git-id b/samples/Cpp/TestCpp/Resources/cocosgui/bitmapFontTest2.png.REMOVED.git-id
new file mode 100644
index 0000000000..d025022480
--- /dev/null
+++ b/samples/Cpp/TestCpp/Resources/cocosgui/bitmapFontTest2.png.REMOVED.git-id
@@ -0,0 +1 @@
+9975e4961272d5bda6d5f3bbd61ea0fc02222199
\ No newline at end of file
diff --git a/samples/Cpp/TestCpp/Resources/cocosgui/examples/examples.json.REMOVED.git-id b/samples/Cpp/TestCpp/Resources/cocosgui/examples/examples.json.REMOVED.git-id
new file mode 100644
index 0000000000..f28818a9af
--- /dev/null
+++ b/samples/Cpp/TestCpp/Resources/cocosgui/examples/examples.json.REMOVED.git-id
@@ -0,0 +1 @@
+0a4ce85782909e964aa0e95e89bab8272d0c3d4e
\ No newline at end of file
diff --git a/samples/Cpp/TestCpp/Resources/cocosgui/gui_examples/equip_1/equip_1.json.REMOVED.git-id b/samples/Cpp/TestCpp/Resources/cocosgui/gui_examples/equip_1/equip_1.json.REMOVED.git-id
new file mode 100644
index 0000000000..596d52b27c
--- /dev/null
+++ b/samples/Cpp/TestCpp/Resources/cocosgui/gui_examples/equip_1/equip_1.json.REMOVED.git-id
@@ -0,0 +1 @@
+0a77108d377ceb5f084f1aab1877159df9499428
\ No newline at end of file
diff --git a/samples/Cpp/TestCpp/Resources/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id b/samples/Cpp/TestCpp/Resources/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id
new file mode 100644
index 0000000000..6f99243a26
--- /dev/null
+++ b/samples/Cpp/TestCpp/Resources/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id
@@ -0,0 +1 @@
+39d29cbeb700598c3e4ad6d3ee0ac273a3385fcd
\ No newline at end of file
diff --git a/samples/Cpp/TestCpp/Resources/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id b/samples/Cpp/TestCpp/Resources/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id
new file mode 100644
index 0000000000..746e4e19e9
--- /dev/null
+++ b/samples/Cpp/TestCpp/Resources/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id
@@ -0,0 +1 @@
+500d95937f3fd81659da66d2099b6c80d988a6b5
\ No newline at end of file
diff --git a/samples/Cpp/TestCpp/Resources/hd/cocosgui/Hello.png.REMOVED.git-id b/samples/Cpp/TestCpp/Resources/hd/cocosgui/Hello.png.REMOVED.git-id
new file mode 100644
index 0000000000..bf03af4205
--- /dev/null
+++ b/samples/Cpp/TestCpp/Resources/hd/cocosgui/Hello.png.REMOVED.git-id
@@ -0,0 +1 @@
+a6e5d948d0c85ecc42b7a2ebf5751e3990002bac
\ No newline at end of file
diff --git a/samples/Cpp/TestCpp/Resources/hd/cocosgui/UITest/background.png.REMOVED.git-id b/samples/Cpp/TestCpp/Resources/hd/cocosgui/UITest/background.png.REMOVED.git-id
new file mode 100644
index 0000000000..1f73829609
--- /dev/null
+++ b/samples/Cpp/TestCpp/Resources/hd/cocosgui/UITest/background.png.REMOVED.git-id
@@ -0,0 +1 @@
+eff519b0334eaeb486f302ec2581771950b7cca2
\ No newline at end of file
diff --git a/samples/Cpp/TestCpp/Resources/hd/cocosgui/b11.png.REMOVED.git-id b/samples/Cpp/TestCpp/Resources/hd/cocosgui/b11.png.REMOVED.git-id
new file mode 100644
index 0000000000..7ad21adacb
--- /dev/null
+++ b/samples/Cpp/TestCpp/Resources/hd/cocosgui/b11.png.REMOVED.git-id
@@ -0,0 +1 @@
+021493cabd2489bf2c20c657e5523e24608df86c
\ No newline at end of file
diff --git a/samples/Cpp/TestCpp/Resources/hd/cocosgui/bitmapFontTest2.png.REMOVED.git-id b/samples/Cpp/TestCpp/Resources/hd/cocosgui/bitmapFontTest2.png.REMOVED.git-id
new file mode 100644
index 0000000000..d025022480
--- /dev/null
+++ b/samples/Cpp/TestCpp/Resources/hd/cocosgui/bitmapFontTest2.png.REMOVED.git-id
@@ -0,0 +1 @@
+9975e4961272d5bda6d5f3bbd61ea0fc02222199
\ No newline at end of file
diff --git a/samples/Cpp/TestCpp/Resources/hd/cocosgui/examples/examples.json.REMOVED.git-id b/samples/Cpp/TestCpp/Resources/hd/cocosgui/examples/examples.json.REMOVED.git-id
new file mode 100644
index 0000000000..f28818a9af
--- /dev/null
+++ b/samples/Cpp/TestCpp/Resources/hd/cocosgui/examples/examples.json.REMOVED.git-id
@@ -0,0 +1 @@
+0a4ce85782909e964aa0e95e89bab8272d0c3d4e
\ No newline at end of file
diff --git a/samples/Cpp/TestCpp/Resources/hd/cocosgui/gui_examples/equip_1/equip_1.json.REMOVED.git-id b/samples/Cpp/TestCpp/Resources/hd/cocosgui/gui_examples/equip_1/equip_1.json.REMOVED.git-id
new file mode 100644
index 0000000000..596d52b27c
--- /dev/null
+++ b/samples/Cpp/TestCpp/Resources/hd/cocosgui/gui_examples/equip_1/equip_1.json.REMOVED.git-id
@@ -0,0 +1 @@
+0a77108d377ceb5f084f1aab1877159df9499428
\ No newline at end of file
diff --git a/samples/Cpp/TestCpp/Resources/hd/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id b/samples/Cpp/TestCpp/Resources/hd/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id
new file mode 100644
index 0000000000..7e87ef6cb4
--- /dev/null
+++ b/samples/Cpp/TestCpp/Resources/hd/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id
@@ -0,0 +1 @@
+1a6a5a2f571c692a962e9159fca8ea5d6879a748
\ No newline at end of file
diff --git a/samples/Cpp/TestCpp/Resources/hd/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id b/samples/Cpp/TestCpp/Resources/hd/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id
new file mode 100644
index 0000000000..1f73829609
--- /dev/null
+++ b/samples/Cpp/TestCpp/Resources/hd/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id
@@ -0,0 +1 @@
+eff519b0334eaeb486f302ec2581771950b7cca2
\ No newline at end of file
diff --git a/samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj b/samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj
index e38cc2fe68..d8c38569e3 100644
--- a/samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj
+++ b/samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj
@@ -146,6 +146,26 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\libwebsockets\win32\lib\*.*" "$(O
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -260,6 +280,26 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\libwebsockets\win32\lib\*.*" "$(O
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters b/samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters
index f6dac52c63..cf47e0d936 100644
--- a/samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters
+++ b/samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters
@@ -241,6 +241,60 @@
{0b414789-7971-4a4c-86e3-40cc00936684}
+
+ {9daecd38-37c6-4216-a999-86077af83beb}
+
+
+ {493fcd85-c749-482d-9404-905e99aa0103}
+
+
+ {5c1960de-24ba-4b72-be18-cc160dd2a50d}
+
+
+ {175b363b-a41a-4b1d-bde1-970e77e64cff}
+
+
+ {2e08949f-bf73-4fdc-85e8-34b8c69aa978}
+
+
+ {c57c0453-a096-44d7-830b-1cf24c712cfd}
+
+
+ {c4dbbfb3-0e91-492f-bbbf-f03fb26f3f54}
+
+
+ {01097388-e538-4081-8e16-d1ff3a86292a}
+
+
+ {160da6f0-a0f1-4a53-8e5e-cf0a63ee82a3}
+
+
+ {fadff96e-c19a-41f5-a755-547cf1f8a5fb}
+
+
+ {73c268e8-3872-49d6-9204-1e679ff72a42}
+
+
+ {6e7f1d2a-c8c1-4f48-826f-930bc8a0556e}
+
+
+ {305e1c54-9321-49f7-8672-46d1286dbe83}
+
+
+ {df6e9468-93f7-472d-be1d-d274d7de677e}
+
+
+ {dedcabba-959c-40e3-9959-7ccf4e31c792}
+
+
+ {cfc87c30-a7b4-4b6f-bc5d-da45360466b6}
+
+
+ {5caf2179-ae22-4040-8bac-17e9f22efbf7}
+
+
+ {24f044ee-09a6-406b-98d7-8d5d759e5bb1}
+
@@ -571,6 +625,66 @@
Classes\NewEventDispatcherTest
+
+ Classes\ExtensionsTest\CocoStudioGUITest\UIButtonTest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest\UICheckBoxTest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest\UIDragPanelTest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest\UIImageViewTest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest\UILabelAtlasTest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest\UILabelBMFontTest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest\UILabelTest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest\UIListViewTest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest\UILoadingBarTest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest\UINodeContainerTest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest\UIPageViewTest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest\UIPanelTest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest\UIScrollViewTest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest\UISliderTest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest\UITextAreaTest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest\UITextButtonTest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest\UITextFieldTest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest
+
@@ -1078,5 +1192,65 @@
Classes\NewEventDispatcherTest
+
+ Classes\ExtensionsTest\CocoStudioGUITest\UIButtonTest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest\UICheckBoxTest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest\UIDragPanelTest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest\UIImageViewTest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest\UILabelAtlasTest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest\UILabelBMFontTest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest\UILabelTest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest\UIListViewTest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest\UILoadingBarTest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest\UINodeContainerTest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest\UIPageViewTest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest\UIPanelTest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest\UIScrollViewTest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest\UISliderTest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest\UITextAreaTest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest\UITextButtonTest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest\UITextFieldTest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest
+
+
+ Classes\ExtensionsTest\CocoStudioGUITest
+
\ No newline at end of file