Skip to content

Commit

Permalink
Background grid
Browse files Browse the repository at this point in the history
  • Loading branch information
@davesmith00000
davesmith00000 committed Oct 25, 2023
1 parent 812301b commit 85aa1d4
Show file tree
Hide file tree
Showing 5 changed files with 107 additions and 59 deletions.
44 changes: 23 additions & 21 deletions paint/src/main/scala/roguepaint/PaintGame.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,57 +4,59 @@ import indigo.*
import indigo.scenes.*
import indigoextras.subsystems.FPSCounter
import io.indigoengine.roguelike.starterkit.*
import roguepaint.shaders.BackgroundGrid

import scala.scalajs.js.annotation.JSExportTopLevel

@JSExportTopLevel("IndigoGame")
object PaintGame extends IndigoGame[Unit, Unit, Model, ViewModel]:
object PaintGame extends IndigoGame[Size, Size, Model, ViewModel]:

def initialScene(bootData: Unit): Option[SceneName] =
def initialScene(bootData: Size): Option[SceneName] =
Option(PaintScene.name)

def scenes(bootData: Unit): NonEmptyList[Scene[Unit, Model, ViewModel]] =
def scenes(bootData: Size): NonEmptyList[Scene[Size, Model, ViewModel]] =
NonEmptyList(PaintScene)

val eventFilters: EventFilters =
EventFilters.Permissive

def boot(flags: Map[String, String]): Outcome[BootResult[Unit]] =
def boot(flags: Map[String, String]): Outcome[BootResult[Size]] =
Outcome(
BootResult
.noData(
Config.config
.withMagnification(1)
)
BootResult(
Config.config
.withMagnification(1),
Config.config.viewport.size
)
.withFonts(RoguelikeTiles.Size10x10.Fonts.fontInfo)
.withAssets(Assets.assets.assetSet)
.withShaders(
TerminalText.standardShader
TerminalText.standardShader,
BackgroundGrid.shader
)
// .withSubSystems(FPSCounter(Point.zero))
)

def initialModel(startupData: Unit): Outcome[Model] =
Outcome(Model.initial)
def setup(bootData: Size, assetCollection: AssetCollection, dice: Dice): Outcome[Startup[Size]] =
Outcome(Startup.Success(bootData))

def initialViewModel(startupData: Unit, model: Model): Outcome[ViewModel] =
Outcome(ViewModel.initial)
def initialModel(startupData: Size): Outcome[Model] =
Outcome(Model.initial)

def setup(bootData: Unit, assetCollection: AssetCollection, dice: Dice): Outcome[Startup[Unit]] =
Outcome(Startup.Success(()))
def initialViewModel(viewportSize: Size, model: Model): Outcome[ViewModel] =
Outcome(ViewModel.initial(viewportSize))

def updateModel(context: FrameContext[Unit], model: Model): GlobalEvent => Outcome[Model] =
def updateModel(context: FrameContext[Size], model: Model): GlobalEvent => Outcome[Model] =
_ => Outcome(model)

def updateViewModel(
context: FrameContext[Unit],
context: FrameContext[Size],
model: Model,
viewModel: ViewModel
): GlobalEvent => Outcome[ViewModel] =
_ => Outcome(viewModel)

def present(
context: FrameContext[Unit],
context: FrameContext[Size],
model: Model,
viewModel: ViewModel
): Outcome[SceneUpdateFragment] =
Expand All @@ -67,5 +69,5 @@ object Model:

final case class ViewModel(paint: PaintViewModel)
object ViewModel:
val initial: ViewModel =
ViewModel(PaintViewModel.initial)
def initial(viewportSize: Size): ViewModel =
ViewModel(PaintViewModel.initial(viewportSize))
35 changes: 22 additions & 13 deletions paint/src/main/scala/roguepaint/PaintScene.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ import roguepaint.components.WindowManager
import roguepaint.components.WindowManagerModel
import roguepaint.components.WindowManagerViewModel
import roguepaint.components.WindowModel
import roguepaint.shaders.BackgroundGrid

object PaintScene extends Scene[Unit, Model, ViewModel]:
object PaintScene extends Scene[Size, Model, ViewModel]:

type SceneModel = PaintModel
type SceneViewModel = PaintViewModel
Expand All @@ -36,7 +37,7 @@ object PaintScene extends Scene[Unit, Model, ViewModel]:
Set()

def updateModel(
context: SceneContext[Unit],
context: SceneContext[Size],
model: PaintModel
): GlobalEvent => Outcome[PaintModel] =
case e =>
Expand All @@ -45,7 +46,7 @@ object PaintScene extends Scene[Unit, Model, ViewModel]:
updated.map(w => model.copy(windowManager = w))

def updateViewModel(
context: SceneContext[Unit],
context: SceneContext[Size],
model: PaintModel,
viewModel: PaintViewModel
): GlobalEvent => Outcome[PaintViewModel] =
Expand All @@ -55,15 +56,20 @@ object PaintScene extends Scene[Unit, Model, ViewModel]:
updated.map(w => viewModel.copy(windowManager = w))

def present(
context: SceneContext[Unit],
context: SceneContext[Size],
model: PaintModel,
viewModel: PaintViewModel
): Outcome[SceneUpdateFragment] =
val tiles =
WindowManager.present(context.frameContext, model.windowManager, viewModel.windowManager)

Outcome(
SceneUpdateFragment(tiles.clones)
SceneUpdateFragment(
Layer(
Batch(viewModel.bg) ++
tiles.clones
)
)
.addCloneBlanks(tiles.blanks)
)

Expand All @@ -78,28 +84,31 @@ object PaintModel:
WindowModel(WindowId("fixed"))
.moveTo((screenSize.toPoint / 2) - 8)
.resizeTo(16, 16)
)
)
.add(
WindowModel(WindowId("Rogue Paint"))
WindowModel(WindowId("tools"))
.withTitle("Tools")
.moveTo(1, 1)
.moveTo(0, 0)
.resizeTo(20, screenSize.height - 2)
)
.add(
WindowModel(WindowId("Test"))
WindowModel(WindowId("test"))
.withTitle("Test")
.moveTo(50, 5)
.resizeTo(15, 10)
.isResizable
.isCloseable
.isDraggable
)

)

final case class PaintViewModel(windowManager: WindowManagerViewModel)
final case class PaintViewModel(windowManager: WindowManagerViewModel, bg: BlankEntity)
object PaintViewModel:
val initial: PaintViewModel =
def initial(viewportSize: Size): PaintViewModel =
PaintViewModel(
WindowManagerViewModel.initial
WindowManagerViewModel.initial,
BlankEntity(
viewportSize,
BackgroundGrid.shaderData
)
)
40 changes: 20 additions & 20 deletions paint/src/main/scala/roguepaint/components/Window.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ object Window:
)

def updateModel(
frameContext: FrameContext[Unit],
frameContext: FrameContext[Size],
model: WindowModel
): GlobalEvent => Outcome[WindowModel] =
case e: MouseEvent.Click =>
Expand All @@ -34,7 +34,7 @@ object Window:
Outcome(model)

def updateViewModel(
frameContext: FrameContext[Unit],
frameContext: FrameContext[Size],
model: WindowModel,
viewModel: WindowViewModel
): GlobalEvent => Outcome[WindowViewModel] =
Expand Down Expand Up @@ -124,7 +124,7 @@ final case class WindowModel(
def notCloseable: WindowModel =
withCloseable(false)

def update(frameContext: FrameContext[Unit], event: GlobalEvent): Outcome[WindowModel] =
def update(frameContext: FrameContext[Size], event: GlobalEvent): Outcome[WindowModel] =
Window.updateModel(frameContext, this)(event)

object WindowModel:
Expand All @@ -146,7 +146,7 @@ final case class WindowViewModel(
):

def update(
frameContext: FrameContext[Unit],
frameContext: FrameContext[Size],
model: WindowModel,
event: GlobalEvent
): Outcome[WindowViewModel] =
Expand Down Expand Up @@ -183,11 +183,11 @@ object WindowViewModel:
// When there is a title
case Point(0, 1) if model.title.isDefined =>
// Title bar left
coords -> MapTile(Tile.`│`, RGBA.White, RGBA.Zero)
coords -> MapTile(Tile.`│`, RGBA.White, RGBA.Black)

case Point(x, 1) if model.title.isDefined && x == maxX =>
// Title bar right
coords -> MapTile(Tile.`│`, RGBA.White, RGBA.Zero)
coords -> MapTile(Tile.`│`, RGBA.White, RGBA.Black)

case Point(x, 1) if model.title.isDefined =>
// Title text, x starts at 2
Expand All @@ -200,67 +200,67 @@ object WindowViewModel:
case Some(char) => Tile(char)
else Tile.SPACE

coords -> MapTile(tile, RGBA.White, RGBA.Zero)
coords -> MapTile(tile, RGBA.White, RGBA.Black)

case Point(0, 2) if model.title.isDefined =>
// Title bar line left
val tile = if maxY > 2 then Tile.`├` else Tile.`└`
coords -> MapTile(Tile.`│`, RGBA.White, RGBA.Zero)
coords -> MapTile(Tile.`│`, RGBA.White, RGBA.Black)

case Point(x, 2) if model.title.isDefined && x == maxX =>
// Title bar line right
val tile = if maxY > 2 then Tile.`┤` else Tile.`┘`
coords -> MapTile(tile, RGBA.White, RGBA.Zero)
coords -> MapTile(tile, RGBA.White, RGBA.Black)

case Point(x, 2) if model.title.isDefined =>
// Title bar line
coords -> MapTile(Tile.`─`, RGBA.White, RGBA.Zero)
coords -> MapTile(Tile.`─`, RGBA.White, RGBA.Black)

// Normal window frame

case Point(0, 0) =>
// top left
coords -> MapTile(Tile.`┌`, RGBA.White, RGBA.Zero)
coords -> MapTile(Tile.`┌`, RGBA.White, RGBA.Black)

case Point(x, 0) if model.closeable && x == maxX =>
// top right closable
coords -> MapTile(Tile.`x`, RGBA.Black, RGBA.White)

case Point(x, 0) if x == maxX =>
// top right
coords -> MapTile(Tile.`┐`, RGBA.White, RGBA.Zero)
coords -> MapTile(Tile.`┐`, RGBA.White, RGBA.Black)

case Point(x, 0) =>
// top
coords -> MapTile(Tile.`─`, RGBA.White, RGBA.Zero)
coords -> MapTile(Tile.`─`, RGBA.White, RGBA.Black)

case Point(0, y) if y == maxY =>
// bottom left
coords -> MapTile(Tile.`└`, RGBA.White, RGBA.Zero)
coords -> MapTile(Tile.`└`, RGBA.White, RGBA.Black)

case Point(x, y) if model.resizable && x == maxX && y == maxY =>
// bottom right with resize
coords -> MapTile(Tile.`▼`, RGBA.White, RGBA.Zero)
coords -> MapTile(Tile.`▼`, RGBA.White, RGBA.Black)

case Point(x, y) if x == maxX && y == maxY =>
// bottom right
coords -> MapTile(Tile.`┘`, RGBA.White, RGBA.Zero)
coords -> MapTile(Tile.`┘`, RGBA.White, RGBA.Black)

case Point(x, y) if y == maxY =>
// bottom
coords -> MapTile(Tile.`─`, RGBA.White, RGBA.Zero)
coords -> MapTile(Tile.`─`, RGBA.White, RGBA.Black)

case Point(0, y) =>
// Middle left
coords -> MapTile(Tile.`│`, RGBA.White, RGBA.Zero)
coords -> MapTile(Tile.`│`, RGBA.White, RGBA.Black)

case Point(x, y) if x == maxX =>
// Middle right
coords -> MapTile(Tile.`│`, RGBA.White, RGBA.Zero)
coords -> MapTile(Tile.`│`, RGBA.White, RGBA.Black)

case Point(x, y) =>
// Window background
coords -> MapTile(Tile.`░`, grey, RGBA.Zero)
coords -> MapTile(Tile.`░`, grey, RGBA.Black)

}
}
Expand Down
10 changes: 5 additions & 5 deletions paint/src/main/scala/roguepaint/components/WindowManager.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import io.indigoengine.roguelike.starterkit.*
object WindowManager:

def updateModel(
frameContext: FrameContext[Unit],
frameContext: FrameContext[Size],
model: WindowManagerModel
): GlobalEvent => Outcome[WindowManagerModel] =
case WindowManagerEvent.Close(id) =>
Expand All @@ -17,7 +17,7 @@ object WindowManager:
model.windows.map(_.update(frameContext, e)).sequence.map(m => model.copy(windows = m))

def updateViewModel(
frameContext: FrameContext[Unit],
frameContext: FrameContext[Size],
model: WindowManagerModel,
viewModel: WindowManagerViewModel
): GlobalEvent => Outcome[WindowManagerViewModel] =
Expand All @@ -35,7 +35,7 @@ object WindowManager:
updated.sequence.map(vm => viewModel.copy(windows = vm))

def present(
frameContext: FrameContext[Unit],
frameContext: FrameContext[Size],
model: WindowManagerModel,
viewModel: WindowManagerViewModel
): TerminalClones =
Expand Down Expand Up @@ -70,7 +70,7 @@ final case class WindowManagerModel(windows: Batch[WindowModel]):
case Some(w) =>
this.copy(windows = windows.filterNot(_.id == id) :+ w)

def update(frameContext: FrameContext[Unit], event: GlobalEvent): Outcome[WindowManagerModel] =
def update(frameContext: FrameContext[Size], event: GlobalEvent): Outcome[WindowManagerModel] =
WindowManager.updateModel(frameContext, this)(event)

object WindowManagerModel:
Expand All @@ -82,7 +82,7 @@ final case class WindowManagerViewModel(windows: Batch[WindowViewModel]):
this.copy(windows = windows.filter(w => model.windows.exists(_.id == w.id)))

def update(
frameContext: FrameContext[Unit],
frameContext: FrameContext[Size],
model: WindowManagerModel,
event: GlobalEvent
): Outcome[WindowManagerViewModel] =
Expand Down
37 changes: 37 additions & 0 deletions paint/src/main/scala/roguepaint/shaders/BackgroundGrid.scala
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package roguepaint.shaders

import indigo.*

object BackgroundGrid:

val shader: Shader =
UltravioletShader.entityFragment(
ShaderId("background grid"),
EntityShader.fragment[FragmentEnv](fragment, FragmentEnv.reference)
)

val shaderData: ShaderData =
ShaderData(
shader.id,
Batch.empty,
None,
None,
None,
None
)

import ultraviolet.syntax.*

inline def fragment: Shader[FragmentEnv, Unit] =
Shader[FragmentEnv] { env =>

def fragment(color: vec4): vec4 =
val gridSize = 10.0f
val count = vec2(1280.0f, 720.0f) / gridSize
val size = 1.0f / count
val outline = step(0.8f, mod(env.UV, size) * count)
val lines = max(outline.x, outline.y)
val lineColour = vec3(1.0f, 1.0f, 1.0f) * max(1.0f - env.UV.y, 0.25f) * 0.15f

vec4(lineColour * lines, lines)
}

0 comments on commit 85aa1d4

Please sign in to comment.