diching RGB10; colors are now fully vec3

This commit is contained in:
minjaesong
2017-07-09 02:21:24 +09:00
parent b3a355f51d
commit c96fb5e017
23 changed files with 299 additions and 282 deletions

View File

@@ -9,7 +9,6 @@ import net.torvald.terrarum.gameactors.Second
import net.torvald.terrarum.gameactors.abs
import net.torvald.terrarum.imagefont.Watch7SegSmall
import net.torvald.terrarum.worlddrawer.LightmapRenderer
import net.torvald.terrarum.worlddrawer.toColor
import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
/**
@@ -94,11 +93,11 @@ class UIBasicNotifier(private val player: ActorHumanoid?) : UICanvas {
if (player != null) {
val playerPos = player.tilewiseHitbox
lightLevel = (LightmapRenderer.getLight(playerPos.centeredX.toInt(), playerPos.centeredY.toInt()) ?:
Terrarum.ingame!!.world.globalLight.toColor()
Terrarum.ingame!!.world.globalLight
)
}
else {
lightLevel = Terrarum.ingame!!.world.globalLight.toColor()
lightLevel = Terrarum.ingame!!.world.globalLight
}