Skip to content
Snippets Groups Projects

merging player for integration testing

Merged Scherbaum Maximilian requested to merge player into development
6 files
+ 141
8
Compare changes
  • Side-by-side
  • Inline
Files
6
@@ -29,6 +29,7 @@ public class GameSceneController implements Initializable {
InputHandler inputHandler = InputHandler.getInstance();
IEntity player;
IEntity enemy;
@Override
@@ -36,6 +37,7 @@ public class GameSceneController implements Initializable {
graphicsContext2D = canvas2D.getGraphicsContext2D();
player = EntityFactory.createEntity(EntityType.PLAYER, graphicsContext2D, inputHandler);
enemy = EntityFactory.createEntity(EntityType.ENEMY_PLAYER, graphicsContext2D, inputHandler);
AnimationTimer gameLoop = new AnimationTimer() {
@Override
@@ -50,10 +52,16 @@ public class GameSceneController implements Initializable {
}
private void updateContent() {
player.updateEntityMovement();
player.updateEntityMovement(this);
enemy.updateEntityMovement(this);
}
private void renderContent(GraphicsContext graphicsContext) {
player.renderEntity(graphicsContext);
enemy.renderEntity(graphicsContext);
}
public IEntity getEnemy() {
return enemy;
}
}
\ No newline at end of file
Loading