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

grey box issue fixed (github issue #13)

Browse Source
This commit is contained in:
minjaesong
2019-01-13 04:06:53 +09:00
parent 692e08fc1e
commit 380a14492f
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/net/torvald/terrarum/DefaultConfig.kt
View File

@@ -81,9 +81,6 @@ object DefaultConfig {
jsonObject.addProperty("maxparticles", 768) jsonObject.addProperty("maxparticles", 768)
//jsonObject.addProperty("fullframelightupdate", false)
jsonObject.addProperty("temperatureunit", 1) // -1: american, 0: kelvin, 1: celcius jsonObject.addProperty("temperatureunit", 1) // -1: american, 0: kelvin, 1: celcius

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

@@ -6,7 +6,7 @@ import net.torvald.terrarum.gameactors.Actor
import net.torvald.terrarum.gameworld.GameWorld import net.torvald.terrarum.gameworld.GameWorld
import net.torvald.terrarum.modulebasegame.gameactors.ActorHumanoid import net.torvald.terrarum.modulebasegame.gameactors.ActorHumanoid
import net.torvald.terrarum.ui.ConsoleWindow import net.torvald.terrarum.ui.ConsoleWindow
import java.util.ArrayList import java.util.*
import java.util.concurrent.locks.Lock import java.util.concurrent.locks.Lock
import java.util.concurrent.locks.ReentrantLock import java.util.concurrent.locks.ReentrantLock
import javax.swing.JOptionPane import javax.swing.JOptionPane
@@ -23,7 +23,7 @@ open class IngameInstance(val batch: SpriteBatch) : Screen {
open lateinit var consoleHandler: ConsoleWindow 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. */ /** how many different planets/stages/etc. are thenre. Whole stages must be manually managed by YOU. */
var gameworldCount = 0 var gameworldCount = 0
/** The actor the game is currently allowing you to control. /** The actor the game is currently allowing you to control.

12
src/net/torvald/terrarum/worlddrawer/FeaturesDrawer.kt
View File

@@ -1,12 +1,13 @@
package net.torvald.terrarum.worlddrawer package net.torvald.terrarum.worlddrawer
import com.badlogic.gdx.graphics.g2d.SpriteBatch 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 com.jme3.math.FastMath
import net.torvald.colourutil.ColourTemp import net.torvald.colourutil.ColourTemp
import net.torvald.terrarum.Terrarum import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.blendMul 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.fillRect
import net.torvald.terrarum.gameworld.GameWorld import net.torvald.terrarum.gameworld.GameWorld
@@ -54,14 +55,15 @@ object FeaturesDrawer {
colTemp = colTemp_warm + colTemp_cold - ENV_COLTEMP_NOON colTemp = colTemp_warm + colTemp_cold - ENV_COLTEMP_NOON
val zoom = Terrarum.ingame?.screenZoom ?: 1f val zoom = Terrarum.ingame?.screenZoom ?: 1f
blendMul() blendMul(batch)
batch.color = ColourTemp(colTemp) batch.color = ColourTemp(colTemp)
batch.fillRect(WorldCamera.x * zoom, batch.fillRect(0f, 0f,
WorldCamera.y * zoom,
Terrarum.WIDTH * if (zoom < 1) 1f / zoom else zoom, Terrarum.WIDTH * if (zoom < 1) 1f / zoom else zoom,
Terrarum.HEIGHT * if (zoom < 1) 1f / zoom else zoom Terrarum.HEIGHT * if (zoom < 1) 1f / zoom else zoom
) )
blendNormal(batch)
} }
/** /**