Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Scala Steward: Reformat with scalafmt 3.10.1
7b1921e2b29e57146f70837222e2cf3834a5e4db
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.8.6
version = 3.10.1
runner.dialect = scala3
style = defaultWithAlign
maxColumn = 100
Expand Down
10 changes: 5 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ lazy val commonSettings: Seq[sbt.Def.Setting[_]] = Seq(
lazy val publishSettings = {
import xerial.sbt.Sonatype._
Seq(
publishTo := sonatypePublishToBundle.value,
publishMavenStyle := true,
sonatypeProfileName := "io.indigoengine",
licenses := Seq("MIT" -> url("https://opensource.org/licenses/MIT")),
publishTo := sonatypePublishToBundle.value,
publishMavenStyle := true,
sonatypeProfileName := "io.indigoengine",
licenses := Seq("MIT" -> url("https://opensource.org/licenses/MIT")),
sonatypeProjectHosting := Some(
GitHubHosting("PurpleKingdomGames", "roguelike-starterkit", "indigo@purplekingdomgames.com")
),
Expand Down Expand Up @@ -138,7 +138,7 @@ lazy val roguelikeStarterKit =
)
.aggregate(roguelike, demo, benchmarks)
.settings(
logo := rawLogo + "(v" + version.value.toString + ")",
logo := rawLogo + "(v" + version.value.toString + ")",
usefulTasks := Seq(
UsefulTask("runGame", "Run the game").noAlias,
UsefulTask("publishLocal", "Local publish").noAlias
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ object TerminalMaterial:
step(0.001f, abs(((color.x + color.y + color.z) / 3.0f) - color.x))

def fragment(color: vec4): vec4 =
val bg = vec4(env.BACKGROUND.rgb * env.BACKGROUND.a, env.BACKGROUND.a)
val bg = vec4(env.BACKGROUND.rgb * env.BACKGROUND.a, env.BACKGROUND.a)
val tint =
mix(env.CHANNEL_0 * env.FOREGROUND, env.CHANNEL_0, distanceToGreyscale(env.CHANNEL_0))
val fg = vec4(tint.rgb * tint.a, tint.a)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ object TerminalInput:
borderTiles: TerminalBorderTiles
): (UIContext[ReferenceData], Input[ReferenceData]) => Outcome[Layer] =
(context, input) =>
val bounds = input.bounds(context)
val bounds = input.bounds(context)
val correctedLabel =
if input.text.length == bounds.width then input.text
else if input.text.length > bounds.width then input.text.take(bounds.width)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ object TerminalSwitch:
charSheet: CharSheet
): (UIContext[ReferenceData], Switch[ReferenceData]) => Outcome[Layer] =
(context, switch) =>
val bounds = switch.bounds(context)
val bounds = switch.bounds(context)
val terminal =
RogueTerminalEmulator(Size(1))
.put(Point.zero, tile.tile, tile.colors.foreground, tile.colors.background)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import roguelikestarterkit.ui.*
object TerminalTextArea:

private def findBounds(text: String): Bounds =
val lines = text.split("\n").toList
val lines = text.split("\n").toList
val maxLength =
lines.foldLeft(0) { (acc, line) =>
if line.length > acc then line.length else acc
Expand Down