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

fixture spawns with correct tex pos and hitbox; unsure if issue #26 is fixed tho

Browse Source
This commit is contained in:
minjaesong
2019-06-11 23:46:52 +09:00
parent 23b103892e
commit c41e60d29f
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/net/torvald/terrarum/gameworld/BlockLayer.kt
View File

@@ -18,10 +18,12 @@ open class BlockLayer(val width: Int, val height: Int) : Disposable {
unsafeConstructor.isAccessible = true unsafeConstructor.isAccessible = true
unsafe = unsafeConstructor.newInstance() unsafe = unsafeConstructor.newInstance()
} }
private var unsafeArrayInitialised = false
private var unsafeArrayDestroyed = false private var unsafeArrayDestroyed = false
private var layerPtr = unsafe.allocateMemory(width * height * BYTES_PER_BLOCK.toLong()) private var layerPtr = unsafe.allocateMemory(width * height * BYTES_PER_BLOCK.toLong())
init {
unsafe.setMemory(layerPtr, width * height * BYTES_PER_BLOCK.toLong(), 0) // sometimes does not work?!
}
/** /**
* @param data Byte array representation of the layer, where: * @param data Byte array representation of the layer, where:
@@ -39,18 +41,8 @@ open class BlockLayer(val width: Int, val height: Int) : Disposable {
*/ */
constructor(width: Int, height: Int, data: ByteArray) : this(width, height) { constructor(width: Int, height: Int, data: ByteArray) : this(width, height) {
data.forEachIndexed { index, byte -> unsafe.putByte(layerPtr + index, byte) } data.forEachIndexed { index, byte -> unsafe.putByte(layerPtr + index, byte) }
unsafeArrayInitialised = true
} }
init {
if (!unsafeArrayInitialised) {
//unsafe.setMemory(layerPtr, width * height * BYTES_PER_BLOCK.toLong(), 0) // sometimes does not work?!
for (i in 0 until width * height * BYTES_PER_BLOCK.toLong()) {
unsafe.putByte(layerPtr + i, 0)
}
unsafeArrayInitialised = true
}
}
/** /**
* Returns an iterator over blocks of type `Int`. * Returns an iterator over blocks of type `Int`.

2
src/net/torvald/terrarum/modulebasegame/gameactors/FixtureTikiTorch.kt
View File

@@ -31,7 +31,7 @@ internal class FixtureTikiTorch : FixtureBase(BlockBox(BlockBox.NO_COLLISION, 1,
lightBoxList = ArrayList(1) lightBoxList = ArrayList(1)
lightBoxList.add(Hitbox(6.0, 5.0, 4.0, 3.0)) lightBoxList.add(Hitbox(6.0, 5.0, 4.0, 3.0))
makeNewSprite(TextureRegionPack(ModMgr.getGdxFile("basegame", "sprites/fixtures/tiki_torch.tga"), 10, 27)) makeNewSprite(TextureRegionPack(ModMgr.getGdxFile("basegame", "sprites/fixtures/tiki_torch.tga"), 16, 32))
sprite!!.setRowsAndFrames(1, 1) sprite!!.setRowsAndFrames(1, 1)
actorValue[AVKey.BASEMASS] = 1.0 actorValue[AVKey.BASEMASS] = 1.0