Prettier world + ores

[cavedroid.git] / core / src / ru / deadsoftware / cavedroid / misc / utils / RenderingUtils.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/misc/utils/RenderingUtils.kt b/core/src/ru/deadsoftware/cavedroid/misc/utils/RenderingUtils.kt
index 5849f03c79f02356a2e14a3f3c58df7102421f0a..24813acc853fe54ef5421c046a55c48cfede0b39 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/misc/utils/RenderingUtils.kt
+++ b/core/src/ru/deadsoftware/cavedroid/misc/utils/RenderingUtils.kt
@@ -5,6 +5,7 @@ import com.badlogic.gdx.graphics.g2d.GlyphLayout
 import com.badlogic.gdx.graphics.g2d.SpriteBatch
 import com.badlogic.gdx.math.Rectangle
 import ru.deadsoftware.cavedroid.misc.Assets
+import java.awt.Color as JavaColor
 
 private fun Rectangle.shifted(shift: Float) = Rectangle(x + shift, y, width, height)
 
@@ -31,12 +32,12 @@ fun Rectangle.cycledInsideWorld(
 
 fun forEachBlockInArea(
     area: Rectangle,
-    func: (x: Int, y: Int) -> Unit
+    func: (x: Int, y: Int) -> Unit,
 ) {
     val startMapX = area.x.bl
-    val endMapX = startMapX + area.width.bl + 1
+    val endMapX = (area.x + area.width - 1f).bl
     val startMapY = area.y.bl
-    val endMapY = startMapY + area.height.bl + 1
+    val endMapY = (area.y + area.height - 1f).bl
 
     for (x in startMapX..endMapX) {
         for (y in startMapY..endMapY) {
@@ -50,3 +51,8 @@ fun SpriteBatch.drawString(str: String, x: Float, y: Float, color: Color = Color
     Assets.minecraftFont.color = color
     return Assets.minecraftFont.draw(this, str, x, y)
 }
+
+fun colorFromHexString(hex: String): Color {
+    val rgba = (JavaColor.decode(hex).rgb shl 8) or (0xFF)
+    return Color(rgba)
+}