diff --git a/cocos2d/core/platform/CCInputManager.js b/cocos2d/core/platform/CCInputManager.js index aad086472c..aa753aaff2 100644 --- a/cocos2d/core/platform/CCInputManager.js +++ b/cocos2d/core/platform/CCInputManager.js @@ -317,12 +317,12 @@ var inputManager = { */ getMouseEvent: function(location, pos, eventType){ var locPreMouse = this._prevMousePoint; - this._glView._convertMouseToLocationInView(location, pos); var mouseEvent = new cc.Event.EventMouse(eventType); - mouseEvent.setLocation(location.x, location.y); mouseEvent._setPrevCursor(locPreMouse.x, locPreMouse.y); locPreMouse.x = location.x; locPreMouse.y = location.y; + this._glView._convertMouseToLocationInView(locPreMouse, pos); + mouseEvent.setLocation(locPreMouse.x, locPreMouse.y); return mouseEvent; }, diff --git a/cocos2d/core/platform/CCView.js b/cocos2d/core/platform/CCView.js index e16696c60b..7133a3b434 100644 --- a/cocos2d/core/platform/CCView.js +++ b/cocos2d/core/platform/CCView.js @@ -967,10 +967,10 @@ var View = cc._Class.extend({ return this._isRotated ? {x: this._viewPortRect.width - y, y: x} : {x: x, y: y}; }, - _convertMouseToLocationInView: function (point, relatedPos) { + _convertMouseToLocationInView: function (in_out_point, relatedPos) { var viewport = this._viewPortRect, _t = this; - point.x = ((_t._devicePixelRatio * (point.x - relatedPos.left)) - viewport.x) / _t._scaleX; - point.y = (_t._devicePixelRatio * (relatedPos.top + relatedPos.height - point.y) - viewport.y) / _t._scaleY; + in_out_point.x = ((_t._devicePixelRatio * (in_out_point.x - relatedPos.left)) - viewport.x) / _t._scaleX; + in_out_point.y = (_t._devicePixelRatio * (relatedPos.top + relatedPos.height - in_out_point.y) - viewport.y) / _t._scaleY; }, _convertPointWithScale: function (point) {