hud rework (still unstable)

MeiNanziiii · Nov 2, 2024 · 30612fd · 30612fd
1 parent 90114d1
commit 30612fd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/main/java/ua/mei/mgui/api/hud/HudDrawContext.java b/src/main/java/ua/mei/mgui/api/hud/HudDrawContext.java
@@ -33,14 +33,16 @@ public MutableText draw() {
 
             if (i != 0) {
                 HudElement previousElement = elements.get(i - 1);
-                text.append(element.glyph.formatter().spaceBefore(-previousElement.x - 1 - (previousElement.glyph.glyphWidth / 2 + element.glyph.glyphWidth / 2) + element.x).value);
+                int midSize = previousElement.glyph.glyphWidth / 2 + element.glyph.glyphWidth / 2;
+                int requiredSize = previousElement.glyph.glyphWidth - midSize;
+                int leftSize = requiredSize < 0 ? -requiredSize : 0;
+                int rightSize = requiredSize > 0 ? requiredSize : 0;
+                text.append(element.glyph.formatter().space(-previousElement.x - 1 - midSize + element.x + leftSize, rightSize).value);
             } else {
                 text.append(element.glyph.formatter().spaceBefore(element.x).value);
             }
         }
 
-        System.out.println(text);
-
         return text;
     }
 }
diff --git a/src/test/java/ua/mei/mgui/test/TestHud.java b/src/test/java/ua/mei/mgui/test/TestHud.java
@@ -13,17 +13,17 @@ public class TestHud extends ServerHud {
 
     public TestHud() {
         this.firstElement = HudElement.create(this, "gui/sprite_0.png", 96);
-        this.secondElement = HudElement.create(this, "gui/sprite_1.png", 64);
-        this.thirdElement = HudElement.create(this, "gui/sprite_2.png", 32);
+        this.secondElement = HudElement.create(this, "gui/sprite_0.png", 64);
+        this.thirdElement = HudElement.create(this, "gui/sprite_0.png", 32);
     }
 
     @Override
     public MutableText draw(HudDrawContext context) {
         firstElement.x = (int) Math.clamp(context.player.getX(), -256, 256);
-        context.drawElement(firstElement);
         secondElement.x = -firstElement.x;
-        context.drawElement(secondElement);
         thirdElement.x = firstElement.x;
+        context.drawElement(firstElement);
+        context.drawElement(secondElement);
         context.drawElement(thirdElement);
         return super.draw(context);
     }