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

Fix accelerometer conversion in iOS

Browse Source
This commit is contained in:
Benau
2019-07-19 01:25:57 +08:00
parent f1cd119465
commit 577d37ced3
2 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/irrlicht/source/Irrlicht/CIrrDeviceiOS.h
View File

@@ -111,6 +111,7 @@ namespace irr
{
m_touch_id_map.clear();
}
void setUpsideDown(bool val) { m_upside_down = val; }
private:
void createWindow();
void createViewAndDriver();
@@ -120,6 +121,7 @@ namespace irr
bool Close;
std::map<void*, size_t> m_touch_id_map;
bool m_upside_down;
};
}

36
lib/irrlicht/source/Irrlicht/CIrrDeviceiOS.mm
View File

@@ -146,8 +146,32 @@ namespace irr
Focus = true;
}
- (void)orientationChanged:(NSNotification*)note
{
UIDevice* device = note.object;
switch(device.orientation)
{
case UIDeviceOrientationLandscapeLeft:
Device->setUpsideDown(true);
break;
case UIDeviceOrientationLandscapeRight:
Device->setUpsideDown(false);
break;
case UIDeviceOrientationPortrait:
case UIDeviceOrientationPortraitUpsideDown:
break;
default:
break;
};
}
- (void)runSTK
{
[[UIDevice currentDevice] beginGeneratingDeviceOrientationNotifications];
[[NSNotificationCenter defaultCenter]
addObserver:self selector:@selector(orientationChanged:)
name:UIDeviceOrientationDidChangeNotification
object:[UIDevice currentDevice]];
override_default_params_for_mobile();
ios_main(0, {});
// App store may not like this
@@ -353,7 +377,8 @@ namespace irr
EAGLContext* m_eagl_context;
};
CIrrDeviceiOS::CIrrDeviceiOS(const SIrrlichtCreationParameters& params) : CIrrDeviceStub(params), DataStorage(0), Close(false)
CIrrDeviceiOS::CIrrDeviceiOS(const SIrrlichtCreationParameters& params)
: CIrrDeviceStub(params), DataStorage(0), Close(false), m_upside_down(false)
{
#ifdef _DEBUG
setDebugName("CIrrDeviceiOS");
@@ -432,10 +457,11 @@ namespace irr
{
irr::SEvent ev;
ev.EventType = irr::EET_ACCELEROMETER_EVENT;
ev.AccelerometerEvent.X = motionManager.accelerometerData.acceleration.x;
ev.AccelerometerEvent.Y = motionManager.accelerometerData.acceleration.y;
ev.AccelerometerEvent.Z = motionManager.accelerometerData.acceleration.z;
ev.AccelerometerEvent.X = motionManager.accelerometerData.acceleration.x * 9.81;
ev.AccelerometerEvent.Y = motionManager.accelerometerData.acceleration.y * 9.81;
ev.AccelerometerEvent.Z = motionManager.accelerometerData.acceleration.z * 9.81;
if (m_upside_down)
ev.AccelerometerEvent.Y = -ev.AccelerometerEvent.Y;
postEventFromUser(ev);
}