Move graphics inside of Chip8 (#84)

The implementation is pretty stable now, since the rendering was moved
outside. This keeps everything a lot simpler.

Author: jblebrun

app/src/main/java/com/emerjbl/ultra8/chip8/graphics/Chip8Graphics.kt

@@ -4,7 +4,7 @@ import com.emerjbl.ultra8.util.LockGuarded
 import java.util.concurrent.locks.ReentrantLock
 
 
-class SimpleGraphics : Chip8Graphics, Chip8Render<SimpleGraphics.Frame> {
+class SimpleGraphics {
     class Frame private constructor(
         val width: Int,
         val height: Int,
@@ -17,7 +17,7 @@ class SimpleGraphics : Chip8Graphics, Chip8Render<SimpleGraphics.Frame> {
 
     private var frame: LockGuarded<Frame> = LockGuarded(ReentrantLock(), lowRes())
 
-    override var hires: Boolean = false
+    var hires: Boolean = false
         set(value) {
             field = value
             frame.update(if (value) hiRes() else lowRes())
@@ -26,11 +26,11 @@ class SimpleGraphics : Chip8Graphics, Chip8Render<SimpleGraphics.Frame> {
     private fun lowRes() = Frame(64, 32)
     private fun hiRes() = Frame(128, 64)
 
-    override fun clear() {
+    fun clear() {
         frame.withLock { it.data.fill(0) }
     }
 
-    override fun scrollRight() = frame.withLock { frame ->
+    fun scrollRight() = frame.withLock { frame ->
         for (row in 0 until frame.width) {
             val rowStart = row * frame.width
             val startIndex = rowStart
@@ -41,7 +41,7 @@ class SimpleGraphics : Chip8Graphics, Chip8Render<SimpleGraphics.Frame> {
         }
     }
 
-    override fun scrollLeft() = frame.withLock { frame ->
+    fun scrollLeft() = frame.withLock { frame ->
         for (row in 0 until frame.height) {
             val rowStart = row * frame.width
             val startIndex = rowStart + 4
@@ -52,23 +52,23 @@ class SimpleGraphics : Chip8Graphics, Chip8Render<SimpleGraphics.Frame> {
         }
     }
 
-    override fun scrollDown(n: Int) = frame.withLock { frame ->
+    fun scrollDown(n: Int) = frame.withLock { frame ->
         val destinationOffset = n * frame.width
         val startIndex = 0
         val endIndex = (frame.height - n) * frame.width
         frame.data.copyInto(frame.data, destinationOffset, startIndex, endIndex)
         frame.data.fill(0, 0, n * frame.width)
     }
 
-    override fun scrollUp(n: Int) = frame.withLock { frame ->
+    fun scrollUp(n: Int) = frame.withLock { frame ->
         val destinationOffset = 0
         val startIndex = n * frame.width
         val endIndex = frame.width * frame.height
         frame.data.copyInto(frame.data, destinationOffset, startIndex, endIndex)
         frame.data.fill(0, 0, n * frame.width)
     }
 
-    override fun putSprite(
+    fun putSprite(
         xBase: Int,
         yBase: Int,
         data: ByteArray,
@@ -119,7 +119,7 @@ class SimpleGraphics : Chip8Graphics, Chip8Render<SimpleGraphics.Frame> {
         return unset
     }
 
-    override fun nextFrame(lastFrame: Frame?): Frame = frame.withLock { frame ->
+    fun nextFrame(lastFrame: Frame?): Frame = frame.withLock { frame ->
         if (lastFrame?.height == frame.height && lastFrame.width == frame.width) {
             frame.data.copyInto(lastFrame.data)
             lastFrame

app/src/main/java/com/emerjbl/ultra8/chip8/graphics/SimpleGraphics.kt

@@ -2,7 +2,7 @@ package com.emerjbl.ultra8.chip8.machine
 
 import android.util.Log
 import com.emerjbl.ultra8.chip8.graphics.Chip8Font
-import com.emerjbl.ultra8.chip8.graphics.Chip8Graphics
+import com.emerjbl.ultra8.chip8.graphics.SimpleGraphics
 import com.emerjbl.ultra8.chip8.input.Chip8Keys
 import com.emerjbl.ultra8.chip8.sound.Chip8Sound
 import com.emerjbl.ultra8.chip8.sound.Pattern
@@ -61,7 +61,6 @@ sealed class Halt(val pc: Int) {
 /** All state of a running Chip8 Machine. */
 class Chip8(
     private val keys: Chip8Keys,
-    private val gfx: Chip8Graphics,
     private val sound: Chip8Sound,
     private val font: Chip8Font,
     timeSource: TimeSource,
@@ -140,6 +139,11 @@ class Chip8(
 
     }
 
+    private val gfx: SimpleGraphics = SimpleGraphics()
+
+    fun nextFrame(frame: SimpleGraphics.Frame?): SimpleGraphics.Frame = gfx.nextFrame(frame)
+
+
     private val state = State().apply {
         font.lo.copyInto(mem, FONT_START)
         font.hi.copyInto(mem, HIRES_FONT_START)

app/src/main/java/com/emerjbl/ultra8/chip8/machine/Chip8.kt

@@ -40,11 +40,9 @@ class Chip8ViewModel(
     private val savedStateHandle: SavedStateHandle
 ) : ViewModel() {
     private val keys = Chip8Keys()
-    private val gfx = SimpleGraphics()
     private fun newMachine(program: ByteArray): Chip8 {
         val sound = AudioTrackSynthSound(viewModelScope, 48000)
-        gfx.hires = false
-        return Chip8(keys, gfx, sound, StandardChip8Font, TimeSource.Monotonic, program)
+        return Chip8(keys, sound, StandardChip8Font, TimeSource.Monotonic, program)
     }
 
     private var machine = newMachine(byteArrayOf())
@@ -157,7 +155,7 @@ class Chip8ViewModel(
     }
 
     fun nextFrame(lastFrame: SimpleGraphics.Frame?): SimpleGraphics.Frame =
-        gfx.nextFrame(lastFrame)
+        machine.nextFrame(lastFrame)
 
 
     companion object {

app/src/main/java/com/emerjbl/ultra8/ui/viewmodel/Chip8ViewModel.kt

@@ -1,6 +1,5 @@
 package com.emerjbl.ultra8
 
-import com.emerjbl.ultra8.chip8.graphics.SimpleGraphics
 import com.emerjbl.ultra8.chip8.graphics.StandardChip8Font
 import com.emerjbl.ultra8.chip8.input.Chip8Keys
 import com.emerjbl.ultra8.chip8.machine.Chip8
@@ -25,16 +24,13 @@ class FakeSound : Chip8Sound {
 
 @RunWith(RobolectricTestRunner::class)
 class ScreenThreadTest {
-    private val gfx = SimpleGraphics()
-
     private val runner = Chip8ThreadRunner().apply {
         cyclesPerTick = 2000
     }
 
     val newMachine = { program: ByteArray ->
         Chip8(
             Chip8Keys(),
-            gfx,
             FakeSound(),
             StandardChip8Font,
             TimeSource.Monotonic,