asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #30759 from akien-mga/ios-camera-type-mismatch

Browse source 
Fix type mismatch in iOS interface orientation checks
This commit is contained in:
Rémi Verschelde 2019-07-22 21:11:02 +02:00 committed by GitHub
commit a36e09f398
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
modules/arkit/arkit_interface.mm
View file

@ -430,7 +430,7 @@ void ARKitInterface::process() {
// get some info about our screen and orientation // get some info about our screen and orientation
Size2 screen_size = OS::get_singleton()->get_window_size(); Size2 screen_size = OS::get_singleton()->get_window_size();
UIDeviceOrientation orientation = [[UIApplication sharedApplication] statusBarOrientation]; UIInterfaceOrientation orientation = [[UIApplication sharedApplication] statusBarOrientation];
// Grab our camera image for our backbuffer // Grab our camera image for our backbuffer
CVPixelBufferRef pixelBuffer = current_frame.capturedImage; CVPixelBufferRef pixelBuffer = current_frame.capturedImage;
@ -531,7 +531,7 @@ void ARKitInterface::process() {
// we need to invert this, probably row v.s. column notation // we need to invert this, probably row v.s. column notation
affine_transform = CGAffineTransformInvert(affine_transform); affine_transform = CGAffineTransformInvert(affine_transform);
if (orientation != UIDeviceOrientationPortrait) { if (orientation != UIInterfaceOrientationPortrait) {
affine_transform.b = -affine_transform.b; affine_transform.b = -affine_transform.b;
affine_transform.d = -affine_transform.d; affine_transform.d = -affine_transform.d;
affine_transform.ty = 1.0 - affine_transform.ty; affine_transform.ty = 1.0 - affine_transform.ty;
@ -582,28 +582,28 @@ void ARKitInterface::process() {
// copy our current frame transform // copy our current frame transform
matrix_float4x4 m44 = camera.transform; matrix_float4x4 m44 = camera.transform;
if (orientation == UIDeviceOrientationLandscapeLeft) { if (orientation == UIInterfaceOrientationLandscapeLeft) {
transform.basis.elements[0].x = m44.columns[0][0]; transform.basis.elements[0].x = m44.columns[0][0];
transform.basis.elements[1].x = m44.columns[0][1]; transform.basis.elements[1].x = m44.columns[0][1];
transform.basis.elements[2].x = m44.columns[0][2]; transform.basis.elements[2].x = m44.columns[0][2];
transform.basis.elements[0].y = m44.columns[1][0]; transform.basis.elements[0].y = m44.columns[1][0];
transform.basis.elements[1].y = m44.columns[1][1]; transform.basis.elements[1].y = m44.columns[1][1];
transform.basis.elements[2].y = m44.columns[1][2]; transform.basis.elements[2].y = m44.columns[1][2];
} else if (orientation == UIDeviceOrientationPortrait) { } else if (orientation == UIInterfaceOrientationPortrait) {
transform.basis.elements[0].x = m44.columns[1][0]; transform.basis.elements[0].x = m44.columns[1][0];
transform.basis.elements[1].x = m44.columns[1][1]; transform.basis.elements[1].x = m44.columns[1][1];
transform.basis.elements[2].x = m44.columns[1][2]; transform.basis.elements[2].x = m44.columns[1][2];
transform.basis.elements[0].y = -m44.columns[0][0]; transform.basis.elements[0].y = -m44.columns[0][0];
transform.basis.elements[1].y = -m44.columns[0][1]; transform.basis.elements[1].y = -m44.columns[0][1];
transform.basis.elements[2].y = -m44.columns[0][2]; transform.basis.elements[2].y = -m44.columns[0][2];
} else if (orientation == UIDeviceOrientationLandscapeRight) { } else if (orientation == UIInterfaceOrientationLandscapeRight) {
transform.basis.elements[0].x = -m44.columns[0][0]; transform.basis.elements[0].x = -m44.columns[0][0];
transform.basis.elements[1].x = -m44.columns[0][1]; transform.basis.elements[1].x = -m44.columns[0][1];
transform.basis.elements[2].x = -m44.columns[0][2]; transform.basis.elements[2].x = -m44.columns[0][2];
transform.basis.elements[0].y = -m44.columns[1][0]; transform.basis.elements[0].y = -m44.columns[1][0];
transform.basis.elements[1].y = -m44.columns[1][1]; transform.basis.elements[1].y = -m44.columns[1][1];
transform.basis.elements[2].y = -m44.columns[1][2]; transform.basis.elements[2].y = -m44.columns[1][2];
} else if (orientation == UIDeviceOrientationPortraitUpsideDown) { } else if (orientation == UIInterfaceOrientationPortraitUpsideDown) {
// this may not be correct // this may not be correct
transform.basis.elements[0].x = m44.columns[1][0]; transform.basis.elements[0].x = m44.columns[1][0];
transform.basis.elements[1].x = m44.columns[1][1]; transform.basis.elements[1].x = m44.columns[1][1];

2
platform/iphone/camera_ios.mm
View file

@ -158,7 +158,7 @@
} else if (dataCbCr == NULL) { } else if (dataCbCr == NULL) {
print_line("Couldn't access CbCr pixel buffer data"); print_line("Couldn't access CbCr pixel buffer data");
} else { } else {
UIDeviceOrientation orientation = [[UIApplication sharedApplication] statusBarOrientation]; UIInterfaceOrientation orientation = [[UIApplication sharedApplication] statusBarOrientation];
Ref<Image> img[2]; Ref<Image> img[2];
{ {