WindowStateManager is no longer a GameComponent

davesmith00000 · May 5, 2024 · 93c17c7 · 93c17c7
1 parent 97ee2d4
commit 93c17c7
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 65 deletions.
diff --git a/roguelike-shared/src/main/scala/roguelike/GameEvent.scala b/roguelike-shared/src/main/scala/roguelike/GameEvent.scala
@@ -2,11 +2,11 @@ package roguelike
 
 import indigo.*
 import indigo.shared.materials.Material.Bitmap
-import roguelike.components.windows.WindowManagerCommand
 import roguelike.model.Message
 import roguelike.model.gamedata.Consumables
 import roguelike.model.gamedata.Ranged
 import roguelike.model.items.Item
+import roguelike.windows.WindowManagerCommand
 
 enum GameEvent extends GlobalEvent:
   // Player events

diff --git a/...onents/windows/WindowManagerCommand.scala → ...uelike/windows/WindowManagerCommand.scala b/...onents/windows/WindowManagerCommand.scala → ...uelike/windows/WindowManagerCommand.scala
@@ -1,4 +1,4 @@
-package roguelike.components.windows
+package roguelike.windows
 
 enum WindowManagerCommand:
   case ShowQuit

diff --git a/roguelike/src/main/scala/roguelike/components/entities/HostileComponent.scala b/roguelike/src/main/scala/roguelike/components/entities/HostileComponent.scala
@@ -7,12 +7,12 @@ import roguelike.ColorScheme
 import roguelike.GameEvent
 import roguelike.HostileEvent
 import roguelike.components.GameComponent
-import roguelike.components.windows.WindowManagerCommand
 import roguelike.model.Message
 import roguelike.model.entity.Hostile
 import roguelike.model.entity.Orc
 import roguelike.model.entity.Troll
 import roguelike.viewmodel.ActorPosition
+import roguelike.windows.WindowManagerCommand
 
 object HostileComponent extends GameComponent[Size, Hostile, HostilesManager.HostilesVM]:
   type Command            = Cmds

diff --git a/roguelike/src/main/scala/roguelike/components/entities/PlayerComponent.scala b/roguelike/src/main/scala/roguelike/components/entities/PlayerComponent.scala
@@ -7,7 +7,6 @@ import roguelike.ColorScheme
 import roguelike.GameEvent
 import roguelike.HostileEvent
 import roguelike.components.GameComponent
-import roguelike.components.windows.WindowManagerCommand
 import roguelike.model.GameState
 import roguelike.model.Inventory
 import roguelike.model.Message
@@ -19,6 +18,7 @@ import roguelike.viewmodel.ActorDirection
 import roguelike.viewmodel.ActorMoveState
 import roguelike.viewmodel.ActorPosition
 import roguelike.viewmodel.GameViewModel
+import roguelike.windows.WindowManagerCommand
 
 object PlayerComponent extends GameComponent[Size, Model, GameViewModel]:
   type ComponentModel     = PlayerM

diff --git a/roguelike/src/main/scala/roguelike/components/windows/DropMenu.scala b/roguelike/src/main/scala/roguelike/components/windows/DropMenu.scala
@@ -12,6 +12,7 @@ import roguelike.model.Model
 import roguelike.model.entity.Collectable
 import roguelike.scenes.UIElements
 import roguelike.viewmodel.GameViewModel
+import roguelike.windows.WindowManagerCommand
 import roguelikestarterkit.*
 
 object DropMenu extends GameComponent[Size, Model, GameViewModel]:

diff --git a/roguelike/src/main/scala/roguelike/components/windows/EquipMenu.scala b/roguelike/src/main/scala/roguelike/components/windows/EquipMenu.scala
@@ -9,6 +9,7 @@ import roguelike.model.Inventory
 import roguelike.model.Model
 import roguelike.scenes.UIElements
 import roguelike.viewmodel.GameViewModel
+import roguelike.windows.WindowManagerCommand
 import roguelikestarterkit.*
 
 object EquipMenu extends GameComponent[Size, Model, GameViewModel]:

diff --git a/roguelike/src/main/scala/roguelike/components/windows/LevelUp.scala b/roguelike/src/main/scala/roguelike/components/windows/LevelUp.scala
@@ -10,6 +10,7 @@ import roguelike.model.Message
 import roguelike.model.Model
 import roguelike.model.entity.Player
 import roguelike.viewmodel.GameViewModel
+import roguelike.windows.WindowManagerCommand
 import roguelikestarterkit.*
 
 object LevelUp extends GameComponent[Size, Model, GameViewModel]:

diff --git a/roguelike/src/main/scala/roguelike/model/Model.scala b/roguelike/src/main/scala/roguelike/model/Model.scala
@@ -10,13 +10,13 @@ import roguelike.InventoryEvent
 import roguelike.RogueLikeGame
 import roguelike.components.entities.HostilesManager
 import roguelike.components.entities.PlayerComponent
-import roguelike.components.windows.ActiveWindow
-import roguelike.components.windows.WindowManagerCommand
-import roguelike.components.windows.WindowStateManager
 import roguelike.model.dungeon.Dungeon
 import roguelike.model.entity.*
 import roguelike.model.gamedata.Consumables
 import roguelike.model.gamedata.Ranged
+import roguelike.windows.ActiveWindow
+import roguelike.windows.WindowManagerCommand
+import roguelike.windows.WindowStateManager
 
 import scala.scalajs.js
 
@@ -183,7 +183,7 @@ final case class Model(
       pickUp
 
     case GameEvent.WindowEvent(command) =>
-      WindowStateManager.updateModel(context, this, command)
+      WindowStateManager.updateModel(context, this)(command)
 
     case GameEvent.Log(message) =>
       Outcome(

diff --git a/roguelike/src/main/scala/roguelike/scenes/GameSceneUpdate.scala b/roguelike/src/main/scala/roguelike/scenes/GameSceneUpdate.scala
@@ -5,12 +5,13 @@ import indigo.scenes.SceneContext
 import roguelike.ColorScheme
 import roguelike.GameEvent
 import roguelike.components.entities.HostilesManager
-import roguelike.components.windows.*
 import roguelike.model.GameState
 import roguelike.model.Message
 import roguelike.model.Model
 import roguelike.model.gamedata.KeyMapping
 import roguelike.windows.HistoryWindow
+import roguelike.windows.WindowManagerCommand
+import roguelike.windows.WindowStateManager
 import roguelikestarterkit.WindowEvent
 
 object GameSceneUpdate:
@@ -37,22 +38,21 @@ object GameSceneUpdate:
         if !model.gameState.isWaitForInput ||
           WindowStateManager.showingCloseableWindow(model) =>
       WindowStateManager
-        .updateModel(context, model, WindowManagerCommand.CloseAll)
+        .updateModel(context, model)(WindowManagerCommand.CloseAll)
         .map(_.closeAllWindows)
 
     case WindowEvent.Closed(HistoryWindow.windowId) =>
       WindowStateManager
-        .updateModel(context, model, WindowManagerCommand.CloseAll)
+        .updateModel(context, model)(WindowManagerCommand.CloseAll)
         .map(_.closeAllWindows)
 
     // Quit window toggle
     case KeyboardEvent.KeyUp(KeyMapping.Quit1) | KeyboardEvent.KeyUp(KeyMapping.Quit2)
         if model.gameState.isWaitForInput =>
       WindowStateManager.updateModel(
         context,
-        model,
-        WindowManagerCommand.ShowQuit
-      )
+        model
+      )(WindowManagerCommand.ShowQuit)
 
     // Looking around
     case KeyboardEvent.KeyDown(KeyMapping.MoveUp) if model.gameState.lookingAround =>
@@ -110,44 +110,34 @@ object GameSceneUpdate:
     case KeyboardEvent.KeyUp(KeyMapping.ViewHistory)
         if model.gameState.isWaitForInput ||
           !WindowStateManager.showingWindow(model) =>
-      WindowStateManager.updateModel(
-        context,
-        model,
+      WindowStateManager.updateModel(context, model)(
         WindowManagerCommand.ShowHistory
       )
     case KeyboardEvent.KeyUp(KeyMapping.ViewControls)
         if model.gameState.isWaitForInput ||
           !WindowStateManager.showingWindow(model) =>
-      WindowStateManager.updateModel(
-        context,
-        model,
+      WindowStateManager.updateModel(context, model)(
         WindowManagerCommand.ShowControls
       )
 
     case KeyboardEvent.KeyUp(KeyMapping.Inventory)
         if model.gameState.isWaitForInput ||
           !WindowStateManager.showingWindow(model) =>
-      WindowStateManager.updateModel(
-        context,
-        model,
+      WindowStateManager.updateModel(context, model)(
         WindowManagerCommand.ShowInventoryMenu
       )
 
     case KeyboardEvent.KeyUp(KeyMapping.Equipment)
         if model.gameState.isWaitForInput ||
           !WindowStateManager.showingWindow(model) =>
-      WindowStateManager.updateModel(
-        context,
-        model,
+      WindowStateManager.updateModel(context, model)(
         WindowManagerCommand.ShowEquipMenu
       )
 
     case KeyboardEvent.KeyUp(KeyMapping.Drop)
         if model.gameState.isWaitForInput ||
           !WindowStateManager.showingWindow(model) =>
-      WindowStateManager.updateModel(
-        context,
-        model,
+      WindowStateManager.updateModel(context, model)(
         WindowManagerCommand.ShowDropMenu
       )
 

diff --git a/roguelike/src/main/scala/roguelike/viewmodel/ViewModel.scala b/roguelike/src/main/scala/roguelike/viewmodel/ViewModel.scala
@@ -8,14 +8,14 @@ import roguelike.GameEvent
 import roguelike.InventoryEvent
 import roguelike.components.entities.HostilesManager
 import roguelike.components.entities.PlayerComponent
-import roguelike.components.windows.WindowStateManager
 import roguelike.model.GameTile
 import roguelike.model.Model
 import roguelike.model.entity.Collectable
 import roguelike.model.entity.Player
 import roguelike.model.gamedata.KeyMapping
 import roguelike.subsystems.FloatingMessage
 import roguelike.viewmodel.ui.*
+import roguelike.windows.WindowStateManager
 
 import scala.scalajs.js
 import scala.scalajs.js.JSConverters.*

diff --git a/roguelike/src/main/scala/roguelike/windows/MenuWindow.scala b/roguelike/src/main/scala/roguelike/windows/MenuWindow.scala
@@ -2,7 +2,6 @@ package roguelike.windows
 
 import indigo.*
 import roguelike.GameEvent
-import roguelike.components.windows.WindowManagerCommand
 import roguelike.model.GameWindowContext
 import roguelikestarterkit.*
 

diff --git a/...mponents/windows/WindowStateManager.scala → ...oguelike/windows/WindowStateManager.scala b/...mponents/windows/WindowStateManager.scala → ...oguelike/windows/WindowStateManager.scala
@@ -1,34 +1,20 @@
-package roguelike.components.windows
+package roguelike.windows
 
 import indigo.*
 import indigo.scenes.SceneContext
 import roguelike.GameEvent
-import roguelike.components.GameComponent
 import roguelike.model.Model
-import roguelike.viewmodel.GameViewModel
-import roguelike.windows.ControlsWindow
-import roguelike.windows.HistoryWindow
-import roguelike.windows.QuitSaveWindow
 import roguelikestarterkit.WindowEvent
 
-object WindowStateManager extends GameComponent[Size, Model, GameViewModel]:
-  type Command            = WindowManagerCommand
-  type ComponentModel     = Model
-  type ComponentViewModel = GameViewModel
-
-  def modelLens: Lens[Model, Model] =
-    Lens.keepLatest
-
-  def viewModelLens: Lens[GameViewModel, GameViewModel] =
-    Lens.keepLatest
+object WindowStateManager:
 
   val updateActive: Lens[Model, ActiveWindow] =
     Lens(
       _.activeWindow,
       (m, next) => m.copy(activeWindow = next)
     )
 
-  def nextModel(
+  def updateModel(
       context: SceneContext[Size],
       model: Model
   ): WindowManagerCommand => Outcome[Model] =
@@ -73,25 +59,11 @@ object WindowStateManager extends GameComponent[Size, Model, GameViewModel]:
       Outcome(updateActive.set(model.closeAllWindows, ActiveWindow.None))
         .addGlobalEvents(closeActive)
 
-  def nextViewModel(
-      context: SceneContext[Size],
-      model: Model,
-      viewModel: GameViewModel
-  ): WindowManagerCommand => Outcome[GameViewModel] =
-    _ => Outcome(viewModel)
-
-  def view(
-      context: SceneContext[Size],
-      model: Model,
-      viewModel: GameViewModel
-  ): Outcome[Batch[SceneNode]] =
-    Outcome(Batch.empty)
-
   val initialModel: ActiveWindow =
     ActiveWindow.None
 
   def showingWindow(model: Model): Boolean =
-    modelLens.get(model).activeWindow match
+    model.activeWindow match
       case ActiveWindow.None => false
       case _                 => true
 
@@ -102,10 +74,10 @@ object WindowStateManager extends GameComponent[Size, Model, GameViewModel]:
     showingWindow(model) && isCloseable(model)
 
   def isCloseable(model: Model): Boolean =
-    modelLens.get(model).activeWindow.closeable
+    model.activeWindow.closeable
 
   def isUnCloseable(model: Model): Boolean =
-    !modelLens.get(model).activeWindow.closeable
+    !model.activeWindow.closeable
 
 enum ActiveWindow(val closeable: Boolean):
   case None          extends ActiveWindow(true)