From 621e682e6e4832bdbdce804ae89ac7e178d77a64 Mon Sep 17 00:00:00 2001 From: James Chen Date: Mon, 16 Sep 2013 19:53:59 +0800 Subject: [PATCH 1/2] [GUI] Fixing compilation errors for win32. Conflicts: extensions/proj.win32/libExtensions.vcxproj.filters --- extensions/CocoStudio/GUI/Layouts/Layout.cpp | 4 +- extensions/proj.win32/libExtensions.vcxproj | 57 +++++ .../proj.win32/libExtensions.vcxproj.filters | 195 +++++++++++++++++- 3 files changed, 251 insertions(+), 5 deletions(-) diff --git a/extensions/CocoStudio/GUI/Layouts/Layout.cpp b/extensions/CocoStudio/GUI/Layouts/Layout.cpp index 9d098cf367..47843aec1f 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(m_clippingSize.width, m_clippingSize.height); rect[3] = Point(0, m_clippingSize.height); - Color4F green = {0, 1, 0, 1}; + Color4F green = Color4F(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(m_clippingSize.width, 0); rect[2] = Point(m_clippingSize.width, m_clippingSize.height); rect[3] = Point(0, m_clippingSize.height); - Color4F green = {0, 1, 0, 1}; + Color4F green = Color4F(0, 1, 0, 1); m_pInnerStencil->clear(); m_pInnerStencil->drawPolygon(rect, 4, green, 0, green); } diff --git a/extensions/proj.win32/libExtensions.vcxproj b/extensions/proj.win32/libExtensions.vcxproj index 964cc89d22..cb635c2c6e 100644 --- a/extensions/proj.win32/libExtensions.vcxproj +++ b/extensions/proj.win32/libExtensions.vcxproj @@ -143,11 +143,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -254,6 +282,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -266,6 +322,7 @@ + diff --git a/extensions/proj.win32/libExtensions.vcxproj.filters b/extensions/proj.win32/libExtensions.vcxproj.filters index 9bcc34aceb..16862da62e 100644 --- a/extensions/proj.win32/libExtensions.vcxproj.filters +++ b/extensions/proj.win32/libExtensions.vcxproj.filters @@ -67,6 +67,27 @@ {d305abea-33cc-4ae8-b78d-b5fb59927e59} + + {9af947f9-84cd-4051-953e-67291da6528c} + + + {6ad66a63-e7d6-4285-b30a-7ab70a299f7e} + + + {9713ac75-d9ba-494a-8dcf-03e30f8ee2b2} + + + {2d6f3e38-bb46-4bec-9ec1-73d90cefb3ba} + + + {7556b22b-b7ca-4f3b-938d-0f9c8047892c} + + + {f66c34f1-f75a-4f06-9788-c48972bc0ff2} + + + {1c44450b-d06e-4638-9f0c-1ff62e67ec84} + @@ -376,6 +397,90 @@ CocoStudio\Armature\external_tool + + CocoStudio\GUI\UIWidgets\ScrollWidget + + + CocoStudio\GUI\UIWidgets\ScrollWidget + + + CocoStudio\GUI\UIWidgets\ScrollWidget + + + CocoStudio\GUI\UIWidgets\ScrollWidget + + + CocoStudio\GUI\UIWidgets + + + CocoStudio\GUI\UIWidgets + + + CocoStudio\GUI\UIWidgets + + + CocoStudio\GUI\UIWidgets + + + CocoStudio\GUI\UIWidgets + + + CocoStudio\GUI\UIWidgets + + + CocoStudio\GUI\UIWidgets + + + CocoStudio\GUI\UIWidgets + + + CocoStudio\GUI\UIWidgets + + + CocoStudio\GUI\Action + + + CocoStudio\GUI\Action + + + CocoStudio\GUI\Action + + + CocoStudio\GUI\Action + + + CocoStudio\GUI\BaseClasses + + + CocoStudio\GUI\BaseClasses + + + CocoStudio\GUI\Layouts + + + CocoStudio\GUI\Layouts + + + CocoStudio\GUI\Layouts + + + CocoStudio\GUI\Layouts + + + CocoStudio\GUI\System + + + CocoStudio\GUI\System + + + CocoStudio\GUI\System + + + CocoStudio\GUI\System + + + CocoStudio\Reader + @@ -740,8 +845,92 @@ CocoStudio\Components - - CocoStudio\Armature\external_tool + + CocoStudio\GUI\UIWidgets\ScrollWidget + + + CocoStudio\GUI\UIWidgets\ScrollWidget + + + CocoStudio\GUI\UIWidgets\ScrollWidget + + + CocoStudio\GUI\UIWidgets\ScrollWidget + + + CocoStudio\GUI\UIWidgets\ScrollWidget + + + CocoStudio\GUI\UIWidgets + + + CocoStudio\GUI\UIWidgets + + + CocoStudio\GUI\UIWidgets + + + CocoStudio\GUI\UIWidgets + + + CocoStudio\GUI\UIWidgets + + + CocoStudio\GUI\UIWidgets + + + CocoStudio\GUI\UIWidgets + + + CocoStudio\GUI\UIWidgets + + + CocoStudio\GUI\UIWidgets + + + CocoStudio\GUI\Action + + + CocoStudio\GUI\Action + + + CocoStudio\GUI\Action + + + CocoStudio\GUI\Action + + + CocoStudio\GUI\BaseClasses + + + CocoStudio\GUI\BaseClasses + + + CocoStudio\GUI\Layouts + + + CocoStudio\GUI\Layouts + + + CocoStudio\GUI\Layouts + + + CocoStudio\GUI\Layouts + + + CocoStudio\GUI\System + + + CocoStudio\GUI\System + + + CocoStudio\GUI\System + + + CocoStudio\GUI\System + + + CocoStudio\Reader @@ -758,4 +947,4 @@ CocoStudio\Json\lib_json - \ No newline at end of file + From c12a655fdf417703199a05782109a5cf94ae3e46 Mon Sep 17 00:00:00 2001 From: James Chen Date: Mon, 16 Sep 2013 20:05:25 +0800 Subject: [PATCH 2/2] [GUI] Fix compilation error on win32. --- extensions/proj.win32/libExtensions.vcxproj.filters | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/extensions/proj.win32/libExtensions.vcxproj.filters b/extensions/proj.win32/libExtensions.vcxproj.filters index 16862da62e..cfc6f865c3 100644 --- a/extensions/proj.win32/libExtensions.vcxproj.filters +++ b/extensions/proj.win32/libExtensions.vcxproj.filters @@ -932,6 +932,9 @@ CocoStudio\Reader + + CocoStudio\Armature\external_tool + @@ -947,4 +950,4 @@ CocoStudio\Json\lib_json - + \ No newline at end of file