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

Merge pull request #1659 from dumganhar/gles20 

fixed #1577: Fix touch event lost on Win32, the reason is that:
Cocos2d-x is using touch event callback for all platforms, it's different from cocos2d-iphone which uses mouse event for Mac port. So we just need to touch event by using kCCBPlatformIOS.
This commit is contained in:
James Chen 2012-11-26 19:09:24 -08:00
parent 8dffd457db de8be8561e
commit 24d6a1658d
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
extensions/CCBReader/CCNodeLoader.cpp
View File

@ -35,17 +35,20 @@ void CCNodeLoader::parseProperties(CCNode * pNode, CCNode * pParent, CCBReader *
{ {
setProp = true; setProp = true;
} }
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) // Cocos2d-x is using touch event callback for all platforms,
// it's different from cocos2d-iphone which uses mouse event for Mac port.
// So we just need to touch event by using kCCBPlatformIOS.
//#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
if(platform == kCCBPlatformIOS) if(platform == kCCBPlatformIOS)
{ {
setProp = true; setProp = true;
} }
#elif (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) // #elif (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
if(platform == kCCBPlatformMac) // if(platform == kCCBPlatformMac)
{ // {
setProp = true; // setProp = true;
} // }
#endif // #endif
// Forward properties for sub ccb files // Forward properties for sub ccb files
if (dynamic_cast<CCBFile*>(pNode) != NULL) if (dynamic_cast<CCBFile*>(pNode) != NULL)