Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'add-deprecated-header' of https://github.com/minggo/cocos2d-x into add-deprecated-header

This commit is contained in:
minggo 2013-07-15 17:52:20 +08:00
parent cb271e21d8 dc2daf31ea
commit bee3b60b5a
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cocos2dx/platform/win32/CCEGLView.cpp
View File

@ -30,7 +30,6 @@ THE SOFTWARE.
#include "touch_dispatcher/CCTouchDispatcher.h" #include "touch_dispatcher/CCTouchDispatcher.h"
#include "text_input_node/CCIMEDispatcher.h" #include "text_input_node/CCIMEDispatcher.h"
#include "keypad_dispatcher/CCKeypadDispatcher.h" #include "keypad_dispatcher/CCKeypadDispatcher.h"
#include "support/CCPointExtension.h"
#include "CCApplication.h" #include "CCApplication.h"
#ifdef CC_KEYBOARD_SUPPORT #ifdef CC_KEYBOARD_SUPPORT
#include "keyboard_dispatcher/CCKeyboardDispatcher.h" #include "keyboard_dispatcher/CCKeyboardDispatcher.h"
@ -352,8 +351,8 @@ LRESULT EGLView::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
Point pt(point.x, point.y); Point pt(point.x, point.y);
pt.x /= _frameZoomFactor; pt.x /= _frameZoomFactor;
pt.y /= _frameZoomFactor; pt.y /= _frameZoomFactor;
Point tmp = ccp(pt.x, _screenSize.height - pt.y); Point tmp = Point(pt.x, _screenSize.height - pt.y);
if (_viewPortRect.equals(RectZero) || _viewPortRect.containsPoint(tmp)) if (_viewPortRect.equals(Rect::ZERO) || _viewPortRect.containsPoint(tmp))
{ {
_captured = true; _captured = true;
SetCapture(_wnd); SetCapture(_wnd);
@ -415,8 +414,8 @@ LRESULT EGLView::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
input.y = TOUCH_COORD_TO_PIXEL(ti.y); input.y = TOUCH_COORD_TO_PIXEL(ti.y);
ScreenToClient(_wnd, &input); ScreenToClient(_wnd, &input);
Point pt(input.x, input.y); Point pt(input.x, input.y);
Point tmp = ccp(pt.x, _screenSize.height - pt.y); Point tmp = Point(pt.x, _screenSize.height - pt.y);
if (_viewPortRect.equals(RectZero) || _viewPortRect.containsPoint(tmp)) if (_viewPortRect.equals(Rect::ZERO) || _viewPortRect.containsPoint(tmp))
{ {
pt.x /= _frameZoomFactor; pt.x /= _frameZoomFactor;
pt.y /= _frameZoomFactor; pt.y /= _frameZoomFactor;

3
cocos2dx/proj.win32/cocos2d.vcxproj
View File

@ -217,7 +217,6 @@ xcopy /Y /Q "$(ProjectDir)..\platform\third_party\win32\libraries\*.*" "$(OutDir
<ClCompile Include="..\sprite_nodes\CCSpriteFrameCache.cpp" /> <ClCompile Include="..\sprite_nodes\CCSpriteFrameCache.cpp" />
<ClCompile Include="..\support\base64.cpp" /> <ClCompile Include="..\support\base64.cpp" />
<ClCompile Include="..\support\CCNotificationCenter.cpp" /> <ClCompile Include="..\support\CCNotificationCenter.cpp" />
<ClCompile Include="..\support\CCPointExtension.cpp" />
<ClCompile Include="..\support\CCProfiling.cpp" /> <ClCompile Include="..\support\CCProfiling.cpp" />
<ClCompile Include="..\support\ccUTF8.cpp" /> <ClCompile Include="..\support\ccUTF8.cpp" />
<ClCompile Include="..\support\ccUtils.cpp" /> <ClCompile Include="..\support\ccUtils.cpp" />
@ -308,6 +307,7 @@ xcopy /Y /Q "$(ProjectDir)..\platform\third_party\win32\libraries\*.*" "$(OutDir
<ClInclude Include="..\actions\CCActionTiledGrid.h" /> <ClInclude Include="..\actions\CCActionTiledGrid.h" />
<ClInclude Include="..\actions\CCActionTween.h" /> <ClInclude Include="..\actions\CCActionTween.h" />
<ClInclude Include="..\include\ccConfig.h" /> <ClInclude Include="..\include\ccConfig.h" />
<ClInclude Include="..\include\CCDeprecated.h" />
<ClInclude Include="..\include\CCEventType.h" /> <ClInclude Include="..\include\CCEventType.h" />
<ClInclude Include="..\include\ccMacros.h" /> <ClInclude Include="..\include\ccMacros.h" />
<ClInclude Include="..\include\CCProtocols.h" /> <ClInclude Include="..\include\CCProtocols.h" />
@ -379,7 +379,6 @@ xcopy /Y /Q "$(ProjectDir)..\platform\third_party\win32\libraries\*.*" "$(OutDir
<ClInclude Include="..\sprite_nodes\CCSpriteFrameCache.h" /> <ClInclude Include="..\sprite_nodes\CCSpriteFrameCache.h" />
<ClInclude Include="..\support\base64.h" /> <ClInclude Include="..\support\base64.h" />
<ClInclude Include="..\support\CCNotificationCenter.h" /> <ClInclude Include="..\support\CCNotificationCenter.h" />
<ClInclude Include="..\support\CCPointExtension.h" />
<ClInclude Include="..\support\CCProfiling.h" /> <ClInclude Include="..\support\CCProfiling.h" />
<ClInclude Include="..\support\ccUTF8.h" /> <ClInclude Include="..\support\ccUTF8.h" />
<ClInclude Include="..\support\ccUtils.h" /> <ClInclude Include="..\support\ccUtils.h" />

9
cocos2dx/proj.win32/cocos2d.vcxproj.filters
View File

@ -297,9 +297,6 @@
<ClCompile Include="..\support\CCNotificationCenter.cpp"> <ClCompile Include="..\support\CCNotificationCenter.cpp">
<Filter>support</Filter> <Filter>support</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\support\CCPointExtension.cpp">
<Filter>support</Filter>
</ClCompile>
<ClCompile Include="..\support\CCProfiling.cpp"> <ClCompile Include="..\support\CCProfiling.cpp">
<Filter>support</Filter> <Filter>support</Filter>
</ClCompile> </ClCompile>
@ -720,9 +717,6 @@
<ClInclude Include="..\support\CCNotificationCenter.h"> <ClInclude Include="..\support\CCNotificationCenter.h">
<Filter>support</Filter> <Filter>support</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\support\CCPointExtension.h">
<Filter>support</Filter>
</ClInclude>
<ClInclude Include="..\support\CCProfiling.h"> <ClInclude Include="..\support\CCProfiling.h">
<Filter>support</Filter> <Filter>support</Filter>
</ClInclude> </ClInclude>
@ -971,5 +965,8 @@
<ClInclude Include="..\keyboard_dispatcher\CCKeyboardDispatcher.h"> <ClInclude Include="..\keyboard_dispatcher\CCKeyboardDispatcher.h">
<Filter>keyboard_dispatcher</Filter> <Filter>keyboard_dispatcher</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\include\CCDeprecated.h">
<Filter>include</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
</Project> </Project>