ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make accelerometer values relative to device orientation

Browse Source
This commit is contained in:
Deve 2018-02-28 21:40:02 +01:00
parent 0c23e6063d
commit 0ee00ad1e5
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/irrlicht/source/Irrlicht/CIrrDeviceAndroid.cpp
View File

@ -50,7 +50,8 @@ CIrrDeviceAndroid::CIrrDeviceAndroid(const SIrrlichtCreationParameters& param)
Gyroscope(0),
IsMousePressed(false),
GamepadAxisX(0),
GamepadAxisY(0)
GamepadAxisY(0),
DefaultOrientation(0)
{
#ifdef _DEBUG
setDebugName("CIrrDeviceAndroid");
@ -63,6 +64,8 @@ CIrrDeviceAndroid::CIrrDeviceAndroid(const SIrrlichtCreationParameters& param)
Android->onAppCmd = handleAndroidCommand;
Android->onInputEvent = handleInput;
DefaultOrientation = getDefaultRotation();
printConfig();
createKeyMap();
@ -250,9 +253,25 @@ bool CIrrDeviceAndroid::run()
case ASENSOR_TYPE_ACCELEROMETER:
SEvent accEvent;
accEvent.EventType = EET_ACCELEROMETER_EVENT;
accEvent.AccelerometerEvent.X = event.acceleration.x;
accEvent.AccelerometerEvent.Y = event.acceleration.y;
if (DefaultOrientation == 0)
{
accEvent.AccelerometerEvent.X = event.acceleration.x;
accEvent.AccelerometerEvent.Y = event.acceleration.y;
}
else
{
accEvent.AccelerometerEvent.X = event.acceleration.y;
accEvent.AccelerometerEvent.Y = -event.acceleration.x;
}
accEvent.AccelerometerEvent.Z = event.acceleration.z;
if (accEvent.AccelerometerEvent.X < 0)
{
accEvent.AccelerometerEvent.X *= -1;
accEvent.AccelerometerEvent.Y *= -1;
accEvent.AccelerometerEvent.Z *= -1;
}
postEventFromUser(accEvent);
break;

1
lib/irrlicht/source/Irrlicht/CIrrDeviceAndroid.h
View File

@ -123,6 +123,7 @@ namespace irr
bool IsMousePressed;
float GamepadAxisX;
float GamepadAxisY;
int DefaultOrientation;
video::SExposedVideoData ExposedVideoData;