This commit is contained in:
minjaesong
2024-09-12 20:53:26 +09:00
parent 4a0f740e03
commit 7ed37cf355
13 changed files with 32 additions and 12 deletions

View File

@@ -75,7 +75,7 @@ class MixerTrackProcessor(bufferSize: Int, val rate: Int, val track: TerrarumAud
private fun purgeStreamBuf() {
track.stop()
streamBuf = null
printdbg("StreamBuf is now null")
// printdbg("StreamBuf is now null")
}
private var breakBomb = false
@@ -87,7 +87,7 @@ class MixerTrackProcessor(bufferSize: Int, val rate: Int, val track: TerrarumAud
}
private fun allocateStreamBuf(track: TerrarumAudioMixerTrack) {
printdbg("Allocating a StreamBuf with rate ${track.currentTrack!!.samplingRate}")
// printdbg("Allocating a StreamBuf with rate ${track.currentTrack!!.samplingRate}")
streamBuf = AudioProcessBuf(track.currentTrack!!.samplingRate, { bufL, bufR ->
var samplesRead = track.currentTrack?.readSamples(bufL, bufR) ?: 0

View File

@@ -179,7 +179,7 @@ class TerrarumAudioMixerTrack(
override fun equals(other: Any?) = this.hash == (other as TerrarumAudioMixerTrack).hash
fun stop() {
printdbg("TerrarumAudioMixerTrack $name", "Stop music (mixertrack=${this.name}, musictrack=$currentTrack)")
// printdbg("TerrarumAudioMixerTrack $name", "Stop music (mixertrack=${this.name}, musictrack=$currentTrack)")
// printStackTrace("TerrarumAudioMixerTrack $name")
currentTrack?.reset()

View File

@@ -181,10 +181,10 @@ abstract class Actor : Comparable<Actor>, Runnable {
open fun startAudio(music: MusicContainer, volume: TrackVolume = 1.0, doSomethingWithTrack: (TerrarumAudioMixerTrack) -> Unit = {}) {
getTrackByAudio(music).let {
if (it == null) {
printdbg(this, "cannot startAudio $music")
// printdbg(this, "cannot startAudio $music")
}
else {
printdbg(this, "startAudio $music")
// printdbg(this, "startAudio $music")
it.trackingTarget = this
it.currentTrack = music
it.maxVolumeFun = { volume }

View File

@@ -91,7 +91,7 @@ class DroppedItem : ActorWithBody {
actorValue.set(AVKey.FALLDAMPENMULT, 0.1)
printdbg(this, "DroppedItem with itemID '${itemID}'")
// printdbg(this, "DroppedItem with itemID '${itemID}'")
physProp.ignorePlatform = false
}

View File

@@ -1,11 +1,13 @@
package net.torvald.terrarum.modulebasegame.gameactors
import net.torvald.terrarum.App
import net.torvald.terrarum.App.printdbg
import net.torvald.terrarum.ItemCodex
import net.torvald.terrarum.gameactors.ActorValue
import net.torvald.terrarum.gameactors.ActorWithBody
import net.torvald.terrarum.gameitems.GameItem
import net.torvald.terrarum.gameitems.ItemID
import net.torvald.terrarum.printStackTrace
/**
* Created by minjaesong on 2016-01-15.
@@ -42,6 +44,11 @@ interface Pocketed {
item.effectOnUnequip(this as ActorWithBody)
}
if (this is IngamePlayer) {
printdbg(this, "UNEQUIP ITEM ${item.name}")
printStackTrace(this)
}
}
fun unequipItem(itemID: ItemID?) {

View File

@@ -144,6 +144,12 @@ class OreLead(originalID: ItemID) : OreItemBase(originalID, true) {
itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(8,6)
}
}
class OreUranium(originalID: ItemID) : OreItemBase(originalID, true) {
override var originalName = "ITEM_ORE_URANINITE"
init {
itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(0,7)
}
}
class GemQuartz(originalID: ItemID) : OreItemBase(originalID, true) {
override var originalName = "ITEM_GEM_QUARTZ"

View File

@@ -192,6 +192,8 @@ class UIIMEConfig(remoCon: UIRemoCon?) : UICanvas() {
"ansi" -> getKeycapsANSI(this)
"iso" -> getKeycapsISO(this)
else -> throw IllegalArgumentException("Unknown physical layout: $layout")
// the JIS "Ro" key is not even recognised as a key by GLFW so JIS layout cannot be supported even if I wanted to
// besides, nobody in Japan types in Kana layout any more
}
keycaps.values.forEach { addUIitemAtHead(it) }