Create InteractiveEntity

engine/src/main/java/com/bartlomiejpluta/base/engine/world/animation/model/DefaultAnimation.java

@@ -3,6 +3,9 @@ package com.bartlomiejpluta.base.engine.world.animation.model;
 import com.bartlomiejpluta.base.api.animation.Animation;
 import com.bartlomiejpluta.base.api.map.layer.base.Layer;
 import com.bartlomiejpluta.base.api.map.layer.object.ObjectLayer;
+import com.bartlomiejpluta.base.api.move.AnimationMovement;
+import com.bartlomiejpluta.base.api.move.Direction;
+import com.bartlomiejpluta.base.api.move.Movement;
 import com.bartlomiejpluta.base.engine.core.gl.object.material.Material;
 import com.bartlomiejpluta.base.engine.core.gl.object.mesh.Mesh;
 import com.bartlomiejpluta.base.engine.world.movement.MovableSprite;
@@ -94,6 +97,11 @@ public class DefaultAnimation extends MovableSprite implements Animation {
       }
    }
 
+   @Override
+   public Movement prepareMovement(Direction direction) {
+      return new AnimationMovement(this, direction);
+   }
+
    @Override
    public void onAdd(Layer layer) {
       this.layer = layer;

engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/model/DefaultEntity.java

@@ -3,6 +3,7 @@ package com.bartlomiejpluta.base.engine.world.entity.model;
 import com.bartlomiejpluta.base.api.entity.Entity;
 import com.bartlomiejpluta.base.api.map.layer.object.ObjectLayer;
 import com.bartlomiejpluta.base.api.move.Direction;
+import com.bartlomiejpluta.base.api.move.EntityMovement;
 import com.bartlomiejpluta.base.api.move.Movement;
 import com.bartlomiejpluta.base.engine.core.gl.object.mesh.Mesh;
 import com.bartlomiejpluta.base.engine.world.entity.manager.EntitySetManager;
@@ -89,6 +90,11 @@ public class DefaultEntity extends MovableSprite implements Entity {
       material.setSpritePosition(spriteDefaultRows.get(faceDirection));
    }
 
+   @Override
+   public Movement prepareMovement(Direction direction) {
+      return new EntityMovement(this, direction);
+   }
+
    @Override
    public boolean move(Movement movement) {
       if (super.move(movement)) {

engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/object/DefaultObjectLayer.java

@@ -3,6 +3,7 @@ package com.bartlomiejpluta.base.engine.world.map.layer.object;
 import com.bartlomiejpluta.base.api.ai.NPC;
 import com.bartlomiejpluta.base.api.camera.Camera;
 import com.bartlomiejpluta.base.api.entity.Entity;
+import com.bartlomiejpluta.base.api.entity.InteractiveEntity;
 import com.bartlomiejpluta.base.api.map.layer.object.ObjectLayer;
 import com.bartlomiejpluta.base.api.map.layer.object.PassageAbility;
 import com.bartlomiejpluta.base.api.map.model.GameMap;
@@ -28,6 +29,8 @@ public class DefaultObjectLayer extends BaseLayer implements ObjectLayer {
    @Getter
    private final List<Entity> entities;
 
+   private final List<InteractiveEntity> interactiveEntities = new ArrayList<>();
+
    @Getter
    private final PassageAbility[][] passageMap;
 
@@ -131,35 +134,14 @@ public class DefaultObjectLayer extends BaseLayer implements ObjectLayer {
 
    @Override
    public void update(float dt) {
-      super.update(dt);
-
-      while (!movements.isEmpty()) {
-         var movement = movements.poll();
-         var from = movement.getFrom();
-         var to = movement.getTo();
-         if (isTileReachable(to)) {
-            movement.perform();
-
-            for(var rule : movementRules) {
-               if(((from.equals(rule.from())) || (to.equals(rule.to())))) {
-                  rule.invoke(movement);
-               }
-            }
-         }
-      }
-
-      for (var entity : entities) {
-         entity.update(dt);
-
-         if (entity instanceof NPC) {
-            ((NPC) entity).getStrategy().nextActivity(this, dt);
-         }
-      }
-
       // Insert entities requested to be added
-      if(!entitiesToAdd.isEmpty()) {
+      if (!entitiesToAdd.isEmpty()) {
          for (var entity : entitiesToAdd) {
             entity.onAdd(this);
+            if (entity instanceof InteractiveEntity) {
+               interactiveEntities.add((InteractiveEntity) entity);
+            }
+
             entities.add(entity);
          }
 
@@ -167,7 +149,7 @@ public class DefaultObjectLayer extends BaseLayer implements ObjectLayer {
       }
 
       // Insert rules requested to be added
-      if(!movementRulesToAdd.isEmpty()) {
+      if (!movementRulesToAdd.isEmpty()) {
          movementRules.addAll(movementRulesToAdd);
          movementRulesToAdd.clear();
       }
@@ -176,6 +158,10 @@ public class DefaultObjectLayer extends BaseLayer implements ObjectLayer {
       if (!entitiesToRemove.isEmpty()) {
          for (var entity : entitiesToRemove) {
             entities.remove(entity);
+            if (entity instanceof InteractiveEntity) {
+               interactiveEntities.remove(entity);
+            }
+
             entity.onRemove(this);
          }
 
@@ -187,6 +173,34 @@ public class DefaultObjectLayer extends BaseLayer implements ObjectLayer {
          movementRules.removeAll(movementRulesToRemove);
          movementRulesToRemove.clear();
       }
+
+      // Update BaseLayer (animations etc.)
+      super.update(dt);
+
+      // Update movements
+      while (!movements.isEmpty()) {
+         var movement = movements.poll();
+         var from = movement.getFrom();
+         var to = movement.getTo();
+         if (isTileReachable(to)) {
+            movement.perform();
+
+            for (var rule : movementRules) {
+               if (((from.equals(rule.from())) || (to.equals(rule.to())))) {
+                  rule.invoke(movement);
+               }
+            }
+         }
+      }
+
+      // Update entities
+      for (var entity : entities) {
+         entity.update(dt);
+
+         if (entity instanceof NPC) {
+            ((NPC) entity).getStrategy().nextActivity(this, dt);
+         }
+      }
    }
 
    @Override
@@ -204,4 +218,26 @@ public class DefaultObjectLayer extends BaseLayer implements ObjectLayer {
       var z = compare(a.getZIndex(), b.getZIndex());
       return z == 0 ? compare(a.getPosition().y(), b.getPosition().y()) : z;
    }
+
+   @Override
+   public void notifyEntityStepIn(Movement movement, Entity entity) {
+      var target = movement.getTo();
+
+      for (var listener : interactiveEntities) {
+         if (listener.getCoordinates().equals(target)) {
+            listener.onEntityStepIn(movement, entity);
+         }
+      }
+   }
+
+   @Override
+   public void notifyEntityStepOut(Movement movement, Entity entity) {
+      var source = movement.getFrom();
+
+      for (var listener : interactiveEntities) {
+         if (listener.getCoordinates().equals(source)) {
+            listener.onEntityStepOut(movement, entity);
+         }
+      }
+   }
 }

engine/src/main/java/com/bartlomiejpluta/base/engine/world/movement/MovableSprite.java

@@ -1,6 +1,5 @@
 package com.bartlomiejpluta.base.engine.world.movement;
 
-import com.bartlomiejpluta.base.api.move.Direction;
 import com.bartlomiejpluta.base.api.move.Movable;
 import com.bartlomiejpluta.base.api.move.Movement;
 import com.bartlomiejpluta.base.engine.core.gl.object.material.Material;
@@ -30,8 +29,6 @@ public abstract class MovableSprite extends AnimatedSprite implements Movable, U
 
    private enum PlacingMode {BY_POSITION, BY_COORDINATES}
 
-   ;
-
    private PlacingMode placingMode;
 
    @Getter
@@ -68,6 +65,7 @@ public abstract class MovableSprite extends AnimatedSprite implements Movable, U
          } else {
             adjustCoordinates();
             setDefaultAnimationFrame();
+            movement.onFinish();
             movementVector = null;
             movement = null;
          }
@@ -80,11 +78,6 @@ public abstract class MovableSprite extends AnimatedSprite implements Movable, U
       setCoordinates(movement.getTo());
    }
 
-   @Override
-   public Movement prepareMovement(Direction direction) {
-      return new Movement(this, direction);
-   }
-
    @Override
    public boolean move(Movement movement) {
       if (this.movement != null) {