curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-11 11:04:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

convolutions and some audio samples are on CommonResourcePool now

Browse Source
This commit is contained in:
minjaesong
2024-01-24 15:34:52 +09:00
parent 76f7b2a145
commit 89b372e4d8
6 changed files with 156 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/net/torvald/terrarum/modulebasegame/FancyWorldReadLoadScreen.kt
View File

@@ -17,19 +17,19 @@ import kotlin.math.sqrt
open class FancyWorldReadLoadScreen(screenToBeLoaded: IngameInstance, private val worldwidth: Int, private val worldheight: Int, override var preLoadJob: (LoadScreenBase) -> Unit) : LoadScreenBase() {
init {
CommonResourcePool.addToLoadingList("basegame-gui-loadscrlayer01") {
CommonResourcePool.addToLoadingList("basegame.gui/loadscrlayer01") {
Texture(ModMgr.getGdxFile("basegame", "gui/loadscr_layer01.png"))
}
CommonResourcePool.addToLoadingList("basegame-gui-loadscrlayer02") {
CommonResourcePool.addToLoadingList("basegame.gui/loadscrlayer02") {
Texture(ModMgr.getGdxFile("basegame", "gui/loadscr_layer02.png"))
}
CommonResourcePool.addToLoadingList("basegame-gui-loadscrlayer03") {
CommonResourcePool.addToLoadingList("basegame.gui/loadscrlayer03") {
Texture(ModMgr.getGdxFile("basegame", "gui/loadscr_layer03.png"))
}
CommonResourcePool.addToLoadingList("basegame-gui-loadscrlayer04") {
CommonResourcePool.addToLoadingList("basegame.gui/loadscrlayer04") {
Texture(ModMgr.getGdxFile("basegame", "gui/loadscr_layer04.png"))
}
CommonResourcePool.addToLoadingList("basegame-gui-loadscrlayer05") {
CommonResourcePool.addToLoadingList("basegame.gui/loadscrlayer05") {
Texture(ModMgr.getGdxFile("basegame", "gui/loadscr_layer05.png"))
}
CommonResourcePool.loadAll()
@@ -51,14 +51,14 @@ open class FancyWorldReadLoadScreen(screenToBeLoaded: IngameInstance, private va
val xoff = (Math.random() * (1024-764)/2).toInt()
val baseTileTex = arrayOf(
CommonResourcePool.getAsTexture("basegame-gui-loadscrlayer01"),
CommonResourcePool.getAsTexture("basegame-gui-loadscrlayer02"),
CommonResourcePool.getAsTexture("basegame-gui-loadscrlayer03"),
CommonResourcePool.getAsTexture("basegame-gui-loadscrlayer04"),
CommonResourcePool.getAsTexture("basegame-gui-loadscrlayer05"),
CommonResourcePool.getAsTexture("basegame-gui-loadscrlayer05"),
CommonResourcePool.getAsTexture("basegame-gui-loadscrlayer05"),
CommonResourcePool.getAsTexture("basegame-gui-loadscrlayer05"),
CommonResourcePool.getAsTexture("basegame.gui/loadscrlayer01"),
CommonResourcePool.getAsTexture("basegame.gui/loadscrlayer02"),
CommonResourcePool.getAsTexture("basegame.gui/loadscrlayer03"),
CommonResourcePool.getAsTexture("basegame.gui/loadscrlayer04"),
CommonResourcePool.getAsTexture("basegame.gui/loadscrlayer05"),
CommonResourcePool.getAsTexture("basegame.gui/loadscrlayer05"),
CommonResourcePool.getAsTexture("basegame.gui/loadscrlayer05"),
CommonResourcePool.getAsTexture("basegame.gui/loadscrlayer05"),
)
val drawWidth = Toolkit.drawWidth

7
src/net/torvald/terrarum/modulebasegame/gameactors/FixtureJukebox.kt
View File

@@ -119,10 +119,9 @@ class FixtureJukebox : Electric, PlaysMusic {
App.audioMixer.requestFadeOut(App.audioMixer.musicTrack, DEFAULT_FADEOUT_LEN / 2f) {
startAudio(musicNowPlaying!!) {
it.filters[filterIndex] = Phono(
ModMgr.getFile(
"basegame",
"audio/convolution/Soundwoofer - large_speaker_Marshall JVM 205C SM57 A 0 0 1.bin"
), 0f, 5f / 16f
"basegame",
"audio/convolution/Soundwoofer - large_speaker_Marshall JVM 205C SM57 A 0 0 1.bin",
0f, 5f / 16f
)
}
}