cleanup + kommentarer för collisions

src/main/GameFrame.java

 package main;
 
 import javafx.scene.layout.HBox;
+import javafx.scene.layout.VBox;
 import states.GameModel;
 
 /**

src/states/Enemy.java

@@ -5,17 +5,24 @@ import java.io.FileNotFoundException;
 
 import constants.Constants;
 import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
 
 public class Enemy {
 	
 	private double enemyX = -100.00;
 	private double enemyY = 250.00;
 	private Image image;
+	private ImageView enemyView;
 
 	public Enemy(String enemyImg) {
 
 		try {
 			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) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
@@ -36,6 +43,10 @@ public class Enemy {
 		return enemyX;
 	}
 
+	public ImageView getEnemyView() {
+		return enemyView;
+	}
+
 	public double getEnemyY() {
 		return enemyY;
 	}

src/states/PlayState.java

@@ -57,15 +57,6 @@ public class PlayState extends GameState {
 		player = new Player(Constants.playerImg);
 		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 {
 		g.setLineDashes(2);
 		g.strokeLine(Constants.screenWidth, 350, 0, 350);
 
-//		if (enemyPosX < 0 - Constants.enemyWidth) {
-//			enemyPosX = Constants.screenWidth;
-//		}
 		
 		if (enemy.getEnemyX() < 0 - Constants.enemyWidth) {
 			enemy.setEnemyX(Constants.screenWidth);
 		}
 
 		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);
+		
+		
 	}
 
 	@Override
@@ -114,11 +103,10 @@ public class PlayState extends GameState {
 	@Override
 	public void update() {
 
-//		enemyPosX -= 10;
+		checkCollision();
 		
 		enemy.setEnemyX(enemy.getEnemyX()-10);
 		
-		
 
 		if (up) {
 
@@ -133,6 +121,9 @@ public class PlayState extends GameState {
 	
 	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
+		
 	}
 
 

src/states/Player.java

@@ -6,8 +6,10 @@ import java.io.FileNotFoundException;
 
 import constants.Constants;
 import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
+import javafx.scene.shape.Rectangle;
 
 public class Player {
 
@@ -18,16 +20,30 @@ public class Player {
 	private Image image;
 	private boolean down = false;
 	private boolean up = false;
+	private Rectangle rekt;
+	private ImageView playerView;
 
 
 	public Player(String playerImg) {
 
 		try {
 			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) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
+		
+		
+	}
+
+
+	public ImageView getPlayerView() {
+		return playerView;
 	}
 
 
@@ -57,17 +73,11 @@ public class Player {
 
 	
 	
-	public void move(KeyEvent key) {
-		
-		if (key.getCode() == KeyCode.UP) {
-			this.jump();
-			up = true;
-		}
-		
-	}
+	
 	
 		
 	public void jump() {
+		
 				
 	if (!down) {