From d8c1d9dab8960ab03d66acdc3bd4038743ecb391 Mon Sep 17 00:00:00 2001
From: DBotThePony <dbotthepony@yandex.ru>
Date: Fri, 30 Dec 2022 12:28:02 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B5=D0=BC=D0=BD=D0=BE=D0=B3=D0=BE=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B8=D0=B1=D0=B8=D1=80=D0=B0=D0=B5=D0=BC=D1=81?=
 =?UTF-8?q?=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../render/{ => entity}/EntityRenderer.kt     | 37 +---------------
 .../render/entity/ProjectileRenderer.kt       | 44 +++++++++++++++++++
 2 files changed, 46 insertions(+), 35 deletions(-)
 rename src/main/kotlin/ru/dbotthepony/kstarbound/client/render/{ => entity}/EntityRenderer.kt (56%)
 create mode 100644 src/main/kotlin/ru/dbotthepony/kstarbound/client/render/entity/ProjectileRenderer.kt

diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/client/render/EntityRenderer.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/client/render/entity/EntityRenderer.kt
similarity index 56%
rename from src/main/kotlin/ru/dbotthepony/kstarbound/client/render/EntityRenderer.kt
rename to src/main/kotlin/ru/dbotthepony/kstarbound/client/render/entity/EntityRenderer.kt
index eb751da1..29dd7156 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/client/render/EntityRenderer.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/client/render/entity/EntityRenderer.kt
@@ -1,12 +1,9 @@
-package ru.dbotthepony.kstarbound.client.render
+package ru.dbotthepony.kstarbound.client.render.entity
 
-import org.lwjgl.opengl.GL46.*
-import ru.dbotthepony.kstarbound.PIXELS_IN_STARBOUND_UNITf
 import ru.dbotthepony.kstarbound.client.ClientChunk
 import ru.dbotthepony.kstarbound.client.gl.GLStateTracker
-import ru.dbotthepony.kstarbound.client.gl.vertex.QuadTransformers
-import ru.dbotthepony.kstarbound.client.gl.vertex.quadRotatedZ
 import ru.dbotthepony.kstarbound.client.render.entity.ItemRenderer
+import ru.dbotthepony.kstarbound.client.render.entity.ProjectileRenderer
 import ru.dbotthepony.kstarbound.world.entities.Entity
 import ru.dbotthepony.kstarbound.world.entities.ItemEntity
 import ru.dbotthepony.kstarbound.world.entities.projectile.Projectile
@@ -55,33 +52,3 @@ open class EntityRenderer(val state: GLStateTracker, val entity: Entity, open va
 	}
 }
 
-open class ProjectileRenderer(state: GLStateTracker, entity: Projectile, chunk: ClientChunk?) : EntityRenderer(state, entity, chunk) {
-	private val def = entity.def
-	private val texture = state.loadNamedTextureSafe(def.image.texture)
-	private val animator = FrameSetAnimator(def.image, def.animationCycle, entity.def.animationLoops)
-
-	override fun render(stack: Matrix4fStack) {
-		state.shaderVertexTexture.use()
-		state.shaderVertexTexture.transform.set(stack.last)
-		state.activeTexture = 0
-		state.shaderVertexTexture["_texture"] = 0
-		texture.bind()
-
-		animator.advance()
-
-		val builder = state.flat2DTexturedQuads.small
-
-		builder.begin()
-
-		val (u0, v0) = texture.pixelToUV(animator.frameObj.texturePosition)
-		val (u1, v1) = texture.pixelToUV(animator.frameObj.textureEndPosition)
-
-		val width = (animator.frameObj.width / PIXELS_IN_STARBOUND_UNITf) / 2f
-		val height = (animator.frameObj.height / PIXELS_IN_STARBOUND_UNITf) / 2f
-
-		builder.quadRotatedZ(-width, -height, width, height, 5f, 0f, 0f, entity.movement.angle, QuadTransformers.uv(u0, v0, u1, v1))
-
-		builder.upload()
-		builder.draw()
-	}
-}
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/client/render/entity/ProjectileRenderer.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/client/render/entity/ProjectileRenderer.kt
new file mode 100644
index 00000000..cad3ac06
--- /dev/null
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/client/render/entity/ProjectileRenderer.kt
@@ -0,0 +1,44 @@
+package ru.dbotthepony.kstarbound.client.render.entity
+
+import ru.dbotthepony.kstarbound.PIXELS_IN_STARBOUND_UNITf
+import ru.dbotthepony.kstarbound.client.ClientChunk
+import ru.dbotthepony.kstarbound.client.gl.GLStateTracker
+import ru.dbotthepony.kstarbound.client.gl.vertex.QuadTransformers
+import ru.dbotthepony.kstarbound.client.gl.vertex.quadRotatedZ
+import ru.dbotthepony.kstarbound.client.render.EntityRenderer
+import ru.dbotthepony.kstarbound.client.render.FrameSetAnimator
+import ru.dbotthepony.kstarbound.world.entities.projectile.Projectile
+import ru.dbotthepony.kvector.matrix.Matrix4fStack
+
+open class ProjectileRenderer(state: GLStateTracker, entity: Projectile, chunk: ClientChunk?) : EntityRenderer(state, entity, chunk) {
+	private val def = entity.def
+	private val texture = state.loadNamedTextureSafe(def.image.texture)
+	private val animator = FrameSetAnimator(def.image, def.animationCycle, entity.def.animationLoops)
+
+	override fun render(stack: Matrix4fStack) {
+		state.shaderVertexTexture.use()
+		state.shaderVertexTexture.transform.set(stack.last)
+		state.activeTexture = 0
+		state.shaderVertexTexture["_texture"] = 0
+		texture.bind()
+
+		animator.advance()
+
+		val builder = state.flat2DTexturedQuads.small
+
+		builder.begin()
+
+		val (u0, v0) = texture.pixelToUV(animator.frameObj.texturePosition)
+		val (u1, v1) = texture.pixelToUV(animator.frameObj.textureEndPosition)
+
+		val width = (animator.frameObj.width / PIXELS_IN_STARBOUND_UNITf) / 2f
+		val height = (animator.frameObj.height / PIXELS_IN_STARBOUND_UNITf) / 2f
+
+		builder.quadRotatedZ(-width, -height, width, height, 5f, 0f, 0f, entity.movement.angle,
+			QuadTransformers.uv(u0, v0, u1, v1)
+		)
+
+		builder.upload()
+		builder.draw()
+	}
+}
\ No newline at end of file