From 52b1bee3a3bf8fc7f207c6804fb1d672bde0719d Mon Sep 17 00:00:00 2001 From: minjaesong Date: Mon, 4 Feb 2019 17:17:48 +0900 Subject: [PATCH] blockprop opacity to be actually cached --- src/net/torvald/terrarum/blockproperties/BlockCodex.kt | 2 +- src/net/torvald/terrarum/blockproperties/BlockProp.kt | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/net/torvald/terrarum/blockproperties/BlockCodex.kt b/src/net/torvald/terrarum/blockproperties/BlockCodex.kt index 9bb2e22bb..5f16215d8 100644 --- a/src/net/torvald/terrarum/blockproperties/BlockCodex.kt +++ b/src/net/torvald/terrarum/blockproperties/BlockCodex.kt @@ -111,7 +111,7 @@ object BlockCodex { prop.shadeColG = floatVal(record, "shdg") / LightmapRenderer.MUL_FLOAT prop.shadeColB = floatVal(record, "shdb") / 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.density = intVal(record, "dsty") diff --git a/src/net/torvald/terrarum/blockproperties/BlockProp.kt b/src/net/torvald/terrarum/blockproperties/BlockProp.kt index e308765d7..6d3b7e82f 100644 --- a/src/net/torvald/terrarum/blockproperties/BlockProp.kt +++ b/src/net/torvald/terrarum/blockproperties/BlockProp.kt @@ -16,13 +16,8 @@ class BlockProp { var shadeColG = 0f var shadeColB = 0f var shadeColA = 0f - lateinit var shadeColor: Color - /** - * @param opacity Raw RGB value, without alpha - */ - inline val opacity: Color - get() = Color(shadeColR, shadeColG, shadeColB, shadeColA) + lateinit var opacity: Color var strength: Int = 0 var density: Int = 0