Add rotation support for the text and rectangle

Author: SirEndii

src/main/java/de/srendi/advancedperipherals/client/smartglasses/objects/twodim/RectangleRenderer.java

@@ -8,6 +8,7 @@
 import com.mojang.blaze3d.vertex.Tesselator;
 import com.mojang.blaze3d.vertex.VertexFormat;
 import com.mojang.math.Matrix4f;
+import com.mojang.math.Vector3f;
 import de.srendi.advancedperipherals.client.RenderUtil;
 import de.srendi.advancedperipherals.common.smartglasses.modules.overlay.objects.RenderableObject;
 import net.minecraft.client.renderer.GameRenderer;
@@ -18,25 +19,38 @@
 public class RectangleRenderer implements ITwoDObjectRenderer {
 
     @Override
-    public void renderBatch(List<RenderableObject> objects, ForgeGui gui, PoseStack poseStack, float partialTick, int screenWidth, int screenHeight) {
+    public void renderBatch(List<RenderableObject> objects, ForgeGui gui, PoseStack ignored, float partialTick, int screenWidth, int screenHeight) {
         RenderSystem.setShader(GameRenderer::getPositionColorShader);
         BufferBuilder bufferbuilder = Tesselator.getInstance().getBuilder();
 
         bufferbuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
 
         for (RenderableObject obj : objects) {
+            float rotX = obj.rotX;
+            float rotY = obj.rotY;
+            float rotZ = obj.rotZ;
+
+            PoseStack poseStack = new PoseStack();
+
+            poseStack.translate(obj.x, obj.y, obj.z);
+
             poseStack.pushPose();
+
             Matrix4f matrix = poseStack.last().pose();
 
+            poseStack.mulPose(Vector3f.XP.rotationDegrees(rotX));
+            poseStack.mulPose(Vector3f.YP.rotationDegrees(rotY));
+            poseStack.mulPose(Vector3f.ZP.rotationDegrees(rotZ));
+
             float alpha = obj.opacity;
             float red = RenderUtil.getRed(obj.color);
             float green = RenderUtil.getGreen(obj.color);
             float blue = RenderUtil.getBlue(obj.color);
 
-            bufferbuilder.vertex(matrix, obj.x, obj.maxY, obj.z).color(red, green, blue, alpha).endVertex();
-            bufferbuilder.vertex(matrix, obj.maxX, obj.maxY, obj.z).color(red, green, blue, alpha).endVertex();
-            bufferbuilder.vertex(matrix, obj.maxX, obj.y, obj.z).color(red, green, blue, alpha).endVertex();
-            bufferbuilder.vertex(matrix, obj.x, obj.y, obj.z).color(red, green, blue, alpha).endVertex();
+            bufferbuilder.vertex(matrix, 0, obj.maxY - obj.y, 0).color(red, green, blue, alpha).endVertex();
+            bufferbuilder.vertex(matrix, obj.maxX - obj.x, obj.maxY  - obj.y, 0).color(red, green, blue, alpha).endVertex();
+            bufferbuilder.vertex(matrix, obj.maxX - obj.x, 0, 0).color(red, green, blue, alpha).endVertex();
+            bufferbuilder.vertex(matrix, 0, 0, 0).color(red, green, blue, alpha).endVertex();
             poseStack.popPose();
 
         }

src/main/java/de/srendi/advancedperipherals/client/smartglasses/objects/twodim/TextRenderer.java

@@ -1,6 +1,8 @@
 package de.srendi.advancedperipherals.client.smartglasses.objects.twodim;
 
 import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.math.Matrix4f;
+import com.mojang.math.Vector3f;
 import de.srendi.advancedperipherals.common.smartglasses.modules.overlay.objects.RenderableObject;
 import de.srendi.advancedperipherals.common.smartglasses.modules.overlay.objects.two_dim.TextObject;
 import net.minecraft.client.Minecraft;
@@ -11,23 +13,36 @@
 public class TextRenderer implements ITwoDObjectRenderer {
 
     @Override
-    public void renderBatch(List<RenderableObject> objects, ForgeGui gui, PoseStack poseStack, float partialTick, int screenWidth, int screenHeight) {
+    public void renderBatch(List<RenderableObject> objects, ForgeGui gui, PoseStack ignored, float partialTick, int screenWidth, int screenHeight) {
         Minecraft minecraft = Minecraft.getInstance();
         for (RenderableObject obj : objects) {
             TextObject text = (TextObject) obj;
-            poseStack.pushPose();
-            poseStack.scale(text.fontSize, text.fontSize, 1);
+            float rotX = obj.rotX;
+            float rotY = obj.rotY;
+            float rotZ = obj.rotZ;
 
             float x = text.x;
 
             if (text.center) {
                 x -= (minecraft.font.width(text.content) * text.fontSize) / 2f;
             }
 
+            PoseStack poseStack = new PoseStack();
+
+            poseStack.translate(x / text.fontSize, text.y / text.fontSize, obj.z);
+
+            poseStack.pushPose();
+
+            poseStack.mulPose(Vector3f.XP.rotationDegrees(rotX));
+            poseStack.mulPose(Vector3f.YP.rotationDegrees(rotY));
+            poseStack.mulPose(Vector3f.ZP.rotationDegrees(rotZ));
+
+            poseStack.scale(text.fontSize, text.fontSize, 1);
+
             if (!text.shadow) {
-                minecraft.font.drawShadow(poseStack, text.content, x / text.fontSize, text.y / text.fontSize, text.color);
+                minecraft.font.drawShadow(poseStack, text.content, 0, 0, text.color);
             } else {
-                minecraft.font.draw(poseStack, text.content, x / text.fontSize, text.y / text.fontSize, text.color);
+                minecraft.font.draw(poseStack, text.content, 0, 0, text.color);
             }
             poseStack.popPose();
         }