abolished a need to pass world as parametre

+ simply changing the single variable (ingame.world) will update all the renderer's behaviour + somehow my git changelogs are exploding
2026-06-10 02:24:05 +09:00 · 2018-10-05 23:40:03 +09:00
parent 5641910036
commit 83fd44df4c
36 changed files with 344 additions and 268 deletions
--- a/src/net/torvald/terrarum/modulebasegame/BuildingMaker.kt
+++ b/src/net/torvald/terrarum/modulebasegame/BuildingMaker.kt
@@ -8,7 +8,6 @@ import net.torvald.terrarum.IngameInstance
 import net.torvald.terrarum.Terrarum
 import net.torvald.terrarum.blockproperties.Block
 import net.torvald.terrarum.gameactors.*
-import net.torvald.terrarum.gameworld.GameWorld
 import net.torvald.terrarum.modulebasegame.gameactors.ActorHumanoid
 import net.torvald.terrarum.modulebasegame.gameworld.GameWorldExtension
 import net.torvald.terrarum.modulebasegame.ui.Notification
@@ -46,7 +45,7 @@ class BuildingMaker(batch: SpriteBatch) : IngameInstance(batch) {
    }


-    override var actorNowPlaying: ActorHumanoid? = MovableWorldCamera(world)
+    override var actorNowPlaying: ActorHumanoid? = MovableWorldCamera()

    val uiToolbox = UIBuildingMakerToolbox()
    val notifier = Notification()
@@ -170,7 +169,7 @@ class BuildingMaker(batch: SpriteBatch) : IngameInstance(batch) {
 }


-class MovableWorldCamera(world: GameWorld) : ActorHumanoid(world, 0, usePhysics = false) {
+class MovableWorldCamera : ActorHumanoid(0, usePhysics = false) {

    init {
        referenceID = Terrarum.PLAYER_REF_ID
--- a/src/net/torvald/terrarum/modulebasegame/Ingame.kt
+++ b/src/net/torvald/terrarum/modulebasegame/Ingame.kt
@@ -523,10 +523,9 @@ open class Ingame(batch: SpriteBatch) : IngameInstance(batch) {
            BlockPropUtil.dynamicLumFuncTickClock()
            world.updateWorldTime(delta)
            //WorldSimulator(player, delta)
-            WeatherMixer.update(delta, actorNowPlaying)
+            WeatherMixer.update(delta, actorNowPlaying, world)
            BlockStats.update()
-            if (!(CommandDict["setgl"] as SetGlobalLightOverride).lightOverride)
-                gameworld.globalLight = WeatherMixer.globalLightNow
+


            ////////////////////////////
--- a/src/net/torvald/terrarum/modulebasegame/IngameRenderer.kt
+++ b/src/net/torvald/terrarum/modulebasegame/IngameRenderer.kt
@@ -74,7 +74,12 @@ object IngameRenderer {
            uiListToDraw = uisToDraw
        }

-        init(world)
+        init()
+
+        BlocksDrawer.world = world
+        LightmapRenderer.setWorld(world)
+        FeaturesDrawer.world = world
+
        this.player = player


@@ -389,7 +394,7 @@ object IngameRenderer {
    }


-    private fun init(world: GameWorldExtension) {
+    private fun init() {
        if (!initDone) {
            batch = SpriteBatch()
            camera = OrthographicCamera(widthf, heightf)
@@ -402,11 +407,6 @@ object IngameRenderer {

            initDone = true
        }
-
-
-        BlocksDrawer.world = world
-        LightmapRenderer.setWorld(world)
-        FeaturesDrawer.world = world
    }

    private fun clearBuffer() {
--- a/src/net/torvald/terrarum/modulebasegame/console/ImportLayerData.kt
+++ b/src/net/torvald/terrarum/modulebasegame/console/ImportLayerData.kt
@@ -29,8 +29,6 @@ object ImportLayerData : ConsoleCommand {
                (Terrarum.ingame!!.world).spawnX * FeaturesDrawer.TILE_SIZE.toDouble()
        )

-        IngameRenderer.
-
        Echo("Successfully loaded ${args[1]}")
    }

--- a/src/net/torvald/terrarum/modulebasegame/console/SpawnPhysTestBall.kt
+++ b/src/net/torvald/terrarum/modulebasegame/console/SpawnPhysTestBall.kt
@@ -13,9 +13,6 @@ import org.dyn4j.geometry.Vector2
 internal object SpawnPhysTestBall : ConsoleCommand {
    @Throws(Exception::class)
    override fun execute(args: Array<String>) {
-        val world = (Terrarum.ingame!!.world)
-
-
        val mouseX = Terrarum.mouseX
        val mouseY = Terrarum.mouseY

@@ -25,7 +22,7 @@ internal object SpawnPhysTestBall : ConsoleCommand {
            val xvel = args[2].toDouble()
            val yvel = if (args.size >= 4) args[3].toDouble() else 0.0

-            val ball = PhysTestBall(world)
+            val ball = PhysTestBall()
            ball.setPosition(mouseX, mouseY)
            ball.elasticity = elasticity
            ball.applyForce(Vector2(xvel, yvel))
@@ -35,7 +32,7 @@ internal object SpawnPhysTestBall : ConsoleCommand {
        else if (args.size == 2) {
            val elasticity = args[1].toDouble()

-            val ball = PhysTestBall(world)
+            val ball = PhysTestBall()
            ball.setPosition(mouseX, mouseY)
            ball.elasticity = elasticity

--- a/src/net/torvald/terrarum/modulebasegame/console/SpawnPhysTestLunarLander.kt
+++ b/src/net/torvald/terrarum/modulebasegame/console/SpawnPhysTestLunarLander.kt
@@ -13,7 +13,7 @@ internal object SpawnPhysTestLunarLander : ConsoleCommand {
    override fun execute(args: Array<String>) {
        val mouseX = Terrarum.mouseX
        val mouseY = Terrarum.mouseY
-        val lander = PhysTestLuarLander((Terrarum.ingame!!.world))
+        val lander = PhysTestLuarLander()

        lander.setPosition(mouseX, mouseY)

--- a/src/net/torvald/terrarum/modulebasegame/console/SpawnTikiTorch.kt
+++ b/src/net/torvald/terrarum/modulebasegame/console/SpawnTikiTorch.kt
@@ -11,7 +11,7 @@ import net.torvald.terrarum.modulebasegame.gameactors.FixtureTikiTorch
 */
 internal object SpawnTikiTorch : ConsoleCommand {
    override fun execute(args: Array<String>) {
-        val torch = FixtureTikiTorch((Terrarum.ingame!!.world))
+        val torch = FixtureTikiTorch()
        torch.setPosition(Terrarum.mouseX, Terrarum.mouseY)

        Terrarum.ingame!!.addNewActor(torch)
--- a/src/net/torvald/terrarum/modulebasegame/gameactors/ActorHumanoid.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameactors/ActorHumanoid.kt
@@ -25,12 +25,13 @@ import java.util.*
 * Created by minjaesong on 2016-10-24.
 */
 open class ActorHumanoid(
-        world: GameWorld,
        birth: time_t,
        death: time_t? = null,
        usePhysics: Boolean = true
-) : ActorWBMovable(world, RenderOrder.MIDDLE, usePhysics = usePhysics), Controllable, Pocketed, Factionable, Luminous, LandHolder, HistoricalFigure {
+) : ActorWBMovable(RenderOrder.MIDDLE, usePhysics = usePhysics), Controllable, Pocketed, Factionable, Luminous, LandHolder, HistoricalFigure {

+    private val world: GameWorld?
+        get() = Terrarum.ingame?.world


    var vehicleRiding: Controllable? = null // usually player only
@@ -50,11 +51,11 @@ open class ActorHumanoid(
    override var houseDesignation: ArrayList<Long>? = ArrayList()

    override fun addHouseTile(x: Int, y: Int) {
-        if (houseDesignation != null) houseDesignation!!.add(LandUtil.getBlockAddr(world, x, y))
+        if (houseDesignation != null) houseDesignation!!.add(LandUtil.getBlockAddr(world!!, x, y))
    }

    override fun removeHouseTile(x: Int, y: Int) {
-        if (houseDesignation != null) houseDesignation!!.remove(LandUtil.getBlockAddr(world, x, y))
+        if (houseDesignation != null) houseDesignation!!.remove(LandUtil.getBlockAddr(world!!, x, y))
    }

    override fun clearHouseDesignation() {
--- a/src/net/torvald/terrarum/modulebasegame/gameactors/CreatureBuilder.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameactors/CreatureBuilder.kt
@@ -15,8 +15,8 @@ object CreatureBuilder {
    /**
     * @Param jsonFileName with extension
     */
-    operator fun invoke(world: GameWorld, module: String, jsonFileName: String): ActorWBMovable {
-        val actor = ActorWBMovable(world, Actor.RenderOrder.MIDDLE)
+    operator fun invoke(module: String, jsonFileName: String): ActorWBMovable {
+        val actor = ActorWBMovable(Actor.RenderOrder.MIDDLE)
        InjectCreatureRaw(actor.actorValue, module, jsonFileName)


--- a/src/net/torvald/terrarum/modulebasegame/gameactors/DecodeTapestry.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameactors/DecodeTapestry.kt
@@ -173,6 +173,6 @@ object DecodeTapestry {
            readCounter++
        }

-        return TapestryObject((Terrarum.ingame!!.world), outImageData, artName, authorName)
+        return TapestryObject(outImageData, artName, authorName)
    }
 }
--- a/src/net/torvald/terrarum/modulebasegame/gameactors/DroppedItem.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameactors/DroppedItem.kt
@@ -10,7 +10,7 @@ import net.torvald.terrarum.gameworld.GameWorld
 /**
 * Created by minjaesong on 2016-03-15.
 */
-open class DroppedItem(world: GameWorld, private val item: GameItem) : ActorWBMovable(world, RenderOrder.MIDTOP) {
+open class DroppedItem(private val item: GameItem) : ActorWBMovable(RenderOrder.MIDTOP) {

    init {
        if (item.dynamicID >= ItemCodex.ACTORID_MIN)
--- a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureBase.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureBase.kt
@@ -6,8 +6,8 @@ import net.torvald.terrarum.gameworld.GameWorld
 /**
 * Created by minjaesong on 2016-06-17.
 */
-open class FixtureBase(world: GameWorld, physics: Boolean = true) :
-        ActorWBMovable(world, RenderOrder.BEHIND, immobileBody = true, usePhysics = physics) {
+open class FixtureBase(physics: Boolean = true) :
+        ActorWBMovable(RenderOrder.BEHIND, immobileBody = true, usePhysics = physics) {
    /**
     * 0: Open
     * 1: Blocked
--- a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureTikiTorch.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureTikiTorch.kt
@@ -14,7 +14,7 @@ import java.util.*
 /**
 * Created by minjaesong on 2016-06-17.
 */
-internal class FixtureTikiTorch(world: GameWorld) : FixtureBase(world), Luminous {
+internal class FixtureTikiTorch : FixtureBase(), Luminous {

    override var color: Color
        get() = BlockCodex[Block.TORCH].luminosity
--- a/src/net/torvald/terrarum/modulebasegame/gameactors/HumanoidNPC.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameactors/HumanoidNPC.kt
@@ -15,12 +15,11 @@ import net.torvald.terrarum.modulebasegame.gameworld.time_t
 * Created by minjaesong on 2016-01-31.
 */
 open class HumanoidNPC(
-        world: GameWorld,
        override val ai: ActorAI, // it's there for written-in-Kotlin, "hard-wired" AIs
        born: time_t,
        usePhysics: Boolean = true,
        forceAssignRefID: Int? = null
-) : ActorHumanoid(world, born, usePhysics = usePhysics), AIControlled, CanBeAnItem {
+) : ActorHumanoid(born, usePhysics = usePhysics), AIControlled, CanBeAnItem {

    companion object {
        val DEFAULT_COLLISION_TYPE = COLLISION_DYNAMIC
--- a/src/net/torvald/terrarum/modulebasegame/gameactors/IngamePlayer.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameactors/IngamePlayer.kt
@@ -11,7 +11,7 @@ import net.torvald.terrarum.modulebasegame.gameworld.time_t
 * Created by minjaesong on 2015-12-31.
 */

-class IngamePlayer(world: GameWorldExtension, born: time_t) : ActorHumanoid(world, born) {
+class IngamePlayer(born: time_t) : ActorHumanoid(born) {

    /**
     * Creates new Player instance with empty elements (sprites, actorvalue, etc.).
--- a/src/net/torvald/terrarum/modulebasegame/gameactors/PhysTestBall.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameactors/PhysTestBall.kt
@@ -10,7 +10,7 @@ import net.torvald.terrarum.modulebasegame.worldgenerator.RoguelikeRandomiser
 /**
 * Created by minjaesong on 2016-03-05.
 */
-class PhysTestBall(world: GameWorld) : ActorWBMovable(world, RenderOrder.MIDDLE, immobileBody = true) {
+class PhysTestBall : ActorWBMovable(RenderOrder.MIDDLE, immobileBody = true) {

    private var color = Color.GOLD

--- a/src/net/torvald/terrarum/modulebasegame/gameactors/PhysTestLuarLander.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameactors/PhysTestLuarLander.kt
@@ -15,7 +15,7 @@ import net.torvald.terrarum.gameworld.GameWorld
 /**
 * Created by minjaesong on 2018-01-17.
 */
-class PhysTestLuarLander(world: GameWorld) : ActorWBMovable(world, RenderOrder.MIDTOP), Controllable {
+class PhysTestLuarLander : ActorWBMovable(RenderOrder.MIDTOP), Controllable {

    private val texture = Texture(ModMgr.getGdxFile("basegame", "sprites/phystest_lunarlander.tga"))

--- a/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilder.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilder.kt
@@ -13,7 +13,7 @@ object PlayerBuilder {
    operator fun invoke(): Actor {
        val world = (Terrarum.ingame!! as Ingame).gameworld

-        val p: Actor = IngamePlayer(world, world.time.TIME_T)
+        val p: Actor = IngamePlayer(world.time.TIME_T)
        InjectCreatureRaw(p.actorValue, "basegame", "CreatureHuman.json")

        // attach sprite
--- a/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderCynthia.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderCynthia.kt
@@ -16,7 +16,6 @@ object PlayerBuilderCynthia {
    operator fun invoke(): ActorWBMovable {
        //val p: IngamePlayer = IngamePlayer(GameDate(100, 143)) // random value thrown
        val p: HumanoidNPC = HumanoidNPC(
-                (Terrarum.ingame!!.world),
                NullAI(),
                -589141658L) // random value thrown
        InjectCreatureRaw(p.actorValue, "basegame", "CreatureHuman.json")
--- a/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderSigrid.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderSigrid.kt
@@ -17,7 +17,7 @@ import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
 object PlayerBuilderSigrid {

    operator fun invoke(): IngamePlayer {
-        val p = IngamePlayer((Terrarum.ingame!! as Ingame).gameworld, -9223372036854775807L) // XD
+        val p = IngamePlayer(-9223372036854775807L) // XD

        p.referenceID = 0x51621D // the only constant of this procedural universe

--- a/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderTestSubject1.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderTestSubject1.kt
@@ -12,7 +12,7 @@ import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
 */
 object PlayerBuilderTestSubject1 {
    operator fun invoke(): IngamePlayer {
-        val p: IngamePlayer = IngamePlayer((Terrarum.ingame!! as Ingame).gameworld, -589141658L) // random value thrown
+        val p: IngamePlayer = IngamePlayer(-589141658L) // random value thrown
        InjectCreatureRaw(p.actorValue, "basegame", "CreatureHuman.json")


--- a/src/net/torvald/terrarum/modulebasegame/gameactors/ProjectileHoming.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameactors/ProjectileHoming.kt
@@ -7,11 +7,10 @@ import org.dyn4j.geometry.Vector2
 * Created by minjaesong on 2016-08-29.
 */
 class ProjectileHoming(
-        world: GameWorld,
        type: Int,
        fromPoint: Vector2, // projected coord
        toPoint: Vector2    // arriving coord
-) : ProjectileSimple(world, type, fromPoint, toPoint) {
+) : ProjectileSimple(type, fromPoint, toPoint) {



--- a/src/net/torvald/terrarum/modulebasegame/gameactors/ProjectileSimple.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameactors/ProjectileSimple.kt
@@ -21,11 +21,10 @@ import java.util.*

 // TODO simplified, lightweight physics (does not call PhysicsSolver)
 open class ProjectileSimple(
-        world: GameWorld,
        private val type: Int,
        fromPoint: Vector2, // projected coord
        toPoint: Vector2    // arriving coord
-) : ActorWBMovable(world, RenderOrder.MIDTOP), Luminous, Projectile {
+) : ActorWBMovable(RenderOrder.MIDTOP), Luminous, Projectile {

    val damage: Int
    val displayColour: Color
--- a/src/net/torvald/terrarum/modulebasegame/gameactors/TapestryObject.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameactors/TapestryObject.kt
@@ -10,7 +10,7 @@ import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
 /**
 * Created by minjaesong on 2017-01-07.
 */
-class TapestryObject(world: GameWorld, pixmap: Pixmap, val artName: String, val artAuthor: String) : FixtureBase(world, physics = false) {
+class TapestryObject(pixmap: Pixmap, val artName: String, val artAuthor: String) : FixtureBase(physics = false) {

    // physics = false only speeds up for ~2 frames with 50 tapestries

--- a/src/net/torvald/terrarum/modulebasegame/gameactors/WeaponSwung.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameactors/WeaponSwung.kt
@@ -9,7 +9,7 @@ import net.torvald.terrarum.gameworld.GameWorld
 /**
 * Created by minjaesong on 2016-04-26.
 */
-class WeaponSwung(world: GameWorld, val itemID: Int) : ActorWBMovable(world, RenderOrder.MIDTOP), Luminous {
+class WeaponSwung(val itemID: Int) : ActorWBMovable(RenderOrder.MIDTOP), Luminous {
    // just let the solver use AABB; it's cheap but works just enough

    /**
--- a/src/net/torvald/terrarum/modulebasegame/weather/WeatherMixer.kt
+++ b/src/net/torvald/terrarum/modulebasegame/weather/WeatherMixer.kt
@@ -3,13 +3,17 @@ package net.torvald.terrarum.modulebasegame.weather
 import com.badlogic.gdx.Gdx
 import com.badlogic.gdx.Input
 import com.badlogic.gdx.graphics.*
+import com.badlogic.gdx.utils.GdxRuntimeException
 import net.torvald.terrarum.utils.JsonFetcher
 import net.torvald.colourutil.*
 import net.torvald.random.HQRNG
 import net.torvald.terrarum.*
+import net.torvald.terrarum.console.CommandDict
+import net.torvald.terrarum.console.SetGlobalLightOverride
 import net.torvald.terrarum.gameactors.ActorWithBody
 import net.torvald.terrarum.modulebasegame.gameactors.ParticleMegaRain
 import net.torvald.terrarum.gamecontroller.KeyToggler
+import net.torvald.terrarum.gameworld.GameWorld
 import net.torvald.terrarum.modulebasegame.Ingame
 import net.torvald.terrarum.modulebasegame.RNGConsumer
 import net.torvald.terrarum.modulebasegame.gameworld.GameWorldExtension
@@ -36,6 +40,7 @@ internal object WeatherMixer : RNGConsumer {

    override val RNG = HQRNG()

+    var globalLightOverridden = false

    var weatherList: HashMap<String, ArrayList<BaseModularWeather>>

@@ -84,7 +89,7 @@ internal object WeatherMixer : RNGConsumer {
    /**
     * Part of Ingame update
     */
-    fun update(delta: Float, player: ActorWithBody?) {
+    fun update(delta: Float, player: ActorWithBody?, world: GameWorldExtension) {
        if (player == null) return

        currentWeather = weatherList[WEATHER_GENERIC]!![0]
@@ -104,6 +109,10 @@ internal object WeatherMixer : RNGConsumer {
            //globalLightNow.set(getGlobalLightOfTime((Terrarum.ingame!!.world).time.todaySeconds).mul(0.3f, 0.3f, 0.3f, 0.58f))
        }

+
+        if (!globalLightOverridden) {
+            world.globalLight = WeatherMixer.globalLightNow
+        }
    }

    //private val parallaxZeroPos = WorldGenerator.TERRAIN_AVERAGE_HEIGHT * 0.75f // just an arb multiplier (266.66666 -> 200)