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

Simplify movement triggering code | create helper basic control utility method

Browse Source
This commit is contained in:
Bartłomiej Przemysław Pluta
2022-08-31 13:55:55 +02:00
parent 2a716f1e23
commit 0c03bc8a12
5 changed files with 52 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/main/java/com/bartlomiejpluta/base/api/character/Character.java
View File

@@ -2,16 +2,16 @@ package com.bartlomiejpluta.base.api.character;
import com.bartlomiejpluta.base.api.animation.Animated;
import com.bartlomiejpluta.base.api.entity.Entity;
import com.bartlomiejpluta.base.api.event.Event;
import com.bartlomiejpluta.base.api.event.EventType;
import com.bartlomiejpluta.base.api.move.Direction;
import com.bartlomiejpluta.base.api.move.Movable;
import com.bartlomiejpluta.base.api.move.Movement;
import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
public interface Character extends Movable, Animated, Entity {
Movement move(Direction direction);
Direction getFaceDirection();
void setFaceDirection(Direction direction);

2
api/src/main/java/com/bartlomiejpluta/base/lib/ai/RandomMovementAI.java
View File

@@ -25,7 +25,7 @@ public class RandomMovementAI<N extends NPC> implements AI {
if (!npc.isMoving()) {
if (accumulator > threshold) {
Direction direction = Direction.values()[random.nextInt(4)];
layer.pushMovement(npc.prepareMovement(direction));
npc.move(direction);
accumulator = 0.0f;
threshold = random.nextFloat() * intervalSeconds;
}

5
api/src/main/java/com/bartlomiejpluta/base/lib/character/CharacterDelegate.java
View File

@@ -56,6 +56,11 @@ public abstract class CharacterDelegate implements Character {
return character.getMovement();
}
@Override
public Movement move(Direction direction) {
return character.move(direction);
}
@Override
public Direction getFaceDirection() {
return character.getFaceDirection();

36
api/src/main/java/com/bartlomiejpluta/base/util/input/InputUtil.java Normal file
View File

@@ -0,0 +1,36 @@
package com.bartlomiejpluta.base.util.input;
import com.bartlomiejpluta.base.api.character.Character;
import com.bartlomiejpluta.base.api.input.Input;
import com.bartlomiejpluta.base.api.input.Key;
import com.bartlomiejpluta.base.api.move.Direction;
public class InputUtil {
public static void handleBasicControl(Character character, Input input) {
if (character.isMoving() || character.getLayer() == null) {
return;
}
if (input.isKeyPressed(Key.KEY_LEFT_CONTROL)) {
if (input.isKeyPressed(Key.KEY_DOWN)) {
character.setFaceDirection(Direction.DOWN);
} else if (input.isKeyPressed(Key.KEY_UP)) {
character.setFaceDirection(Direction.UP);
} else if (input.isKeyPressed(Key.KEY_LEFT)) {
character.setFaceDirection(Direction.LEFT);
} else if (input.isKeyPressed(Key.KEY_RIGHT)) {
character.setFaceDirection(Direction.RIGHT);
}
} else {
if (input.isKeyPressed(Key.KEY_DOWN)) {
character.move(Direction.DOWN);
} else if (input.isKeyPressed(Key.KEY_UP)) {
character.move(Direction.UP);
} else if (input.isKeyPressed(Key.KEY_LEFT)) {
character.move(Direction.LEFT);
} else if (input.isKeyPressed(Key.KEY_RIGHT)) {
character.move(Direction.RIGHT);
}
}
}
}

7
engine/src/main/java/com/bartlomiejpluta/base/engine/world/character/model/DefaultCharacter.java
View File

@@ -144,6 +144,13 @@ public class DefaultCharacter extends MovableSprite implements Character {
return animation.getFuture();
}
@Override
public Movement move(Direction direction) {
var movement = prepareMovement(direction);
layer.pushMovement(movement);
return movement;
}
@Override
public boolean move(Movement movement) {
if (super.move(movement)) {