From 004abc3b66e1caa786cc4be24940fbd036f243b2 Mon Sep 17 00:00:00 2001 From: knoxHuang <821686174@qq.com> Date: Tue, 18 Apr 2017 09:18:03 +0800 Subject: [PATCH] fix cocos-creator/fireball/issues/5484 --- cocos2d/core/event-manager/CCSystemEvent.js | 10 +--------- cocos2d/core/platform/CCInputExtension.js | 6 ++++++ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/cocos2d/core/event-manager/CCSystemEvent.js b/cocos2d/core/event-manager/CCSystemEvent.js index 7461ad6f90..997ef8cfc2 100644 --- a/cocos2d/core/event-manager/CCSystemEvent.js +++ b/cocos2d/core/event-manager/CCSystemEvent.js @@ -118,16 +118,8 @@ var SystemEvent = cc.Class({ if (!accelerationListener) { accelerationListener = cc.EventListener.create({ event: cc.EventListener.ACCELERATION, - callback: function (accelEvent, event) { + callback: function (acc, event) { event.type = EventType.DEVICEMOTION; - // fix android acc values are opposite - if (!CC_JSB && cc.sys.os === cc.sys.OS_ANDROID && - cc.sys.browserType !== cc.sys.BROWSER_TYPE_MOBILE_QQ) { - event.acc = cc.p(-accelEvent.x, -accelEvent.y); - } - else { - event.acc = cc.p(accelEvent.x, accelEvent.y); - } cc.systemEvent.dispatchEvent(event); } }); diff --git a/cocos2d/core/platform/CCInputExtension.js b/cocos2d/core/platform/CCInputExtension.js index 4502ab98e3..e03816cbf9 100644 --- a/cocos2d/core/platform/CCInputExtension.js +++ b/cocos2d/core/platform/CCInputExtension.js @@ -125,4 +125,10 @@ inputManager.didAccelerate = function (eventData) { mAcceleration.x = -mAcceleration.x; mAcceleration.y = -mAcceleration.y; } + // fix android acc values are opposite + if (!CC_JSB && cc.sys.os === cc.sys.OS_ANDROID && + cc.sys.browserType !== cc.sys.BROWSER_TYPE_MOBILE_QQ) { + mAcceleration.x = -mAcceleration.x; + mAcceleration.y = -mAcceleration.y; + } }; \ No newline at end of file