mirror of
https://github.com/curioustorvald/Terrarum.git
synced 2026-06-13 03:54:06 +09:00
Greek support, modular weather, command history for console window
Former-commit-id: b72d0b018c084e80cf4fef77e1b1a81101d6daea Former-commit-id: 32da6a2998826de6519a901dcff7bf058f689b2f
This commit is contained in:
Song Minjae
195
src/net/torvald/terrarum/mapdrawer/Light10B.kt
Normal file
195
src/net/torvald/terrarum/mapdrawer/Light10B.kt
Normal file
@@ -0,0 +1,195 @@
|
||||
package net.torvald.terrarum.mapdrawer
|
||||
|
||||
import com.jme3.math.FastMath
|
||||
import org.newdawn.slick.Color
|
||||
|
||||
/**
|
||||
* Created by minjaesong on 16-07-08.
|
||||
*/
|
||||
|
||||
class Light10B {
|
||||
|
||||
private var data = 0
|
||||
|
||||
constructor(r: Int, g: Int, b: Int) {
|
||||
data = constructRGBFromInt(r, g, b)
|
||||
}
|
||||
|
||||
constructor(r: Float, g: Float, b: Float) {
|
||||
if (r < 0 || r > 1.0f) throw IllegalArgumentException("Red: out of range ($r)")
|
||||
if (g < 0 || g > 1.0f) throw IllegalArgumentException("Green: out of range ($g)")
|
||||
if (b < 0 || b > 1.0f) throw IllegalArgumentException("Blue: out of range ($b)")
|
||||
|
||||
val intR = (r * CHANNEL_MAX).floor()
|
||||
val intG = (g * CHANNEL_MAX).floor()
|
||||
val intB = (b * CHANNEL_MAX).floor()
|
||||
|
||||
data = constructRGBFromInt(intR, intG, intB)
|
||||
}
|
||||
|
||||
constructor(raw: Int) {
|
||||
data = raw
|
||||
}
|
||||
|
||||
constructor(color: Color) {
|
||||
data = constructRGBFromInt(color.red, color.green, color.blue)
|
||||
}
|
||||
|
||||
/**
|
||||
* Assigners
|
||||
*/
|
||||
fun fromRGB(r: Int, g: Int, b: Int): Light10B {
|
||||
data = constructRGBFromInt(r, g, b)
|
||||
return this
|
||||
}
|
||||
|
||||
fun fromInt(raw: Int): Light10B {
|
||||
data = raw
|
||||
return this
|
||||
}
|
||||
|
||||
fun fromSlickColor(color: Color): Light10B {
|
||||
data = constructRGBFromInt(color.red, color.green, color.blue)
|
||||
return this
|
||||
}
|
||||
|
||||
|
||||
|
||||
fun toInt(): Int = data
|
||||
|
||||
fun constructRGBFromInt(r: Int, g: Int, b: Int): Int {
|
||||
if (r !in 0..CHANNEL_MAX) throw IllegalArgumentException("Red: out of range ($r)")
|
||||
if (g !in 0..CHANNEL_MAX) throw IllegalArgumentException("Green: out of range ($g)")
|
||||
if (b !in 0..CHANNEL_MAX) throw IllegalArgumentException("Blue: out of range ($b)")
|
||||
return (r * STEPS_2 + g * STEPS + b)
|
||||
}
|
||||
|
||||
val STEPS = 1024
|
||||
val STEPS_2 = STEPS * STEPS
|
||||
val CHANNEL_MAX = STEPS - 1
|
||||
val CHANNEL_MAX_FLOAT = CHANNEL_MAX.toFloat()
|
||||
val CHANNEL_MAX_DECIMAL = 4f
|
||||
val COLOUR_RANGE_SIZE = STEPS * STEPS_2
|
||||
|
||||
override fun toString() = "10BitCol:$data"
|
||||
|
||||
fun rawR() = data / STEPS_2
|
||||
fun rawG() = data % STEPS_2 / STEPS
|
||||
fun rawB() = data % STEPS
|
||||
|
||||
fun r(): Float = this.rawR() / CHANNEL_MAX_FLOAT
|
||||
fun g(): Float = this.rawG() / CHANNEL_MAX_FLOAT
|
||||
fun b(): Float = this.rawB() / CHANNEL_MAX_FLOAT
|
||||
|
||||
fun Float.floor() = FastMath.floor(this)
|
||||
private fun Float.clampChannel() = if (this < 0) 0f else if (this > CHANNEL_MAX_DECIMAL) CHANNEL_MAX_DECIMAL else this
|
||||
private fun Int.clampChannel() = if (this < 0) 0 else if (this > CHANNEL_MAX) CHANNEL_MAX else this
|
||||
|
||||
operator fun plus(other: Light10B) =
|
||||
Light10B(
|
||||
rawR().plus(other.rawR()).clampChannel(),
|
||||
rawG().plus(other.rawG()).clampChannel(),
|
||||
rawB().plus(other.rawB()).clampChannel()
|
||||
)
|
||||
operator fun minus(other: Light10B) =
|
||||
Light10B(
|
||||
rawR().minus(other.rawR()).clampChannel(),
|
||||
rawG().minus(other.rawG()).clampChannel(),
|
||||
rawB().minus(other.rawB()).clampChannel()
|
||||
)
|
||||
operator fun times(other: Light10B) =
|
||||
Light10B(
|
||||
r().times(other.r()).clampChannel(),
|
||||
g().times(other.g()).clampChannel(),
|
||||
b().times(other.b()).clampChannel()
|
||||
)
|
||||
infix fun darken(other: Light10B): Light10B {
|
||||
if (other.toInt() < 0 || other.toInt() >= COLOUR_RANGE_SIZE)
|
||||
throw IllegalArgumentException("darken: out of range ($other)")
|
||||
|
||||
val r = this.r() * (1f - other.r() * 6) // 6: Arbitrary value
|
||||
val g = this.g() * (1f - other.g() * 6) // TODO gamma correction?
|
||||
val b = this.b() * (1f - other.b() * 6)
|
||||
|
||||
return Light10B(r.clampChannel(), g.clampChannel(), b.clampChannel())
|
||||
}
|
||||
infix fun darken(darken: Int): Light10B {
|
||||
if (darken < 0 || darken > CHANNEL_MAX)
|
||||
throw IllegalArgumentException("darken: out of range ($darken)")
|
||||
|
||||
val darkenColoured = constructRGBFromInt(darken, darken, darken)
|
||||
return (this darken darkenColoured)
|
||||
}
|
||||
infix fun brighten(other: Light10B): Light10B {
|
||||
if (other.toInt() < 0 || other.toInt() >= COLOUR_RANGE_SIZE)
|
||||
throw IllegalArgumentException("brighten: out of range ($other)")
|
||||
|
||||
val r = this.r() * (1f + other.r() * 6) // 6: Arbitrary value
|
||||
val g = this.g() * (1f + other.g() * 6) // TODO gamma correction?
|
||||
val b = this.b() * (1f + other.b() * 6)
|
||||
|
||||
return Light10B(r.clampChannel(), g.clampChannel(), b.clampChannel())
|
||||
}
|
||||
/**
|
||||
* Darken or brighten colour by 'brighten' argument
|
||||
*
|
||||
* @param data Raw channel value (0-255) per channel
|
||||
* @param brighten (-1.0 - 1.0) negative means darkening
|
||||
* @return processed colour
|
||||
*/
|
||||
fun alterBrightnessUniform(data: Light10B, brighten: Float): Light10B {
|
||||
val modifier = if (brighten < 0)
|
||||
Light10B(-brighten, -brighten, -brighten)
|
||||
else
|
||||
Light10B(brighten, brighten, brighten)
|
||||
return if (brighten < 0)
|
||||
data darken modifier
|
||||
else
|
||||
data brighten modifier
|
||||
}
|
||||
|
||||
/** Get each channel from two RGB values, return new RGB that has max value of each channel
|
||||
* @param rgb
|
||||
* @param rgb2
|
||||
* @return
|
||||
*/
|
||||
infix fun maxBlend(other: Light10B): Light10B {
|
||||
val r1 = this.rawR()
|
||||
val r2 = other.rawR()
|
||||
val newR = if (r1 > r2) r1 else r2
|
||||
val g1 = this.rawG()
|
||||
val g2 = other.rawG()
|
||||
val newG = if (g1 > g2) g1 else g2
|
||||
val b1 = this.rawB()
|
||||
val b2 = other.rawB()
|
||||
val newB = if (b1 > b2) b1 else b2
|
||||
|
||||
return Light10B(newR, newG, newB)
|
||||
}
|
||||
|
||||
infix fun screenBlend(other: Light10B): Light10B {
|
||||
val r1 = this.r()
|
||||
val r2 = other.r()
|
||||
val newR = 1 - (1 - r1) * (1 - r2)
|
||||
val g1 = this.g()
|
||||
val g2 = other.g()
|
||||
val newG = 1 - (1 - g1) * (1 - g2)
|
||||
val b1 = this.b()
|
||||
val b2 = other.b()
|
||||
val newB = 1 - (1 - b1) * (1 - b2)
|
||||
|
||||
return Light10B(newR, newG, newB)
|
||||
}
|
||||
|
||||
private infix fun colSub(other: Light10B) = Light10B(
|
||||
(this.rawR() - other.rawR()).clampChannel() ,
|
||||
(this.rawG() - other.rawG()).clampChannel() ,
|
||||
(this.rawB() - other.rawB()).clampChannel()
|
||||
)
|
||||
|
||||
private infix fun colAdd(other: Light10B) = Light10B(
|
||||
(this.rawR() + other.rawR()).clampChannel() ,
|
||||
(this.rawG() + other.rawG()).clampChannel() ,
|
||||
(this.rawB() + other.rawB()).clampChannel()
|
||||
)
|
||||
}
|
||||
@@ -228,11 +228,11 @@ object LightmapRenderer {
|
||||
|
||||
private fun calculate(x: Int, y: Int, doNotCalculateAmbient: Boolean): Int {
|
||||
var lightLevelThis: Int = 0
|
||||
val thisTerrain = Terrarum.ingame.map.getTileFromTerrain(x, y)
|
||||
val thisWall = Terrarum.ingame.map.getTileFromWall(x, y)
|
||||
val thisTerrain = Terrarum.ingame.world.getTileFromTerrain(x, y)
|
||||
val thisWall = Terrarum.ingame.world.getTileFromWall(x, y)
|
||||
val thisTileLuminosity = TilePropCodex.getProp(thisTerrain).luminosity
|
||||
val thisTileOpacity = TilePropCodex.getProp(thisTerrain).opacity
|
||||
val sunLight = Terrarum.ingame.map.globalLight
|
||||
val sunLight = Terrarum.ingame.world.globalLight
|
||||
|
||||
// MIX TILE
|
||||
// open air
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package net.torvald.terrarum.mapdrawer
|
||||
|
||||
import net.torvald.terrarum.gamemap.GameMap
|
||||
import net.torvald.terrarum.gamemap.GameWorld
|
||||
import net.torvald.terrarum.gamemap.PairedMapLayer
|
||||
import net.torvald.terrarum.Terrarum
|
||||
import net.torvald.terrarum.tileproperties.TileNameCode
|
||||
@@ -20,7 +20,7 @@ import java.util.*
|
||||
* Created by minjaesong on 16-01-19.
|
||||
*/
|
||||
object MapCamera {
|
||||
val map: GameMap = Terrarum.ingame.map;
|
||||
val WORLD: GameWorld = Terrarum.ingame.world;
|
||||
|
||||
var cameraX = 0
|
||||
private set
|
||||
@@ -38,9 +38,9 @@ object MapCamera {
|
||||
var tilesetBook: Array<SpriteSheet> = arrayOf(tilesWall, tilesTerrain, tilesWire)
|
||||
private set
|
||||
|
||||
val WALL = GameMap.WALL
|
||||
val TERRAIN = GameMap.TERRAIN
|
||||
val WIRE = GameMap.WIRE
|
||||
val WALL = GameWorld.WALL
|
||||
val TERRAIN = GameWorld.TERRAIN
|
||||
val WIRE = GameWorld.WIRE
|
||||
|
||||
var renderWidth: Int = 0
|
||||
private set
|
||||
@@ -236,9 +236,9 @@ object MapCamera {
|
||||
|
||||
// position - (WH / 2)
|
||||
cameraX = Math.round(FastMath.clamp(
|
||||
player.hitbox.centeredX.toFloat() - renderWidth / 2, TSIZE.toFloat(), map.width * TSIZE - renderWidth - TSIZE.toFloat()))
|
||||
player.hitbox.centeredX.toFloat() - renderWidth / 2, TSIZE.toFloat(), WORLD.width * TSIZE - renderWidth - TSIZE.toFloat()))
|
||||
cameraY = Math.round(FastMath.clamp(
|
||||
player.hitbox.centeredY.toFloat() - renderHeight / 2, TSIZE.toFloat(), map.height * TSIZE - renderHeight - TSIZE.toFloat()))
|
||||
player.hitbox.centeredY.toFloat() - renderHeight / 2, TSIZE.toFloat(), WORLD.height * TSIZE - renderHeight - TSIZE.toFloat()))
|
||||
}
|
||||
|
||||
fun renderBehind(gc: GameContainer, g: Graphics) {
|
||||
@@ -272,11 +272,11 @@ object MapCamera {
|
||||
|
||||
val thisTile: Int?
|
||||
if (mode % 3 == MapCamera.WALL)
|
||||
thisTile = MapCamera.map.getTileFromWall(x, y)
|
||||
thisTile = MapCamera.WORLD.getTileFromWall(x, y)
|
||||
else if (mode % 3 == MapCamera.TERRAIN)
|
||||
thisTile = MapCamera.map.getTileFromTerrain(x, y)
|
||||
thisTile = MapCamera.WORLD.getTileFromTerrain(x, y)
|
||||
else if (mode % 3 == MapCamera.WIRE)
|
||||
thisTile = MapCamera.map.getTileFromWire(x, y)
|
||||
thisTile = MapCamera.WORLD.getTileFromWire(x, y)
|
||||
else
|
||||
throw IllegalArgumentException()
|
||||
|
||||
@@ -352,10 +352,10 @@ object MapCamera {
|
||||
*/
|
||||
fun getNearbyTilesInfo(x: Int, y: Int, mode: Int, mark: Int?): Int {
|
||||
val nearbyTiles = IntArray(4)
|
||||
nearbyTiles[NEARBY_TILE_KEY_LEFT] = map.getTileFrom(mode, x - 1, y) ?: 4096
|
||||
nearbyTiles[NEARBY_TILE_KEY_RIGHT] = map.getTileFrom(mode, x + 1, y) ?: 4096
|
||||
nearbyTiles[NEARBY_TILE_KEY_UP] = map.getTileFrom(mode, x, y - 1) ?: 4906
|
||||
nearbyTiles[NEARBY_TILE_KEY_DOWN] = map.getTileFrom(mode, x, y + 1) ?: 4096
|
||||
nearbyTiles[NEARBY_TILE_KEY_LEFT] = WORLD.getTileFrom(mode, x - 1, y) ?: 4096
|
||||
nearbyTiles[NEARBY_TILE_KEY_RIGHT] = WORLD.getTileFrom(mode, x + 1, y) ?: 4096
|
||||
nearbyTiles[NEARBY_TILE_KEY_UP] = WORLD.getTileFrom(mode, x, y - 1) ?: 4906
|
||||
nearbyTiles[NEARBY_TILE_KEY_DOWN] = WORLD.getTileFrom(mode, x, y + 1) ?: 4096
|
||||
|
||||
// try for
|
||||
var ret = 0
|
||||
@@ -370,10 +370,10 @@ object MapCamera {
|
||||
|
||||
fun getNearbyTilesInfoNonSolid(x: Int, y: Int, mode: Int): Int {
|
||||
val nearbyTiles = IntArray(4)
|
||||
nearbyTiles[NEARBY_TILE_KEY_LEFT] = map.getTileFrom(mode, x - 1, y) ?: 4096
|
||||
nearbyTiles[NEARBY_TILE_KEY_RIGHT] = map.getTileFrom(mode, x + 1, y) ?: 4096
|
||||
nearbyTiles[NEARBY_TILE_KEY_UP] = map.getTileFrom(mode, x, y - 1) ?: 4096
|
||||
nearbyTiles[NEARBY_TILE_KEY_DOWN] = map.getTileFrom(mode, x, y + 1) ?: 4096
|
||||
nearbyTiles[NEARBY_TILE_KEY_LEFT] = WORLD.getTileFrom(mode, x - 1, y) ?: 4096
|
||||
nearbyTiles[NEARBY_TILE_KEY_RIGHT] = WORLD.getTileFrom(mode, x + 1, y) ?: 4096
|
||||
nearbyTiles[NEARBY_TILE_KEY_UP] = WORLD.getTileFrom(mode, x, y - 1) ?: 4096
|
||||
nearbyTiles[NEARBY_TILE_KEY_DOWN] = WORLD.getTileFrom(mode, x, y + 1) ?: 4096
|
||||
|
||||
// try for
|
||||
var ret = 0
|
||||
@@ -393,10 +393,10 @@ object MapCamera {
|
||||
fun getNearbyTilesInfoWallSticker(x: Int, y: Int): Int {
|
||||
val nearbyTiles = IntArray(4)
|
||||
val NEARBY_TILE_KEY_BACK = NEARBY_TILE_KEY_UP
|
||||
nearbyTiles[NEARBY_TILE_KEY_LEFT] = map.getTileFrom(TERRAIN, x - 1, y) ?: 4096
|
||||
nearbyTiles[NEARBY_TILE_KEY_RIGHT] = map.getTileFrom(TERRAIN, x + 1, y) ?: 4096
|
||||
nearbyTiles[NEARBY_TILE_KEY_DOWN] = map.getTileFrom(TERRAIN, x, y + 1) ?: 4096
|
||||
nearbyTiles[NEARBY_TILE_KEY_BACK] = map.getTileFrom(WALL, x, y) ?: 4096
|
||||
nearbyTiles[NEARBY_TILE_KEY_LEFT] = WORLD.getTileFrom(TERRAIN, x - 1, y) ?: 4096
|
||||
nearbyTiles[NEARBY_TILE_KEY_RIGHT] = WORLD.getTileFrom(TERRAIN, x + 1, y) ?: 4096
|
||||
nearbyTiles[NEARBY_TILE_KEY_DOWN] = WORLD.getTileFrom(TERRAIN, x, y + 1) ?: 4096
|
||||
nearbyTiles[NEARBY_TILE_KEY_BACK] = WORLD.getTileFrom(WALL, x, y) ?: 4096
|
||||
|
||||
try {
|
||||
if (TilePropCodex.getProp(nearbyTiles[NEARBY_TILE_KEY_DOWN]).isSolid)
|
||||
@@ -442,8 +442,8 @@ object MapCamera {
|
||||
fun clampW(x: Int): Int {
|
||||
if (x < 0) {
|
||||
return 0
|
||||
} else if (x > map.width * TSIZE) {
|
||||
return map.width * TSIZE
|
||||
} else if (x > WORLD.width * TSIZE) {
|
||||
return WORLD.width * TSIZE
|
||||
} else {
|
||||
return x
|
||||
}
|
||||
@@ -452,8 +452,8 @@ object MapCamera {
|
||||
fun clampH(x: Int): Int {
|
||||
if (x < 0) {
|
||||
return 0
|
||||
} else if (x > map.height * TSIZE) {
|
||||
return map.height * TSIZE
|
||||
} else if (x > WORLD.height * TSIZE) {
|
||||
return WORLD.height * TSIZE
|
||||
} else {
|
||||
return x
|
||||
}
|
||||
@@ -462,8 +462,8 @@ object MapCamera {
|
||||
fun clampWTile(x: Int): Int {
|
||||
if (x < 0) {
|
||||
return 0
|
||||
} else if (x > map.width) {
|
||||
return map.width
|
||||
} else if (x > WORLD.width) {
|
||||
return WORLD.width
|
||||
} else {
|
||||
return x
|
||||
}
|
||||
@@ -472,8 +472,8 @@ object MapCamera {
|
||||
fun clampHTile(x: Int): Int {
|
||||
if (x < 0) {
|
||||
return 0
|
||||
} else if (x > map.height) {
|
||||
return map.height
|
||||
} else if (x > WORLD.height) {
|
||||
return WORLD.height
|
||||
} else {
|
||||
return x
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package net.torvald.terrarum.mapdrawer
|
||||
|
||||
import net.torvald.terrarum.gamemap.GameMap
|
||||
import net.torvald.terrarum.gamemap.GameWorld
|
||||
import net.torvald.terrarum.Terrarum
|
||||
import net.torvald.terrarum.tileproperties.TileNameCode
|
||||
import net.torvald.terrarum.tilestats.TileStats
|
||||
|
||||
Reference in New Issue
Block a user