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

Merge pull request #4097 from hannon235/fix-android-nativeactivity-amd-support 

[android] update nativeactivity.cpp to work with changes made in commit ...
This commit is contained in:
minggo 2013-11-05 17:48:38 -08:00
parent 5061c7cae4 471dd07f3b
commit 2b551732f0
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cocos/2d/platform/android/nativeactivity.cpp
View File

@ -292,7 +292,7 @@ static void engine_term_display(struct engine* engine) {
/* /*
* Get X, Y positions and ID's for all pointers * Get X, Y positions and ID's for all pointers
*/ */
static void getTouchPos(AInputEvent *event, int ids[], float xs[], float ys[]) { static void getTouchPos(AInputEvent *event, long ids[], float xs[], float ys[]) {
int pointerCount = AMotionEvent_getPointerCount(event); int pointerCount = AMotionEvent_getPointerCount(event);
for(int i = 0; i < pointerCount; ++i) { for(int i = 0; i < pointerCount; ++i) {
ids[i] = AMotionEvent_getPointerId(event, i); ids[i] = AMotionEvent_getPointerId(event, i);
@ -321,7 +321,7 @@ static int32_t handle_touch_input(AInputEvent *event) {
LOG_EVENTS_DEBUG("Event: Action DOWN x=%f y=%f pointerID=%d\n", LOG_EVENTS_DEBUG("Event: Action DOWN x=%f y=%f pointerID=%d\n",
xP, yP, pointerId); xP, yP, pointerId);
int pId = pointerId; long pId = pointerId;
float x = xP; float x = xP;
float y = yP; float y = yP;
@ -340,7 +340,7 @@ static int32_t handle_touch_input(AInputEvent *event) {
LOG_EVENTS_DEBUG("Event: Action POINTER DOWN x=%f y=%f pointerID=%d\n", LOG_EVENTS_DEBUG("Event: Action POINTER DOWN x=%f y=%f pointerID=%d\n",
xP, yP, pointerId); xP, yP, pointerId);
int pId = pointerId; long pId = pointerId;
float x = xP; float x = xP;
float y = yP; float y = yP;
@ -353,10 +353,10 @@ static int32_t handle_touch_input(AInputEvent *event) {
{ {
LOG_EVENTS_DEBUG("AMOTION_EVENT_ACTION_MOVE"); LOG_EVENTS_DEBUG("AMOTION_EVENT_ACTION_MOVE");
int pointerCount = AMotionEvent_getPointerCount(event); int pointerCount = AMotionEvent_getPointerCount(event);
int ids[pointerCount]; long ids[pointerCount];
float xs[pointerCount], ys[pointerCount]; float xs[pointerCount], ys[pointerCount];
getTouchPos(event, ids, xs, ys); getTouchPos(event, ids, xs, ys);
cocos2d::Director::getInstance()->getOpenGLView()->handleTouchesMove(pointerCount, ids, xs, ys); cocos2d::Director::getInstance()->getOpenGLView()->handleTouchesMove(pointerCount, ids, xs, ys);
return 1; return 1;
} }
break; break;
@ -369,7 +369,7 @@ static int32_t handle_touch_input(AInputEvent *event) {
float yP = AMotionEvent_getY(event,0); float yP = AMotionEvent_getY(event,0);
LOG_EVENTS_DEBUG("Event: Action UP x=%f y=%f pointerID=%d\n", LOG_EVENTS_DEBUG("Event: Action UP x=%f y=%f pointerID=%d\n",
xP, yP, pointerId); xP, yP, pointerId);
int pId = pointerId; long pId = pointerId;
float x = xP; float x = xP;
float y = yP; float y = yP;
@ -387,7 +387,7 @@ static int32_t handle_touch_input(AInputEvent *event) {
float yP = AMotionEvent_getY(event,pointerIndex); float yP = AMotionEvent_getY(event,pointerIndex);
LOG_EVENTS_DEBUG("Event: Action POINTER UP x=%f y=%f pointerID=%d\n", LOG_EVENTS_DEBUG("Event: Action POINTER UP x=%f y=%f pointerID=%d\n",
xP, yP, pointerIndex); xP, yP, pointerIndex);
int pId = pointerId; long pId = pointerId;
float x = xP; float x = xP;
float y = yP; float y = yP;
@ -400,10 +400,10 @@ static int32_t handle_touch_input(AInputEvent *event) {
{ {
LOG_EVENTS_DEBUG("AMOTION_EVENT_ACTION_CANCEL"); LOG_EVENTS_DEBUG("AMOTION_EVENT_ACTION_CANCEL");
int pointerCount = AMotionEvent_getPointerCount(event); int pointerCount = AMotionEvent_getPointerCount(event);
int ids[pointerCount]; long ids[pointerCount];
float xs[pointerCount], ys[pointerCount]; float xs[pointerCount], ys[pointerCount];
getTouchPos(event, ids, xs, ys); getTouchPos(event, ids, xs, ys);
cocos2d::Director::getInstance()->getOpenGLView()->handleTouchesCancel(pointerCount, ids, xs, ys); cocos2d::Director::getInstance()->getOpenGLView()->handleTouchesCancel(pointerCount, ids, xs, ys);
return 1; return 1;
} }
break; break;