Prepare for interchangeable SurfaceViews

SupernaviX · Apr 7, 2023 · dc06308 · dc06308
1 parent bfe8edf
commit dc06308
Show file tree

Hide file tree

Showing 12 changed files with 112 additions and 35 deletions.
diff --git a/app/src/main/java/com/simongellis/vvb/emulator/AnaglyphRenderer.kt b/app/src/main/java/com/simongellis/vvb/emulator/AnaglyphRenderer.kt
@@ -1,8 +1,6 @@
 package com.simongellis.vvb.emulator
 
 import androidx.annotation.ColorInt
-import javax.microedition.khronos.egl.EGLConfig
-import javax.microedition.khronos.opengles.GL10
 
 class AnaglyphRenderer(emulator: Emulator, settings: Settings) : Renderer {
     private var _pointer = 0L
@@ -21,15 +19,15 @@ class AnaglyphRenderer(emulator: Emulator, settings: Settings) : Renderer {
         }
     }
 
-    override fun onSurfaceCreated(gl: GL10?, config: EGLConfig?) {
+    override fun onSurfaceCreated() {
         nativeOnSurfaceCreated()
     }
 
-    override fun onSurfaceChanged(gl: GL10?, width: Int, height: Int) {
+    override fun onSurfaceChanged(width: Int, height: Int) {
         nativeOnSurfaceChanged(width, height)
     }
 
-    override fun onDrawFrame(gl: GL10?) {
+    override fun onDrawFrame() {
         nativeOnDrawFrame()
     }
 

diff --git a/app/src/main/java/com/simongellis/vvb/emulator/CardboardRenderer.kt b/app/src/main/java/com/simongellis/vvb/emulator/CardboardRenderer.kt
@@ -1,8 +1,6 @@
 package com.simongellis.vvb.emulator
 
 import androidx.annotation.ColorInt
-import javax.microedition.khronos.egl.EGLConfig
-import javax.microedition.khronos.opengles.GL10
 
 class CardboardRenderer(emulator: Emulator, settings: Settings) : Renderer {
     private var _pointer = 0L
@@ -21,15 +19,15 @@ class CardboardRenderer(emulator: Emulator, settings: Settings) : Renderer {
         }
     }
 
-    override fun onSurfaceCreated(gl: GL10?, config: EGLConfig?) {
+    override fun onSurfaceCreated() {
         nativeOnSurfaceCreated()
     }
 
-    override fun onSurfaceChanged(gl: GL10?, width: Int, height: Int) {
+    override fun onSurfaceChanged(width: Int, height: Int) {
         nativeOnSurfaceChanged(width, height)
     }
 
-    override fun onDrawFrame(gl: GL10?) {
+    override fun onDrawFrame() {
         nativeOnDrawFrame()
     }
 

diff --git a/app/src/main/java/com/simongellis/vvb/emulator/LeiaRenderer.kt b/app/src/main/java/com/simongellis/vvb/emulator/LeiaRenderer.kt
@@ -1,8 +1,6 @@
 package com.simongellis.vvb.emulator
 
 import androidx.annotation.ColorInt
-import javax.microedition.khronos.egl.EGLConfig
-import javax.microedition.khronos.opengles.GL10
 
 class LeiaRenderer(emulator: Emulator, settings: Settings) : Renderer {
     private var _pointer = 0L
@@ -21,15 +19,15 @@ class LeiaRenderer(emulator: Emulator, settings: Settings) : Renderer {
         }
     }
 
-    override fun onSurfaceCreated(gl: GL10?, config: EGLConfig?) {
+    override fun onSurfaceCreated() {
         nativeOnSurfaceCreated()
     }
 
-    override fun onSurfaceChanged(gl: GL10?, width: Int, height: Int) {
+    override fun onSurfaceChanged(width: Int, height: Int) {
         nativeOnSurfaceChanged(width, height)
     }
 
-    override fun onDrawFrame(gl: GL10?) {
+    override fun onDrawFrame() {
         nativeOnDrawFrame()
     }
 

diff --git a/app/src/main/java/com/simongellis/vvb/emulator/MonoRenderer.kt b/app/src/main/java/com/simongellis/vvb/emulator/MonoRenderer.kt
@@ -2,8 +2,6 @@ package com.simongellis.vvb.emulator
 
 import androidx.annotation.ColorInt
 import androidx.annotation.IntRange
-import javax.microedition.khronos.egl.EGLConfig
-import javax.microedition.khronos.opengles.GL10
 
 class MonoRenderer(emulator: Emulator, settings: Settings): Renderer {
     private var _pointer = 0L
@@ -22,15 +20,15 @@ class MonoRenderer(emulator: Emulator, settings: Settings): Renderer {
         }
     }
 
-    override fun onSurfaceCreated(gl: GL10?, config: EGLConfig?) {
+    override fun onSurfaceCreated() {
         nativeOnSurfaceCreated()
     }
 
-    override fun onSurfaceChanged(gl: GL10?, width: Int, height: Int) {
+    override fun onSurfaceChanged(width: Int, height: Int) {
         nativeOnSurfaceChanged(width, height)
     }
 
-    override fun onDrawFrame(gl: GL10?) {
+    override fun onDrawFrame() {
         nativeOnDrawFrame()
     }
 

diff --git a/app/src/main/java/com/simongellis/vvb/emulator/Renderer.kt b/app/src/main/java/com/simongellis/vvb/emulator/Renderer.kt
@@ -1,8 +1,9 @@
 package com.simongellis.vvb.emulator
 
-import android.opengl.GLSurfaceView
-
-interface Renderer : GLSurfaceView.Renderer {
+interface Renderer {
+    fun onSurfaceCreated()
+    fun onSurfaceChanged(width: Int, height: Int)
+    fun onDrawFrame()
     fun destroy()
     fun onResume() {}
     fun onModeChanged(enable3d: Boolean) {}

diff --git a/app/src/main/java/com/simongellis/vvb/emulator/StereoRenderer.kt b/app/src/main/java/com/simongellis/vvb/emulator/StereoRenderer.kt
@@ -1,8 +1,6 @@
 package com.simongellis.vvb.emulator
 
 import androidx.annotation.ColorInt
-import javax.microedition.khronos.egl.EGLConfig
-import javax.microedition.khronos.opengles.GL10
 
 class StereoRenderer(emulator: Emulator, settings: Settings): Renderer {
     private var _pointer = 0L
@@ -21,15 +19,15 @@ class StereoRenderer(emulator: Emulator, settings: Settings): Renderer {
         }
     }
 
-    override fun onSurfaceCreated(gl: GL10?, config: EGLConfig?) {
+    override fun onSurfaceCreated() {
         nativeOnSurfaceCreated()
     }
 
-    override fun onSurfaceChanged(gl: GL10?, width: Int, height: Int) {
+    override fun onSurfaceChanged(width: Int, height: Int) {
         nativeOnSurfaceChanged(width, height)
     }
 
-    override fun onDrawFrame(gl: GL10?) {
+    override fun onDrawFrame() {
         nativeOnDrawFrame()
     }
 

diff --git a/app/src/main/java/com/simongellis/vvb/game/GLSurfaceViewAdapter.kt b/app/src/main/java/com/simongellis/vvb/game/GLSurfaceViewAdapter.kt
@@ -0,0 +1,32 @@
+package com.simongellis.vvb.game
+
+import android.content.Context
+import android.opengl.GLSurfaceView
+import android.util.AttributeSet
+import javax.microedition.khronos.egl.EGLConfig
+import javax.microedition.khronos.opengles.GL10
+
+class GLSurfaceViewAdapter: GLSurfaceView, SurfaceViewAdapter {
+    constructor(context: Context): super(context)
+    constructor(context: Context, attrs: AttributeSet?): super(context, attrs)
+
+    override fun setRenderer(renderer: com.simongellis.vvb.emulator.Renderer) {
+        setEGLContextClientVersion(2)
+        setRenderer(RendererAdapter(renderer))
+        renderMode = RENDERMODE_CONTINUOUSLY
+    }
+
+    class RendererAdapter(private val inner: com.simongellis.vvb.emulator.Renderer): Renderer {
+        override fun onSurfaceCreated(gl: GL10?, p1: EGLConfig?) {
+            inner.onSurfaceCreated()
+        }
+
+        override fun onSurfaceChanged(gl: GL10?, width: Int, height: Int) {
+            inner.onSurfaceChanged(width, height)
+        }
+
+        override fun onDrawFrame(gl: GL10?) {
+            inner.onDrawFrame()
+        }
+    }
+}
diff --git a/app/src/main/java/com/simongellis/vvb/game/GameView.kt b/app/src/main/java/com/simongellis/vvb/game/GameView.kt
@@ -3,7 +3,6 @@ package com.simongellis.vvb.game
 import android.content.Context
 import android.content.pm.ActivityInfo
 import android.graphics.Color
-import android.opengl.GLSurfaceView
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import androidx.constraintlayout.widget.ConstraintLayout
@@ -36,6 +35,9 @@ class GameView : ConstraintLayout, BacklightModeListener {
 
     val requestedOrientation: Int
 
+    private val _surfaceView: SurfaceViewAdapter
+        get() = _binding.surfaceView as SurfaceViewAdapter
+
     constructor(context: Context) : super(context)
     constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
     constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
@@ -61,9 +63,7 @@ class GameView : ConstraintLayout, BacklightModeListener {
                 guidePercent = _preferences.horizontalOffset
             }
 
-            surfaceView.setEGLContextClientVersion(2)
-            surfaceView.setRenderer(_renderer)
-            surfaceView.renderMode = GLSurfaceView.RENDERMODE_CONTINUOUSLY
+            _surfaceView.setRenderer(_renderer)
 
             gamepadView.setPreferences(_preferences)
 
@@ -85,12 +85,12 @@ class GameView : ConstraintLayout, BacklightModeListener {
     }
 
     fun onPause() {
-        _binding.surfaceView.onPause()
+        _surfaceView.onPause()
         checkShouldToggle3D(false)
     }
 
     fun onResume() {
-        _binding.surfaceView.onResume()
+        _surfaceView.onResume()
         _renderer.onResume()
         checkShouldToggle3D(true)
     }

diff --git a/app/src/main/java/com/simongellis/vvb/game/SurfaceViewAdapter.kt b/app/src/main/java/com/simongellis/vvb/game/SurfaceViewAdapter.kt
@@ -0,0 +1,9 @@
+package com.simongellis.vvb.game
+
+import com.simongellis.vvb.emulator.Renderer
+
+interface SurfaceViewAdapter {
+    fun setRenderer(renderer: Renderer)
+    fun onPause()
+    fun onResume()
+}
diff --git a/app/src/main/java/com/simongellis/vvb/game/WrapperSurfaceViewAdapter.kt b/app/src/main/java/com/simongellis/vvb/game/WrapperSurfaceViewAdapter.kt
@@ -0,0 +1,36 @@
+package com.simongellis.vvb.game
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.widget.LinearLayout
+import com.simongellis.vvb.R
+import com.simongellis.vvb.databinding.WrapperSurfaceViewAdapterBinding
+import com.simongellis.vvb.emulator.Renderer
+
+class WrapperSurfaceViewAdapter : LinearLayout, SurfaceViewAdapter {
+    constructor(context: Context): super(context)
+    constructor(context: Context, attrs: AttributeSet?): super(context, attrs)
+
+    init {
+        val layoutInflater = LayoutInflater.from(context)
+        WrapperSurfaceViewAdapterBinding.inflate(layoutInflater, this, true)
+    }
+
+    @Suppress("TypeParameterFindViewById")
+    private val inner: SurfaceViewAdapter
+        get() = findViewById(R.id.inner_surface_view) as SurfaceViewAdapter
+
+    override fun setRenderer(renderer: Renderer) {
+        inner.setRenderer(renderer)
+    }
+
+    override fun onPause() {
+        inner.onPause()
+    }
+
+    override fun onResume() {
+        inner.onResume()
+    }
+
+}
diff --git a/app/src/main/res/layout/game_view.xml b/app/src/main/res/layout/game_view.xml
@@ -13,7 +13,7 @@
         app:layout_constraintGuide_percent="0.3"
         android:orientation="vertical" />
 
-    <android.opengl.GLSurfaceView
+    <com.simongellis.vvb.game.WrapperSurfaceViewAdapter
         android:id="@+id/surface_view"
         app:layout_constraintStart_toStartOf="@id/start_guideline"
         app:layout_constraintWidth_default="percent"

diff --git a/app/src/main/res/layout/wrapper_surface_view_adapter.xml b/app/src/main/res/layout/wrapper_surface_view_adapter.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <com.simongellis.vvb.game.GLSurfaceViewAdapter
+        android:id="@+id/inner_surface_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+</LinearLayout>