Skip to content
Snippets Groups Projects
Commit e85dfe2d authored by Scherbaum Maximilian's avatar Scherbaum Maximilian
Browse files

add EntityFactory.java, update GameSceneController.java, fix...

add EntityFactory.java, update GameSceneController.java, fix InputHandler.java, update Player.java #6
parent bf9bd48c
No related branches found
No related tags found
4 merge requests!74V1,!73Initial commit,!71Merge DataBase into Development,!3merging player for integration testing
package de.hdm_stuttgart.battlearena.Controller;
import de.hdm_stuttgart.battlearena.Model.Entity.Player;
import de.hdm_stuttgart.battlearena.Model.Inputs.InputHandler;
import javafx.animation.AnimationTimer;
......@@ -25,25 +26,31 @@ public class GameSceneController implements Initializable {
InputHandler inputHandler = InputHandler.getInstance();
Player player;
@Override
public void initialize(URL url, ResourceBundle resourceBundle) {
graphicsContext2D = canvas2D.getGraphicsContext2D();
player = new Player(graphicsContext2D, inputHandler);
AnimationTimer gameLoop = new AnimationTimer() {
@Override
public void handle(long l) {
graphicsContext2D.clearRect(0, 0, canvas2D.getWidth(), canvas2D.getHeight());
updateContent();
renderContent(graphicsContext2D);
}
};
gameLoop.start();
}
private void updateContent() {
player.updateEntityMovement();
}
private void renderContent(GraphicsContext graphicsContext) {
player.renderEntity(graphicsContext);
}
}
\ No newline at end of file
package de.hdm_stuttgart.battlearena.Model.Entity;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
public class EntityFactory {
private static final Logger log = LogManager.getLogger(EntityFactory.class);
}
\ No newline at end of file
......@@ -50,8 +50,8 @@ public class Player implements IEntity {
@Override
public void loadEntitySprites() {
try {
directionDownOne = new Image(Objects.requireNonNull(getClass().getResourceAsStream("textures/player/playerPlaceholder.png")));
directionDownTwo = new Image(Objects.requireNonNull(getClass().getResourceAsStream("textures/player/playerPlaceholder.png")));
directionDownOne = new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/player/playerPlaceholder.png")));
directionDownTwo = new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/player/playerPlaceholder.png")));
} catch (Exception e) {
log.error(e);
}
......@@ -69,28 +69,28 @@ public class Player implements IEntity {
} else {
playerDirection = "right";
}
}
boolean isColliding = false;
if (!isColliding) {
switch (playerDirection) {
case "up":
mapPosY -= playerSpeed;
break;
case "down":
mapPosY += playerSpeed;
break;
case "left":
mapPosX -= playerSpeed;
break;
case "right":
mapPosX += playerSpeed;
boolean isColliding = false;
if (!isColliding) {
switch (playerDirection) {
case "up":
mapPosY -= playerSpeed;
break;
case "down":
mapPosY += playerSpeed;
break;
case "left":
mapPosX -= playerSpeed;
break;
case "right":
mapPosX += playerSpeed;
}
}
}
updateEntityAnimation();
updateEntityAnimation();
}
}
@Override
......@@ -144,4 +144,13 @@ public class Player implements IEntity {
graphicsContext.drawImage(playerSprite, mapPosX, mapPosY, 48, 48);
}
public int getMapPosX() {
return mapPosX;
}
public int getMapPosY() {
return mapPosY;
}
}
\ No newline at end of file
......@@ -48,6 +48,7 @@ public class InputHandler {
break;
case S:
moveDown = false;
break;
case A:
moveLeft = false;
break;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment