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

tiki torch correctly spawns; gotta check for collision

Browse Source
This commit is contained in:
minjaesong
2019-05-29 23:00:37 +09:00
parent 3a5fcb9ba0
commit 9aa002f4cc
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/net/torvald/terrarum/modulebasegame/gameactors/FixtureBase.kt
View File

@@ -10,9 +10,12 @@ import net.torvald.terrarum.gameworld.GameWorld
/** /**
* Created by minjaesong on 2016-06-17. * Created by minjaesong on 2016-06-17.
*/ */
open class FixtureBase(val blockBox: BlockBox, val blockBoxProps: BlockBoxProps = BlockBoxProps(0)) : open class FixtureBase(blockBox0: BlockBox, val blockBoxProps: BlockBoxProps = BlockBoxProps(0), renderOrder: RenderOrder = RenderOrder.MIDDLE) :
// disabling physics (not allowing the fixture to move) WILL make things easier in many ways // disabling physics (not allowing the fixture to move) WILL make things easier in many ways
ActorWBMovable(RenderOrder.BEHIND, immobileBody = true, usePhysics = false), CuedByTerrainChange { ActorWBMovable(renderOrder, immobileBody = true, usePhysics = false), CuedByTerrainChange {
var blockBox: BlockBox = blockBox0
protected set // something like TapestryObject will want to redefine this
private val world: GameWorld private val world: GameWorld
get() = Terrarum.ingame!!.world get() = Terrarum.ingame!!.world
@@ -53,16 +56,16 @@ open class FixtureBase(val blockBox: BlockBox, val blockBoxProps: BlockBoxProps
// set the position of this actor // set the position of this actor
worldBlockPos = Point2i(posX, posY) worldBlockPos = Point2i(posX, posY)
val posXoff = (TSIZE % (this.sprite?.cellWidth ?: 0)) / 2
this.isVisible = true this.isVisible = true
this.hitbox.setFromWidthHeight(posX * TSIZE, posY * TSIZE, blockBox.width * TSIZE, blockBox.height * TSIZE) this.hitbox.setFromWidthHeight(posX * TSIZE + posXoff, posY * TSIZE, blockBox.width * TSIZE, blockBox.height * TSIZE)
// actually add this actor into the world // actually add this actor into the world
Terrarum.ingame!!.addNewActor(this) Terrarum.ingame!!.addNewActor(this)
return true // TODO for the tests' sake, just get fucking spawned return true // TODO for the tests' sake, just get fucking spawned
// TODO TESTING RESULTS SO FAR: tiki torch spawns but is not centred
} }
/** /**
@@ -162,7 +165,7 @@ inline class BlockBoxProps(val flags: Int) {
/** /**
* To not define the blockbox, simply use BlockBox.NULL * To not define the blockbox, simply use BlockBox.NULL
* *
* Null blockbox means the fixture won't bar any block placement. Fixtures like paintings will want to have such feature. * Null blockbox means the fixture won't bar any block placement. Fixtures like paintings will want to have such feature. (e.g. torch placed on top; buried)
* *
* @param collisionType Collision type defined in BlockBox.Companion * @param collisionType Collision type defined in BlockBox.Companion
* @param width Width of the block box, tile-wise * @param width Width of the block box, tile-wise

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

@@ -13,9 +13,7 @@ import java.util.*
/** /**
* Created by minjaesong on 2016-06-17. * Created by minjaesong on 2016-06-17.
*/ */
internal class FixtureTikiTorch : FixtureBase( internal class FixtureTikiTorch : FixtureBase(BlockBox(BlockBox.NO_COLLISION, 1, 2)), Luminous {
BlockBox(BlockBox.NO_COLLISION, 1, 2)
), Luminous {
override var color: Color override var color: Color
get() = BlockCodex[Block.TORCH].luminosity get() = BlockCodex[Block.TORCH].luminosity

4
src/net/torvald/terrarum/modulebasegame/gameactors/TapestryObject.kt
View File

@@ -11,7 +11,7 @@ import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
* Created by minjaesong on 2017-01-07. * Created by minjaesong on 2017-01-07.
*/ */
class TapestryObject(pixmap: Pixmap, val artName: String, val artAuthor: String) : class TapestryObject(pixmap: Pixmap, val artName: String, val artAuthor: String) :
FixtureBase(BlockBox(BlockBox.NO_COLLISION, 1, 1)) // placeholder blockbox FixtureBase(BlockBox(BlockBox.NO_COLLISION, 1, 1), renderOrder = RenderOrder.BEHIND) // placeholder blockbox
{ {
// physics = false only speeds up for ~2 frames with 50 tapestries // physics = false only speeds up for ~2 frames with 50 tapestries
@@ -28,7 +28,7 @@ class TapestryObject(pixmap: Pixmap, val artName: String, val artAuthor: String)
// you CAN'T destroy the image // you CAN'T destroy the image
// redefine blockbox // redefine blockbox
blockBox.redefine(texture.width.div(TILE_SIZEF).ceilInt(), texture.height.div(TILE_SIZEF).ceilInt()) blockBox = BlockBox(BlockBox.NO_COLLISION, texture.width.div(TILE_SIZEF).ceilInt(), texture.height.div(TILE_SIZEF).ceilInt())
} }
override fun update(delta: Float) { override fun update(delta: Float) {