Merge pull request #9 from minigdx/custom-sound

Rework SFX editor

.gitignore

@@ -5,17 +5,14 @@ build/
 !**/src/test/**/build/
 
 ### IntelliJ IDEA ###
-.idea/modules.xml
-.idea/jarRepositories.xml
-.idea/compiler.xml
-.idea/libraries/
+.idea/**
+.idea/
 *.iws
 *.iml
 *.ipr
 out/
 !**/src/main/**/out/
 !**/src/test/**/out/
-.idea
 
 ### Eclipse ###
 .apt_generated

tiny-cli/src/jvmMain/kotlin/com/github/minigdx/tiny/cli/command/RunCommand.kt

@@ -4,6 +4,8 @@ import com.github.ajalt.clikt.core.Abort
 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.parameters.arguments.argument
 import com.github.ajalt.clikt.parameters.arguments.default
+import com.github.ajalt.clikt.parameters.options.flag
+import com.github.ajalt.clikt.parameters.options.option
 import com.github.ajalt.clikt.parameters.types.file
 import com.github.minigdx.tiny.cli.config.GameParameters
 import com.github.minigdx.tiny.engine.GameEngine
@@ -19,10 +21,13 @@ import java.io.File
 
 class RunCommand : CliktCommand(name = "run", help = "Run your game.") {
 
-    val gameDirectory by argument(help = "The directory containing all game information")
+    val gameDirectory by argument(help = "The directory containing all game information.")
         .file(mustExist = true, canBeDir = true, canBeFile = false)
         .default(File("."))
 
+    val test by option(help = "Run tests before running the game.")
+        .flag()
+
     fun isOracleOrOpenJDK(): Boolean {
         val vendor = System.getProperty("java.vendor")?.lowercase()
         return vendor?.contains("oracle") == true || vendor?.contains("eclipse") == true || vendor?.contains("openjdk") == true
@@ -50,6 +55,7 @@ class RunCommand : CliktCommand(name = "run", help = "Run your game.") {
             val logger = StdOutLogger("tiny-cli")
             val vfs = CommonVirtualFileSystem()
             val gameOption = gameParameters.toGameOptions()
+                .copy(runTests = test)
             val gameEngine = GameEngine(
                 gameOptions = gameOption,
                 platform = GlfwPlatform(gameOption, logger, vfs, gameDirectory, LwjglGLRender(logger, gameOption)),
@@ -65,7 +71,7 @@ class RunCommand : CliktCommand(name = "run", help = "Run your game.") {
 
             val data = File("data")
             if (data.exists() && data.isDirectory) {
-                WorkspaceLib.DEFAULT = data.listFiles().map { JvmLocalFile(it.name, data) }
+                WorkspaceLib.DEFAULT = data.listFiles()?.map { JvmLocalFile(it.name, data) } ?: emptyList()
             }
             gameEngine.main()
         } catch (ex: Exception) {

tiny-cli/src/jvmMain/resources/sfx/_tiny.json

@@ -1,40 +1 @@
-{
-  "version": "V1",
-  "name": "Tiny SFX Sequencer",
-  "resolution": {
-    "width": 512,
-    "height": 288
-  },
-  "sprites": {
-    "width": 16,
-    "height": 16
-  },
-  "zoom": 2,
-  "colors": [
-    "#000000",
-    "#1D2B53",
-    "#7E2553",
-    "#008751",
-    "#AB5236",
-    "#5F574F",
-    "#C2C3C7",
-    "#FFF1E8",
-    "#FF004D",
-    "#FFA300",
-    "#FFEC27",
-    "#00E436",
-    "#29ADFF",
-    "#83769C",
-    "#FF77A8",
-    "#FFCCAA"
-  ],
-  "scripts": [
-    "game.lua",
-    "mouse.lua",
-    "widgets.lua"
-  ],
-  "spritesheets": [
-    "sfx.png"
-  ],
-  "hideMouseCursor": true
-}
+{"version":"V1","name":"Tiny SFX Sequencer","resolution":{"width":192,"height":128},"sprites":{"width":8,"height":8},"zoom":4,"colors":["#000000","#1D2B53","#7E2553","#008751","#AB5236","#5F574F","#C2C3C7","#FFF1E8","#FF004D","#FFA300","#FFEC27","#00E436","#29ADFF","#83769C","#FF77A8","#FFCCAA"],"scripts":["test-game.lua","game.lua","mouse.lua","widgets.lua"],"spritesheets":["sfx.png"],"levels":["editor/simplified/Level_0","editor/simplified/Score","editor/simplified/Fx","editor/simplified/Music"],"hideMouseCursor":true}