rework KeyframeAnimations

Signed-off-by: Malte Dostal <[email protected]>

src/main/java/de/edgelord/saltyengine/components/DeflectionOnMouseOverComponent.java

@@ -16,37 +16,33 @@
 
 package de.edgelord.saltyengine.components;
 
-import de.edgelord.saltyengine.core.animation.LinearKeyframeAnimation;
+import de.edgelord.saltyengine.core.animation.KeyframeAnimation;
+import de.edgelord.saltyengine.core.animation.TransitionFunction;
 import de.edgelord.saltyengine.core.event.CollisionEvent;
 import de.edgelord.saltyengine.core.graphics.SaltyGraphics;
 import de.edgelord.saltyengine.core.stereotypes.ComponentContainer;
 import de.edgelord.saltyengine.transform.Vector2f;
 
 /**
- * Uses a {@link LinearKeyframeAnimation} to make its parent grow and shrink
- * again when the cursor touches is.
+ * Uses a {@link KeyframeAnimation} to make its parent grow and shrink again
+ * when the cursor touches is.
  */
 public class DeflectionOnMouseOverComponent extends Component<ComponentContainer> {
 
     /**
      * The animation that is used.
      */
-    private final LinearKeyframeAnimation keyframeAnimation = new LinearKeyframeAnimation();
-
+    private final KeyframeAnimation keyframeAnimation = new KeyframeAnimation(TransitionFunction.easeInOutSine());
     private final Vector2f returnPosition;
-
     private float totalDeflection = 0f;
 
     /**
      * Whether to loop the animation or only playing it whenever the cursor
      * enters the parent
      */
     private boolean loop;
-
     private boolean shouldPlay = false;
-
     private boolean singleDeflection = false;
-
     private boolean impact = false;
 
     /**
@@ -64,17 +60,16 @@ public DeflectionOnMouseOverComponent(final ComponentContainer parent, final Str
 
         this.loop = loop;
 
-        keyframeAnimation.add(interval, distance);
-        keyframeAnimation.add(interval * 2, 0);
-        keyframeAnimation.calculateAnimation();
+        keyframeAnimation.appendFrame(0, 0);
+        keyframeAnimation.appendFrame(interval, distance);
+        keyframeAnimation.appendFrame(interval * 2, 0);
 
         final Vector2f currentCentre = getParent().getTransform().getCentre();
         returnPosition = new Vector2f(currentCentre.getX(), currentCentre.getY());
     }
 
     @Override
     public void onCursorEntersParent() {
-
         if (!loop) {
             singleDeflection = true;
         } else {
@@ -88,7 +83,7 @@ public void onCursorExitsParent() {
         singleDeflection = false;
         shouldPlay = false;
         totalDeflection = 0f;
-        keyframeAnimation.restart();
+        keyframeAnimation.reset();
     }
 
     @Override
@@ -98,15 +93,13 @@ public void draw(final SaltyGraphics saltyGraphics) {
 
     @Override
     public void onFixedTick() {
-
-        if (keyframeAnimation.animationEnded()) {
-
+        if (keyframeAnimation.finished()) {
             if (impact) {
                 resetTransform();
                 impact = false;
             }
 
-            keyframeAnimation.restart();
+            keyframeAnimation.reset();
             if (!loop) {
                 singleDeflection = false;
             }
@@ -125,7 +118,7 @@ private void resetTransform() {
     }
 
     private void nextFrame() {
-        final float delta = keyframeAnimation.nextDelta();
+        final float delta = keyframeAnimation.nextValue() - totalDeflection;
         totalDeflection += delta;
 
         getParent().setWidth(getParent().getWidth() + delta);
@@ -140,7 +133,6 @@ private void nextFrame() {
      * there should be no need to call it manually.
      */
     public void updatePosition() {
-
         final Vector2f centre = getParent().getTransform().getCentre();
         returnPosition.setX(centre.getX());
         returnPosition.setY(centre.getY());
@@ -182,6 +174,6 @@ public void cancel() {
         impact = false;
         shouldPlay = false;
         totalDeflection = 0f;
-        keyframeAnimation.restart();
+        keyframeAnimation.reset();
     }
 }