Element and animations

2026-03-06 00:53:11 +01:00
parent 0f41b2786c
commit 9dbf431a55
12 changed files with 390 additions and 65 deletions
@@ -1,89 +0,0 @@
-package org.saturnclient.ui;
-
-import org.saturnclient.ui.anim.Animation;
-
-public class Element {
-    public int x;
-    public int y;
-    public int width;
-    public int height;
-    public float opacity = 1.0f;
-    public boolean focused;
-    public Animation animation;
-    public float scale = 1.0f;
-    public Integer duration = null; // Element duration, will fade out if not null
-
-    public void render(RenderScope renderScope, ElementContext ctx) {
-    }
-
-    public void click(int mouseX, int mouseY) {
-    }
-
-    public void scroll(int mouseX, int mouseY, double horizontalAmount, double verticalAmount) {
-    }
-
-    public void keyPressed(int keyCode, int scanCode, int modifiers) {
-    }
-
-    public void charTyped(char typedChar) {
-    }
-
-    public void mouseClicked(double mouseX, double mouseY, int button) {
-    }
-
-    public void mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
-    }
-
-    public void mouseReleased(double mouseX, double mouseY, int button) {
-    }
-
-    public void playAnimationFrame(long elapsed) {
-        if (this.animation != null && elapsed >= this.animation.delay) {
-            this.animation.tick(this.animation.curve
-                    .apply(Math.min(1.0, (double) (elapsed - this.animation.delay) / this.animation.duration)), this);
-        }
-    }
-
-    public Element dimensions(int width, int height) {
-        this.width = width;
-        this.height = height;
-
-        return this;
-    }
-
-    public Element position(int x, int y) {
-        this.x = x;
-        this.y = y;
-
-        return this;
-    }
-
-    public Element centerHorizontal(int w, int h, int offsetX, int offsetY) {
-        this.x = (w - (int) (width * scale)) / 2 + offsetX;
-        this.y = offsetY;
-
-        return this;
-    }
-
-    public Element center(int w, int h) {
-        this.centerOffset(w, h, 0, 0);
-        return this;
-    }
-
-    public Element centerOffset(int w, int h, int offsetX, int offsetY) {
-        this.x = (w - (int) (width * scale)) / 2 + offsetX;
-        this.y = (h - (int) (height * scale)) / 2 + offsetY;
-
-        return this;
-    }
-
-    public Element animation(Animation animation) {
-        this.animation = animation;
-        return this;
-    }
-
-    public Element scale(float scale) {
-        this.scale = scale;
-        return this;
-    }
-}
@@ -1,25 +0,0 @@
-package org.saturnclient.ui;
-
-public class ElementContext {
-    public int mouseX, mouseY;
-    public int elementWidth, elementHeight;
-    public float elementScale;
-    public long elapsed;
-
-    public ElementContext(long elapsed, int mouseX, int mouseY, Element e) {
-        this.mouseX = mouseX - e.x;
-        this.mouseY = mouseY - e.y;
-        this.elementWidth = e.width;
-        this.elementHeight = e.height;
-        this.elementScale = e.scale;
-        this.elapsed = elapsed;
-    }
-
-    public boolean isHovering() {
-        return Utils.isHovering(mouseX, mouseY, elementWidth, elementHeight, elementScale);
-    }
-
-    public boolean isHovering(int x, int y, int width, int height) {
-        return Utils.isHovering(mouseX - x, mouseY - y, width, height, elementScale);
-    }
-}
@@ -1,65 +0,0 @@
-package org.saturnclient.ui;
-
-import java.util.List;
-
-import org.lwjgl.glfw.GLFW;
-import org.saturnclient.saturnclient.SaturnClient;
-import org.saturnclient.ui.elements.Notification;
-import org.saturnclient.ui.elements.Notification.NotificationKind;
-
-public class Utils {
-    public static boolean isHovering(int mouseX, int mouseY, int elementWidth, int elementHeight, float elementScale) {
-        return mouseX >= 0 &&
-                mouseX <= (elementWidth * elementScale) &&
-                mouseY >= 0 &&
-                mouseY <= (elementHeight * elementScale);
-    }
-
-    public static char getCharFromKey(int keyCode, int modifiers) {
-        boolean shift = (modifiers & GLFW.GLFW_MOD_SHIFT) != 0;
-
-        // A-Z
-        if (keyCode >= GLFW.GLFW_KEY_A && keyCode <= GLFW.GLFW_KEY_Z) {
-            return (char) (shift
-                    ? 'A' + (keyCode - GLFW.GLFW_KEY_A)
-                    : 'a' + (keyCode - GLFW.GLFW_KEY_A));
-        }
-
-        // 0-9
-        if (keyCode >= GLFW.GLFW_KEY_0 && keyCode <= GLFW.GLFW_KEY_9) {
-            return shift
-                    ? ")!@#$%^&*(".charAt(keyCode - GLFW.GLFW_KEY_0)
-                    : (char) ('0' + (keyCode - GLFW.GLFW_KEY_0));
-        }
-
-        // Special characters
-        return switch (keyCode) {
-            case GLFW.GLFW_KEY_SPACE -> ' ';
-            case GLFW.GLFW_KEY_PERIOD -> shift ? '>' : '.';
-            case GLFW.GLFW_KEY_COMMA -> shift ? '<' : ',';
-            case GLFW.GLFW_KEY_MINUS -> shift ? '_' : '-';
-            case GLFW.GLFW_KEY_EQUAL -> shift ? '+' : '=';
-            case GLFW.GLFW_KEY_SEMICOLON -> shift ? ':' : ';';
-            case GLFW.GLFW_KEY_APOSTROPHE -> shift ? '"' : '\'';
-            case GLFW.GLFW_KEY_SLASH -> shift ? '?' : '/';
-            case GLFW.GLFW_KEY_BACKSLASH -> shift ? '|' : '\\';
-            case GLFW.GLFW_KEY_LEFT_BRACKET -> shift ? '{' : '[';
-            case GLFW.GLFW_KEY_RIGHT_BRACKET -> shift ? '}' : ']';
-            case GLFW.GLFW_KEY_GRAVE_ACCENT -> shift ? '~' : '`';
-            default -> '\0';
-        };
-    }
-
-    public static <T> T getOrNull(List<T> list, int index) {
-        return (index >= 0 && index < list.size()) ? list.get(index) : null;
-    }
-
-    public static void notify(NotificationKind kind, String title, String toast) {
-        if (SaturnClient.client.currentScreen instanceof SaturnScreen) {
-            ((SaturnScreen) SaturnClient.client.currentScreen)
-                    .draw(new Notification(SaturnClient.client.currentScreen.width,
-                            SaturnClient.client.currentScreen.height, kind,
-                            title, toast));
-        }
-    }
-}