- Let the SFX editor edit one file

- Allow to switch octave in the editor

Author: dwursteisen

tiny-cli/src/main/kotlin/com/github/minigdx/tiny/cli/command/SfxCommand.kt

@@ -9,9 +9,7 @@ import com.github.minigdx.tiny.cli.config.GameParameters
 import com.github.minigdx.tiny.engine.GameEngine
 import com.github.minigdx.tiny.engine.TinyException
 import com.github.minigdx.tiny.file.CommonVirtualFileSystem
-import com.github.minigdx.tiny.file.JvmLocalFile
 import com.github.minigdx.tiny.log.StdOutLogger
-import com.github.minigdx.tiny.lua.WorkspaceLib
 import com.github.minigdx.tiny.lua.errorLine
 import com.github.minigdx.tiny.platform.glfw.GlfwPlatform
 import com.github.minigdx.tiny.render.LwjglGLRender
@@ -58,15 +56,16 @@ class SfxCommand : CliktCommand(name = "sfx") {
             }
             val commandParameters = GameParameters.JSON.decodeFromStream<GameParameters>(configFile)
 
-            if (filename.exists()) {
+            if (!filename.exists()) {
                 val json = Json.encodeToString(Music())
                 filename.writeBytes(json.encodeToByteArray())
             }
-            WorkspaceLib.DEFAULT = listOf(JvmLocalFile(filename.name, workingDirectory = filename.absoluteFile.parentFile))
 
             val logger = StdOutLogger("tiny-cli")
             val vfs = CommonVirtualFileSystem()
             val commandOptions = commandParameters.toGameOptions()
+                .copy(sounds = listOf(filename.name))
+
             val gameEngine = GameEngine(
                 gameOptions = commandOptions,
                 platform = GlfwPlatform(

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

@@ -43,5 +43,8 @@
   "levels": [
     "editor.ldtk"
   ],
+  "sounds": [
+    "test.sfx"
+  ],
   "hideMouseCursor": true
 }

tiny-cli/src/main/resources/sfx/bar-editor.lua

@@ -52,6 +52,10 @@ CursorEditor._update = function(self)
         self.beat = 0
         self.play = not self.play
         self.time = 0
+
+        if self.play then
+            state.current_bar.play()
+        end
     end
 
     if self.play then
@@ -105,8 +109,12 @@ local BarEditor = {
         { y = 185, h = 8 },
     },
 
-    octave = 0,
+    octave = 4,
     note = 0,
+    hitbox_octaves = {
+        { x = -16, y = -8, width = 8, height = 8 },
+        { x = -16, y = 0, width = 8, height = 8 },
+    }
 }
 
 BarEditor._init = function(self)
@@ -115,6 +123,21 @@ end
 
 BarEditor._update = function(self)
     local p = ctrl.touch()
+
+    -- octave management
+    -- (as the octave buttons is using the default mouse, the mouse position needs to be checked without the offset)
+    local up = self.hitbox_octaves[1]
+    local down = self.hitbox_octaves[2]
+    if ctrl.touched(0) then
+        if inside_widget({ x = self.x + up.x, y = self.y + up.y, width = up.width, height = up.height }, p.x, p.y) then
+            self.octave = self.octave + 1
+        elseif inside_widget({ x = self.x + down.x, y = self.y + self.height + down.y, width = down.width, height = down.height }, p.x, p.y) then
+            self.octave = self.octave - 1
+        end
+
+        self.octave = math.clamp(0, self.octave, 8)
+    end
+
     p = { x = p.x, y = p.y + 8 }
     if inside_widget(self, p.x, p.y) then
         state.edit = true
@@ -171,7 +194,6 @@ BarEditor._update = function(self)
         self.current_edit = nil
     elseif inside_widget(self, p.x, p.y) and ctrl.touching(1) ~= nil then
         local local_x = p.x - self.x
-        local local_y = p.y - self.y
 
         local value = {
             beat = roundToHalf((local_x) / 16.0),
@@ -215,24 +237,30 @@ BarEditor._draw = function(self)
     end
 
     for note in all(state.current_bar.notes()) do
-        local i = (note.notei) % 25
 
-        local keys = self.keys_y[1 + #self.keys_y - i]
-        local y = keys.y
-        local h = keys.h
+        local i = note.notei - self.octave * 12
 
-        shape.rectf(
-                self.x + note.beat * 16, self.y + y,
-                note.duration * 16, h,
-                9
-        )
+        if self.octave <= note.octave and note.octave < self.octave + 2 then
+            local keys = self.keys_y[1 + #self.keys_y - i]
+            if not keys then
+                debug.console("i -> ", i, " index -> ", 1 + #self.keys_y - i, " notei ", note.notei)
+            end
+            local y = keys.y
+            local h = keys.h
+
+            shape.rectf(
+                    self.x + note.beat * 16, self.y + y,
+                    note.duration * 16, h,
+                    9
+            )
+        end
     end
 
     if self.current_edit then
         local t = self.current_edit
-        debug.console(t.note)
+
         local note = state.current_bar.note_data(t.note)
-        local i = (note.notei) % 25
+        local i = note.notei - self.octave * 12
         local keys = self.keys_y[1 + #self.keys_y - i]
 
         local y = keys.y
@@ -248,15 +276,22 @@ BarEditor._draw = function(self)
     -- border
     shape.rect(self.x, self.y, self.width, self.height, 4)
 
+    -- keyboard
     spr.sdraw(self.x - 3 * 8, self.y, 136, 64, 3 * 8, self.height)
+    -- octave up
+    local up = self.hitbox_octaves[1]
+    spr.sdraw(self.x + up.x, self.y + up.y, 240, 40, up.width, up.height)
+    -- octave down
+    local down = self.hitbox_octaves[2]
+    spr.sdraw(self.x + down.x, self.y + self.height + down.y, 240, 40, down.width, down.height, false, true)
 
     gfx.pal(2, 8)
     local p = ctrl.touch()
     local x = math.clamp(self.x, p.x, self.x + self.width)
     spr.sdraw(x - 8, self.y, 232, 64, 3 * 8, self.height)
     gfx.pal()
 
-    print(self.note, self.x - 10, self.y - 8)
+    print(self.note, x, self.y - 8)
 end
 
 local w = {}
@@ -265,7 +300,10 @@ function _init()
     w = {}
     test = {}
     state = new(State)
+    sfx.load(0) -- Load the sound file before init everything
+
     state.current_bar = sfx.bar(0)
+    debug.console(state.current_bar)
     state.current_instrument = sfx.instrument(state.current_bar.instrument())
 
     map.level("BarEditor")
@@ -355,10 +393,6 @@ function _update()
     for widget in all(w) do
         widget:_update()
     end
-
-    if ctrl.pressed(keys.space) then
-        state.current_bar.play()
-    end
 end
 
 function _draw()

tiny-cli/src/main/resources/sfx/sfx-0.sfx

@@ -0,0 +1 @@
+{"instruments":[{"index":0,"name":"clarinet","wave":"TRIANGLE","attack":0.01,"decay":0.1,"sustain":0.8,"release":0.5,"harmonics":[1.1,0.3,0.031,0.039,0.345,0.29,0.0119]},{"index":1,"name":"violon","attack":0.1,"decay":0.1,"sustain":0.9,"release":0.05,"harmonics":[1.0,0.65,0.7,0.55,0.45,0.35,0.3]},{"index":2,"name":"obos","wave":"SAW_TOOTH","attack":0.1,"decay":0.1,"sustain":0.9,"release":0.05,"harmonics":[1.0,0.05,0.01]},{"index":3,"name":"drum","wave":"NOISE","attack":0.1,"decay":0.1,"sustain":0.9,"release":0.05,"harmonics":[1.0],"lastOutput":0.06498258,"lastFrequencyUsed":146.83,"cachedAlpha":0.020702422}],"musicalBars":[{"instrument":{"index":1,"name":"violon","attack":0.1,"decay":0.1,"sustain":0.9,"release":0.05,"harmonics":[1.0,0.65,0.7,0.55,0.45,0.35,0.3]},"tempo":380,"beats":[{"note":"A3","beat":0.5,"duration":0.5,"volume":1.0},{"note":"D3","beat":0.0,"duration":0.5,"volume":1.0}]},{"index":2,"instrument":{"index":0,"name":"clarinet","wave":"TRIANGLE","attack":0.01,"decay":0.1,"sustain":0.8,"release":0.5,"harmonics":[1.1,0.3,0.031,0.039,0.345,0.29,0.0119]}},{"index":3,"instrument":{"index":0,"name":"clarinet","wave":"TRIANGLE","attack":0.01,"decay":0.1,"sustain":0.8,"release":0.5,"harmonics":[1.1,0.3,0.031,0.039,0.345,0.29,0.0119]}},{"index":4,"instrument":{"index":0,"name":"clarinet","wave":"TRIANGLE","attack":0.01,"decay":0.1,"sustain":0.8,"release":0.5,"harmonics":[1.1,0.3,0.031,0.039,0.345,0.29,0.0119]}},{"index":5,"instrument":{"index":0,"name":"clarinet","wave":"TRIANGLE","attack":0.01,"decay":0.1,"sustain":0.8,"release":0.5,"harmonics":[1.1,0.3,0.031,0.039,0.345,0.29,0.0119]}},{"index":6,"instrument":{"index":0,"name":"clarinet","wave":"TRIANGLE","attack":0.01,"decay":0.1,"sustain":0.8,"release":0.5,"harmonics":[1.1,0.3,0.031,0.039,0.345,0.29,0.0119]}},{"index":7,"instrument":{"index":0,"name":"clarinet","wave":"TRIANGLE","attack":0.01,"decay":0.1,"sustain":0.8,"release":0.5,"harmonics":[1.1,0.3,0.031,0.039,0.345,0.29,0.0119]}},{"index":8,"instrument":{"index":0,"name":"clarinet","wave":"TRIANGLE","attack":0.01,"decay":0.1,"sustain":0.8,"release":0.5,"harmonics":[1.1,0.3,0.031,0.039,0.345,0.29,0.0119]}},{"index":9,"instrument":{"index":0,"name":"clarinet","wave":"TRIANGLE","attack":0.01,"decay":0.1,"sustain":0.8,"release":0.5,"harmonics":[1.1,0.3,0.031,0.039,0.345,0.29,0.0119]}},{"index":10,"instrument":{"index":0,"name":"clarinet","wave":"TRIANGLE","attack":0.01,"decay":0.1,"sustain":0.8,"release":0.5,"harmonics":[1.1,0.3,0.031,0.039,0.345,0.29,0.0119]}},{"index":11,"instrument":{"index":0,"name":"clarinet","wave":"TRIANGLE","attack":0.01,"decay":0.1,"sustain":0.8,"release":0.5,"harmonics":[1.1,0.3,0.031,0.039,0.345,0.29,0.0119]}},{"index":12,"instrument":{"index":0,"name":"clarinet","wave":"TRIANGLE","attack":0.01,"decay":0.1,"sustain":0.8,"release":0.5,"harmonics":[1.1,0.3,0.031,0.039,0.345,0.29,0.0119]}},{"index":13,"instrument":{"index":0,"name":"clarinet","wave":"TRIANGLE","attack":0.01,"decay":0.1,"sustain":0.8,"release":0.5,"harmonics":[1.1,0.3,0.031,0.039,0.345,0.29,0.0119]}},{"index":14,"instrument":{"index":0,"name":"clarinet","wave":"TRIANGLE","attack":0.01,"decay":0.1,"sustain":0.8,"release":0.5,"harmonics":[1.1,0.3,0.031,0.039,0.345,0.29,0.0119]}},{"index":15,"instrument":{"index":0,"name":"clarinet","wave":"TRIANGLE","attack":0.01,"decay":0.1,"sustain":0.8,"release":0.5,"harmonics":[1.1,0.3,0.031,0.039,0.345,0.29,0.0119]}},{"index":16,"instrument":{"index":0,"name":"clarinet","wave":"TRIANGLE","attack":0.01,"decay":0.1,"sustain":0.8,"release":0.5,"harmonics":[1.1,0.3,0.031,0.039,0.345,0.29,0.0119]}},{"index":17,"instrument":{"index":0,"name":"clarinet","wave":"TRIANGLE","attack":0.01,"decay":0.1,"sustain":0.8,"release":0.5,"harmonics":[1.1,0.3,0.031,0.039,0.345,0.29,0.0119]}},{"index":18,"instrument":{"index":0,"name":"clarinet","wave":"TRIANGLE","attack":0.01,"decay":0.1,"sustain":0.8,"release":0.5,"harmonics":[1.1,0.3,0.031,0.039,0.345,0.29,0.0119]}},{"index":19,"instrument":{"index":0,"name":"clarinet","wave":"TRIANGLE","attack":0.01,"decay":0.1,"sustain":0.8,"release":0.5,"harmonics":[1.1,0.3,0.031,0.039,0.345,0.29,0.0119]}},{"index":20,"instrument":{"index":0,"name":"clarinet","wave":"TRIANGLE","attack":0.01,"decay":0.1,"sustain":0.8,"release":0.5,"harmonics":[1.1,0.3,0.031,0.039,0.345,0.29,0.0119]}},{"index":21,"instrument":{"index":0,"name":"clarinet","wave":"TRIANGLE","attack":0.01,"decay":0.1,"sustain":0.8,"release":0.5,"harmonics":[1.1,0.3,0.031,0.039,0.345,0.29,0.0119]}},{"index":22,"instrument":{"index":0,"name":"clarinet","wave":"TRIANGLE","attack":0.01,"decay":0.1,"sustain":0.8,"release":0.5,"harmonics":[1.1,0.3,0.031,0.039,0.345,0.29,0.0119]}},{"index":23,"instrument":{"index":0,"name":"clarinet","wave":"TRIANGLE","attack":0.01,"decay":0.1,"sustain":0.8,"release":0.5,"harmonics":[1.1,0.3,0.031,0.039,0.345,0.29,0.0119]}},{"index":24,"instrument":{"index":0,"name":"clarinet","wave":"TRIANGLE","attack":0.01,"decay":0.1,"sustain":0.8,"release":0.5,"harmonics":[1.1,0.3,0.031,0.039,0.345,0.29,0.0119]}},{"index":25,"instrument":{"index":0,"name":"clarinet","wave":"TRIANGLE","attack":0.01,"decay":0.1,"sustain":0.8,"release":0.5,"harmonics":[1.1,0.3,0.031,0.039,0.345,0.29,0.0119]}},{"index":26,"instrument":{"index":0,"name":"clarinet","wave":"TRIANGLE","attack":0.01,"decay":0.1,"sustain":0.8,"release":0.5,"harmonics":[1.1,0.3,0.031,0.039,0.345,0.29,0.0119]}},{"index":27,"instrument":{"index":0,"name":"clarinet","wave":"TRIANGLE","attack":0.01,"decay":0.1,"sustain":0.8,"release":0.5,"harmonics":[1.1,0.3,0.031,0.039,0.345,0.29,0.0119]}},{"index":28,"instrument":{"index":0,"name":"clarinet","wave":"TRIANGLE","attack":0.01,"decay":0.1,"sustain":0.8,"release":0.5,"harmonics":[1.1,0.3,0.031,0.039,0.345,0.29,0.0119]}},{"index":29,"instrument":{"index":0,"name":"clarinet","wave":"TRIANGLE","attack":0.01,"decay":0.1,"sustain":0.8,"release":0.5,"harmonics":[1.1,0.3,0.031,0.039,0.345,0.29,0.0119]}},{"index":30,"instrument":{"index":0,"name":"clarinet","wave":"TRIANGLE","attack":0.01,"decay":0.1,"sustain":0.8,"release":0.5,"harmonics":[1.1,0.3,0.031,0.039,0.345,0.29,0.0119]}},{"index":31,"instrument":{"index":0,"name":"clarinet","wave":"TRIANGLE","attack":0.01,"decay":0.1,"sustain":0.8,"release":0.5,"harmonics":[1.1,0.3,0.031,0.039,0.345,0.29,0.0119]}},{"index":32,"instrument":{"index":0,"name":"clarinet","wave":"TRIANGLE","attack":0.01,"decay":0.1,"sustain":0.8,"release":0.5,"harmonics":[1.1,0.3,0.031,0.039,0.345,0.29,0.0119]}}]}

tiny-cli/src/main/resources/sfx/sfx-1.sfx

@@ -184,6 +184,13 @@ enum class Note(val frequency: Float, val index: Int) {
     B8(7902.13f, OCTAVE_8 + 12),
     ;
 
+    val octave: Int
+        get() {
+            val note = (index - 1) % OCTAVE_1
+            val octave = (index - 1 - note) / OCTAVE_1
+            return octave
+        }
+
     companion object {
         private val notesPerIndex = entries.toTypedArray().distinctBy { it.index }.sortedBy { it.index }.toTypedArray()
 

tiny-cli/src/main/resources/sfx/test.sfx

@@ -269,6 +269,7 @@ class SfxLib(
                 LuaTable().apply {
                     this.set("note", valueOf(note.name))
                     this.set("notei", valueOf(note.index))
+                    this.set("octave", valueOf(note.octave))
                 }
             }
 
@@ -278,6 +279,7 @@ class SfxLib(
                     LuaTable().apply {
                         this.set("note", it.note?.name?.let { valueOf(it) } ?: NIL)
                         this.set("notei", it.note?.index?.let { valueOf(it) } ?: NIL)
+                        this.set("octave", it.note?.octave?.let { valueOf(it) } ?: NIL)
                         this.set("beat", valueOf(it.beat.toDouble()))
                         this.set("duration", valueOf(it.duration.toDouble()))
                     }

tiny-engine/src/commonMain/kotlin/com/github/minigdx/tiny/lua/NotesLib.kt

@@ -0,0 +1,14 @@
+package com.github.minigdx.tiny.lua
+
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class NotesLibTest {
+    @Test
+    fun octave() {
+        assertEquals(0, Note.C0.octave)
+        assertEquals(1, Note.C1.octave)
+        assertEquals(1, Note.B1.octave)
+        assertEquals(5, Note.C5.octave)
+    }
+}