X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmodel%2Fblock%2FBlock.kt;h=76c6ac580c0df1a6604c447e3f1c0e930496f456;hb=f34df6e5eb1052467333f1461c67e75b21eb0d95;hp=9669a5378c5f84dbafd7be4a58bc801522f2a3d7;hpb=dfe9ff3e9253c250f62ee029411f773916948601;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavedroid/game/model/block/Block.kt b/core/src/ru/deadsoftware/cavedroid/game/model/block/Block.kt index 9669a53..76c6ac5 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/model/block/Block.kt +++ b/core/src/ru/deadsoftware/cavedroid/game/model/block/Block.kt @@ -5,6 +5,7 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch import com.badlogic.gdx.math.Rectangle import com.badlogic.gdx.utils.TimeUtils import ru.deadsoftware.cavedroid.game.model.item.Item +import ru.deadsoftware.cavedroid.misc.utils.colorFromHexString import kotlin.contracts.ExperimentalContracts import kotlin.contracts.contract @@ -56,7 +57,10 @@ sealed class Block { val width = 16 - params.spriteMargins.left - params.spriteMargins.right val height = 16 - params.spriteMargins.top - params.spriteMargins.bottom Sprite(params.texture, params.spriteMargins.left, 16 * y + params.spriteMargins.top, width, height) - .apply { flip(false, true) } + .apply { + flip(false, true) + params.tint?.let { tint -> color = colorFromHexString(tint) } + } } } } @@ -66,7 +70,10 @@ sealed class Block { val width = 16 - params.spriteMargins.left - params.spriteMargins.right val height = 16 - params.spriteMargins.top - params.spriteMargins.bottom Sprite(tex, params.spriteMargins.left, params.spriteMargins.top, width, height) - .apply { flip(false, true) } + .apply { + flip(false, true) + params.tint?.let { tint -> color = colorFromHexString(tint) } + } } }