Skip to content
Snippets Groups Projects
Commit bab5ad12 authored by Oscar Wiberg's avatar Oscar Wiberg
Browse files

cleanup + kommentarer för collisions

parent bc2c67aa
No related branches found
No related tags found
1 merge request!1Testb
package main; package main;
import javafx.scene.layout.HBox; import javafx.scene.layout.HBox;
import javafx.scene.layout.VBox;
import states.GameModel; import states.GameModel;
/** /**
......
...@@ -5,17 +5,24 @@ import java.io.FileNotFoundException; ...@@ -5,17 +5,24 @@ import java.io.FileNotFoundException;
import constants.Constants; import constants.Constants;
import javafx.scene.image.Image; import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
public class Enemy { public class Enemy {
private double enemyX = -100.00; private double enemyX = -100.00;
private double enemyY = 250.00; private double enemyY = 250.00;
private Image image; private Image image;
private ImageView enemyView;
public Enemy(String enemyImg) { public Enemy(String enemyImg) {
try { try {
image = new Image(new FileInputStream(enemyImg)); image = new Image(new FileInputStream(enemyImg));
enemyView = new ImageView(image);
enemyView.setX(enemyX);
enemyView.setY(enemyY);
enemyView.setFitHeight(Constants.enemyHeight);
enemyView.setFitWidth(Constants.enemyWidth);
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();
...@@ -36,6 +43,10 @@ public class Enemy { ...@@ -36,6 +43,10 @@ public class Enemy {
return enemyX; return enemyX;
} }
public ImageView getEnemyView() {
return enemyView;
}
public double getEnemyY() { public double getEnemyY() {
return enemyY; return enemyY;
} }
......
...@@ -57,15 +57,6 @@ public class PlayState extends GameState { ...@@ -57,15 +57,6 @@ public class PlayState extends GameState {
player = new Player(Constants.playerImg); player = new Player(Constants.playerImg);
enemy = new Enemy(Constants.enemyImg); enemy = new Enemy(Constants.enemyImg);
try {
obstacle = new Image(new FileInputStream(Constants.enemyImg));
} catch (FileNotFoundException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
} }
/** /**
...@@ -83,17 +74,15 @@ public class PlayState extends GameState { ...@@ -83,17 +74,15 @@ public class PlayState extends GameState {
g.setLineDashes(2); g.setLineDashes(2);
g.strokeLine(Constants.screenWidth, 350, 0, 350); g.strokeLine(Constants.screenWidth, 350, 0, 350);
// if (enemyPosX < 0 - Constants.enemyWidth) {
// enemyPosX = Constants.screenWidth;
// }
if (enemy.getEnemyX() < 0 - Constants.enemyWidth) { if (enemy.getEnemyX() < 0 - Constants.enemyWidth) {
enemy.setEnemyX(Constants.screenWidth); enemy.setEnemyX(Constants.screenWidth);
} }
g.drawImage(player.getImage(), player.getPlayerX(), player.getPlayerY(), Constants.playerWidth, Constants.playerHeight); g.drawImage(player.getImage(), player.getPlayerX(), player.getPlayerY(), Constants.playerWidth, Constants.playerHeight);
// g.drawImage(obstacle, enemyPosX, enemyPosY, Constants.enemyWidth, Constants.enemyHeight);
g.drawImage(enemy.getImage(), enemy.getEnemyX(), enemy.getEnemyY(), Constants.enemyWidth, Constants.enemyHeight); g.drawImage(enemy.getImage(), enemy.getEnemyX(), enemy.getEnemyY(), Constants.enemyWidth, Constants.enemyHeight);
} }
@Override @Override
...@@ -114,11 +103,10 @@ public class PlayState extends GameState { ...@@ -114,11 +103,10 @@ public class PlayState extends GameState {
@Override @Override
public void update() { public void update() {
// enemyPosX -= 10; checkCollision();
enemy.setEnemyX(enemy.getEnemyX()-10); enemy.setEnemyX(enemy.getEnemyX()-10);
if (up) { if (up) {
...@@ -133,6 +121,9 @@ public class PlayState extends GameState { ...@@ -133,6 +121,9 @@ public class PlayState extends GameState {
public void checkCollision() { public void checkCollision() {
// rita upp från player samt enemy x och y kordinater + eller - höjd och bredd, då får vi spannen som enemy och player bilderna befinner sig i
// nästlade if satser, först kolla om enemy befinner sig i mitten av skärmen på players x position, sen kollar vi om players y är större än enemy
} }
......
...@@ -6,8 +6,10 @@ import java.io.FileNotFoundException; ...@@ -6,8 +6,10 @@ import java.io.FileNotFoundException;
import constants.Constants; import constants.Constants;
import javafx.scene.image.Image; import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
import javafx.scene.input.KeyCode; import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyEvent; import javafx.scene.input.KeyEvent;
import javafx.scene.shape.Rectangle;
public class Player { public class Player {
...@@ -18,16 +20,30 @@ public class Player { ...@@ -18,16 +20,30 @@ public class Player {
private Image image; private Image image;
private boolean down = false; private boolean down = false;
private boolean up = false; private boolean up = false;
private Rectangle rekt;
private ImageView playerView;
public Player(String playerImg) { public Player(String playerImg) {
try { try {
image = new Image(new FileInputStream(playerImg)); image = new Image(new FileInputStream(playerImg));
playerView = new ImageView(image);
playerView.setX(playerX);
playerView.setY(playerY);
playerView.setFitHeight(Constants.playerHeight);
playerView.setFitWidth(Constants.playerWidth);
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();
} }
}
public ImageView getPlayerView() {
return playerView;
} }
...@@ -57,17 +73,11 @@ public class Player { ...@@ -57,17 +73,11 @@ public class Player {
public void move(KeyEvent key) {
if (key.getCode() == KeyCode.UP) {
this.jump();
up = true;
}
}
public void jump() { public void jump() {
if (!down) { if (!down) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment