Skip to content

Commit

Permalink
Upgrade examples to Indigo 0.15.0
Browse files Browse the repository at this point in the history
  • Loading branch information
davesmith00000 committed Sep 25, 2023
1 parent 79616fb commit c632afc
Show file tree
Hide file tree
Showing 19 changed files with 1,601 additions and 183 deletions.
14 changes: 7 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import scala.language.postfixOps
import Misc._
import Dependencies._
import org.typelevel.scalacoptions.ScalacOptions
import indigoplugin.IndigoOptions

Global / onChangedBuildSource := ReloadOnSourceChanges

Expand Down Expand Up @@ -77,15 +78,14 @@ lazy val sandbox =
.settings(
neverPublish,
commonSettings,
name := "sandbox",
showCursor := true,
title := "Sandbox",
gameAssetsDirectory := "assets",
disableFrameRateLimit := false,
electronInstall := indigoplugin.ElectronInstall.Latest,
name := "sandbox",
libraryDependencies ++= Shared.indigo.value,
libraryDependencies ++= Shared.indigoExtras.value,
libraryDependencies ++= Shared.indigoJson.value
libraryDependencies ++= Shared.indigoJson.value,
indigoOptions :=
IndigoOptions.defaults
.withTitle("Sandbox")
.withAssetDirectory(os.RelPath.rel / "sandbox" / "assets")
)

// Shader
Expand Down
9 changes: 5 additions & 4 deletions examples/indigo-shader-scala-cli/SimpleVoronoi.scala
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
//> using scala "3.3.0"
//> using scala "3.3.1"
//> using platform "js"
//> using jsVersion "1.13.1"
//> using jsVersion "1.13.2"

//> using lib "io.indigoengine::ultraviolet::0.1.2"
//> using lib "io.indigoengine::indigo::0.15.0-RC1"
//> using lib "io.indigoengine::ultraviolet::0.1.3"
//> using lib "io.indigoengine::indigo::0.15.0"

import indigo.*

Expand All @@ -16,6 +16,7 @@ object SimpleVoronoi extends IndigoShader:
GameConfig.default
.withFrameRateLimit(FPS.`60`)
.withViewport(400, 400)
.noResize

val assets: Set[AssetType] = Set()
val channel0: Option[AssetPath] = None
Expand Down
1 change: 0 additions & 1 deletion examples/indigo-shader-scala-cli/app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
<body>
<!-- This div's id is hardcoded, and several parts of this reference implementation look for it. -->
<div id="indigo-container"></div>
<script type="text/javascript" src="./scripts/indigo-support.js"></script>
<script type="text/javascript" src="./scripts/main.js"></script>
<script type="text/javascript">
IndigoGame.launch("indigo-container", {"width": window.innerWidth.toString(), "height": window.innerHeight.toString()})
Expand Down
Loading

0 comments on commit c632afc

Please sign in to comment.