Adding more implementations and fixes

2026-03-06 11:11:24 +01:00
parent ccdd5aad5c
commit 5bb69c92eb
31 changed files with 1200 additions and 5 deletions
@@ -0,0 +1,37 @@
+package org.saturnclient.ui.anim;
+
+import java.util.function.Function;
+
+import org.saturnclient.config.AnimationConfig;
+import org.saturnclient.ui.Element;
+
+public abstract class Animation {
+    public int duration;
+    public int delay = 0;
+    public Function<Double, Double> curve = Curve::easeInOutCubic;
+
+    Animation(AnimationConfig config) {
+        this.duration = config.duration.value;
+        switch (config.curve.value) {
+            case 0:
+                this.curve = Curve::easeInOutCubic;
+                break;
+            case 1:
+                this.curve = Curve::easeOutCubic;
+                break;
+            case 2:
+                this.curve = Curve::easeInOutBack;
+                break;
+            default:
+                break;
+        }
+    }
+
+    Animation(int duration) {
+        this.duration = duration;
+    }
+
+    public abstract void tick(double progress, Element element);
+
+    public abstract void init(Element element);
+}
@@ -0,0 +1,22 @@
+package org.saturnclient.ui.anim;
+
+public class Curve {
+    public static double easeOutCubic(double x) {
+        return 1 - Math.pow(1 - x, 3);
+    }
+
+    public static double easeInOutCubic(double x) {
+        return (x < 0.5 ? 4 * x * x * x : 1 - Math.pow(-2 * x + 2, 3) / 2);
+    }
+
+    public static double easeInOutBack(double x) {
+        double c1 = 2.5;
+        double c2 = c1 * 1.525;
+
+        if (x < 0.5) {
+            return (Math.pow(2 * x, 2) * ((c2 + 1) * 2 * x - c2)) / 2;
+        } else {
+            return (Math.pow(2 * x - 2, 2) * ((c2 + 1) * (2 * x - 2) + c2) + 2) / 2;
+        }
+    }
+}
@@ -0,0 +1,27 @@
+package org.saturnclient.ui.anim;
+
+import org.saturnclient.config.AnimationConfig;
+import org.saturnclient.ui.Element;
+
+public class Fade extends Animation {
+    float targetOpacity;
+
+    public Fade(int duration) {
+        super(duration);
+    }
+
+    public Fade(AnimationConfig config) {
+        super(config);
+    }
+
+    @Override
+    public void tick(double progress, Element element) {
+        element.opacity = Math.max(0.1f, targetOpacity * (float) progress);
+    }
+
+    @Override
+    public void init(Element element) {
+        targetOpacity = element.opacity;
+        element.opacity = 0.1f;
+    }
+}
@@ -0,0 +1,27 @@
+package org.saturnclient.ui.anim;
+
+import org.saturnclient.config.AnimationConfig;
+import org.saturnclient.ui.Element;
+
+public class FadeOut extends Animation {
+    float targetOpacity;
+
+    public FadeOut(int duration) {
+        super(duration);
+    }
+
+    public FadeOut(AnimationConfig config) {
+        super(config);
+    }
+
+    @Override
+    public void tick(double progress, Element element) {
+        element.opacity = targetOpacity - (float) progress;
+    }
+
+    @Override
+    public void init(Element element) {
+        targetOpacity = element.opacity;
+        // element.opacity = 1.0f;
+    }
+}
@@ -0,0 +1,39 @@
+package org.saturnclient.ui.anim;
+
+import org.saturnclient.config.AnimationConfig;
+import org.saturnclient.ui.Element;
+
+public class SlideFade extends Animation {
+    public Fade fade;
+    public SlideY slideY;
+
+    public SlideFade(int duration, int offset) {
+        super(duration);
+        this.fade = new Fade(duration);
+        this.slideY = new SlideY(duration, offset);
+    }
+
+    public SlideFade(AnimationConfig config, int offset) {
+        super(config);
+        this.fade = new Fade(duration);
+        this.slideY = new SlideY(duration, offset);
+    }
+
+    @Override
+    public void tick(double progress, Element element) {
+        fade.delay = this.delay;
+        fade.duration = this.duration;
+
+        slideY.delay = this.delay;
+        slideY.duration = this.duration;
+
+        fade.tick(progress, element);
+        slideY.tick(progress, element);
+    }
+
+    @Override
+    public void init(Element element) {
+        fade.init(element);
+        slideY.init(element);
+    }
+}
@@ -0,0 +1,39 @@
+package org.saturnclient.ui.anim;
+
+import org.saturnclient.config.AnimationConfig;
+import org.saturnclient.ui.Element;
+
+public class SlideX extends Animation {
+    int offset = 20;
+    double startX;
+
+    public SlideX(AnimationConfig config) {
+        super(config);
+    }
+
+    public SlideX(AnimationConfig config, int offset) {
+        super(config);
+        this.offset = offset;
+    }
+
+    public SlideX(int duration) {
+        super(duration);
+    }
+
+    public SlideX(int duration, int offset) {
+        super(duration);
+        this.offset = offset;
+    }
+
+    @Override
+    public void init(Element element) {
+        startX = element.x - offset;
+        element.x = (int) startX;
+    }
+
+    @Override
+    public void tick(double progress, Element element) {
+        double currentX = startX + offset * progress;
+        element.x = (int) currentX;
+    }
+}
@@ -0,0 +1,39 @@
+package org.saturnclient.ui.anim;
+
+import org.saturnclient.config.AnimationConfig;
+import org.saturnclient.ui.Element;
+
+public class SlideY extends Animation {
+    int offset = 20;
+    double startY;
+
+    public SlideY(AnimationConfig config) {
+        super(config);
+    }
+
+    public SlideY(AnimationConfig config, int offset) {
+        super(config);
+        this.offset = offset;
+    }
+
+    public SlideY(int duration) {
+        super(duration);
+    }
+
+    public SlideY(int duration, int offset) {
+        super(duration);
+        this.offset = offset;
+    }
+
+    @Override
+    public void init(Element element) {
+        startY = element.y - offset;
+        element.y = (int) startY;
+    }
+
+    @Override
+    public void tick(double progress, Element element) {
+        double currentY = startY + offset * progress;
+        element.y = (int) currentY;
+    }
+}