Merge pull request #1834 from b10z/ForceOrientation

skmp · web-flow · commit ad7452a2e00d · 2020-03-17T19:12:23.000+02:00
Force orientation for Android
diff --git a/libswirl/android/Android.cpp b/libswirl/android/Android.cpp
@@ -116,9 +116,10 @@ JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_getControllers(JNIEnv
 
 JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_setupMic(JNIEnv *env,jobject obj,jobject sip)  __attribute__((visibility("default")));
 
-SETTINGS_ACCESSORS(Nosound, aica.NoSound, jboolean)
-SETTINGS_ACCESSORS(Widescreen, rend.WideScreen, jboolean)
+SETTINGS_ACCESSORS(Nosound, aica.NoSound, jboolean);
+SETTINGS_ACCESSORS(Widescreen, rend.WideScreen, jboolean);
 SETTINGS_ACCESSORS(VirtualGamepadVibration, input.VirtualGamepadVibration, jint);
+SETTINGS_ACCESSORS(ScreenOrientation, rend.ScreenOrientation, jint);
 
 JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_screenDpi(JNIEnv *env,jobject obj, jint screenDpi)  __attribute__((visibility("default")));
 JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_guiOpenSettings(JNIEnv *env,jobject obj)  __attribute__((visibility("default")));
@@ -725,4 +726,4 @@ void android_RecreateView()
     JNIEnv *env = jvm_attacher.getEnv();
     jmethodID RecreateViewMID = env->GetMethodID(env->GetObjectClass(g_activity), "RecreateView", "()V");
     env->CallVoidMethod(g_activity, RecreateViewMID);
-}
+}
diff --git a/libswirl/gui/gui_settings_general.cpp b/libswirl/gui/gui_settings_general.cpp
@@ -41,6 +41,23 @@ void gui_settings_general()
         ImGui::SameLine();
         gui_ShowHelpMarker("The language as configured in the Dreamcast BIOS");
 
+#ifdef _ANDROID
+		const char *orientation[] = { "Auto", "Force Portrait", "Force Landscape" };
+		if (ImGui::BeginCombo("Orientation", orientation[settings.rend.ScreenOrientation], ImGuiComboFlags_None))
+		{
+			for (int i = 0; i < IM_ARRAYSIZE(orientation); i++)
+			{
+				bool is_selected = settings.rend.ScreenOrientation == i;
+				if (ImGui::Selectable(orientation[i], &is_selected))
+					settings.rend.ScreenOrientation = i;
+				if (is_selected)
+					ImGui::SetItemDefaultFocus();
+			}
+			ImGui::EndCombo();
+		}
+		ImGui::SameLine();
+		gui_ShowHelpMarker("Select type of orientation");
+#endif
 		const char *broadcast[] = { "NTSC", "PAL", "PAL/M", "PAL/N", "Default" };
 		if (ImGui::BeginCombo("Broadcast", broadcast[settings.dreamcast.broadcast], ImGuiComboFlags_None))
 		{
diff --git a/libswirl/libswirl.cpp b/libswirl/libswirl.cpp
@@ -309,6 +309,7 @@ void InitSettings()
     settings.rend.Fog = true;
     settings.rend.FloatVMUs = false;
     settings.rend.Rotate90 = false;
+    settings.rend.ScreenOrientation = 0; //default is 0 (Auto Rotation)
 
     settings.pvr.ta_skip = 0;
     settings.pvr.backend = "auto";
@@ -405,6 +406,7 @@ void LoadSettings(bool game_specific)
     settings.rend.Fog = cfgLoadBool(config_section, "rend.Fog", settings.rend.Fog);
     settings.rend.FloatVMUs = cfgLoadBool(config_section, "rend.FloatVMUs", settings.rend.FloatVMUs);
     settings.rend.Rotate90 = cfgLoadBool(config_section, "rend.Rotate90", settings.rend.Rotate90);
+    settings.rend.ScreenOrientation = cfgLoadInt(config_section, "rend.ScreenOrientation", settings.rend.ScreenOrientation); //Load Orientation
 
     settings.pvr.ta_skip = cfgLoadInt(config_section, "ta.skip", settings.pvr.ta_skip);
     settings.pvr.backend = cfgLoadStr(config_section, "pvr.backend", settings.pvr.backend.c_str());
@@ -563,6 +565,7 @@ void SaveSettings()
     cfgSaveBool("config", "rend.Fog", settings.rend.Fog);
     cfgSaveBool("config", "rend.FloatVMUs", settings.rend.FloatVMUs);
     cfgSaveBool("config", "rend.Rotate90", settings.rend.Rotate90);
+    cfgSaveInt("config", "rend.ScreenOrientation", settings.rend.ScreenOrientation);
     cfgSaveInt("config", "ta.skip", settings.pvr.ta_skip);
     cfgSaveStr("config", "pvr.backend", settings.pvr.backend.c_str());
 
diff --git a/libswirl/types.h b/libswirl/types.h
@@ -359,7 +359,6 @@ using namespace std;
 #define naked __attribute__((naked))
 #endif
 
-
 // NOTE: Always inline for macOS builds or it causes duplicate symbol linker errors
 #if DEBUG && HOST_OS != OS_DARWIN
 //force
@@ -486,6 +485,7 @@ struct settings_t
 		bool Fog;
 		bool FloatVMUs;
 		bool Rotate90;			// Rotate the screen 90 deg CC
+		int ScreenOrientation;		//Force Screen Orientation value here: 1=Force Portrait, 2=Force Landscape, 3=AutoRotate
 	} rend;
 
 	struct
diff --git a/reicast/android-studio/reicast/src/main/java/com/reicast/emulator/BaseGLActivity.java b/reicast/android-studio/reicast/src/main/java/com/reicast/emulator/BaseGLActivity.java
@@ -6,7 +6,9 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
+import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -21,6 +23,7 @@
 import android.view.InputDevice;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
+import android.view.Surface;
 import android.view.View;
 import android.view.ViewConfiguration;
 
@@ -60,7 +63,6 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         prefs = PreferenceManager.getDefaultSharedPreferences(this);
 
         Emulator app = (Emulator)getApplicationContext();
-        app.getConfigurationPrefs();
         Emulator.setCurrentActivity(this);
 
         OuyaController.init(this);
@@ -103,8 +105,11 @@ public void onClick(DialogInterface dialog,int id) {
 
         InputDeviceManager.getInstance().startListening(getApplicationContext());
         register(this);
-
+        app.getConfigurationPrefs(); //when this method is on top, the values of screenOrientation, vibrationDuration and noSound did not load as they should. moved here fixes all these problems.
         audioBackend = new AudioBackend();
+        setOrientation(); //Setting device orientation as the application starts.
+
+
 
         // When viewing a resource, pass its URI to the native code for opening
         Intent intent = getIntent();
@@ -134,6 +139,26 @@ private void setStorageDirectories()
         JNIdc.setExternalStorageDirectories(pathList.toArray());
     }
 
+    public void setOrientation(){ //forcing orientation, depending on the value of Emulator.screenOrientation
+        Log.i("reicast", Integer.toString(Emulator.screenOrientation));
+       if ((Emulator.screenOrientation == 1)){
+           setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT);
+       }else if ((Emulator.screenOrientation == 2)){
+           setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
+       }else{
+           setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
+       }
+    }
+
+    @Override 
+    public void onConfigurationChanged(Configuration newConfig) { //as the device orientation changes, the device checks the config and apply the Orientation if possible (this is used in order to get revert_landscape working as well in realtime, without restart or Save changes)
+        super.onConfigurationChanged(newConfig);
+        setOrientation();
+
+
+    }
+
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
diff --git a/reicast/android-studio/reicast/src/main/java/com/reicast/emulator/Emulator.java b/reicast/android-studio/reicast/src/main/java/com/reicast/emulator/Emulator.java
@@ -23,6 +23,7 @@ public class Emulator extends Application {
 
     public static boolean nosound = false;
     public static int vibrationDuration = 20;
+    public static int screenOrientation = 0; //Default value is 0
 
     public static int maple_devices[] = {
             MDT_None,
@@ -44,6 +45,7 @@ public class Emulator extends Application {
     public void getConfigurationPrefs() {
         Emulator.nosound = JNIdc.getNosound();
         Emulator.vibrationDuration = JNIdc.getVirtualGamepadVibration();
+        Emulator.screenOrientation = JNIdc.getScreenOrientation(); //Loading screenOrientation
         JNIdc.getControllers(maple_devices, maple_expansion_devices);
     }
 
@@ -53,10 +55,12 @@ public void getConfigurationPrefs() {
      */
     public void SaveAndroidSettings(String homeDirectory)
     {
+
         Log.i("reicast", "SaveAndroidSettings: saving preferences");
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
         Emulator.nosound = JNIdc.getNosound();
         Emulator.vibrationDuration = JNIdc.getVirtualGamepadVibration();
+        Emulator.screenOrientation = JNIdc.getScreenOrientation();
         JNIdc.getControllers(maple_devices, maple_expansion_devices);
 
         prefs.edit()
@@ -67,6 +71,8 @@ public void SaveAndroidSettings(String homeDirectory)
         if (micPluggedIn() && currentActivity instanceof BaseGLActivity) {
             ((BaseGLActivity)currentActivity).requestRecordAudioPermission();
         }
+        currentActivity.setOrientation(); //As the settings are saved, setOrientation sets the new Orientation of the device
+
     }
 
     public void LaunchFromUrl(String url) {
diff --git a/reicast/android-studio/reicast/src/main/java/com/reicast/emulator/emu/JNIdc.java b/reicast/android-studio/reicast/src/main/java/com/reicast/emulator/emu/JNIdc.java
@@ -29,6 +29,7 @@ public final class JNIdc
 
 	public static native void setupMic(SipEmulator sip);
 	public static native boolean getNosound();
+	public static native int getScreenOrientation(); //Using SETTINGS_ACCESSORS to get the value of ScreenOrientation
 
 	public static native int getVirtualGamepadVibration();
 
