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 4a0c31a4a4fa7e7038284aa5b3b9776412c99c03..76c6ac580c0df1a6604c447e3f1c0e930496f456 100644 (file)
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
val width: Float get() = 16f - params.collisionMargins.left - params.collisionMargins.right
val height: Float get() = 16f - params.collisionMargins.top - params.collisionMargins.bottom
- private val spriteWidth: Float get() = 16f - params.spriteMargins.left - params.spriteMargins.right
- private val spriteHeight: Float get() = 16f - params.spriteMargins.top - params.spriteMargins.bottom
+ val spriteWidth: Float get() = 16f - params.spriteMargins.left - params.spriteMargins.right
+ val spriteHeight: Float get() = 16f - params.spriteMargins.top - params.spriteMargins.bottom
private var animation: Array<Sprite>? = null
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) }
+ }
}
}
}
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) }
+ }
}
}
data class Slab(
override val params: CommonBlockParams,
val fullBlockKey: String,
+ val otherPartBlockKey: String,
): Block()
sealed class Fluid: Block() {