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

blockprop opacity to be actually cached

Browse Source
This commit is contained in:
minjaesong
2019-02-04 17:17:48 +09:00
parent a73a865d29
commit 52b1bee3a3
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/torvald/terrarum/blockproperties/BlockCodex.kt
View File

@@ -111,7 +111,7 @@ object BlockCodex {
prop.shadeColG = floatVal(record, "shdg") / LightmapRenderer.MUL_FLOAT prop.shadeColG = floatVal(record, "shdg") / LightmapRenderer.MUL_FLOAT
prop.shadeColB = floatVal(record, "shdb") / LightmapRenderer.MUL_FLOAT prop.shadeColB = floatVal(record, "shdb") / LightmapRenderer.MUL_FLOAT
prop.shadeColA = floatVal(record, "shduv") / LightmapRenderer.MUL_FLOAT prop.shadeColA = floatVal(record, "shduv") / LightmapRenderer.MUL_FLOAT
prop.shadeColor = Color(prop.shadeColR, prop.shadeColG, prop.shadeColB, prop.shadeColA) prop.opacity = Color(prop.shadeColR, prop.shadeColG, prop.shadeColB, prop.shadeColA)
prop.strength = intVal(record, "str") prop.strength = intVal(record, "str")
prop.density = intVal(record, "dsty") prop.density = intVal(record, "dsty")

7
src/net/torvald/terrarum/blockproperties/BlockProp.kt
View File

@@ -16,13 +16,8 @@ class BlockProp {
var shadeColG = 0f var shadeColG = 0f
var shadeColB = 0f var shadeColB = 0f
var shadeColA = 0f var shadeColA = 0f
lateinit var shadeColor: Color
/** lateinit var opacity: Color
* @param opacity Raw RGB value, without alpha
*/
inline val opacity: Color
get() = Color(shadeColR, shadeColG, shadeColB, shadeColA)
var strength: Int = 0 var strength: Int = 0
var density: Int = 0 var density: Int = 0