From 380a14492fcb9ec22b2aa6d8f386e5090270c1ee Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Sun, 13 Jan 2019 04:06:53 +0900
Subject: [PATCH] grey box issue fixed (github issue #13)

---
 src/net/torvald/terrarum/DefaultConfig.kt            |  3 ---
 src/net/torvald/terrarum/IngameInstance.kt           |  4 ++--
 .../torvald/terrarum/worlddrawer/FeaturesDrawer.kt   | 12 +++++++-----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/net/torvald/terrarum/DefaultConfig.kt b/src/net/torvald/terrarum/DefaultConfig.kt
index 48329a7a9..de83d8585 100644
--- a/src/net/torvald/terrarum/DefaultConfig.kt
+++ b/src/net/torvald/terrarum/DefaultConfig.kt
@@ -81,9 +81,6 @@ object DefaultConfig {
 
         jsonObject.addProperty("maxparticles", 768)
 
-
-        //jsonObject.addProperty("fullframelightupdate", false)
-
         jsonObject.addProperty("temperatureunit", 1) // -1: american, 0: kelvin, 1: celcius
 
 
diff --git a/src/net/torvald/terrarum/IngameInstance.kt b/src/net/torvald/terrarum/IngameInstance.kt
index 6be484d41..15ce8fb44 100644
--- a/src/net/torvald/terrarum/IngameInstance.kt
+++ b/src/net/torvald/terrarum/IngameInstance.kt
@@ -6,7 +6,7 @@ import net.torvald.terrarum.gameactors.Actor
 import net.torvald.terrarum.gameworld.GameWorld
 import net.torvald.terrarum.modulebasegame.gameactors.ActorHumanoid
 import net.torvald.terrarum.ui.ConsoleWindow
-import java.util.ArrayList
+import java.util.*
 import java.util.concurrent.locks.Lock
 import java.util.concurrent.locks.ReentrantLock
 import javax.swing.JOptionPane
@@ -23,7 +23,7 @@ open class IngameInstance(val batch: SpriteBatch) : Screen {
 
     open lateinit var consoleHandler: ConsoleWindow
 
-    open lateinit var world: GameWorld
+    open var world: GameWorld = GameWorld.makeNullWorld()
     /** how many different planets/stages/etc. are thenre. Whole stages must be manually managed by YOU. */
     var gameworldCount = 0
     /** The actor the game is currently allowing you to control.
diff --git a/src/net/torvald/terrarum/worlddrawer/FeaturesDrawer.kt b/src/net/torvald/terrarum/worlddrawer/FeaturesDrawer.kt
index a4df496f5..0a3a63ceb 100644
--- a/src/net/torvald/terrarum/worlddrawer/FeaturesDrawer.kt
+++ b/src/net/torvald/terrarum/worlddrawer/FeaturesDrawer.kt
@@ -1,12 +1,13 @@
 package net.torvald.terrarum.worlddrawer
 
 import com.badlogic.gdx.graphics.g2d.SpriteBatch
-import net.torvald.terrarum.blockproperties.Block
-import net.torvald.terrarum.blockstats.BlockStats
 import com.jme3.math.FastMath
 import net.torvald.colourutil.ColourTemp
 import net.torvald.terrarum.Terrarum
 import net.torvald.terrarum.blendMul
+import net.torvald.terrarum.blendNormal
+import net.torvald.terrarum.blockproperties.Block
+import net.torvald.terrarum.blockstats.BlockStats
 import net.torvald.terrarum.fillRect
 import net.torvald.terrarum.gameworld.GameWorld
 
@@ -54,14 +55,15 @@ object FeaturesDrawer {
         colTemp = colTemp_warm + colTemp_cold - ENV_COLTEMP_NOON
         val zoom = Terrarum.ingame?.screenZoom ?: 1f
 
-        blendMul()
+        blendMul(batch)
 
         batch.color = ColourTemp(colTemp)
-        batch.fillRect(WorldCamera.x * zoom,
-                WorldCamera.y * zoom,
+        batch.fillRect(0f, 0f,
                 Terrarum.WIDTH * if (zoom < 1) 1f / zoom else zoom,
                 Terrarum.HEIGHT * if (zoom < 1) 1f / zoom else zoom
         )
+
+        blendNormal(batch)
     }
 
     /**