Merge pull request #346 from novoda/extract_game_loop

[GoL] Extract game loop

game-of-life-multiplatform/common/src/main/kotlin/com/novoda/gol/GameLoop.kt

@@ -0,0 +1,13 @@
+package com.novoda.gol
+
+
+expect class GameLoop() {
+
+    var onTick: () -> Unit
+
+    fun startWith(intervalMs: Int)
+
+    fun stop()
+
+    fun isLooping(): Boolean
+}

game-of-life-multiplatform/common/src/main/kotlin/com/novoda/gol/BoardEntity.kt → game-of-life-multiplatform/common/src/main/kotlin/com/novoda/gol/data/BoardEntity.kt

@@ -1,4 +1,4 @@
-package com.novoda.gol
+package com.novoda.gol.data
 
 import com.novoda.gol.patterns.PatternEntity
 
@@ -8,5 +8,5 @@ interface BoardEntity : CellMatrix {
 
     fun toggleCell(x: Int, y: Int): BoardEntity
 
-    fun applyPattern(patternEntity: PatternEntity):BoardEntity
-}
+    fun applyPattern(patternEntity: PatternEntity): BoardEntity
+}

game-of-life-multiplatform/common/src/main/kotlin/com/novoda/gol/CellEntity.kt → game-of-life-multiplatform/common/src/main/kotlin/com/novoda/gol/data/CellEntity.kt

@@ -1,4 +1,4 @@
-package com.novoda.gol
+package com.novoda.gol.data
 
 data class CellEntity(val isAlive: Boolean) {
 

game-of-life-multiplatform/common/src/main/kotlin/com/novoda/gol/CellMatrix.kt → game-of-life-multiplatform/common/src/main/kotlin/com/novoda/gol/data/CellMatrix.kt

@@ -1,4 +1,4 @@
-package com.novoda.gol
+package com.novoda.gol.data
 
 interface CellMatrix {
 
@@ -9,4 +9,4 @@ interface CellMatrix {
     fun getHeight(): Int
 
     fun getSeeds(): List<PositionEntity>
-}
+}

game-of-life-multiplatform/common/src/main/kotlin/com/novoda/gol/ListBasedMatrix.kt → game-of-life-multiplatform/common/src/main/kotlin/com/novoda/gol/data/ListBasedMatrix.kt

@@ -1,4 +1,4 @@
-package com.novoda.gol
+package com.novoda.gol.data
 
 data class ListBasedMatrix(private val width: Int, private val height: Int, private val seeds: List<PositionEntity> = listOf()) : CellMatrix {
 
@@ -24,4 +24,4 @@ data class ListBasedMatrix(private val width: Int, private val height: Int, priv
 
     override fun getSeeds() = seeds
 
-}
+}

game-of-life-multiplatform/common/src/main/kotlin/com/novoda/gol/data/PositionEntity.kt

@@ -0,0 +1,3 @@
+package com.novoda.gol.data
+
+data class PositionEntity(val x: Int, val y: Int)

game-of-life-multiplatform/common/src/main/kotlin/com/novoda/gol/SimulationBoardEntity.kt → game-of-life-multiplatform/common/src/main/kotlin/com/novoda/gol/data/SimulationBoardEntity.kt

@@ -1,4 +1,4 @@
-package com.novoda.gol
+package com.novoda.gol.data
 
 import com.novoda.gol.patterns.PatternEntity
 
@@ -98,4 +98,4 @@ data class SimulationBoardEntity(private val cellMatrix: CellMatrix) : BoardEnti
         val nextIterationMatrix = ListBasedMatrix(getWidth(), getHeight(), seeds)
         return SimulationBoardEntity(nextIterationMatrix)
     }
-}
+}

game-of-life-multiplatform/common/src/main/kotlin/com/novoda/gol/patterns/AbstractPattern.kt

@@ -1,6 +1,6 @@
 package com.novoda.gol.patterns
 
-import com.novoda.gol.CellMatrix
+import com.novoda.gol.data.CellMatrix
 
 abstract class AbstractPattern(private val cellMatrix: CellMatrix) : PatternEntity {
 
@@ -28,4 +28,4 @@ abstract class AbstractPattern(private val cellMatrix: CellMatrix) : PatternEnti
     }
 
 
-}
+}

game-of-life-multiplatform/common/src/main/kotlin/com/novoda/gol/patterns/Blinker.kt

@@ -1,8 +1,8 @@
 package com.novoda.gol.patterns
 
-import com.novoda.gol.CellMatrix
-import com.novoda.gol.ListBasedMatrix
-import com.novoda.gol.PositionEntity
+import com.novoda.gol.data.CellMatrix
+import com.novoda.gol.data.ListBasedMatrix
+import com.novoda.gol.data.PositionEntity
 
 class Blinker private constructor(cellMatrix: CellMatrix) : AbstractPattern(cellMatrix) {
 
@@ -17,4 +17,4 @@ class Blinker private constructor(cellMatrix: CellMatrix) : AbstractPattern(cell
             return Blinker(ListBasedMatrix(width = 3, height = 3, seeds = seeds))
         }
     }
-}
+}

game-of-life-multiplatform/common/src/main/kotlin/com/novoda/gol/patterns/Glider.kt

@@ -1,8 +1,8 @@
 package com.novoda.gol.patterns
 
-import com.novoda.gol.CellMatrix
-import com.novoda.gol.ListBasedMatrix
-import com.novoda.gol.PositionEntity
+import com.novoda.gol.data.CellMatrix
+import com.novoda.gol.data.ListBasedMatrix
+import com.novoda.gol.data.PositionEntity
 
 class Glider private constructor(cellMatrix: CellMatrix) : AbstractPattern(cellMatrix) {
     override fun getName() = "Glider"

game-of-life-multiplatform/common/src/main/kotlin/com/novoda/gol/patterns/PatternEntity.kt

@@ -1,7 +1,7 @@
 package com.novoda.gol.patterns
 
-import com.novoda.gol.CellMatrix
+import com.novoda.gol.data.CellMatrix
 
 interface PatternEntity : CellMatrix {
     fun getName(): String
-}
+}

game-of-life-multiplatform/common/src/main/kotlin/com/novoda/gol/BoardModel.kt → game-of-life-multiplatform/common/src/main/kotlin/com/novoda/gol/presentation/BoardModel.kt

@@ -1,5 +1,7 @@
-package com.novoda.gol
+package com.novoda.gol.presentation
 
+import com.novoda.gol.data.BoardEntity
+import com.novoda.gol.data.PositionEntity
 import com.novoda.gol.patterns.PatternEntity
 
 interface BoardModel {
@@ -10,5 +12,7 @@ interface BoardModel {
 
     fun selectPattern(pattern: PatternEntity)
 
-    fun nextIteration()
+    fun startSimulation()
+
+    fun stopSimulation()
 }

game-of-life-multiplatform/common/src/main/kotlin/com/novoda/gol/presentation/BoardModelImpl.kt

@@ -0,0 +1,63 @@
+package com.novoda.gol.presentation
+
+import com.novoda.gol.GameLoop
+import com.novoda.gol.data.BoardEntity
+import com.novoda.gol.data.ListBasedMatrix
+import com.novoda.gol.data.PositionEntity
+import com.novoda.gol.data.SimulationBoardEntity
+import com.novoda.gol.patterns.PatternEntity
+import kotlin.properties.Delegates.observable
+
+
+class BoardModelImpl private constructor(initialBoard: BoardEntity, private val gameLoop: GameLoop) : BoardModel {
+
+    private var board: BoardEntity by observable(initialBoard) { _, _, newValue ->
+        onBoardChanged.invoke(newValue)
+    }
+    private var pattern: PatternEntity? = null
+
+    override var onBoardChanged by observable<(BoardEntity) -> Unit>({}, { _, _, newValue ->
+        newValue.invoke(board)
+    })
+
+    init {
+        gameLoop.onTick = {
+            board = board.nextIteration()
+        }
+    }
+
+    override fun toggleCellAt(positionEntity: PositionEntity) {
+        if (gameLoop.isLooping()) {
+            return
+        }
+        board = board.toggleCell(positionEntity.x, positionEntity.y)
+    }
+
+    override fun selectPattern(pattern: PatternEntity) {
+        if (gameLoop.isLooping() || this.pattern == pattern) {
+            return
+        }
+        this.pattern = pattern
+        board = board.applyPattern(pattern)
+    }
+
+    override fun startSimulation() {
+        if (gameLoop.isLooping()) {
+            return
+        }
+        gameLoop.startWith(300)
+    }
+
+    override fun stopSimulation() {
+        if (gameLoop.isLooping().not()) {
+            return
+        }
+        gameLoop.stop()
+    }
+
+    companion object {
+
+        fun create(width: Int, height: Int): BoardModel = BoardModelImpl(SimulationBoardEntity(ListBasedMatrix(width, height)), GameLoop())
+
+    }
+}

game-of-life-multiplatform/common/src/main/kotlin/com/novoda/gol/BoardPresenter.kt → game-of-life-multiplatform/common/src/main/kotlin/com/novoda/gol/presentation/BoardPresenter.kt

@@ -1,9 +1,9 @@
-package com.novoda.gol
+package com.novoda.gol.presentation
 
 
 class BoardPresenter(width: Int, height: Int) {
 
-    private val boardModel = BoardModelImpl(width, height)
+    private val boardModel = BoardModelImpl.create(width, height)
 
     fun bind(boardView: BoardView) {
 
@@ -15,20 +15,24 @@ class BoardPresenter(width: Int, height: Int) {
             boardModel.toggleCellAt(position)
         }
 
-        boardView.onTick = {
-            boardModel.nextIteration()
-        }
-
         boardView.onPatternSelected = { pattern ->
             boardModel.selectPattern(pattern)
         }
+
+        boardView.onStartSimulationClicked = {
+            boardModel.startSimulation()
+        }
+
+        boardView.onStopSimulationClicked = {
+            boardModel.stopSimulation()
+        }
     }
 
     fun unbind(boardView: BoardView) {
         boardModel.onBoardChanged = { }
         boardView.onCellClicked = { }
-        boardView.onTick = {}
         boardView.onPatternSelected = {}
+        boardView.onStartSimulationClicked = {}
+        boardView.onStopSimulationClicked = {}
     }
-
 }

game-of-life-multiplatform/common/src/main/kotlin/com/novoda/gol/BoardView.kt → game-of-life-multiplatform/common/src/main/kotlin/com/novoda/gol/presentation/BoardView.kt

@@ -1,12 +1,15 @@
-package com.novoda.gol
+package com.novoda.gol.presentation
 
+import com.novoda.gol.data.BoardEntity
+import com.novoda.gol.data.PositionEntity
 import com.novoda.gol.patterns.PatternEntity
 
 interface BoardView {
 
     var onPatternSelected: (pattern: PatternEntity) -> Unit
     var onCellClicked: (position: PositionEntity) -> Unit
-    var onTick: () -> Unit
+    var onStartSimulationClicked: () -> Unit
+    var onStopSimulationClicked: () -> Unit
 
     fun renderBoard(boardEntity: BoardEntity)
 

game-of-life-multiplatform/game-of-life-js/src/main/kotlin/com/novoda/gol/GameLoop.kt

@@ -0,0 +1,26 @@
+package com.novoda.gol
+
+import kotlin.browser.window
+
+
+actual class GameLoop {
+
+    private var loop: Int? = null
+
+    actual var onTick: () -> Unit = {}
+
+    actual fun startWith(intervalMs: Int) {
+        loop = window.setInterval({
+            onTick.invoke()
+        }, intervalMs)
+    }
+
+    actual fun stop() {
+        if (loop != null) {
+            window.clearInterval(loop!!)
+            loop = null
+        }
+    }
+
+    actual fun isLooping() = loop != null
+}