From 9147aa55ce44b80a2916eaad7256e598bbdb0abd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Przemys=C5=82aw=20Pluta?=
 <noreply.git@mx.bartlomiejpluta.com>
Date: Tue, 2 Mar 2021 11:37:44 +0100
Subject: [PATCH] Create Entity API scaffolding

---
 .../base/api/context/Context.java               |  4 ++++
 .../bartlomiejpluta/base/api/entity/Entity.java | 15 +++++++++++++++
 .../entity/manager/DefaultEntityManager.java    |  9 +++++----
 .../base/game/entity/manager/EntityManager.java |  6 ++----
 .../model/{Entity.java => DefaultEntity.java}   | 17 ++++++++++++-----
 .../base/game/movement/MovableSprite.java       | 12 +++++++++---
 .../game/project/model/RenderableContext.java   |  6 ++++++
 .../tileset/manager/DefaultTileSetManager.java  |  2 +-
 8 files changed, 54 insertions(+), 17 deletions(-)
 create mode 100644 api/src/main/java/com/bartlomiejpluta/base/api/entity/Entity.java
 rename game/src/main/java/com/bartlomiejpluta/base/game/entity/model/{Entity.java => DefaultEntity.java} (79%)

diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/context/Context.java b/api/src/main/java/com/bartlomiejpluta/base/api/context/Context.java
index 59374917..120db735 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/context/Context.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/api/context/Context.java
@@ -1,5 +1,9 @@
 package com.bartlomiejpluta.base.api.context;
 
+import com.bartlomiejpluta.base.api.entity.Entity;
+
 public interface Context {
    void openMap(String mapUid);
+
+   Entity createEntity(String entitySetUid);
 }
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/entity/Entity.java b/api/src/main/java/com/bartlomiejpluta/base/api/entity/Entity.java
new file mode 100644
index 00000000..766b1eaf
--- /dev/null
+++ b/api/src/main/java/com/bartlomiejpluta/base/api/entity/Entity.java
@@ -0,0 +1,15 @@
+package com.bartlomiejpluta.base.api.entity;
+
+import com.bartlomiejpluta.base.api.geo.Vector;
+
+public interface Entity {
+   Vector getCoordinates();
+
+   void setCoordinates(Vector coordinates);
+
+   Movement prepareMovement(Direction direction);
+
+   Direction getFaceDirection();
+
+   void setFaceDirection(Direction direction);
+}
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/entity/manager/DefaultEntityManager.java b/game/src/main/java/com/bartlomiejpluta/base/game/entity/manager/DefaultEntityManager.java
index 5eaad6ec..b8037f52 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/entity/manager/DefaultEntityManager.java
+++ b/game/src/main/java/com/bartlomiejpluta/base/game/entity/manager/DefaultEntityManager.java
@@ -4,8 +4,7 @@ import com.bartlomiejpluta.base.core.gl.object.material.Material;
 import com.bartlomiejpluta.base.core.gl.object.mesh.Mesh;
 import com.bartlomiejpluta.base.core.util.mesh.MeshManager;
 import com.bartlomiejpluta.base.game.entity.config.EntitySpriteConfiguration;
-import com.bartlomiejpluta.base.game.entity.model.Entity;
-import com.bartlomiejpluta.base.game.map.model.GameMap;
+import com.bartlomiejpluta.base.game.entity.model.DefaultEntity;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,11 +15,13 @@ import org.springframework.stereotype.Component;
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class DefaultEntityManager implements EntityManager {
    private final MeshManager meshManager;
+   private final EntitySetManager entitySetManager;
    private final EntitySpriteConfiguration configuration;
 
    @Override
-   public Entity createEntity(Material material, GameMap map) {
-      return new Entity(buildMesh(material), material, map.getStepSize(), configuration);
+   public DefaultEntity createEntity(String entitySetUid) {
+      var material = entitySetManager.loadObject(entitySetUid);
+      return new DefaultEntity(buildMesh(material), material, configuration);
    }
 
    private Mesh buildMesh(Material material) {
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/entity/manager/EntityManager.java b/game/src/main/java/com/bartlomiejpluta/base/game/entity/manager/EntityManager.java
index ea91bbf3..1624a5da 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/entity/manager/EntityManager.java
+++ b/game/src/main/java/com/bartlomiejpluta/base/game/entity/manager/EntityManager.java
@@ -1,10 +1,8 @@
 package com.bartlomiejpluta.base.game.entity.manager;
 
 import com.bartlomiejpluta.base.core.gc.Cleanable;
-import com.bartlomiejpluta.base.core.gl.object.material.Material;
-import com.bartlomiejpluta.base.game.entity.model.Entity;
-import com.bartlomiejpluta.base.game.map.model.GameMap;
+import com.bartlomiejpluta.base.game.entity.model.DefaultEntity;
 
 public interface EntityManager extends Cleanable {
-   Entity createEntity(Material material, GameMap map);
+   DefaultEntity createEntity(String entitySetUid);
 }
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/entity/model/Entity.java b/game/src/main/java/com/bartlomiejpluta/base/game/entity/model/DefaultEntity.java
similarity index 79%
rename from game/src/main/java/com/bartlomiejpluta/base/game/entity/model/Entity.java
rename to game/src/main/java/com/bartlomiejpluta/base/game/entity/model/DefaultEntity.java
index 881038dc..8ee1bbf8 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/entity/model/Entity.java
+++ b/game/src/main/java/com/bartlomiejpluta/base/game/entity/model/DefaultEntity.java
@@ -1,6 +1,8 @@
 package com.bartlomiejpluta.base.game.entity.model;
 
 import com.bartlomiejpluta.base.api.entity.Direction;
+import com.bartlomiejpluta.base.api.entity.Entity;
+import com.bartlomiejpluta.base.api.geo.Vector;
 import com.bartlomiejpluta.base.core.gl.object.material.Material;
 import com.bartlomiejpluta.base.core.gl.object.mesh.Mesh;
 import com.bartlomiejpluta.base.game.entity.config.EntitySpriteConfiguration;
@@ -13,7 +15,7 @@ import org.joml.Vector2f;
 import java.util.Map;
 
 @EqualsAndHashCode(callSuper = true)
-public class Entity extends MovableSprite {
+public class DefaultEntity extends MovableSprite implements Entity {
    private final Map<Direction, Integer> spriteDirectionRows;
    private final int defaultSpriteColumn;
 
@@ -40,7 +42,7 @@ public class Entity extends MovableSprite {
       var frames = material.getTexture().getRows();
       var array = new Vector2f[frames];
 
-      for(int column=0; column<frames; ++column) {
+      for (int column = 0; column < frames; ++column) {
          array[column] = new Vector2f(column, row);
       }
 
@@ -54,7 +56,7 @@ public class Entity extends MovableSprite {
 
    @Override
    protected boolean move(Direction direction) {
-      if(super.move(direction)) {
+      if (super.move(direction)) {
          faceDirection = direction;
          return true;
       }
@@ -70,8 +72,13 @@ public class Entity extends MovableSprite {
       return framesToCrossOneTile;
    }
 
-   public Entity(Mesh mesh, Material material, Vector2f coordinateStepSize, EntitySpriteConfiguration configuration) {
-      super(mesh, material, coordinateStepSize);
+   @Override
+   public void setCoordinates(Vector coordinates) {
+      setCoordinates(coordinates.x, coordinates.y);
+   }
+
+   public DefaultEntity(Mesh mesh, Material material, EntitySpriteConfiguration configuration) {
+      super(mesh, material);
       this.defaultSpriteColumn = configuration.getDefaultSpriteColumn();
       this.spriteDirectionRows = configuration.getSpriteDirectionRows();
       this.faceDirection = Direction.DOWN;
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/movement/MovableSprite.java b/game/src/main/java/com/bartlomiejpluta/base/game/movement/MovableSprite.java
index 109a9d48..13fd8be3 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/movement/MovableSprite.java
+++ b/game/src/main/java/com/bartlomiejpluta/base/game/movement/MovableSprite.java
@@ -13,7 +13,7 @@ import org.joml.Vector2i;
 
 @EqualsAndHashCode(callSuper = true)
 public abstract class MovableSprite extends AnimatedSprite implements Updatable {
-   private final Vector2f coordinateStepSize;
+   private final Vector2f coordinateStepSize = new Vector2f(0, 0);
 
    private int moveTime = 0;
    private Vector2f movementVector;
@@ -78,9 +78,15 @@ public abstract class MovableSprite extends AnimatedSprite implements Updatable
       return setCoordinates(coordinates.x, coordinates.y);
    }
 
-   public MovableSprite(Mesh mesh, Material material, Vector2f coordinateStepSize) {
+   public MovableSprite setStepSize(float x, float y) {
+      coordinateStepSize.x = x;
+      coordinateStepSize.y = y;
+
+      return this;
+   }
+
+   public MovableSprite(Mesh mesh, Material material) {
       super(mesh, material);
-      this.coordinateStepSize = coordinateStepSize;
       setCoordinates(0, 0);
    }
 }
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/project/model/RenderableContext.java b/game/src/main/java/com/bartlomiejpluta/base/game/project/model/RenderableContext.java
index 8508f8f5..a03a03ff 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/project/model/RenderableContext.java
+++ b/game/src/main/java/com/bartlomiejpluta/base/game/project/model/RenderableContext.java
@@ -1,6 +1,7 @@
 package com.bartlomiejpluta.base.game.project.model;
 
 import com.bartlomiejpluta.base.api.context.Context;
+import com.bartlomiejpluta.base.api.entity.Entity;
 import com.bartlomiejpluta.base.api.input.Keyboard;
 import com.bartlomiejpluta.base.api.map.MapHandler;
 import com.bartlomiejpluta.base.core.gl.object.texture.TextureManager;
@@ -52,6 +53,11 @@ public class RenderableContext implements Context, Updatable, Renderable {
       mapHandler.init(this);
    }
 
+   @Override
+   public Entity createEntity(String entitySetUid) {
+      return entityManager.createEntity(entitySetUid);
+   }
+
    public void input() {
       mapHandler.input(keyboard);
    }
diff --git a/game/src/main/java/com/bartlomiejpluta/base/game/tileset/manager/DefaultTileSetManager.java b/game/src/main/java/com/bartlomiejpluta/base/game/tileset/manager/DefaultTileSetManager.java
index 18ab8cd9..1c583083 100644
--- a/game/src/main/java/com/bartlomiejpluta/base/game/tileset/manager/DefaultTileSetManager.java
+++ b/game/src/main/java/com/bartlomiejpluta/base/game/tileset/manager/DefaultTileSetManager.java
@@ -46,7 +46,7 @@ public class DefaultTileSetManager implements TileSetManager {
          var size = texture.getSpriteSize();
          var mesh = meshManager.createQuad(size.x, size.y, 0, 0);
          tileset = new TileSet(texture, mesh);
-         log.info("Loading tileset from assets to cache under the key: [{}]", uid);
+         log.info("Loading tile set from assets to cache under the key: [{}]", uid);
          tileSets.put(uid, tileset);
       }