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

seemingly working #41

Browse Source
This commit is contained in:
minjaesong
2021-08-21 21:43:52 +09:00
parent ca72a6fbe5
commit d315d61f68
3 changed files with 41 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/net/torvald/terrarum/IngameInstance.kt
View File

@@ -71,9 +71,9 @@ open class IngameInstance(val batch: SpriteBatch) : Screen {
val actorContainerInactive = SortedArrayList<Actor>(ACTORCONTAINER_INITIAL_SIZE) val actorContainerInactive = SortedArrayList<Actor>(ACTORCONTAINER_INITIAL_SIZE)
// FIXME queues will not work; input processing (blocks will queue) and queue consuming cannot be synchronised // FIXME queues will not work; input processing (blocks will queue) and queue consuming cannot be synchronised
//protected val terrainChangeQueue = ArrayList<BlockChangeQueueItem>() protected val terrainChangeQueue = ArrayList<BlockChangeQueueItem>()
//protected val wallChangeQueue = ArrayList<BlockChangeQueueItem>() protected val wallChangeQueue = ArrayList<BlockChangeQueueItem>()
//protected val wireChangeQueue = ArrayList<BlockChangeQueueItem>() // if 'old' is set and 'new' is blank, it's a wire cutter protected val wireChangeQueue = ArrayList<BlockChangeQueueItem>() // if 'old' is set and 'new' is blank, it's a wire cutter
override fun hide() { override fun hide() {
} }
@@ -153,6 +153,7 @@ open class IngameInstance(val batch: SpriteBatch) : Screen {
* Queueing schema is used to make sure things are synchronised. * Queueing schema is used to make sure things are synchronised.
*/ */
open fun queueTerrainChangedEvent(old: ItemID, new: ItemID, x: Int, y: Int) { open fun queueTerrainChangedEvent(old: ItemID, new: ItemID, x: Int, y: Int) {
terrainChangeQueue.add(BlockChangeQueueItem(old, new, x, y))
//printdbg(this, terrainChangeQueue) //printdbg(this, terrainChangeQueue)
} }
@@ -160,7 +161,7 @@ open class IngameInstance(val batch: SpriteBatch) : Screen {
* Wall version of terrainChanged() event * Wall version of terrainChanged() event
*/ */
open fun queueWallChangedEvent(old: ItemID, new: ItemID, x: Int, y: Int) { open fun queueWallChangedEvent(old: ItemID, new: ItemID, x: Int, y: Int) {
//wallChangeQueue.add(BlockChangeQueueItem(old, new, x, y)) wallChangeQueue.add(BlockChangeQueueItem(old, new, x, y))
} }
/** /**
@@ -170,7 +171,8 @@ open class IngameInstance(val batch: SpriteBatch) : Screen {
* @param new current settings of conduits in bit set format. * @param new current settings of conduits in bit set format.
*/ */
open fun queueWireChangedEvent(wire: ItemID, isRemoval: Boolean, x: Int, y: Int) { open fun queueWireChangedEvent(wire: ItemID, isRemoval: Boolean, x: Int, y: Int) {
//wireChangeQueue.add(BlockChangeQueueItem(if (isRemoval) wire else "", if (isRemoval) "" else wire, x, y)) wireChangeQueue.add(BlockChangeQueueItem(if (isRemoval) wire else "", if (isRemoval) "" else wire, x, y))
//printdbg(this, wireChangeQueue)
} }

27
src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt
View File

@@ -565,9 +565,9 @@ open class TerrarumIngame(batch: SpriteBatch) : IngameInstance(batch) {
// synchronised Ingame Input Updater // synchronised Ingame Input Updater
// will also queue up the block/wall/wire placed events
ingameController.update(delta) ingameController.update(delta)
if (!paused) { if (!paused) {
//hypothetical_input_capturing_function_if_you_finally_decided_to_forgo_gdx_input_processor_and_implement_your_own_to_synchronise_everything() //hypothetical_input_capturing_function_if_you_finally_decided_to_forgo_gdx_input_processor_and_implement_your_own_to_synchronise_everything()
@@ -615,12 +615,12 @@ open class TerrarumIngame(batch: SpriteBatch) : IngameInstance(batch) {
} }
/*if (!paused) { if (!paused) {
// completely consume block change queues because why not // completely consume block change queues because why not
terrainChangeQueue.clear() terrainChangeQueue.clear()
wallChangeQueue.clear() wallChangeQueue.clear()
wireChangeQueue.clear() wireChangeQueue.clear()
}*/ }
//////////////////////// ////////////////////////
@@ -859,13 +859,26 @@ open class TerrarumIngame(batch: SpriteBatch) : IngameInstance(batch) {
} }
} }
/*if (it is CuedByTerrainChange) { if (it is CuedByTerrainChange) {
printdbg(this, "actor is CuedByTerrainChange: ${terrainChangeQueue}")
terrainChangeQueue.forEach { cue -> terrainChangeQueue.forEach { cue ->
printdbg(this, "Ingame actors terrainChangeCue: ${cue}") printdbg(this, "Ingame actors terrainChangeCue: ${cue}")
it.updateForWorldChange(cue) it.updateForTerrainChange(cue)
} }
}*/ }
if (it is CuedByWallChange) {
wallChangeQueue.forEach { cue ->
printdbg(this, "Ingame actors wallChangeCue: ${cue}")
it.updateForWallChange(cue)
}
}
if (it is CuedByWireChange) {
wireChangeQueue.forEach { cue ->
printdbg(this, "Ingame actors wireChangeCue: ${cue}")
it.updateForWireChange(cue)
}
}
} }
} }
actorNowPlaying?.update(delta) actorNowPlaying?.update(delta)

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

@@ -65,6 +65,10 @@ open class FixtureBase(
} }
} }
override fun updateForTerrainChange(cue: IngameInstance.BlockChangeQueueItem) {
// TODO check for despawn code here
}
/** /**
* Adds this instance of the fixture to the world * Adds this instance of the fixture to the world
* *
@@ -187,9 +191,18 @@ interface CuedByTerrainChange {
* *
* E.g. if a fixture block that is inside of BlockBox is missing, destroy and drop self. * E.g. if a fixture block that is inside of BlockBox is missing, destroy and drop self.
*/ */
//fun updateForWorldChange(cue: IngameInstance.BlockChangeQueueItem) fun updateForTerrainChange(cue: IngameInstance.BlockChangeQueueItem)
} }
interface CuedByWallChange {
fun updateForWallChange(cue: IngameInstance.BlockChangeQueueItem)
}
interface CuedByWireChange {
fun updateForWireChange(cue: IngameInstance.BlockChangeQueueItem)
}
/** /**
* Standard 32-bit binary flags. * Standard 32-bit binary flags.
* *