mirror of
https://github.com/curioustorvald/Terrarum.git
synced 2026-06-14 12:34:05 +09:00
Greek support, modular weather, command history for console window
Former-commit-id: b72d0b018c084e80cf4fef77e1b1a81101d6daea Former-commit-id: 32da6a2998826de6519a901dcff7bf058f689b2f
This commit is contained in:
48
src/net/torvald/terrarum/audio/AudioMixer.kt
Normal file
48
src/net/torvald/terrarum/audio/AudioMixer.kt
Normal file
@@ -0,0 +1,48 @@
|
||||
package net.torvald.terrarum.audio
|
||||
|
||||
import org.lwjgl.openal.AL10
|
||||
import org.newdawn.slick.openal.Audio
|
||||
import org.newdawn.slick.openal.AudioImpl
|
||||
import org.newdawn.slick.openal.MODSound
|
||||
import java.util.*
|
||||
|
||||
/**
|
||||
* Created by minjaesong on 16-07-08.
|
||||
*/
|
||||
object AudioMixer {
|
||||
const val TRACK_COUNT = 32
|
||||
|
||||
const val TRACK_AMBIENT_ONE = 0
|
||||
const val TRACK_AMBIENT_ONE_NEXT = 1
|
||||
const val TRACK_AMBIENT_TWO = 2
|
||||
const val TRACK_AMBIENT_TWO_NEXT = 3
|
||||
|
||||
const val TRACK_UI_ONE = 8
|
||||
const val TRACK_UI_TWO = 9
|
||||
|
||||
const val TRACK_SFX_START = 16
|
||||
const val TRACK_SFX_END = 31
|
||||
|
||||
val tracks = ArrayList<MixerTrack>(TRACK_COUNT)
|
||||
|
||||
init {
|
||||
|
||||
}
|
||||
|
||||
fun getAudio(track: Int) = tracks[track]
|
||||
|
||||
/**
|
||||
* Queue an SFX to any empty SFX track and play it.
|
||||
*/
|
||||
fun queueSfx(audio: Audio) {
|
||||
|
||||
}
|
||||
|
||||
fun update() {
|
||||
|
||||
}
|
||||
|
||||
class MixerTrack(val audio: Audio, var volume: Float, var pan: Float) {
|
||||
|
||||
}
|
||||
}
|
||||
31
src/net/torvald/terrarum/audio/AudioResourceLibrary.kt
Normal file
31
src/net/torvald/terrarum/audio/AudioResourceLibrary.kt
Normal file
@@ -0,0 +1,31 @@
|
||||
package net.torvald.terrarum.audio
|
||||
|
||||
import org.newdawn.slick.openal.Audio
|
||||
import org.newdawn.slick.openal.AudioLoader
|
||||
import java.io.FileInputStream
|
||||
import java.util.*
|
||||
|
||||
/**
|
||||
* Created by minjaesong on 16-07-08.
|
||||
*/
|
||||
object AudioResourceLibrary {
|
||||
|
||||
val ambientsForest = ArrayList<Audio>()
|
||||
val ambientsMeadow = ArrayList<Audio>()
|
||||
val ambientsWindy = ArrayList<Audio>()
|
||||
val ambientsWoods = ArrayList<Audio>()
|
||||
val crickets = ArrayList<Audio>()
|
||||
|
||||
init {
|
||||
ambientsForest.add(AudioLoader.getAudio("ogg", FileInputStream("./res/sounds/ambient/ambient_forest_01.ogg")))
|
||||
|
||||
ambientsMeadow.add(AudioLoader.getAudio("ogg", FileInputStream("./res/sounds/ambient/ambient_meadow_01.ogg")))
|
||||
|
||||
ambientsWindy.add(AudioLoader.getAudio("ogg", FileInputStream("./res/sounds/ambient/ambient_windy_01.ogg")))
|
||||
|
||||
ambientsWoods.add(AudioLoader.getAudio("ogg", FileInputStream("./res/sounds/ambient/ambient_woods_01.ogg")))
|
||||
|
||||
crickets.add(AudioLoader.getAudio("ogg", FileInputStream("./res/sounds/ambient/crickets_01.ogg")))
|
||||
crickets.add(AudioLoader.getAudio("ogg", FileInputStream("./res/sounds/ambient/crickets_02.ogg")))
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user