From c045a699d4e3f661c2d1fd76ac3d20150e2f9e7f Mon Sep 17 00:00:00 2001
From: DBotThePony <dbotthepony@yandex.ru>
Date: Fri, 4 Feb 2022 21:06:31 +0700
Subject: [PATCH] =?UTF-8?q?=D0=A2=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D1=82?=
 =?UTF-8?q?=D0=B0=D0=B9=D0=BB=D1=8B=20=D1=81=D0=BE=D0=B5=D0=B4=D0=B8=D0=BD?=
 =?UTF-8?q?=D1=8F=D1=8E=D1=82=D1=81=D1=8F!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/kotlin/ru/dbotthepony/kstarbound/Main.kt  | 14 ++++++++++----
 .../dbotthepony/kstarbound/client/ClientWorld.kt   |  2 +-
 .../kstarbound/client/StarboundClient.kt           |  3 ++-
 .../kstarbound/client/render/TileRenderer.kt       |  2 +-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/Main.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/Main.kt
index 6693ac79..a7979d00 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/Main.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/Main.kt
@@ -46,8 +46,8 @@ fun main() {
 		var y = 0
 
 		for (tile in Starbound.tilesAccess.values) {
-			chunkA!!.background[x, y + 1] = tile
-			chunkA!!.background[x++, y] = tile
+			//chunkA!!.background[x, y + 1] = tile
+			//chunkA!!.background[x++, y] = tile
 
 			if (x >= 31) {
 				x = 0
@@ -59,8 +59,8 @@ fun main() {
 		y = 0
 
 		for (tile in Starbound.tilesAccess.values) {
-			chunkB.foreground[x, y + 1] = tile
-			chunkB.foreground[x++, y] = tile
+			//chunkB.foreground[x, y + 1] = tile
+			//chunkB.foreground[x++, y] = tile
 
 			if (x > 31) {
 				x = 0
@@ -76,6 +76,12 @@ fun main() {
 			}
 		}
 
+		for (x in 0 .. 31) {
+			for (y in 0 .. 31) {
+				chunkB.foreground[x, y] = tile
+			}
+		}
+
 		for (x in 4 .. 8) {
 			for (y in 4 .. 8) {
 				chunkA!!.foreground[x, y] = null as TileDefinition?
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/client/ClientWorld.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/client/ClientWorld.kt
index 3642b8f6..52f09aab 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/client/ClientWorld.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/client/ClientWorld.kt
@@ -42,7 +42,7 @@ class ClientWorld(val client: StarboundClient, seed: Long = 0L) : World<ClientWo
 			right = right,
 			bottom = bottom,
 
-			renderer = ChunkRenderer(client.gl, chunk)
+			renderer = ChunkRenderer(client.gl, chunk, this)
 		)
 	}
 
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/client/StarboundClient.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/client/StarboundClient.kt
index 526894da..a44b645f 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/client/StarboundClient.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/client/StarboundClient.kt
@@ -16,6 +16,7 @@ import ru.dbotthepony.kstarbound.math.Vector2f
 import ru.dbotthepony.kstarbound.util.Color
 import ru.dbotthepony.kstarbound.util.formatBytesShort
 import kotlin.math.cos
+import kotlin.math.roundToInt
 import kotlin.math.sin
 
 class StarboundClient : AutoCloseable {
@@ -211,7 +212,7 @@ class StarboundClient : AutoCloseable {
 
 		val runtime = Runtime.getRuntime()
 
-		gl.font.render("FPS: %.2f".format(averageFramesPerSecond), scale = 0.4f)
+		gl.font.render("FPS: ${(averageFramesPerSecond * 100f).toInt() / 100f}", scale = 0.4f)
 		gl.font.render("Mem: ${formatBytesShort(runtime.totalMemory() - runtime.freeMemory())}", x = viewportWidth.toFloat(), scale = 0.4f, alignX = TextAlignX.RIGHT)
 
 		GLFW.glfwSwapBuffers(window)
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/client/render/TileRenderer.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/client/render/TileRenderer.kt
index 09ab3a9b..1fe45b4c 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/client/render/TileRenderer.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/client/render/TileRenderer.kt
@@ -43,7 +43,7 @@ class TileLayerList {
 		}
 
 		list.sortBy {
-			// унарный минус для инвентирования порядка (сначала маленькие, потом большие)
+			// унарный минус для инвентирования порядка (сначала большие, потом маленькие)
 			return@sortBy -it.zPos
 		}