CharSheet contains character crop data

PurpleKingdomGames · Oct 29, 2023 · 10937c8 · 10937c8
1 parent b7e3baa
commit 10937c8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/paint/src/main/scala/roguepaint/PaintGame.scala b/paint/src/main/scala/roguepaint/PaintGame.scala
@@ -27,7 +27,6 @@ object PaintGame extends IndigoGame[Size, Size, Model, ViewModel]:
           .withMagnification(1),
         Config.config.viewport.size
       )
-        .withFonts(RoguelikeTiles.Size10x10.Fonts.fontInfo)
         .withAssets(Assets.assets.assetSet)
         .withShaders(
           TerminalText.standardShader,

diff --git a/paint/src/main/scala/roguepaint/PaintScene.scala b/paint/src/main/scala/roguepaint/PaintScene.scala
@@ -101,7 +101,8 @@ object PaintModel:
   private val defaultCharSheet: CharSheet =
     CharSheet(
       Assets.assets.AnikkiSquare10x10,
-      Size(10)
+      Size(10),
+      RoguelikeTiles.Size10x10.charCrops
     )
   private val screenSize: Size = Size(1280, 720) / 10
 
@@ -155,7 +156,8 @@ object PaintModel:
       None,
       CharSheet(
         Assets.assets.AnikkiSquare10x10,
-        Size(10)
+        Size(10),
+        RoguelikeTiles.Size10x10.charCrops
       )
     )
 

diff --git a/paint/src/main/scala/roguepaint/components/Window.scala b/paint/src/main/scala/roguepaint/components/Window.scala
@@ -62,7 +62,7 @@ object Window:
     val clones =
       vm.terminal.toCloneTiles(
         tempModel.bounds.position * charSize,
-        RoguelikeTiles.Size10x10.charCrops
+        model.charSheet.charCrops
       ) { case (fg, bg) =>
         graphic10x10.withMaterial(TerminalText(model.charSheet.assetName, fg, bg))
       }
@@ -488,5 +488,9 @@ object DragData:
   val zero: DragData =
     DragData(Point.zero, Point.zero)
 
-final case class CharSheet(assetName: AssetName, size: Size):
+final case class CharSheet(
+    assetName: AssetName,
+    size: Size,
+    charCrops: Batch[(Int, Int, Int, Int)]
+):
   val charSize: Int = size.width
diff --git a/paint/src/main/scala/roguepaint/windows/CanvasWindow.scala b/paint/src/main/scala/roguepaint/windows/CanvasWindow.scala
@@ -88,7 +88,7 @@ object CanvasWindow {
 
     val clones = model.terminal.toCloneTiles(
       context.bounds.position / magnification,
-      RoguelikeTiles.Size10x10.charCrops
+      context.data.charSheet.charCrops
     ) { case (fg, bg) =>
       graphic.withMaterial(TerminalText(context.data.charSheet.assetName, fg, bg))
     }