wip

meikpiep · Jan 8, 2025 · d9701ae · d9701ae
1 parent d57a751
commit d9701ae
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/gauguin-core/src/main/kotlin/org/piepmeyer/gauguin/calculation/GridCalculationService.kt b/gauguin-core/src/main/kotlin/org/piepmeyer/gauguin/calculation/GridCalculationService.kt
@@ -6,6 +6,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
+import kotlinx.coroutines.future.asCompletableFuture
 import kotlinx.coroutines.launch
 import org.piepmeyer.gauguin.creation.GridCalculatorFactory
 import org.piepmeyer.gauguin.grid.Grid
@@ -34,6 +35,8 @@ class GridCalculationService(
         nextGrid = null
         this.variant = variant
         calculateCurrentGrid(scope, invokeAfterNewGridWasCreated)
+
+        calculateNextGrid(scope)
     }
 
     private fun calculateCurrentGrid(
@@ -55,9 +58,11 @@ class GridCalculationService(
             }
     }
 
-    fun calculateNextGrid(scope: CoroutineScope) {
+    private fun calculateNextGrid(scope: CoroutineScope) {
         nextGridJob =
             scope.launch(dispatcher) {
+                currentGridJob?.asCompletableFuture()?.join()
+
                 logger.info { "Calculating next grid of $variant" }
                 listeners.forEach { it.startingNextGridCalculation() }
 
@@ -70,9 +75,7 @@ class GridCalculationService(
             }
     }
 
-    fun hasCalculatedNextGrid(variantParam: GameVariant): Boolean {
-        return nextGrid != null && variantParam == variant
-    }
+    fun hasCalculatedNextGrid(variantParam: GameVariant): Boolean = nextGrid != null && variantParam == variant
 
     fun consumeNextGrid(): Grid {
         val grid = nextGrid!!

diff --git a/gauguin-core/src/main/kotlin/org/piepmeyer/gauguin/game/GameLifecycle.kt b/gauguin-core/src/main/kotlin/org/piepmeyer/gauguin/game/GameLifecycle.kt
@@ -166,8 +166,6 @@ class GameLifecycle(
                 startNewGrid()
             }
         }
-
-        calculationService.calculateNextGrid(scope)
     }
 
     fun loadGame(saveGameFile: File) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -166,8 +166,6 @@ class GameLifecycle( @@
                     startNewGrid()
                 }
             }
-            calculationService.calculateNextGrid(scope)
         }
         fun loadGame(saveGameFile: File) {
@@ Expand Down @@