android UI update for swap eyes

Author: DavidRGriswold

dist/compatibility_list

@@ -62,6 +62,13 @@ class ScreenAdjustmentUtil(
         NativeLibrary.updateFramebuffer(NativeLibrary.isPortraitMode)
     }
 
+    fun changeSecondaryOrientation(layoutOption: Int) {
+        IntSetting.SECONDARY_DISPLAY_LAYOUT.int = layoutOption
+        settings.saveSetting(IntSetting.SECONDARY_DISPLAY_LAYOUT,SettingsFile.FILE_NAME_CONFIG)
+        NativeLibrary.reloadSettings()
+        NativeLibrary.updateFramebuffer(NativeLibrary.isPortraitMode)
+    }
+
     fun changeActivityOrientation(orientationOption: Int) {
         val activity = context as? Activity ?: return
         IntSetting.ORIENTATION_OPTION.int = orientationOption
@@ -77,4 +84,15 @@ class ScreenAdjustmentUtil(
         NativeLibrary.updateFramebuffer(NativeLibrary.isPortraitMode)
 
     }
+
+    fun toggleSecondaryScreenUpright() {
+        val uprightBoolean = BooleanSetting.SECONDARY_UPRIGHT_SCREEN.boolean
+        BooleanSetting.SECONDARY_UPRIGHT_SCREEN.boolean = !uprightBoolean
+        settings.saveSetting(
+            BooleanSetting.SECONDARY_UPRIGHT_SCREEN,
+            SettingsFile.FILE_NAME_CONFIG
+        )
+        NativeLibrary.reloadSettings()
+        NativeLibrary.updateFramebuffer(NativeLibrary.isPortraitMode)
+    }
 }

src/android/app/src/main/java/org/citra/citra_emu/display/ScreenAdjustmentUtil.kt

@@ -56,7 +56,9 @@ enum class SecondaryDisplayLayout(val int: Int) {
     NONE(0),
     TOP_SCREEN(1),
     BOTTOM_SCREEN(2),
-    SIDE_BY_SIDE(3);
+    SIDE_BY_SIDE(3),
+
+    REVERSE_PRIMARY(4);
 
     companion object {
         fun from(int: Int): SecondaryDisplayLayout {

src/android/app/src/main/java/org/citra/citra_emu/display/ScreenLayout.kt

@@ -19,6 +19,9 @@ enum class BooleanSetting(
     INSTANT_DEBUG_LOG("instant_debug_log", Settings.SECTION_DEBUG, false),
     ENABLE_RPC_SERVER("enable_rpc_server", Settings.SECTION_DEBUG, false),
     CUSTOM_LAYOUT("custom_layout",Settings.SECTION_LAYOUT,false),
+    SWAP_EYES_3D("swap_eyes_3d",Settings.SECTION_RENDERER,false),
+
+    RENDER_3D_SECONDARY_ONLY("render_3d_secondary_only",Settings.SECTION_RENDERER,false),
     PERF_OVERLAY_ENABLE("performance_overlay_enable", Settings.SECTION_LAYOUT, false),
     PERF_OVERLAY_SHOW_FPS("performance_overlay_show_fps", Settings.SECTION_LAYOUT, true),
     PERF_OVERLAY_SHOW_FRAMETIME("performance_overlay_show_frame_time", Settings.SECTION_LAYOUT, false),
@@ -50,6 +53,7 @@ enum class BooleanSetting(
     DISABLE_RIGHT_EYE_RENDER("disable_right_eye_render", Settings.SECTION_RENDERER, false),
     USE_ARTIC_BASE_CONTROLLER("use_artic_base_controller", Settings.SECTION_CONTROLS, false),
     UPRIGHT_SCREEN("upright_screen", Settings.SECTION_LAYOUT, false),
+    SECONDARY_UPRIGHT_SCREEN("upright_secondary_screen", Settings.SECTION_LAYOUT, false),
     COMPRESS_INSTALLED_CIA_CONTENT("compress_cia_installs", Settings.SECTION_STORAGE, false),
     ANDROID_HIDE_IMAGES("android_hide_images", Settings.SECTION_CORE, false);
 

src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/BooleanSetting.kt

@@ -947,6 +947,15 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
                     IntSetting.STEREOSCOPIC_3D_MODE.defaultValue
                 )
             )
+            add(
+                SwitchSetting(
+                    BooleanSetting.RENDER_3D_SECONDARY_ONLY,
+                    R.string.render_3d_secondary_only,
+                    R.string.render_3d_secondary_only_description,
+                    BooleanSetting.RENDER_3D_SECONDARY_ONLY.key,
+                    BooleanSetting.RENDER_3D_SECONDARY_ONLY.defaultValue
+                )
+            )
             add(
                 SliderSetting(
                     IntSetting.STEREOSCOPIC_3D_DEPTH,
@@ -969,6 +978,16 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
                 )
             )
 
+            add(
+                SwitchSetting(
+                    BooleanSetting.SWAP_EYES_3D,
+                    R.string.swap_eyes_3d,
+                    R.string.swap_eyes_3d_description,
+                    BooleanSetting.SWAP_EYES_3D.key,
+                    BooleanSetting.SWAP_EYES_3D.defaultValue
+                )
+            )
+
             add(HeaderSetting(R.string.cardboard_vr))
             add(
                 SliderSetting(
@@ -1106,6 +1125,15 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
                     BooleanSetting.UPRIGHT_SCREEN.defaultValue
                 )
             )
+            add(
+                SwitchSetting(
+                    BooleanSetting.SECONDARY_UPRIGHT_SCREEN,
+                    R.string.emulation_rotate_external_left,
+                    0,
+                    BooleanSetting.SECONDARY_UPRIGHT_SCREEN.key,
+                    BooleanSetting.SECONDARY_UPRIGHT_SCREEN.defaultValue
+                )
+            )
             add(
                 SingleChoiceSetting(
                     IntSetting.PORTRAIT_SCREEN_LAYOUT,

src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt

@@ -64,6 +64,7 @@ import org.citra.citra_emu.databinding.FragmentEmulationBinding
 import org.citra.citra_emu.display.PortraitScreenLayout
 import org.citra.citra_emu.display.ScreenAdjustmentUtil
 import org.citra.citra_emu.display.ScreenLayout
+import org.citra.citra_emu.display.SecondaryDisplayLayout
 import org.citra.citra_emu.features.settings.model.BooleanSetting
 import org.citra.citra_emu.features.settings.model.IntSetting
 import org.citra.citra_emu.features.settings.model.Settings
@@ -306,6 +307,11 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
                     true
                 }
 
+                R.id.menu_secondary_screen_layout -> {
+                    showSecondaryScreenLayoutMenu()
+                    true
+                }
+
                 R.id.menu_swap_screens -> {
                     screenAdjustmentUtil.swapScreen()
                     true
@@ -316,6 +322,11 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
                     true
                 }
 
+                R.id.menu_rotate_external_upright -> {
+                    screenAdjustmentUtil.toggleSecondaryScreenUpright()
+                    true
+                }
+
                 R.id.menu_lock_drawer -> {
                     when (EmulationMenuSettings.drawerLockMode) {
                         DrawerLayout.LOCK_MODE_UNLOCKED -> {
@@ -1002,6 +1013,61 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
         popupMenu.show()
     }
 
+    private fun showSecondaryScreenLayoutMenu() {
+        val popupMenu = PopupMenu(
+            requireContext(),
+            binding.inGameMenu.findViewById(R.id.menu_secondary_screen_layout)
+        )
+
+        popupMenu.menuInflater.inflate(R.menu.menu_secondary_screen_layout, popupMenu.menu)
+
+        val layoutOptionMenuItem = when (IntSetting.SECONDARY_DISPLAY_LAYOUT.int) {
+           SecondaryDisplayLayout.NONE.int ->
+                R.id.menu_secondary_layout_none
+            SecondaryDisplayLayout.REVERSE_PRIMARY.int ->
+                R.id.menu_secondary_layout_reverse_primary
+            SecondaryDisplayLayout.TOP_SCREEN.int ->
+                R.id.menu_secondary_layout_top
+            SecondaryDisplayLayout.BOTTOM_SCREEN.int ->
+                R.id.menu_secondary_layout_bottom
+            else ->
+                R.id.menu_secondary_layout_side_by_side
+
+        }
+
+        popupMenu.menu.findItem(layoutOptionMenuItem).setChecked(true)
+
+        popupMenu.setOnMenuItemClickListener {
+            when (it.itemId) {
+                R.id.menu_secondary_layout_none -> {
+                    screenAdjustmentUtil.changeSecondaryOrientation(SecondaryDisplayLayout.NONE.int)
+                    true
+                }
+
+                R.id.menu_secondary_layout_reverse_primary -> {
+                    screenAdjustmentUtil.changeSecondaryOrientation(SecondaryDisplayLayout.REVERSE_PRIMARY.int)
+                    true
+                }
+                R.id.menu_secondary_layout_top -> {
+                    screenAdjustmentUtil.changeSecondaryOrientation(SecondaryDisplayLayout.TOP_SCREEN.int)
+                    true
+                }
+                R.id.menu_secondary_layout_bottom -> {
+                    screenAdjustmentUtil.changeSecondaryOrientation(SecondaryDisplayLayout.BOTTOM_SCREEN.int)
+                    true
+                }
+                R.id.menu_secondary_layout_side_by_side -> {
+                    screenAdjustmentUtil.changeSecondaryOrientation(SecondaryDisplayLayout.SIDE_BY_SIDE.int)
+                    true
+                }
+
+
+                else -> true
+            }
+        }
+
+        popupMenu.show()
+    }
     private fun editControlsPlacement() {
         if (binding.surfaceInputOverlay.isInEditMode) {
             binding.doneControlConfig.visibility = View.GONE

src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.kt

@@ -175,7 +175,8 @@ void Config::ReadValues() {
     ReadSetting("Renderer", Settings::values.custom_second_layer_opacity);
     ReadSetting("Renderer", Settings::values.delay_game_render_thread_us);
     ReadSetting("Renderer", Settings::values.disable_right_eye_render);
-
+    ReadSetting("Renderer", Settings::values.swap_eyes_3d);
+    ReadSetting("Renderer", Settings::values.render_3d_secondary_only);
     // Layout
     // Somewhat inelegant solution to ensure layout value is between 0 and 5 on read
     // since older config files may have other values
@@ -205,6 +206,7 @@ void Config::ReadValues() {
     ReadSetting("Layout", Settings::values.cardboard_x_shift);
     ReadSetting("Layout", Settings::values.cardboard_y_shift);
     ReadSetting("Layout", Settings::values.upright_screen);
+    ReadSetting("Layout", Settings::values.upright_secondary_screen);
 
     Settings::values.portrait_layout_option =
         static_cast<Settings::PortraitLayoutOption>(sdl2_config->GetInteger(

src/android/app/src/main/jni/config.cpp

@@ -181,6 +181,14 @@ render_3d =
 # 0 - 255: Intensity. 0 (default)
 factor_3d =
 
+# Swap Eyes in 3d
+# true or false (default)
+swap_eyes_3d =
+
+# Render 3D To Secondary Display
+# true or false (default)
+render_3d_secondary_only =
+
 # The name of the post processing shader to apply.
 # Loaded from shaders if render_3d is off or side by side.
 pp_shader_name =

src/android/app/src/main/jni/default_ini.h

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorOnSurface">
+    <path
+        android:fillColor="@android:color/black"
+        android:fillType="evenOdd"
+        android:pathData="M17 4h3c1.1 0 2 0.9 2 2v2h-2V6h-3ZM4 8V6h3V4H4C2.9 4 2 4.9 2 6v2z m16 8v2h-3v2h3c1.1 0 2-0.9 2-2v-2ZM7 18H4v-2H2v2c0 1.1 0.9 2 2 2h3ZM18 8H6v8h12z M12.6 10.23q-0.07-0.17-0.21-0.28-0.13-0.12-0.26-0.14-0.42 0-0.77 0.23-0.35 0.22-0.64 0.53-0.13 0.1-0.29 0.1-0.16 0-0.27-0.1-0.1-0.12-0.1-0.3 0-0.15 0.1-0.3 0.18-0.19 0.39-0.37 0.21-0.2 0.45-0.34 0.24-0.14 0.5-0.23 0.25-0.09 0.52-0.09 0.31 0 0.58 0.14 0.27 0.12 0.47 0.36 0.2 0.24 0.31 0.56 0.12 0.33 0.12 0.72 0 0.12-0.03 0.26-0.1 0.44-0.33 0.72-0.21 0.28-0.48 0.48-0.26 0.2-0.55 0.36-0.28 0.15-0.53 0.35-0.24 0.2-0.42 0.47-0.19 0.27-0.25 0.7h1.84q0.11 0 0.17-0.03l0.09-0.06 0.1-0.12q0.08-0.1 0.12-0.11l0.1-0.04 0.12-0.01q0.18 0 0.28 0.12 0.1 0.12 0.1 0.28 0 0.11-0.02 0.17l-0.04 0.08q-0.18 0.26-0.43 0.42-0.25 0.15-0.56 0.15h-2.3q-0.38-0.03-0.42-0.45 0.03-0.32 0.1-0.62 0.05-0.3 0.16-0.59 0.1-0.28 0.27-0.53 0.16-0.25 0.41-0.45 0.22-0.17 0.51-0.33 0.3-0.15 0.55-0.34 0.26-0.19 0.45-0.44 0.18-0.25 0.18-0.6 0-0.1-0.04-0.21l-0.05-0.12z"/>
+</vector>

src/android/app/src/main/res/drawable/ic_secondary_fit_screen.xml

@@ -32,6 +32,11 @@
         android:icon="@drawable/ic_portrait_fit_screen"
         android:title="@string/emulation_switch_portrait_layout" />
 
+    <item
+        android:id="@+id/menu_secondary_screen_layout"
+        android:icon="@drawable/ic_secondary_fit_screen"
+        android:title="@string/emulation_switch_secondary_layout" />
+
     <item
         android:id="@+id/menu_swap_screens"
         android:icon="@drawable/ic_splitscreen"
@@ -42,6 +47,11 @@
         android:icon="@drawable/ic_rotate_up_right"
         android:title="@string/emulation_rotate_upright" />
 
+    <item
+        android:id="@+id/menu_rotate_external_upright"
+        android:icon="@drawable/ic_rotate_up_right"
+        android:title="@string/emulation_rotate_external_left" />
+
     <item
         android:id="@+id/menu_lock_drawer"
         android:icon="@drawable/ic_unlocked"