Merge pull request #1629 from rgngl/androidOrientationFix

Fix Android orientation problem

gameplay/src/PlatformAndroid.cpp

@@ -1779,6 +1779,11 @@ JNIEXPORT void JNICALL Java_org_gameplay3d_GamePlayNativeActivity_gamepadEventDi
 	gameplay::Platform::gamepadEventDisconnectedInternal(deviceId);
 }
 
+JNIEXPORT void JNICALL Java_org_gameplay3d_GamePlayNativeActivity_screenOrientationChanged(JNIEnv* env, jclass clazz, jint orientation)
+{
+    __orientationAngle = orientation * 90;
+}
+
 }
 
 #endif

gameplay/src/org/gameplay3d/GamePlayNativeActivity.java

@@ -8,10 +8,13 @@ import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.util.SparseArray;
+import android.view.Display;
 import android.view.InputDevice;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.WindowManager;
+import android.view.OrientationEventListener;
 
 /**
  * GamePlay native activity extension for Android platform.
@@ -43,6 +46,18 @@ public class GamePlayNativeActivity extends NativeActivity
         if (Build.VERSION.SDK_INT >= 18) 
             uiOptions ^= 0x00000800; // View.SYSTEM_UI_FLAG_IMMERSIVE;
         decorView.setSystemUiVisibility(uiOptions);
+
+        orientationListener = new OrientationEventListener(this) {
+            public void onOrientationChanged(int orientation) {
+                if (orientation != OrientationEventListener.ORIENTATION_UNKNOWN) {
+                    WindowManager mWindowManager = (WindowManager) getSystemService(Context.WINDOW_SERVICE);
+
+                    Display display = mWindowManager.getDefaultDisplay();
+                    int rotation = display.getRotation();
+                    screenOrientationChanged(rotation);
+                }
+            }
+        };
     }
     
     @Override
@@ -58,6 +73,7 @@ public class GamePlayNativeActivity extends NativeActivity
     @Override
     protected void onResume() {
         super.onResume();
+        orientationListener.enable();
         _inputManager.registerInputDeviceListener(this, null);
         int[] ids = InputDevice.getDeviceIds();
         for (int i = 0; i < ids.length; i++) {
@@ -67,6 +83,7 @@ public class GamePlayNativeActivity extends NativeActivity
     
     @Override
     protected void onPause() {
+        orientationListener.disable();
         _inputManager.unregisterInputDeviceListener(this);
         super.onPause();
     }
@@ -121,7 +138,9 @@ public class GamePlayNativeActivity extends NativeActivity
     // JNI calls to PlatformAndroid.cpp
     private static native void gamepadEventConnectedImpl(int deviceId, int buttonCount, int joystickCount, int triggerCount, String deviceName);
     private static native void gamepadEventDisconnectedImpl(int deviceId);
+    private static native void screenOrientationChanged(int orientation);
     
     private InputManager _inputManager;
     private SparseArray<InputDevice> _gamepadDevices;
+    private OrientationEventListener orientationListener;
 }