From 435b8760d27727be42bc40d27f275a7c50f3220f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Przemys=C5=82aw=20Pluta?=
 <noreply.git@mx.bartlomiejpluta.com>
Date: Sun, 31 Jan 2021 15:12:32 +0100
Subject: [PATCH] Create working PoC of creature movement

---
 .../base/game/logic/Updatable.java            |  5 ++
 .../base/game/world/MoveableObject.java       | 76 ++++++++++++++++---
 2 files changed, 72 insertions(+), 9 deletions(-)
 create mode 100755 game/src/main/java/com/bartlomiejpluta/base/game/logic/Updatable.java

diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/logic/Updatable.java b/game/src/main/java/com/bartlomiejpluta/base/game/logic/Updatable.java
new file mode 100755
index 00000000..78f2ee62
--- /dev/null
+++ b/game/src/main/java/com/bartlomiejpluta/base/game/logic/Updatable.java
@@ -0,0 +1,5 @@
+package com.bartlomiejpluta.base.game.logic;
+
+public interface Updatable {
+   void update(float dt);
+}
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/world/MoveableObject.java b/game/src/main/java/com/bartlomiejpluta/base/game/world/MoveableObject.java
index 4332762c..c727c4c0 100755
--- a/game/src/main/java/com/bartlomiejpluta/base/game/world/MoveableObject.java
+++ b/game/src/main/java/com/bartlomiejpluta/base/game/world/MoveableObject.java
@@ -3,19 +3,82 @@ package com.bartlomiejpluta.base.game.world;
 import com.bartlomiejpluta.base.core.gl.object.material.Material;
 import com.bartlomiejpluta.base.core.gl.object.mesh.Mesh;
 import com.bartlomiejpluta.base.core.world.animation.AnimationableObject;
+import com.bartlomiejpluta.base.game.logic.Updatable;
 import lombok.Getter;
+import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.joml.Vector2f;
 import org.joml.Vector2i;
 
 @Slf4j
-@Getter
-public abstract class MoveableObject extends AnimationableObject {
+public abstract class MoveableObject extends AnimationableObject implements Updatable {
    private static final Vector2i SPRITE_DIMENSION = new Vector2i(4, 4);
+   private static final float tolerance = 1f;
 
    private final Vector2i coordinates = new Vector2i(0, 0);
-   private Direction direction = Direction.DOWN;
    private final Vector2f coordinateStepSize;
+   private Vector2i targetCoordinates;
+   private Vector2f targetPosition;
+   private Vector2f targetOffset;
+   private Vector2f dS;
+
+   @Getter
+   @Setter
+   private Direction faceDirection = Direction.DOWN;
+
+   @Getter
+   @Setter
+   private Direction movementDirection = Direction.DOWN;
+
+   @Getter
+   @Setter
+   private float speed;
+
+   @Override
+   public int getAnimationSpeed() {
+      return 100;
+   }
+
+   @Override
+   public boolean shouldAnimate() {
+      return targetCoordinates != null;
+   }
+
+   @Override
+   public void update(float dt) {
+      if(targetCoordinates != null) {
+         movePosition(dS);
+         var distance = new Vector2f(dS).add(getPosition()).distance(targetPosition);
+
+         log.info("Target: [{}, {}], Current: [{}, {}], distance: {}, dS: [{}, {}]", targetPosition.x, targetPosition.y, getPosition().x, getPosition().y, distance, dS.x, dS.y);
+
+         if(distance < tolerance) {
+            setCoordinates(new Vector2i(coordinates).add(targetCoordinates));
+            targetCoordinates = null;
+         }
+      }
+   }
+
+   public void move(Direction direction) {
+      if(this.targetCoordinates != null) {
+         return;
+      }
+
+      setFaceDirection(direction);
+      targetCoordinates = switch (direction) {
+         case UP -> new Vector2i(0, -1);
+         case DOWN -> new Vector2i(0, 1);
+         case LEFT -> new Vector2i(-1, 0);
+         case RIGHT -> new Vector2i(1, 0);
+      };
+
+      targetOffset = new Vector2f(targetCoordinates).mul(coordinateStepSize);
+      targetPosition = new Vector2f(getPosition()).add(targetOffset);
+      dS = new Vector2f(targetOffset).mul(speed);
+      log.info("TargetCoord: [{}, {}], targetOffset: [{}, {}], dS: [{}, {}], targetPos: [{}, {}]", targetCoordinates.x, targetCoordinates.y, targetOffset.x, targetOffset.y, dS.x, dS.y, targetPosition.x, targetPosition.y);
+
+      this.movementDirection = direction;
+   }
 
    public MoveableObject setCoordinates(int x, int y) {
       coordinates.x = x;
@@ -39,11 +102,6 @@ public abstract class MoveableObject extends AnimationableObject {
       return moveCoordinates(coordinates.x, coordinates.y);
    }
 
-   public MoveableObject setDirection(Direction direction) {
-      this.direction = direction;
-      return this;
-   }
-
    @Override
    public Vector2i getSpriteSheetDimensions() {
       return SPRITE_DIMENSION;
@@ -51,7 +109,7 @@ public abstract class MoveableObject extends AnimationableObject {
 
    @Override
    public Vector2f[] getSpriteAnimationFramesPositions() {
-      var row = switch (direction) {
+      var row = switch (faceDirection) {
          case DOWN -> 0;
          case LEFT -> 1;
          case RIGHT -> 2;