VERY experimental Nintendo Switch 2 emulator
C++
android: Re-implement overlay editing
Charles Lombardoa8834fa20c34
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.ktindex 4ba283dddc..18517bdf8e 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt@@ -90,7 +90,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Frambinding.doneControlConfig.setOnClickListener { stopConfiguringControls() }// Setup overlay.- resetInputOverlay()updateShowFpsOverlay()binding.inGameMenu.getHeaderView(0).findViewById<TextView>(R.id.text_game_title).text =diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.ktindex acd4a1fe21..97e0ba3df3 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt@@ -45,9 +45,15 @@ class InputOverlay(context: Context, attrs: AttributeSet?) : SurfaceView(contextprivate val overlayButtons: MutableSet<InputOverlayDrawableButton> = HashSet()private val overlayDpads: MutableSet<InputOverlayDrawableDpad> = HashSet()private val overlayJoysticks: MutableSet<InputOverlayDrawableJoystick> = HashSet()+private var inEditMode = false+ private var buttonBeingConfigured: InputOverlayDrawableButton? = null+ private var dpadBeingConfigured: InputOverlayDrawableDpad? = null+ private var joystickBeingConfigured: InputOverlayDrawableJoystick? = null+private val preferences: SharedPreferences =PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)+private val gyro = FloatArray(3)private val accel = FloatArray(3)private var motionTimestamp: Long = 0@@ -114,7 +120,7 @@ class InputOverlay(context: Context, attrs: AttributeSet?) : SurfaceView(context}NativeLibrary.onGamePadButtonEvent(NativeLibrary.Player1Device,- button.id,+ button.buttonId,button.status)shouldUpdateView = true@@ -224,8 +230,109 @@ class InputOverlay(context: Context, attrs: AttributeSet?) : SurfaceView(contextreturn false}- private fun onTouchWhileEditing(event: MotionEvent?): Boolean {- // TODO: Reimplement this+ private fun onTouchWhileEditing(event: MotionEvent): Boolean {+ val pointerIndex = event.actionIndex+ val fingerPositionX = event.getX(pointerIndex).toInt()+ val fingerPositionY = event.getY(pointerIndex).toInt()++ // TODO: Provide support for portrait layout+ //val orientation =+ // if (resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT) "-Portrait" else ""++ for (button in overlayButtons) {+ // Determine the button state to apply based on the MotionEvent action flag.+ when (event.action and MotionEvent.ACTION_MASK) {+ MotionEvent.ACTION_DOWN,+ MotionEvent.ACTION_POINTER_DOWN ->+ // If no button is being moved now, remember the currently touched button to move.+ if (buttonBeingConfigured == null &&+ button.bounds.contains(+ fingerPositionX,+ fingerPositionY+ )+ ) {+ buttonBeingConfigured = button+ buttonBeingConfigured!!.onConfigureTouch(event)+ }+ MotionEvent.ACTION_MOVE -> if (buttonBeingConfigured != null) {+ buttonBeingConfigured!!.onConfigureTouch(event)+ invalidate()+ return true+ }+ MotionEvent.ACTION_UP,+ MotionEvent.ACTION_POINTER_UP -> if (buttonBeingConfigured === button) {+ // Persist button position by saving new place.+ saveControlPosition(+ buttonBeingConfigured!!.buttonId,+ buttonBeingConfigured!!.bounds.centerX(),+ buttonBeingConfigured!!.bounds.centerY(),+ ""+ )+ buttonBeingConfigured = null+ }+ }+ }++ for (dpad in overlayDpads) {+ // Determine the button state to apply based on the MotionEvent action flag.+ when (event.action and MotionEvent.ACTION_MASK) {+ MotionEvent.ACTION_DOWN,+ MotionEvent.ACTION_POINTER_DOWN ->+ // If no button is being moved now, remember the currently touched button to move.+ if (buttonBeingConfigured == null &&+ dpad.bounds.contains(fingerPositionX, fingerPositionY)+ ) {+ dpadBeingConfigured = dpad+ dpadBeingConfigured!!.onConfigureTouch(event)+ }+ MotionEvent.ACTION_MOVE -> if (dpadBeingConfigured != null) {+ dpadBeingConfigured!!.onConfigureTouch(event)+ invalidate()+ return true+ }+ MotionEvent.ACTION_UP,+ MotionEvent.ACTION_POINTER_UP -> if (dpadBeingConfigured === dpad) {+ // Persist button position by saving new place.+ saveControlPosition(+ dpadBeingConfigured!!.upId,+ dpadBeingConfigured!!.bounds.centerX(),+ dpadBeingConfigured!!.bounds.centerY(),+ ""+ )+ dpadBeingConfigured = null+ }+ }+ }++ for (joystick in overlayJoysticks) {+ when (event.action) {+ MotionEvent.ACTION_DOWN,+ MotionEvent.ACTION_POINTER_DOWN -> if (joystickBeingConfigured == null &&+ joystick.bounds.contains(+ fingerPositionX,+ fingerPositionY+ )+ ) {+ joystickBeingConfigured = joystick+ joystickBeingConfigured!!.onConfigureTouch(event)+ }+ MotionEvent.ACTION_MOVE -> if (joystickBeingConfigured != null) {+ joystickBeingConfigured!!.onConfigureTouch(event)+ invalidate()+ }+ MotionEvent.ACTION_UP,+ MotionEvent.ACTION_POINTER_UP -> if (joystickBeingConfigured != null) {+ saveControlPosition(+ joystickBeingConfigured!!.buttonId,+ joystickBeingConfigured!!.bounds.centerX(),+ joystickBeingConfigured!!.bounds.centerY(),+ ""+ )+ joystickBeingConfigured = null+ }+ }+ }+return true}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlayDrawableButton.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlayDrawableButton.ktindex bf0c2f3e68..99d7d9521a 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlayDrawableButton.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlayDrawableButton.kt@@ -24,32 +24,30 @@ class InputOverlayDrawableButton(res: Resources,defaultStateBitmap: Bitmap,pressedStateBitmap: Bitmap,- buttonId: Int+ val buttonId: Int) {- /**- * Gets this InputOverlayDrawableButton's button ID.- *- * @return this InputOverlayDrawableButton's button ID.- */- // The ID value what type of button this Drawable represents.- val id: Int-// The ID value what motion event is trackingvar trackId: Int// The drawable position on the screenprivate var buttonPositionX = 0private var buttonPositionY = 0+val width: Intval height: Int+private val defaultStateBitmap: BitmapDrawableprivate val pressedStateBitmap: BitmapDrawableprivate var pressedState = false+ private var previousTouchX = 0+ private var previousTouchY = 0+ var controlPositionX = 0+ var controlPositionY = 0+init {this.defaultStateBitmap = BitmapDrawable(res, defaultStateBitmap)this.pressedStateBitmap = BitmapDrawable(res, pressedStateBitmap)- id = buttonIdtrackId = -1width = this.defaultStateBitmap.intrinsicWidthheight = this.defaultStateBitmap.intrinsicHeight@@ -104,6 +102,34 @@ class InputOverlayDrawableButton(private val currentStateBitmapDrawable: BitmapDrawableget() = if (pressedState) pressedStateBitmap else defaultStateBitmap+ fun onConfigureTouch(event: MotionEvent): Boolean {+ val pointerIndex = event.actionIndex+ val fingerPositionX = event.getX(pointerIndex).toInt()+ val fingerPositionY = event.getY(pointerIndex).toInt()++ when (event.action) {+ MotionEvent.ACTION_DOWN -> {+ previousTouchX = fingerPositionX+ previousTouchY = fingerPositionY+ controlPositionX = fingerPositionX - (width / 2)+ controlPositionY = fingerPositionY - (height / 2)+ }+ MotionEvent.ACTION_MOVE -> {+ controlPositionX += fingerPositionX - previousTouchX+ controlPositionY += fingerPositionY - previousTouchY+ setBounds(+ controlPositionX,+ controlPositionY,+ width + controlPositionX,+ height + controlPositionY+ )+ previousTouchX = fingerPositionX+ previousTouchY = fingerPositionY+ }+ }+ return true+ }+fun setBounds(left: Int, top: Int, right: Int, bottom: Int) {defaultStateBitmap.setBounds(left, top, right, bottom)pressedStateBitmap.setBounds(left, top, right, bottom)@@ -111,6 +137,6 @@ class InputOverlayDrawableButton(val status: Intget() = if (pressedState) ButtonState.PRESSED else ButtonState.RELEASED- private val bounds: Rect+ val bounds: Rectget() = defaultStateBitmap.bounds}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlayDrawableDpad.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlayDrawableDpad.ktindex 34d18eb1da..625cad661e 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlayDrawableDpad.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlayDrawableDpad.kt@@ -45,13 +45,19 @@ class InputOverlayDrawableDpad(val leftId: Intval rightId: Intvar trackId: Int- private var controlPositionX = 0- private var controlPositionY = 0+val width: Intval height: Int+private val defaultStateBitmap: BitmapDrawableprivate val pressedOneDirectionStateBitmap: BitmapDrawableprivate val pressedTwoDirectionsStateBitmap: BitmapDrawable++ private var previousTouchX = 0+ private var previousTouchY = 0+ private var controlPositionX = 0+ private var controlPositionY = 0+private var upButtonState = falseprivate var downButtonState = falseprivate var leftButtonState = false@@ -215,6 +221,32 @@ class InputOverlayDrawableDpad(val rightStatus: Intget() = if (rightButtonState) ButtonState.PRESSED else ButtonState.RELEASED+ fun onConfigureTouch(event: MotionEvent): Boolean {+ val pointerIndex = event.actionIndex+ val fingerPositionX = event.getX(pointerIndex).toInt()+ val fingerPositionY = event.getY(pointerIndex).toInt()++ when (event.action) {+ MotionEvent.ACTION_DOWN -> {+ previousTouchX = fingerPositionX+ previousTouchY = fingerPositionY+ }+ MotionEvent.ACTION_MOVE -> {+ controlPositionX += fingerPositionX - previousTouchX+ controlPositionY += fingerPositionY - previousTouchY+ setBounds(+ controlPositionX,+ controlPositionY,+ width + controlPositionX,+ height + controlPositionY+ )+ previousTouchX = fingerPositionX+ previousTouchY = fingerPositionY+ }+ }+ return true+ }+fun setPosition(x: Int, y: Int) {controlPositionX = xcontrolPositionY = ydiff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlayDrawableJoystick.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlayDrawableJoystick.ktindex 11ab0b829d..1960eaff08 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlayDrawableJoystick.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlayDrawableJoystick.kt@@ -39,31 +39,39 @@ class InputOverlayDrawableJoystick(val joystickId: Int,val buttonId: Int) {-// The ID value what motion event is trackingvar trackId = -1+var xAxis = 0fprivate var yAxis = 0f- private var controlPositionX = 0- private var controlPositionY = 0+val width: Intval height: Int+private var virtBounds: Rect- private val origBounds: Rect+ private var origBounds: Rect+private val outerBitmap: BitmapDrawableprivate val defaultStateInnerBitmap: BitmapDrawableprivate val pressedStateInnerBitmap: BitmapDrawable++ private var previousTouchX = 0+ private var previousTouchY = 0+ var controlPositionX = 0+ var controlPositionY = 0+private val boundsBoxBitmap: BitmapDrawable+private var pressedState = false// TODO: Add button supportval buttonStatus: Intget() =NativeLibrary.ButtonState.RELEASED- var bounds: Rect?+ var bounds: Rectget() = outerBitmap.boundsset(bounds) {- outerBitmap.bounds = bounds!!+ outerBitmap.bounds = bounds}// Nintendo joysticks have y axis inverted@@ -83,7 +91,7 @@ class InputOverlayDrawableJoystick(bounds = rectOuterdefaultStateInnerBitmap.bounds = rectInnerpressedStateInnerBitmap.bounds = rectInner- virtBounds = bounds!!+ virtBounds = boundsorigBounds = outerBitmap.copyBounds()boundsBoxBitmap.alpha = 0boundsBoxBitmap.bounds = virtBounds@@ -106,8 +114,9 @@ class InputOverlayDrawableJoystick(motionEvent == MotionEvent.ACTION_DOWN || motionEvent == MotionEvent.ACTION_POINTER_DOWNval isActionUp =motionEvent == MotionEvent.ACTION_UP || motionEvent == MotionEvent.ACTION_POINTER_UP+if (isActionDown) {- if (!bounds!!.contains(xPosition, yPosition)) {+ if (!bounds.contains(xPosition, yPosition)) {return false}pressedState = true@@ -122,6 +131,7 @@ class InputOverlayDrawableJoystick(boundsBoxBitmap.bounds = virtBoundstrackId = pointerId}+if (isActionUp) {if (trackId != pointerId) {return false@@ -147,7 +157,9 @@ class InputOverlayDrawableJoystick(trackId = -1return true}+if (trackId == -1) return false+for (i in 0 until event.pointerCount) {if (trackId != event.getPointerId(i)) {continue@@ -179,6 +191,50 @@ class InputOverlayDrawableJoystick(return false}+ fun onConfigureTouch(event: MotionEvent): Boolean {+ val pointerIndex = event.actionIndex+ val fingerPositionX = event.getX(pointerIndex).toInt()+ val fingerPositionY = event.getY(pointerIndex).toInt()++ when (event.action) {+ MotionEvent.ACTION_DOWN -> {+ previousTouchX = fingerPositionX+ previousTouchY = fingerPositionY+ controlPositionX = fingerPositionX - (width / 2)+ controlPositionY = fingerPositionY - (height / 2)+ }+ MotionEvent.ACTION_MOVE -> {+ controlPositionX += fingerPositionX - previousTouchX+ controlPositionY += fingerPositionY - previousTouchY+ bounds = Rect(+ controlPositionX,+ controlPositionY,+ outerBitmap.intrinsicWidth + controlPositionX,+ outerBitmap.intrinsicHeight + controlPositionY+ )+ virtBounds = Rect(+ controlPositionX,+ controlPositionY,+ outerBitmap.intrinsicWidth + controlPositionX,+ outerBitmap.intrinsicHeight + controlPositionY+ )+ setInnerBounds()+ bounds = Rect(+ Rect(+ controlPositionX,+ controlPositionY,+ outerBitmap.intrinsicWidth + controlPositionX,+ outerBitmap.intrinsicHeight + controlPositionY+ )+ )+ previousTouchX = fingerPositionX+ previousTouchY = fingerPositionY+ }+ }+ origBounds = outerBitmap.copyBounds()+ return true+ }+private fun setInnerBounds() {var x = virtBounds.centerX() + (xAxis * (virtBounds.width() / 2)).toInt()var y = virtBounds.centerY() + (yAxis * (virtBounds.height() / 2)).toInt()