bartek/base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add some additional methods to Entity and GameMap API classes

Browse Source
This commit is contained in:
Bartłomiej Przemysław Pluta
2021-03-02 14:12:24 +01:00
parent 4446e82049
commit c5e2888048
7 changed files with 56 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/com/bartlomiejpluta/base/api/entity/Entity.java
View File

@@ -14,4 +14,6 @@ public interface Entity {
void setFaceDirection(Direction direction);
void setSpeed(float speed);
void setAnimationSpeed(float speed);
}

16
api/src/main/java/com/bartlomiejpluta/base/api/map/GameMap.java
View File

@@ -4,9 +4,19 @@ import com.bartlomiejpluta.base.api.entity.Entity;
import com.bartlomiejpluta.base.api.entity.Movement;
public interface GameMap {
void addEntity(int layerIndex, Entity entity);
void addEntity(int objectLayerIndex, Entity entity);
void removeEntity(int layerIndex, Entity entity);
void removeEntity(int objectLayerIndex, Entity entity);
boolean isMovementPossible(int layerIndex, Movement movement);
boolean isMovementPossible(int objectLayerIndex, Movement movement);
void setTile(int tileLayerIndex, int row, int column, int tileId);
void setTile(int tileLayerIndex, int row, int column, int tileSetRow, int tileSetColumn);
void clearTile(int tileLayerIndex, int row, int column);
void setPassageAbility(int objectLayerIndex, int row, int column, PassageAbility passageAbility);
void setColor(int colorLayerIndex, float r, float g, float b, float alpha);
}

2
game/src/main/java/com/bartlomiejpluta/base/game/map/layer/object/PassageAbility.java → api/src/main/java/com/bartlomiejpluta/base/api/map/PassageAbility.java
View File

@@ -1,4 +1,4 @@
package com.bartlomiejpluta.base.game.map.layer.object;
package com.bartlomiejpluta.base.api.map;
public enum PassageAbility {
BLOCK,

16
game/src/main/java/com/bartlomiejpluta/base/game/entity/model/DefaultEntity.java
View File

@@ -20,7 +20,6 @@ public class DefaultEntity extends MovableSprite implements Entity {
private final Map<Direction, Integer> spriteDirectionRows;
private final int defaultSpriteColumn;
@Setter
private int animationSpeed = 100;
@Setter
@@ -65,14 +64,6 @@ public class DefaultEntity extends MovableSprite implements Entity {
return false;
}
public void setMovementSlowness(int slowness) {
framesToCrossOneTile = slowness;
}
public int getMovementSlowness() {
return framesToCrossOneTile;
}
@Override
public void setCoordinates(Vector coordinates) {
setCoordinates(coordinates.x, coordinates.y);
@@ -80,7 +71,12 @@ public class DefaultEntity extends MovableSprite implements Entity {
@Override
public void setSpeed(float speed) {
setMovementSlowness((int) (1 / MathUtil.clamp(speed, 0.01, 1.0)));
framesToCrossOneTile = (int) (1 / MathUtil.clamp(speed, Float.MIN_VALUE, 1.0));
}
@Override
public void setAnimationSpeed(float speed) {
animationSpeed = (int) (1 / MathUtil.clamp(speed, Float.MIN_VALUE, 1.0));
}
public DefaultEntity(Mesh mesh, Material material, EntitySpriteConfiguration configuration) {

1
game/src/main/java/com/bartlomiejpluta/base/game/map/layer/object/ObjectLayer.java
View File

@@ -2,6 +2,7 @@ package com.bartlomiejpluta.base.game.map.layer.object;
import com.bartlomiejpluta.base.api.entity.Direction;
import com.bartlomiejpluta.base.api.geo.Vector;
import com.bartlomiejpluta.base.api.map.PassageAbility;
import com.bartlomiejpluta.base.core.gl.shader.manager.ShaderManager;
import com.bartlomiejpluta.base.core.ui.Window;
import com.bartlomiejpluta.base.core.world.camera.Camera;

76
game/src/main/java/com/bartlomiejpluta/base/game/map/model/DefaultGameMap.java
View File

@@ -3,6 +3,7 @@ package com.bartlomiejpluta.base.game.map.model;
import com.bartlomiejpluta.base.api.entity.Entity;
import com.bartlomiejpluta.base.api.entity.Movement;
import com.bartlomiejpluta.base.api.map.GameMap;
import com.bartlomiejpluta.base.api.map.PassageAbility;
import com.bartlomiejpluta.base.core.gl.render.Renderable;
import com.bartlomiejpluta.base.core.gl.shader.manager.ShaderManager;
import com.bartlomiejpluta.base.core.logic.Updatable;
@@ -16,9 +17,7 @@ import com.bartlomiejpluta.base.game.map.layer.color.ColorLayer;
import com.bartlomiejpluta.base.game.map.layer.image.ImageLayer;
import com.bartlomiejpluta.base.game.map.layer.image.ImageLayerMode;
import com.bartlomiejpluta.base.game.map.layer.object.ObjectLayer;
import com.bartlomiejpluta.base.game.map.layer.object.PassageAbility;
import com.bartlomiejpluta.base.game.map.layer.tile.TileLayer;
import com.bartlomiejpluta.base.game.movement.MovableSprite;
import com.bartlomiejpluta.base.game.tileset.model.TileSet;
import lombok.Getter;
import lombok.NonNull;
@@ -110,57 +109,46 @@ public class DefaultGameMap implements Renderable, Updatable, GameMap {
return layers.size() - 1;
}
public DefaultGameMap setTile(int layerIndex, int row, int column, int tileId) {
((TileLayer) layers.get(layerIndex)).setTile(row, column, tileSet.tileById(tileId));
return this;
}
public DefaultGameMap setTile(int layerIndex, int row, int column, int tileSetRow, int tileSetColumn) {
((TileLayer) layers.get(layerIndex)).setTile(row, column, tileSet.tileAt(tileSetRow, tileSetColumn));
return this;
}
public DefaultGameMap clearTile(int layerIndex, int row, int column) {
((TileLayer) layers.get(layerIndex)).setTile(row, column, null);
return this;
}
public DefaultGameMap removeObject(int layerIndex, MovableSprite object) {
((ObjectLayer) layers.get(layerIndex)).removeObject(object);
return this;
}
public DefaultGameMap setPassageAbility(int layerIndex, int row, int column, PassageAbility passageAbility) {
((ObjectLayer) layers.get(layerIndex)).setPassageAbility(row, column, passageAbility);
return this;
}
public DefaultGameMap setColor(int layerIndex, float r, float g, float b, float alpha) {
((ColorLayer) layers.get(layerIndex)).setColor(r, g, b, alpha);
return this;
}
@Override
public void addEntity(int layerIndex, Entity entity) {
public void addEntity(int objectLayerIndex, Entity entity) {
var object = (DefaultEntity) entity;
object.setStepSize(stepSize.x, stepSize.y);
((ObjectLayer) layers.get(layerIndex)).addObject(object);
((ObjectLayer) layers.get(objectLayerIndex)).addObject(object);
}
@Override
public void removeEntity(int layerIndex, Entity entity) {
((ObjectLayer) layers.get(layerIndex)).removeObject((DefaultEntity) entity);
public void removeEntity(int objectLayerIndex, Entity entity) {
((ObjectLayer) layers.get(objectLayerIndex)).removeObject((DefaultEntity) entity);
}
@Override
public boolean isMovementPossible(int layerIndex, Movement movement) {
public void setTile(int tileLayerIndex, int row, int column, int tileId) {
((TileLayer) layers.get(tileLayerIndex)).setTile(row, column, tileSet.tileById(tileId));
}
@Override
public void setTile(int tileLayerIndex, int row, int column, int tileSetRow, int tileSetColumn) {
((TileLayer) layers.get(tileLayerIndex)).setTile(row, column, tileSet.tileAt(tileSetRow, tileSetColumn));
}
@Override
public void clearTile(int tileLayerIndex, int row, int column) {
((TileLayer) layers.get(tileLayerIndex)).setTile(row, column, null);
}
@Override
public void setPassageAbility(int objectLayerIndex, int row, int column, PassageAbility passageAbility) {
((ObjectLayer) layers.get(objectLayerIndex)).setPassageAbility(row, column, passageAbility);
}
@Override
public void setColor(int colorLayerIndex, float r, float g, float b, float alpha) {
((ColorLayer) layers.get(colorLayerIndex)).setColor(r, g, b, alpha);
}
@Override
public boolean isMovementPossible(int objectLayerIndex, Movement movement) {
var target = movement.getTo();
// Is trying to go beyond the map
@@ -171,6 +159,6 @@ public class DefaultGameMap implements Renderable, Updatable, GameMap {
var source = movement.getFrom();
var direction = movement.getDirection();
return ((ObjectLayer) layers.get(layerIndex)).isMovementPossible(source, target, direction);
return ((ObjectLayer) layers.get(objectLayerIndex)).isMovementPossible(source, target, direction);
}
}

2
game/src/main/java/com/bartlomiejpluta/base/game/map/serial/ProtobufMapDeserializer.java
View File

@@ -1,10 +1,10 @@
package com.bartlomiejpluta.base.game.map.serial;
import com.bartlomiejpluta.base.api.map.PassageAbility;
import com.bartlomiejpluta.base.core.error.AppException;
import com.bartlomiejpluta.base.core.util.mesh.MeshManager;
import com.bartlomiejpluta.base.game.image.manager.ImageManager;
import com.bartlomiejpluta.base.game.map.layer.image.ImageLayerMode;
import com.bartlomiejpluta.base.game.map.layer.object.PassageAbility;
import com.bartlomiejpluta.base.game.map.model.DefaultGameMap;
import com.bartlomiejpluta.base.game.tileset.manager.TileSetManager;
import com.bartlomiejpluta.base.proto.GameMapProto;