feat: Add DrawHelper#setupCameraTransformations

Author: My-Name-Is-Jeff

mod/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/catlas/Catlas.kt

@@ -141,7 +141,7 @@ object Catlas : EventSubscriber {
 
         matrices.runWithGlobalState {
             matrices.push()
-            DrawHelper.cameraOffset(matrices)
+            DrawHelper.setupCameraTransformations(matrices)
             val linesBuffer = UBufferBuilder.create(UGraphics.DrawMode.LINES, UGraphics.CommonVertexFormats.POSITION_COLOR)
             val trianglesBuffer = UBufferBuilder.create(UGraphics.DrawMode.TRIANGLES, UGraphics.CommonVertexFormats.POSITION_COLOR)
             doors.forEach {

mod/src/main/kotlin/gg/skytils/skytilsmod/features/impl/handlers/Waypoints.kt

@@ -34,6 +34,7 @@ import gg.skytils.skytilsmod.core.PersistentSave
 import gg.skytils.skytilsmod.core.tickTimer
 import gg.skytils.skytilsmod.tweaker.DependencyLoader
 import gg.skytils.skytilsmod.utils.*
+import gg.skytils.skytilsmod.utils.rendering.DrawHelper
 import kotlinx.serialization.EncodeDefault
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.Serializable
@@ -399,13 +400,15 @@ data class Waypoint @OptIn(ExperimentalSerializationApi::class) constructor(
         }
 
     fun draw(partialTicks: Float, matrixStack: UMatrixStack) {
-        val (viewerX, viewerY, viewerZ) = RenderUtil.getViewerPos(partialTicks)
+        matrixStack.push()
+        DrawHelper.setupCameraTransformations(matrixStack)
         RenderUtil.drawFilledBoundingBox(
             matrixStack,
-            pos.toBoundingBox().expandBlock().offset(-viewerX, -viewerY, -viewerZ),
+            pos.toBoundingBox().expandBlock(),
             color.withAlpha(color.alpha.coerceAtMost(128)),
             1f
         )
+        matrixStack.pop()
         UGraphics.disableDepth()
         RenderUtil.renderWaypointText(
             name,

mod/src/main/kotlin/gg/skytils/skytilsmod/utils/RenderUtil.kt

@@ -96,7 +96,7 @@ object RenderUtil {
         val buffer = UBufferBuilder.create(UGraphics.DrawMode.QUADS, UGraphics.CommonVertexFormats.POSITION_COLOR)
         val matrices = UMatrixStack.Compat.get()
         matrices.push()
-        DrawHelper.cameraOffset(matrices)
+        DrawHelper.setupCameraTransformations(matrices)
         RenderSystem.lineWidth(width)
         DrawHelper.writeOutlineCube(buffer, matrices, aabb, color.multAlpha(1f))
         buffer.build()?.drawAndClose(if (throughWalls) SRenderPipelines.noDepthBoxPipeline else SRenderPipelines.boxPipeline)
@@ -140,7 +140,7 @@ object RenderUtil {
         alphaMultiplier: Float = 1f
     ) {
         matrixStack.push()
-        DrawHelper.cameraOffset(matrixStack)
+        DrawHelper.setupCameraTransformations(matrixStack)
         RenderSystem.lineWidth(width.toFloat())
         val fixedColor = color.multAlpha(alphaMultiplier)
         val buffer = UBufferBuilder.create(UGraphics.DrawMode.LINE_STRIP, UGraphics.CommonVertexFormats.POSITION_COLOR)
@@ -159,7 +159,7 @@ object RenderUtil {
         alphaMultiplier: Float = 1f
     ) {
         matrixStack.push()
-        DrawHelper.cameraOffset(matrixStack)
+        DrawHelper.setupCameraTransformations(matrixStack)
         RenderSystem.lineWidth(width.toFloat())
         val fixedColor = color.multAlpha(alphaMultiplier)
         val buffer = UBufferBuilder.create(UGraphics.DrawMode.LINE_STRIP, UGraphics.CommonVertexFormats.POSITION_COLOR)
@@ -226,7 +226,7 @@ object RenderUtil {
         //#endif
         // matrixStack.translate(0.0, -0.25, 0.0)
         //#if MC>=12000
-        // matrixStack.multiply(mc.entityRenderDispatcher.rotation.invert())
+        // matrixStack.multiply(mc.entityRenderDispatcher.rotation.invert(Quaternionf()))
         //#else
         //$$ matrixStack.rotate(-mc.entityRenderDispatcher.cameraPitch, 1.0f, 0.0f, 0.0f)
         //$$ matrixStack.rotate(mc.entityRenderDispatcher.cameraYaw, 0.0f, 1.0f, 0.0f)
@@ -250,7 +250,7 @@ object RenderUtil {
         shadow: Boolean = true, scale: Float = 1f, background: Boolean = true
     ) {
         matrixStack.push()
-        DrawHelper.cameraOffset(matrixStack)
+        DrawHelper.setupCameraTransformations(matrixStack)
         DrawHelper.drawNametag(matrixStack, str, x, y, z, shadow, scale, background)
         matrixStack.pop()
     }

mod/src/main/kotlin/gg/skytils/skytilsmod/utils/rendering/DrawHelper.kt

@@ -31,6 +31,7 @@ import net.minecraft.util.Colors
 import net.minecraft.util.Identifier
 import net.minecraft.util.math.Box
 import net.minecraft.util.math.MathHelper
+import org.joml.Quaternionf
 import java.awt.Color
 
 object DrawHelper {
@@ -44,6 +45,23 @@ object DrawHelper {
         matrices.translate(mc.gameRenderer.camera.pos.negate())
     }
 
+    /**
+     * Applies the camera rotation to the given matrices.
+     * This is useful for rendering things in world space, as it will negate the camera rotation.
+     */
+    fun cameraRotation(matrices: UMatrixStack) {
+        matrices.multiply(mc.gameRenderer.camera.rotation.conjugate(Quaternionf()))
+    }
+
+    /**
+     * Applies the camera offset and rotation to the given matrices.
+     * This is useful for rendering things in world space, as it will negate the camera position and rotation.
+     */
+    fun setupCameraTransformations(matrices: UMatrixStack) {
+        cameraOffset(matrices)
+        cameraRotation(matrices)
+    }
+
     /**
     * Writes a cube outline to the given buffer. Draw must still be called manually.
     * Buffer must be created with [gg.essential.universal.UGraphics.DrawMode.LINES]