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

lightmap aesthetics: blocks exposed to light are now rendered brighter

Browse Source
This commit is contained in:
minjaesong
2017-06-02 00:46:45 +09:00
parent f464ef8c18
commit 5e0fc0136c
1 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/net/torvald/terrarum/worlddrawer/LightmapRenderer.kt
View File

@@ -294,6 +294,22 @@ object LightmapRenderer {
} }
} }
private fun getLightSpecial(x: Int, y: Int): Int? {
val l = getLight(x, y)
if (l == null) return null
if (BlockCodex[world.getTileFromTerrain(x, y)].isSolid) {
return constructRGBFromFloat(
(l.r() * 1.25f).clampOne(),
(l.g() * 1.25f).clampOne(),
(l.b() * 1.25f).clampOne()
)
}
else {
return l
}
}
fun draw(g: Graphics) { fun draw(g: Graphics) {
val this_x_start = for_x_start// + overscan_open val this_x_start = for_x_start// + overscan_open
val this_x_end = for_x_end// + overscan_open val this_x_end = for_x_end// + overscan_open
@@ -312,14 +328,14 @@ object LightmapRenderer {
if (Terrarum.getConfigBoolean("smoothlighting") ?: false && if (Terrarum.getConfigBoolean("smoothlighting") ?: false &&
Terrarum.ingame!!.screenZoom >= 0.75) { Terrarum.ingame!!.screenZoom >= 0.75) {
val thisLightLevel = getLight(x, y) ?: 0 val thisLightLevel = getLightSpecial(x, y) ?: 0
if (x < this_x_end && thisLightLevel == 0 if (x < this_x_end && thisLightLevel == 0
&& getLight(x, y - 1) == 0) { && getLightSpecial(x, y - 1) == 0) {
try { try {
// coalesce zero intensity blocks to one // coalesce zero intensity blocks to one
var zeroLevelCounter = 1 var zeroLevelCounter = 1
while (getLight(x + zeroLevelCounter, y) == 0) { while (getLightSpecial(x + zeroLevelCounter, y) == 0) {
zeroLevelCounter += 1 zeroLevelCounter += 1
if (x + zeroLevelCounter >= this_x_end) break if (x + zeroLevelCounter >= this_x_end) break
@@ -349,10 +365,10 @@ object LightmapRenderer {
* +-+-+ * +-+-+
* d * d
*/ */
val a = thisLightLevel maxBlend (getLight(x, y - 1) ?: thisLightLevel) val a = thisLightLevel maxBlend (getLightSpecial(x, y - 1) ?: thisLightLevel)
val d = thisLightLevel maxBlend (getLight(x, y + 1) ?: thisLightLevel) val d = thisLightLevel maxBlend (getLightSpecial(x, y + 1) ?: thisLightLevel)
val b = thisLightLevel maxBlend (getLight(x - 1, y) ?: thisLightLevel) val b = thisLightLevel maxBlend (getLightSpecial(x - 1, y) ?: thisLightLevel)
val c = thisLightLevel maxBlend (getLight(x + 1, y) ?: thisLightLevel) val c = thisLightLevel maxBlend (getLightSpecial(x + 1, y) ?: thisLightLevel)
val colourMapItoL = IntArray(4) val colourMapItoL = IntArray(4)
val colMean = (a linMix d) linMix (b linMix c) val colMean = (a linMix d) linMix (b linMix c)
@@ -383,17 +399,17 @@ object LightmapRenderer {
// smoothing disabled // smoothing disabled
else { else {
try { try {
val thisLightLevel = getLight(x, y) val thisLightLevel = getLightSpecial(x, y)
// coalesce identical intensity blocks to one // coalesce identical intensity blocks to one
var sameLevelCounter = 1 var sameLevelCounter = 1
while (getLight(x + sameLevelCounter, y) == thisLightLevel) { while (getLightSpecial(x + sameLevelCounter, y) == thisLightLevel) {
sameLevelCounter += 1 sameLevelCounter += 1
if (x + sameLevelCounter >= this_x_end) break if (x + sameLevelCounter >= this_x_end) break
} }
g.color = (getLight(x, y) ?: 0).normaliseToColourHDR() g.color = (getLightSpecial(x, y) ?: 0).normaliseToColourHDR()
g.fillRect( g.fillRect(
(x.toFloat() * TILE_SIZE).round().toFloat(), (x.toFloat() * TILE_SIZE).round().toFloat(),