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

multiblock fixtures can now emit/consume multiple wiring types

Browse Source
This commit is contained in:
minjaesong
2021-08-10 16:56:22 +09:00
parent 43ae93e982
commit f1cece1064
3 changed files with 49 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,14 @@ import net.torvald.terrarum.gameworld.GameWorld
import net.torvald.terrarum.ui.UICanvas
import org.dyn4j.geometry.Vector2
typealias BlockBoxIndex = Int
interface Electric {
val wireEmitterTypes: HashMap<String, BlockBoxIndex>
val wireEmission: HashMap<BlockBoxIndex, Vector2>
val wireConsumption: HashMap<BlockBoxIndex, Vector2>
}
/**
* Created by minjaesong on 2016-06-17.
*/
@@ -29,15 +37,15 @@ open class FixtureBase(
var blockBox: BlockBox = blockBox0
protected set // something like TapestryObject will want to redefine this
fun blockBoxIndexToPoint2i(it: BlockBoxIndex): Point2i = this.blockBox.width.let { w -> Point2i(it % w, it / w) }
open val wireEmitterType = ""
open val wireEmission = Vector2()
open val wireConsumption = Vector2()
/**
* Block-wise position of this fixture when it's placed on the world. Null if it's not on the world
* Tile-wise position of this fixture when it's placed on the world, top-left origin. Null if it's not on the world
*/
protected var worldBlockPos: Point2i? = null
var worldBlockPos: Point2i? = null
private set
init {
if (mainUI != null)

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

@@ -7,10 +7,12 @@ import net.torvald.terrarum.gameactors.AVKey
import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
import org.dyn4j.geometry.Vector2
class FixtureLogicSignalEmitter(nameFun: () -> String) : FixtureBase(BlockBox(BlockBox.NO_COLLISION, 1, 1), nameFun = nameFun) {
class FixtureLogicSignalEmitter(nameFun: () -> String)
: FixtureBase(BlockBox(BlockBox.NO_COLLISION, 1, 1), nameFun = nameFun), Electric {
override val wireEmitterType = "digital_bit"
override val wireEmission = Vector2(1.0, 0.0)
override val wireEmitterTypes: HashMap<String, BlockBoxIndex> = HashMap()
override val wireEmission: HashMap<BlockBoxIndex, Vector2> = HashMap()
override val wireConsumption: HashMap<BlockBoxIndex, Vector2> = HashMap()
init {
density = 1400.0
@@ -20,6 +22,9 @@ class FixtureLogicSignalEmitter(nameFun: () -> String) : FixtureBase(BlockBox(Bl
sprite!!.setRowsAndFrames(1, 1)
actorValue[AVKey.BASEMASS] = MASS
wireEmitterTypes["digital_bit"] = 0
wireEmission[0] = Vector2(1.0, 0.0)
}
override fun dispose() { }
@@ -31,8 +36,8 @@ class FixtureLogicSignalEmitter(nameFun: () -> String) : FixtureBase(BlockBox(Bl
override fun update(delta: Float) {
// set emit
worldBlockPos?.let { (x, y) ->
WireCodex.getAll().filter { it.renderClass == "signal" }.forEach { prop ->
world?.setWireEmitStateOf(x, y, prop.id, wireEmission)
WireCodex.getAll().filter { it.accepts == "digital_bit" }.forEach { prop ->
world?.setWireEmitStateOf(x, y, prop.id, wireEmission[0]!!)
}
}
}