From bb9cc623c709df93f0654e7e1df835150bae0b6a Mon Sep 17 00:00:00 2001 From: Leo dev Date: Tue, 29 Apr 2025 05:42:25 -0500 Subject: [PATCH] added animations --- src/main/java/org/saturnclient/ui2/SaturnScreen.java | 12 ++++++++++-- .../java/org/saturnclient/ui2/screens/ShiftMenu.java | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/saturnclient/ui2/SaturnScreen.java b/src/main/java/org/saturnclient/ui2/SaturnScreen.java index 874292e..785ca82 100644 --- a/src/main/java/org/saturnclient/ui2/SaturnScreen.java +++ b/src/main/java/org/saturnclient/ui2/SaturnScreen.java @@ -42,7 +42,6 @@ public class SaturnScreen extends Screen { double incremental = (1000 - element.animation.duration) / 10000.0; System.out.println("Starting animation..."); - // System.out.printf("Increment per step: %.6f%n", incremental); for (int i = 0; i <= 100; i++) { float newProgress = (float) (double) curveFunction.apply(i / 100.0); @@ -73,6 +72,8 @@ public class SaturnScreen extends Screen { @Override protected void init() { + width *= 2; + height *= 2; ui(); // abstraction to render the saturn ui and also render extra stuff here } @@ -81,6 +82,9 @@ public class SaturnScreen extends Screen { @Override public void render(DrawContext context, int mouseX, int mouseY, float delta) { + mouseX *= 2; + mouseY *= 2; + // We are using a Abstracted RenderScope because older minecraft versions don't // use DrawContext RenderScope renderScope = new RenderScope(context.getMatrices(), @@ -88,9 +92,11 @@ public class SaturnScreen extends Screen { renderScope.matrices.push(); + renderScope.matrices.scale(0.5f, 0.5f, 1.0f); + for (Element element : elements) { - renderScope.setOpacity(element.opacity); renderScope.matrices.push(); + renderScope.setOpacity(element.opacity); renderScope.matrices.translate(element.x, element.y, 0); element.render(renderScope, new RenderContext(mouseX, mouseY, element)); renderScope.matrices.pop(); @@ -102,6 +108,8 @@ public class SaturnScreen extends Screen { @Override public boolean mouseClicked(double mouseX, double mouseY, int button) { + mouseX *= 2; + mouseY *= 2; if (button == 0) { for (Element element : new ArrayList<>(elements)) { element.focused = false; diff --git a/src/main/java/org/saturnclient/ui2/screens/ShiftMenu.java b/src/main/java/org/saturnclient/ui2/screens/ShiftMenu.java index d6806c9..4cdadfc 100644 --- a/src/main/java/org/saturnclient/ui2/screens/ShiftMenu.java +++ b/src/main/java/org/saturnclient/ui2/screens/ShiftMenu.java @@ -20,7 +20,7 @@ public class ShiftMenu extends SaturnScreen { @Override public void ui() { - draw(new ImageTexture(Textures.LOGO).dimensions(49, 49).centerOffset(width, height, 0, -40).animation(new SlideY(700, -20))); + draw(new ImageTexture(Textures.LOGO).dimensions(49, 49).centerOffset(width, height, 0, -40).animation(new SlideY(700, -40))); draw(new ImageTexture(Textures.LOGO_TEXT).dimensions(49, 8).centerOffset(width, height, 0, -18).animation(new Fade(700))); Element button = new Button("Settings", () -> {