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

Merge pull request #3401 from folecr/accel 

Take orientation into account when reporting accelerometer sensor readout
This commit is contained in:
minggo 2013-08-10 05:46:42 -07:00
parent 22cdfee84e 2ebd400a75
commit d2b96be1e6
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
cocos2dx/platform/android/nativeactivity.cpp
View File

@ -9,6 +9,7 @@
#include <android/sensor.h> #include <android/sensor.h>
#include <android/log.h> #include <android/log.h>
#include <android_native_app_glue.h> #include <android_native_app_glue.h>
#include <android/configuration.h>
#include <pthread.h> #include <pthread.h>
@ -517,15 +518,31 @@ void android_main(struct android_app* state) {
while (ASensorEventQueue_getEvents(engine.sensorEventQueue, while (ASensorEventQueue_getEvents(engine.sensorEventQueue,
&event, 1) > 0) { &event, 1) > 0) {
cocos2d::Director* pDirector = cocos2d::Director::getInstance();
pDirector->getAccelerometer()->update(event.acceleration.x,
event.acceleration.y,
event.acceleration.z,
0);
LOG_EVENTS_DEBUG("accelerometer: x=%f y=%f z=%f", LOG_EVENTS_DEBUG("accelerometer: x=%f y=%f z=%f",
event.acceleration.x, event.acceleration.y, event.acceleration.x, event.acceleration.y,
event.acceleration.z); event.acceleration.z);
AConfiguration* _currentconf = AConfiguration_new();
AConfiguration_fromAssetManager(_currentconf,
state->activity->assetManager);
static int32_t _orientation = AConfiguration_getOrientation(_currentconf);
if (ACONFIGURATION_ORIENTATION_LAND != _orientation) {
// ACONFIGURATION_ORIENTATION_ANY
// ACONFIGURATION_ORIENTATION_PORT
// ACONFIGURATION_ORIENTATION_SQUARE
cocos2d::Director::getInstance()->getAccelerometer()->update(event.acceleration.x,
-event.acceleration.y,
event.acceleration.z,
0);
} else {
// ACONFIGURATION_ORIENTATION_LAND
// swap x and y parameters
cocos2d::Director::getInstance()->getAccelerometer()->update(-event.acceleration.y,
event.acceleration.x,
event.acceleration.z,
0);
}
} }
} }
} }