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

does this fix the segfault?

Browse Source
This commit is contained in:
minjaesong
2024-05-26 14:40:55 +09:00
parent 4607abbbd0
commit de38561eb2
2 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/net/torvald/terrarum/gameitems/GameItem.kt
View File

@@ -2,6 +2,7 @@ package net.torvald.terrarum.gameitems
import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.graphics.Pixmap import com.badlogic.gdx.graphics.Pixmap
import com.badlogic.gdx.graphics.Texture
import com.badlogic.gdx.graphics.g2d.TextureRegion import com.badlogic.gdx.graphics.g2d.TextureRegion
import net.torvald.gdx.graphics.Cvec import net.torvald.gdx.graphics.Cvec
import net.torvald.terrarum.* import net.torvald.terrarum.*
@@ -132,6 +133,8 @@ abstract class GameItem(val originalID: ItemID) : Comparable<GameItem>, Cloneabl
get() = MaterialCodex.getOrDefault(materialId) get() = MaterialCodex.getOrDefault(materialId)
abstract val materialId: String abstract val materialId: String
@Transient private var itemImage0: TextureRegion? = null
/** /**
* DO NOT READ FROM THIS VALUE: USE `ItemCodex.getItemImage(item)`; * DO NOT READ FROM THIS VALUE: USE `ItemCodex.getItemImage(item)`;
* this hack is needed to avoid the unsolvable issue regarding the ItemImage of the tiles, of which they * this hack is needed to avoid the unsolvable issue regarding the ItemImage of the tiles, of which they
@@ -160,23 +163,32 @@ abstract class GameItem(val originalID: ItemID) : Comparable<GameItem>, Cloneabl
* ``` * ```
* *
*/ */
@Transient var itemImage: TextureRegion? = null var itemImage: TextureRegion?
set(tex) { get() = itemImage0
field = tex set(textureRegion) {
tex?.let { itemImage0 = textureRegion
val texdata = tex.texture.textureData.also { textureRegion?.let {
val texdata = textureRegion.texture.textureData.also {
if (!it.isPrepared) it.prepare() if (!it.isPrepared) it.prepare()
} }
itemImagePixmap = Pixmap(tex.regionWidth, tex.regionHeight, texdata.format).also { itemImagePixmap = Pixmap(textureRegion.regionWidth, textureRegion.regionHeight, texdata.format).also {
it.drawPixmap( it.drawPixmap(
texdata.consumePixmap(), texdata.consumePixmap(),
0, 0, tex.regionX, tex.regionY, tex.regionWidth, tex.regionHeight 0, 0, textureRegion.regionX, textureRegion.regionY, textureRegion.regionWidth, textureRegion.regionHeight
) )
App.disposables.add(it) App.disposables.add(it)
} }
} }
} }
fun setItemImage(pixmap: Pixmap) {
val texture = TextureRegion(Texture(pixmap))
App.disposables.add(texture.texture)
this.itemImage0 = texture
this.itemImagePixmap = pixmap
}
@Transient open var itemImagePixmap: Pixmap? = null; internal set @Transient open var itemImagePixmap: Pixmap? = null; internal set
@Transient open val itemImageGlow: TextureRegion? = null @Transient open val itemImageGlow: TextureRegion? = null
@Transient open val itemImageEmissive: TextureRegion? = null @Transient open val itemImageEmissive: TextureRegion? = null

9
src/net/torvald/terrarum/modulebasegame/gameitems/MusicDisc.kt
View File

@@ -53,13 +53,13 @@ open class MusicDiscPrototype(originalID: ItemID, module: String, path: String)
} }
init { init {
itemImage = generateSprite() setItemImage(generateSprite())
} }
/** /**
* Reads a channel-wise black and white image and tints it using HSLuv colour space * Reads a channel-wise black and white image and tints it using HSLuv colour space
*/ */
private fun generateSprite(): TextureRegion { private fun generateSprite(): Pixmap {
val authorHash = XXHash64.hash(author.encodeToByteArray(), 54) val authorHash = XXHash64.hash(author.encodeToByteArray(), 54)
val albumHash = XXHash64.hash(collection.encodeToByteArray(), 32) val albumHash = XXHash64.hash(collection.encodeToByteArray(), 32)
val nameHash = XXHash64.hash(name.encodeToByteArray(), 10) val nameHash = XXHash64.hash(name.encodeToByteArray(), 10)
@@ -129,10 +129,7 @@ open class MusicDiscPrototype(originalID: ItemID, module: String, path: String)
} }
} }
val ret = TextureRegion(Texture(pixmap)) return pixmap
pixmap.dispose()
return ret
} }
} }