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

removed unnecessary class Light10B, minor fixes for LightmapRenderer

Browse Source 
Former-commit-id: 4cddfb080cc689738d9bf308f7d08852f4c78a8b
Former-commit-id: 2354b2483f30e70862a327c1b9688a19bd1b2f66
This commit is contained in:
Song Minjae
2016-09-07 22:58:42 +09:00
parent d817c586e9
commit 9b9b65efba
31 changed files with 3718 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/net/torvald/terrarum/StateInGame.kt
View File

@@ -16,6 +16,7 @@ import net.torvald.terrarum.gamemap.GameWorld
import net.torvald.terrarum.gamemap.WorldSimulator
import net.torvald.terrarum.gamemap.WorldTime
import net.torvald.terrarum.mapdrawer.LightmapRenderer
import net.torvald.terrarum.mapdrawer.LightmapRenderer.constructRGBFromInt
import net.torvald.terrarum.mapdrawer.MapCamera
import net.torvald.terrarum.mapdrawer.MapDrawer
import net.torvald.terrarum.mapgenerator.WorldGenerator
@@ -121,8 +122,8 @@ constructor() : BasicGameState() {
// add new player and put it to actorContainer
//player = PBSigrid.create()
player = PBCynthia.create()
player = PBSigrid.create()
//player = PBCynthia.create()
//player.setNoClip(true);
addActor(player)
@@ -177,7 +178,11 @@ constructor() : BasicGameState() {
WeatherMixer.update(gc, delta)
TileStats.update()
if (!(CommandDict["setgl"] as SetGlobalLightOverride).lightOverride)
world.globalLight = globalLightByTime.toInt()
world.globalLight = constructRGBFromInt(
globalLightByTime.redByte,
globalLightByTime.greenByte,
globalLightByTime.blueByte
)
///////////////////////////
@@ -438,7 +443,9 @@ constructor() : BasicGameState() {
}
// inactivate distant actors
else if (actor is Visible && !actor.inUpdateRange()) {
actorContainerInactive.add(actor) // naïve add; duplicates are checked when the actor is re-activated
if (actor !is Projectile) { // if it's a projectile, just kill it.
actorContainerInactive.add(actor) // naïve add; duplicates are checked when the actor is re-activated
}
actorContainer.removeAt(actorIndex)
actorContainerSize -= 1
i-- // array removed 1 elem, so we also decrement counter by 1
@@ -570,3 +577,5 @@ constructor() : BasicGameState() {
return -(low + 1) // key not found
}
}
fun Color.toInt() = redByte.shl(16) or greenByte.shl(8) or blueByte