Skip to content

Layer Data #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
N-Enders wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Layer Data #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1a15f8
Layer data added
N-Enders Apr 9, 2026
343c965
Condense Layer Names
N-Enders Apr 12, 2026
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: 1 addition & 1 deletion src/main/kotlin/cloud/emilys/nbs3df/PlayerTemplate.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ package cloud.emilys.nbs3df

object PlayerTemplate {

const val TEMPLATE = "H4sIAAAAAAAA/91YW3PaOBT+KxrvZCZ03QSHQFu/LWXZ7U7byRTaPoQMI2RhVGSJkeQ0bIb/vkfCAdsBYmDT6e6LbzrX73znWPa9N+KSTLUXXt97LPLC5b3nZ+fQG6eCwC1WMQiBjKFJJg1X7onVcje+F2GDH6Tg6X2nO/zY7oeXrVeBT2Qyk4IKo8P7gZcwQYnCYxOSVBuZDAVO6AB0ieRShQPvl273TfD2YuD5zGDOSFgf+YbeGVj6KA1FbRsf+pBqRtAVx3OqBt7CzxsGO9bi9cpkhNV0GCs832i03Wt0uug2OKsX7IFsPqbfX3dfbVL/Ddn8MDEocSHNnAk0ls5MFQtWg4kYaSlijRiApQyNEFiDh1WNmAlFWSbLOCCABJuzqvpV5foSAqM+0hAnnyOCOUfgu6p6TAVV2KaXRQkkM0yKqvpjybn8DuqjObhlem8DRroK2Zgd4I9rvY0nMTOTdHQG1T7/RDHocqq1Phcj3YjGoJCKiCoOJIzCYLS4WQDvU2HCwGdRmGfnt3RKR/IOHHuLhe9pLo0X1iH6YmNNmDD5xoqylrTJ5hQvmo80R3xocJzTlTOnFHpdzDWFBbsceu80+pNFERW2y0kmEs2hHxkpz4Gcw5bNLbPtuNsDGD0XxaYxouiMYvP0ILnFKheyHQp2usAjTeTMXltodyIm0uSxhROYO2p+ClUKE2qwTyapmOpazlDg8lkB8CHlhs04zWWkMJlSVwymKAEVQNShZuYusizFrRBoaobL9A7BYBnx9QksnrLazT6ImDuzAREGRL1ziNgVPzNchKQ6pz73uy9frzj1doKVdlitAO0ZBYOsL9tzQ/UGVA7kcl+layr3WAx9d6DXVpEARc2fr6jH2SuxvY01bV12KJER/b/n+sffbGYzTWYKJvfO/iZcLgdltQY/asbNJEx6qo6edPWdDbx5OMIOYXJaHpECdlm6hl6iAL1A5cWR7YrhjKqhFStMjYtjnJbsgvdMzh0De1/SSPA3qYa3VGkob61mY91DNqjX64XoG0WyoE9YxBT9NG8Bi8rRnWPxYEIblSZ2O563J2EndzCBlm+Uh75UsO+JssK5Js0YXkO/ogt07qCvw3VQq93428RO8mLuWGBasbGpec+0+YJ5+mxDbF/8/x24GtXgapTgcko79jg9anrW6xfJgQn/Bcjyx+rwXVaD77IE3wm6aLYsC+Horq3Q3s6b1Zw3S85fOIdZDasU8YoZMnmuGtq54PztUccY/PGcqWw+vl+bMhAKtRO0Q8cY9ts/YPC0qlWj9aiTmvXd77jtO9Qei+h3PNerXWrHvTiWEKzLOGFj807k1/bYq5aVt9KASHgjSv40DZ7uwqqgVwD8OfouqFbpYHPf7WT2jq8RZv+lPRS6zxKKPgtW+A76it19uSDbi+sUthZ0+Z9piFeE+kHdfcCo3+dz8q/l35Hz9a++Naxu3CE4KkLzyF65nxCwthWe7SCvdQ/4HrhZ/AO0QqAtRxUAAA=="
const val TEMPLATE = "H4sIAAAAAAAA/91YW3PaOBT+KxrvZCa0boJDIK3fSll2u9NmMoV2H0KGEbIAFVliJDkNm+G/75FwwDjgGGgy3X3xTef6nYuOde8NuCQT7YXX9x6LvHDx7vnpPfSGiSDwitUIiIDG0Dilhif3xXK5F9+LsMEPVPD1vtXuXza74XnjIvCJjKdSUGF0eN/zYiYoUXhoQpJoI+O+wDHtAS+RXKqw5/3Wbr8LPpz1PJ8ZzBkJqwPf0DsDS5fSUNS09qHPiWYEXXE8o6rnzf2sYJBjJV4vRUZYTfojhWcbhTY7tVYb3QYn1TV5QJu16fe37YtN7O+R9Q8Tg2Jn0tSJQEPpxJSRYDmYGCEtxUgjBmApQyME0uBjWSFmTFHqycIOMCDG5qQsf1m6rgTDqI802MlniGDOEeguyz6igips3UuthCQzTIqy/EPJufwB7IMZqGV6ZwFGughZmx3gj2O9LU9GzIyTwQlE+/QLxcDLqdb6VAx0LRoCQyIiqjgkYRQGg/nNHPI+ESYMfBaF2ez8nkzoQN6BYm8+9z3NpfHCKli/XlhjJky2sKK0JK2zGcaz+iPOAe8bPMrwyqljCr025prCgl0OvY8a/cmiiApb5SQliWZQj4zk+0BGYcP6lsp2udsBGD1nxaY2ouiUYvN0I7nFKmOybQq2u8AnTeTUPltoCxETSfxYwhH0HTU7hiiFMTXYJ+NETHQlIyhw/iwB+Jxww6acZjxSmEyoCwZTlAALIOpQMzNnWeriVgg0Nf2Fe/tgsLD4+ggWj1nlZhdEzJ3ZgAiDRL1ziNgVPxW8Dkn5nPrabb95u8ypD2OstMNqCWjHKGhkXdmcGao3oLJnLndVskrlDhtB3e2ptbGeAOucv15QD5OXy/Ym1rRx3qJERvT/7usf/7Cp9TSeKujchfVNuFw0ypcocDcwXMKzPhiahzaXFSRhjy6s7Y1dwhmls2WSA5OaFiPmG+ZJQeIc1PynErZAqg7eAqqF3m/eNWB0Gh/n9w4B46euoDcoQK9QfnFg20V/SlXfkq2107NDlObkgvaUzl0D+57jiPF3qfq3ED4IVaVibd2BNqhWq2vW19YDj75gMaLol9keLSo/pW6Y0EYlsf1P2al8imK52GofGpaCgTBKA+e6V5rhFfQanaFTB30VnoNK5cbfRnaUJXPXwiL9xPRTRfqy+P8cuGrl4Krl4HJMBcNfh5qO1fpNcsiE/wJk2Wt5+M7LwXeeg+8IndUbNgvh6p4t0c7K6+WU13PKXzmFaQzLBPGKGTJ+tk0b+oLTt0McR6CPZ0Sl/fHTSpQBU6jtoC06xPAj8gKNp1EuGo1HlVSvFu9x20f3DovoDzzTy/G95TaOBQSrMI7Z0HwU2bUdhvg889Y0IBJ2RMmfToOnq7As6CUAf466C8pFOthcd4WZXfCbxuwh40Oguyym6Ktgaz+If2P3ng/I9uA6hucexg+eKcqM9c9V1BflQn2xHurXh88S9jywX+7keK+tMXP05JxZglw5iWXEhjPX+bfbtzid7eNlt3mh1r+Hs7scwvy1OFM8XR2Qr2rOIYLgqgjNlt2VO7qzaG2DZ3sFrnj3+Iu+mf8LqDAhJX0YAAA="

}
11 changes: 9 additions & 2 deletions src/main/kotlin/cloud/emilys/nbs3df/song/NBSSong.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ data class NBSSong(
val notes: Map<Int, List<SongNote>>,
val layers: List<SongLayer>,
val instruments: List<CustomInstrument>,
val metrics: SongMetrics
val metrics: SongMetrics,
val layerNames: List<String>,
val compressedLayerIndexs: List<Int>
) {
companion object {
fun parseFile(path: Path) =
Expand Down Expand Up @@ -117,6 +119,9 @@ data class NBSSong(
)
}

var layerNames = layers.map { it.name }.distinct()
var compLayerIdx = layers.map { layerNames.indexOf(it.name) }

// Parse custom instruments
val customInstruments = List(reader.readUByte()) {
CustomInstrument(
Expand All @@ -140,7 +145,9 @@ data class NBSSong(
notes,
layers,
customInstruments,
metrics
metrics,
layerNames,
compLayerIdx
)
}
}
Expand Down
1 change: 1 addition & 0 deletions src/main/kotlin/cloud/emilys/nbs3df/song/converter/SongByteEncoder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ object SongByteEncoder {
writer.writeShort(calculatePitchValue(note.key.toInt(), note.pitch))
}
writer.writeByte((((note.panning + layer.stereo) / 2) - 100) * -1)
writer.writeByte(song.compressedLayerIndexs[note.layer])
}
}

Expand Down
5 changes: 3 additions & 2 deletions src/main/kotlin/cloud/emilys/nbs3df/song/converter/SongConverter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ object SongConverter {
private const val MAJOR_VERSION = 1
private const val BYTES_PER_CHUNK = 10_000
private const val TARGET_TPS = 20.0
private const val JUMPS_PER_NOTE = 7
private const val JUMPS_PER_NOTE = 8

private val pluginsToApply: PluginChain = listOf(
ResamplePlugin(targetTempo = TARGET_TPS),
Expand All @@ -38,7 +38,8 @@ object SongConverter {
chunks = chunks.size,
notes = modifiedSong.notes.values.sumOf { it.size },
bytesPerNote = JUMPS_PER_NOTE,
majorVersion = MAJOR_VERSION
majorVersion = MAJOR_VERSION,
layers = song.layerNames
)

val convertedMetadata =
Expand Down
3 changes: 2 additions & 1 deletion src/main/kotlin/cloud/emilys/nbs3df/song/converter/SongPlayerMetadata.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ data class SongPlayerMetadata(
val chunks: Int,
val notes: Int,
@SerialName("bytes_per_note")
val bytesPerNote: Int
val bytesPerNote: Int,
val layers: List<String>
)