Brought up to date

PurpleKingdomGames · Oct 1, 2024 · 55ef817 · 55ef817
1 parent edd9295
commit 55ef817
Show file tree

Hide file tree

Showing 28 changed files with 14 additions and 76 deletions.
diff --git a/demo/src/main/scala/demo/ColourWindow.scala b/demo/src/main/scala/demo/ColourWindow.scala
@@ -8,12 +8,10 @@ import roguelikestarterkit.ui.components.BoundsType
 import roguelikestarterkit.ui.components.ComponentGroup
 import roguelikestarterkit.ui.components.ScrollPane
 import roguelikestarterkit.ui.components.TerminalButton
-import roguelikestarterkit.ui.components.TerminalLabel
 import roguelikestarterkit.ui.components.TerminalScrollPane
 import roguelikestarterkit.ui.components.datatypes.Anchor
 import roguelikestarterkit.ui.components.datatypes.BoundsMode
 import roguelikestarterkit.ui.components.datatypes.ComponentLayout
-import roguelikestarterkit.ui.components.datatypes.FitMode
 import roguelikestarterkit.ui.components.datatypes.Overflow
 import roguelikestarterkit.ui.components.datatypes.Padding
 import roguelikestarterkit.ui.window.Space

diff --git a/demo/src/main/scala/demo/ComponentsWindow.scala b/demo/src/main/scala/demo/ComponentsWindow.scala
@@ -7,7 +7,6 @@ import roguelikestarterkit.ui.components.ComponentGroup
 import roguelikestarterkit.ui.components.TerminalButton
 import roguelikestarterkit.ui.components.TerminalLabel
 import roguelikestarterkit.ui.components.datatypes.ComponentLayout
-import roguelikestarterkit.ui.components.datatypes.Overflow
 import roguelikestarterkit.ui.components.datatypes.Padding
 import roguelikestarterkit.ui.window.TerminalWindow
 

diff --git a/demo/src/main/scala/demo/ComponentsWindow2.scala b/demo/src/main/scala/demo/ComponentsWindow2.scala
@@ -11,7 +11,6 @@ import roguelikestarterkit.ui.components.TerminalLabel
 import roguelikestarterkit.ui.components.TerminalTextArea
 import roguelikestarterkit.ui.components.datatypes.ComponentId
 import roguelikestarterkit.ui.components.datatypes.ComponentLayout
-import roguelikestarterkit.ui.components.datatypes.Overflow
 import roguelikestarterkit.ui.components.datatypes.Padding
 import roguelikestarterkit.ui.window.TerminalWindow
 

diff --git a/demo/src/main/scala/demo/MenuWindow.scala b/demo/src/main/scala/demo/MenuWindow.scala
@@ -2,12 +2,10 @@ package demo
 
 import indigo.*
 import roguelikestarterkit.*
-import roguelikestarterkit.ui.components.ComponentGroup
 import roguelikestarterkit.ui.components.ComponentList
 import roguelikestarterkit.ui.components.TerminalButton
 import roguelikestarterkit.ui.components.datatypes.ComponentId
 import roguelikestarterkit.ui.components.datatypes.ComponentLayout
-import roguelikestarterkit.ui.components.datatypes.Overflow
 import roguelikestarterkit.ui.components.datatypes.Padding
 import roguelikestarterkit.ui.window.TerminalWindow
 

diff --git a/demo/src/main/scala/demo/NoTerminalUI.scala b/demo/src/main/scala/demo/NoTerminalUI.scala
@@ -6,7 +6,6 @@ import indigo.shared.subsystems.SubSystemFrameContext.*
 import roguelikestarterkit.*
 import roguelikestarterkit.ui.component.Component
 import roguelikestarterkit.ui.components.ComponentGroup
-import roguelikestarterkit.ui.components.ComponentList
 
 object NoTerminalUI extends Scene[Size, Model, ViewModel]:
 

diff --git a/flake.nix b/flake.nix
@@ -22,6 +22,7 @@
             pkgs.nodejs
             pkgs.yarn
             pkgs.nodePackages_latest.http-server
+            pkgs.bloop
           ];
           shellHook = startupHook;
         };

diff --git a/roguelike-starterkit/src/main/scala/roguelikestarterkit/ui/components/TerminalButton.scala b/roguelike-starterkit/src/main/scala/roguelikestarterkit/ui/components/TerminalButton.scala
@@ -1,14 +1,11 @@
 package roguelikestarterkit.ui.components
 
 import indigo.*
-import indigo.syntax.*
 import roguelikestarterkit.TerminalEmulator
 import roguelikestarterkit.syntax.*
 import roguelikestarterkit.terminal.RogueTerminalEmulator
 import roguelikestarterkit.terminal.TerminalMaterial
 import roguelikestarterkit.tiles.Tile
-import roguelikestarterkit.ui.components.Button
-import roguelikestarterkit.ui.components.TerminalTileColors
 import roguelikestarterkit.ui.datatypes.Bounds
 import roguelikestarterkit.ui.datatypes.CharSheet
 import roguelikestarterkit.ui.datatypes.Coords

diff --git a/roguelike-starterkit/src/main/scala/roguelikestarterkit/ui/components/TerminalInput.scala b/roguelike-starterkit/src/main/scala/roguelikestarterkit/ui/components/TerminalInput.scala
@@ -1,23 +1,14 @@
 package roguelikestarterkit.ui.components
 
 import indigo.*
-import indigo.syntax.*
 import roguelikestarterkit.Tile
 import roguelikestarterkit.syntax.*
 import roguelikestarterkit.terminal.RogueTerminalEmulator
 import roguelikestarterkit.terminal.TerminalMaterial
-import roguelikestarterkit.tiles.RoguelikeTiles10x10
-import roguelikestarterkit.tiles.RoguelikeTiles5x6
-import roguelikestarterkit.ui.component.Component
-import roguelikestarterkit.ui.components.TerminalTileColors
 import roguelikestarterkit.ui.datatypes.Bounds
 import roguelikestarterkit.ui.datatypes.CharSheet
 import roguelikestarterkit.ui.datatypes.Coords
 import roguelikestarterkit.ui.datatypes.Dimensions
-import roguelikestarterkit.ui.datatypes.UIContext
-
-import scala.annotation.tailrec
-import scala.annotation.targetName
 
 object TerminalInput:
 

diff --git a/roguelike-starterkit/src/main/scala/roguelikestarterkit/ui/components/TerminalLabel.scala b/roguelike-starterkit/src/main/scala/roguelikestarterkit/ui/components/TerminalLabel.scala
@@ -1,11 +1,9 @@
 package roguelikestarterkit.ui.components
 
 import indigo.*
-import indigo.syntax.*
 import roguelikestarterkit.syntax.*
 import roguelikestarterkit.terminal.RogueTerminalEmulator
 import roguelikestarterkit.terminal.TerminalMaterial
-import roguelikestarterkit.ui.components.TerminalTileColors
 import roguelikestarterkit.ui.datatypes.Bounds
 import roguelikestarterkit.ui.datatypes.CharSheet
 import roguelikestarterkit.ui.datatypes.Coords

diff --git a/roguelike-starterkit/src/main/scala/roguelikestarterkit/ui/components/TerminalTextArea.scala b/roguelike-starterkit/src/main/scala/roguelikestarterkit/ui/components/TerminalTextArea.scala
@@ -1,17 +1,14 @@
 package roguelikestarterkit.ui.components
 
 import indigo.*
-import indigo.syntax.*
+import roguelikestarterkit.syntax.*
 import roguelikestarterkit.terminal.RogueTerminalEmulator
 import roguelikestarterkit.terminal.TerminalMaterial
-import roguelikestarterkit.ui.components.TerminalTileColors
 import roguelikestarterkit.ui.datatypes.Bounds
 import roguelikestarterkit.ui.datatypes.CharSheet
 import roguelikestarterkit.ui.datatypes.Coords
 import roguelikestarterkit.ui.datatypes.Dimensions
 
-import scala.annotation.targetName
-
 object TerminalTextArea:
 
   private def findBounds(text: List[String]): Bounds =

diff --git a/roguelike-starterkit/src/main/scala/roguelikestarterkit/ui/window/TerminalWindow.scala b/roguelike-starterkit/src/main/scala/roguelikestarterkit/ui/window/TerminalWindow.scala
@@ -3,15 +3,12 @@ package roguelikestarterkit.ui.window
 import indigo.*
 import indigo.syntax.*
 import roguelikestarterkit.CharSheet
-import roguelikestarterkit.Coords
 import roguelikestarterkit.Dimensions
 import roguelikestarterkit.MapTile
 import roguelikestarterkit.TerminalMaterial
 import roguelikestarterkit.Tile
-import roguelikestarterkit.UIContext
 import roguelikestarterkit.terminal.RogueTerminalEmulator
 import roguelikestarterkit.ui.component.Component
-import roguelikestarterkit.ui.components.datatypes.Padding
 import roguelikestarterkit.ui.datatypes.Bounds
 
 object TerminalWindow:

diff --git a/ui/src/main/scala/roguelikestarterkit/ui/components/Button.scala b/ui/src/main/scala/roguelikestarterkit/ui/components/Button.scala
@@ -3,7 +3,6 @@ package roguelikestarterkit.ui.components
 import indigo.*
 import indigo.syntax.*
 import roguelikestarterkit.ui.component.Component
-import roguelikestarterkit.ui.components.datatypes.ComponentLayout.Horizontal
 import roguelikestarterkit.ui.datatypes.Bounds
 import roguelikestarterkit.ui.datatypes.Coords
 import roguelikestarterkit.ui.datatypes.Dimensions

diff --git a/ui/src/main/scala/roguelikestarterkit/ui/components/ComponentGroup.scala b/ui/src/main/scala/roguelikestarterkit/ui/components/ComponentGroup.scala
@@ -13,8 +13,6 @@ import roguelikestarterkit.ui.components.datatypes.Overflow
 import roguelikestarterkit.ui.components.datatypes.Padding
 import roguelikestarterkit.ui.datatypes.*
 
-import scala.annotation.tailrec
-
 /** Describes a fixed arrangement of components, manages their layout, which may include anchored
   * components.
   */

diff --git a/ui/src/main/scala/roguelikestarterkit/ui/components/ComponentList.scala b/ui/src/main/scala/roguelikestarterkit/ui/components/ComponentList.scala
@@ -9,9 +9,6 @@ import roguelikestarterkit.ui.components.datatypes.ComponentLayout
 import roguelikestarterkit.ui.components.datatypes.ContainerLikeFunctions
 import roguelikestarterkit.ui.components.datatypes.Padding
 import roguelikestarterkit.ui.datatypes.*
-import ultraviolet.syntax.layout
-
-import scala.annotation.tailrec
 
 /** Describes a dynamic list of components, and their realtive layout.
   */

diff --git a/ui/src/main/scala/roguelikestarterkit/ui/components/Input.scala b/ui/src/main/scala/roguelikestarterkit/ui/components/Input.scala
@@ -9,7 +9,6 @@ import roguelikestarterkit.ui.datatypes.Dimensions
 import roguelikestarterkit.ui.datatypes.UIContext
 
 import scala.annotation.tailrec
-import scala.annotation.targetName
 
 /** Input components allow the user to input text information.
   */

diff --git a/ui/src/main/scala/roguelikestarterkit/ui/components/ScrollPane.scala b/ui/src/main/scala/roguelikestarterkit/ui/components/ScrollPane.scala
@@ -2,25 +2,17 @@ package roguelikestarterkit.ui.components
 
 import indigo.*
 import roguelikestarterkit.ui.component.*
-import roguelikestarterkit.ui.components.Button
-import roguelikestarterkit.ui.components.DragData
 import roguelikestarterkit.ui.components.datatypes.Anchor
 import roguelikestarterkit.ui.components.datatypes.BoundsMode
 import roguelikestarterkit.ui.components.datatypes.ComponentEntry
 import roguelikestarterkit.ui.components.datatypes.ComponentId
-import roguelikestarterkit.ui.components.datatypes.ComponentLayout
 import roguelikestarterkit.ui.components.datatypes.ContainerLikeFunctions
 import roguelikestarterkit.ui.components.datatypes.FitMode
-import roguelikestarterkit.ui.components.datatypes.Overflow
-import roguelikestarterkit.ui.components.datatypes.Padding
 import roguelikestarterkit.ui.components.datatypes.ScrollMode
 import roguelikestarterkit.ui.components.datatypes.ScrollOptions
 import roguelikestarterkit.ui.datatypes.*
 import roguelikestarterkit.ui.shaders.LayerMask
 
-import java.lang.ref.Reference
-import scala.annotation.tailrec
-
 /** Describes a fixed arrangement of components, manages their layout, which may include anchored
   * components.
   */

diff --git a/ui/src/main/scala/roguelikestarterkit/ui/components/datatypes/Anchor.scala b/ui/src/main/scala/roguelikestarterkit/ui/components/datatypes/Anchor.scala
@@ -1,6 +1,5 @@
 package roguelikestarterkit.ui.components.datatypes
 
-import roguelikestarterkit.ui.datatypes.Bounds
 import roguelikestarterkit.ui.datatypes.Coords
 import roguelikestarterkit.ui.datatypes.Dimensions
 

diff --git a/ui/src/main/scala/roguelikestarterkit/ui/components/datatypes/BoundsMode.scala b/ui/src/main/scala/roguelikestarterkit/ui/components/datatypes/BoundsMode.scala
@@ -1,7 +1,5 @@
 package roguelikestarterkit.ui.components.datatypes
 
-import roguelikestarterkit.ui.datatypes.Bounds
-import roguelikestarterkit.ui.datatypes.Coords
 import roguelikestarterkit.ui.datatypes.Dimensions
 
 /** Describes how a ComponentGroup responds to changes in its parents bounds.

diff --git a/ui/src/main/scala/roguelikestarterkit/ui/components/datatypes/ComponentEntry.scala b/ui/src/main/scala/roguelikestarterkit/ui/components/datatypes/ComponentEntry.scala
@@ -1,8 +1,6 @@
 package roguelikestarterkit.ui.components.datatypes
 
-import indigo.*
 import roguelikestarterkit.ui.component.Component
-import roguelikestarterkit.ui.datatypes.Bounds
 import roguelikestarterkit.ui.datatypes.Coords
 
 /** `ComponentEntry`s record a components model, position, and relevant component typeclass instance

diff --git a/ui/src/main/scala/roguelikestarterkit/ui/components/datatypes/ComponentLayout.scala b/ui/src/main/scala/roguelikestarterkit/ui/components/datatypes/ComponentLayout.scala
@@ -1,7 +1,5 @@
 package roguelikestarterkit.ui.components.datatypes
 
-import roguelikestarterkit.ui.datatypes.Dimensions
-
 /** `ComponentLayout` instructs a `ComponentGroup` how it should layout the components it contains.
   * They are always placed one after another, optionally with some padding unless the layout type is
   * `None`.
@@ -36,11 +34,8 @@ object ComponentLayout:
       Horizontal(Padding.zero, overflow)
 
     extension (h: Horizontal)
-      def withPadding(value: Padding): Horizontal   = h.copy(padding = value)
       def withOverflow(value: Overflow): Horizontal = h.copy(overflow = value)
 
   object Vertical:
     def apply(): Vertical =
       Vertical(Padding.zero)
-
-    extension (h: Vertical) def withPadding(value: Padding): Vertical = h.copy(padding = value)
diff --git a/ui/src/main/scala/roguelikestarterkit/ui/components/datatypes/Padding.scala b/ui/src/main/scala/roguelikestarterkit/ui/components/datatypes/Padding.scala
@@ -1,7 +1,5 @@
 package roguelikestarterkit.ui.components.datatypes
 
-import roguelikestarterkit.ui.datatypes.Bounds
-
 /** Describes the padding between components.
   */
 final case class Padding(top: Int, right: Int, bottom: Int, left: Int):

diff --git a/ui/src/main/scala/roguelikestarterkit/ui/datatypes/UiContext.scala b/ui/src/main/scala/roguelikestarterkit/ui/datatypes/UiContext.scala
@@ -1,7 +1,6 @@
 package roguelikestarterkit.ui.datatypes
 
 import indigo.*
-import indigo.scenes.SceneContext
 
 final case class UIContext[ReferenceData](
     bounds: Bounds,

diff --git a/ui/src/main/scala/roguelikestarterkit/ui/shaders/LayerMask.scala b/ui/src/main/scala/roguelikestarterkit/ui/shaders/LayerMask.scala
@@ -3,6 +3,8 @@ package roguelikestarterkit.ui.shaders
 import indigo.*
 import indigo.syntax.shaders.*
 
+import scala.annotation.nowarn
+
 final case class LayerMask(mask: Rectangle) extends BlendMaterial:
   lazy val toShaderData: BlendShaderData =
     BlendShaderData(
@@ -41,6 +43,7 @@ object LayerMask:
       MASK_BOUNDS: vec4
   )
 
+  @nowarn("msg=unused")
   inline def fragment =
     Shader[Env] { env =>
 

diff --git a/ui/src/main/scala/roguelikestarterkit/ui/window/Window.scala b/ui/src/main/scala/roguelikestarterkit/ui/window/Window.scala
@@ -2,7 +2,6 @@ package roguelikestarterkit.ui.window
 
 import indigo.*
 import roguelikestarterkit.ui.component.Component
-import roguelikestarterkit.ui.components.datatypes.Padding
 import roguelikestarterkit.ui.datatypes.Bounds
 import roguelikestarterkit.ui.datatypes.Coords
 import roguelikestarterkit.ui.datatypes.Dimensions

diff --git a/ui/src/main/scala/roguelikestarterkit/ui/window/WindowInternalEvent.scala b/ui/src/main/scala/roguelikestarterkit/ui/window/WindowInternalEvent.scala
@@ -1,7 +1,6 @@
 package roguelikestarterkit.ui.window
 
 import indigo.*
-import roguelikestarterkit.ui.datatypes.Coords
 
 /** Internal events */
 enum WindowInternalEvent extends GlobalEvent:

diff --git a/ui/src/main/scala/roguelikestarterkit/ui/window/WindowManager.scala b/ui/src/main/scala/roguelikestarterkit/ui/window/WindowManager.scala
@@ -1,9 +1,7 @@
 package roguelikestarterkit.ui.window
 
 import indigo.*
-import indigo.shared.FrameContext
 import roguelikestarterkit.ui.datatypes.Coords
-import roguelikestarterkit.ui.datatypes.Dimensions
 import roguelikestarterkit.ui.datatypes.UIContext
 import roguelikestarterkit.ui.datatypes.UIState
 

diff --git a/ui/src/main/scala/roguelikestarterkit/ui/window/WindowView.scala b/ui/src/main/scala/roguelikestarterkit/ui/window/WindowView.scala
@@ -1,11 +1,6 @@
 package roguelikestarterkit.ui.window
 
 import indigo.*
-import roguelikestarterkit.ui.component.Component
-import roguelikestarterkit.ui.datatypes.Bounds
-import roguelikestarterkit.ui.datatypes.Bounds.dimensions
-import roguelikestarterkit.ui.datatypes.Coords
-import roguelikestarterkit.ui.datatypes.Dimensions
 import roguelikestarterkit.ui.datatypes.UIContext
 
 object WindowView:

diff --git a/ui/src/main/scala/roguelikestarterkit/ui/window/WindowViewModel.scala b/ui/src/main/scala/roguelikestarterkit/ui/window/WindowViewModel.scala
@@ -3,8 +3,6 @@ package roguelikestarterkit.ui.window
 import indigo.*
 import indigo.syntax.*
 import roguelikestarterkit.ui.datatypes.Bounds
-import roguelikestarterkit.ui.datatypes.Coords
-import roguelikestarterkit.ui.datatypes.Dimensions
 import roguelikestarterkit.ui.datatypes.UIContext
 
 final case class WindowViewModel[ReferenceData](
@@ -37,10 +35,10 @@ object WindowViewModel:
       viewModel: WindowViewModel[ReferenceData]
   ): GlobalEvent => Outcome[WindowViewModel[ReferenceData]] =
     case FrameTick if model.bounds.hashCode() != viewModel.modelHashCode =>
-      Outcome(redraw(context, model, viewModel))
+      Outcome(redraw(model, viewModel))
 
     case WindowInternalEvent.Redraw =>
-      Outcome(redraw(context, model, viewModel))
+      Outcome(redraw(model, viewModel))
 
     case MouseEvent.Move(pt)
         if viewModel.mouseIsOver && !model.bounds
@@ -59,15 +57,15 @@ object WindowViewModel:
     case _ =>
       Outcome(viewModel)
 
-  private def calculateDragBy(
-      charSize: Size,
-      mousePosition: Point,
-      windowPosition: Coords
-  ): Coords =
-    Coords(mousePosition / charSize.toPoint) - windowPosition
+  // private def calculateDragBy(
+  //     charSize: Size,
+  //     mousePosition: Point,
+  //     windowPosition: Coords
+  // ): Coords =
+  //   Coords(mousePosition / charSize.toPoint) - windowPosition
 
   private def redraw[A, ReferenceData](
-      context: UIContext[ReferenceData],
+      // context: UIContext[ReferenceData],
       model: Window[A, ReferenceData],
       viewModel: WindowViewModel[ReferenceData]
   ): WindowViewModel[ReferenceData] =