Merge branch 'develop' of https://github.com/ProjectGroepA2/Arcade into develop

Conflicts:
	main/Window.java
	model/drawObjects/Player.java
	model/gameState/PlayState.java

control/Button.java

@@ -1,5 +0,0 @@
-package control;
-
-public class Button {
-
-}

control/JoyStick.java

@@ -1,5 +0,0 @@
-package control;
-
-public class JoyStick {
-
-}

control/button/ButtonHandler.java

@@ -126,7 +126,32 @@ public class ButtonHandler implements KeyListener{
 		}
 	}
 
-	public void keyReleased(KeyEvent arg0) {}
+	public void keyReleased(KeyEvent e) {
+		switch(e.getKeyCode())
+		{
+		case KeyEvent.VK_0:
+			buttonRelease(buttons.get(0));
+			break;
+		case KeyEvent.VK_1:
+			buttonRelease(buttons.get(1));
+			break;
+		case KeyEvent.VK_2:
+			buttonRelease(buttons.get(2));
+			break;
+		case KeyEvent.VK_3:
+			buttonRelease(buttons.get(3));
+			break;
+		case KeyEvent.VK_4:
+			buttonRelease(buttons.get(4));
+			break;
+		case KeyEvent.VK_5:
+			buttonRelease(buttons.get(5));
+			break;
+		case KeyEvent.VK_6:
+			buttonRelease(buttons.get(6));
+			break;
+		}
+	}
 	public void keyTyped(KeyEvent arg0) {}
 	
 	public static List<Button> getButtons()

main/Window.java

@@ -1,9 +1,18 @@
 package main;
 
+
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
+
+import java.awt.Cursor;
 import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
+import java.awt.Point;
+import java.awt.Toolkit;
+
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
+import java.awt.image.BufferedImage;
 
 import javax.swing.JFrame;
 
@@ -40,26 +49,28 @@ public class Window extends JFrame {
 			}
 		});
 		
-		//Set window to fullscreen
-//		setExtendedState(getExtendedState() | JFrame.MAXIMIZED_BOTH);
-//		setUndecorated(true);
-		
+
 		//Create Events
 		LedHandler led = null;
 		
-		if(ON_RASP) //TODO REMOVE
+		if(ON_RASP)
 		{
 			led = new LedHandler();
 			GraphicsEnvironment graphicsEnvironment = GraphicsEnvironment.getLocalGraphicsEnvironment();
 			GraphicsDevice[] devices =  graphicsEnvironment.getScreenDevices();
-			for(GraphicsDevice divice : devices){
-				System.out.println(divice);
-			}
+
 			if (!devices[0].isFullScreenSupported ())
 			{
 			     throw new UnsupportedOperationException ("Fullscreen mode is unsupported.");
 			}
 			devices[0].setFullScreenWindow(this);
+
+			
+			//dissapear cursor
+			BufferedImage cursorImg = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
+			Cursor blankCursor = Toolkit.getDefaultToolkit().createCustomCursor(cursorImg, new Point(0, 0), "blank cursor");
+			this.setCursor(blankCursor);
+
 		}
 		
 		ButtonHandler bth = new ButtonHandler(led);

model/drawObjects/DrawObject.java

@@ -21,6 +21,10 @@ public abstract class DrawObject {
 		this.index = index;
 	}
 	
+	public void setIndex(int index){
+		this.index = index;
+	}
+	
 	public abstract void draw(Graphics2D g2);
 	public abstract void update();
 }

model/drawObjects/Player.java

@@ -18,13 +18,14 @@ public class Player extends Person {
 	}
 	
 	public void draw(Graphics2D g2){//		
-		g2.drawImage(img, transform, null);			
+		g2.drawImage(img, transform, null);		
+		
 	}
 	
 	public void update(){
 		transform = new AffineTransform();
 		transform.rotate(Math.toRadians(index*45),middlePoint.getX(),middlePoint.getY());
-		transform.translate(middlePoint.getX() - width/2, middlePoint.getY() - height);		
+		transform.translate(middlePoint.getX() - width/2, middlePoint.getY() - height);	
 	}
 }
 	

model/gameState/PlayState.java

@@ -1,5 +1,6 @@
 package model.gameState;
 
+
 import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Graphics2D;
@@ -30,6 +31,7 @@ public class PlayState extends GameState{
 	private List<Bullet> bullets;
 	private Iterator<Enemy> enemyIterator;
 	private Iterator<Bullet> bulletIterator;
+
 	
 	public PlayState(GameStateManager gsm) {
 		super(gsm);
@@ -41,7 +43,8 @@ public class PlayState extends GameState{
 		for(int i = 0; i < 8; i++){
 			Line2D line = area.getLine(i);
 			addEnemy(line, Color.BLUE, 200);
-		}		
+		}
+		
 	}
 
 	@Override
@@ -53,6 +56,7 @@ public class PlayState extends GameState{
 	@Override
 	public void update() {		
 		player.update();	
+
 		
 		bulletIterator = bullets.iterator();
 		while(bulletIterator.hasNext()){
@@ -100,6 +104,7 @@ public class PlayState extends GameState{
 			}						
 		}	
 		
+
 		while(enemys.size() < 8){
 			int index = (int)(Math.random()*8);
 			int color = (int)(Math.random()*GameModel.colors.length);
@@ -121,22 +126,22 @@ public class PlayState extends GameState{
 				}
 			}
 		}		
+
 		g2.setStroke(new BasicStroke(5));
 		for(Bullet b : bullets){
 			b.draw(g2);
 		}
+
 		if(player != null)
 			player.draw(g2);
 		
 	}
 	
-	public void addEnemy(Line2D path,Color c,double speed){		
-		enemys.add(new Enemy(path,c,20,speed));	
-	}
+	
 
 	@Override
 	public void buttonPressed(ButtonEvent e) {	
-//		System.out.println("Playstate button pressed: "+e.getButton().getButtonID());
+
 		switch(e.getButton().getButtonID()){
 			case 1:
 				addBullet(GameModel.colors[0],player.getIndex());
@@ -197,6 +202,11 @@ public class PlayState extends GameState{
 			break;
 		}
 	}
+
+	public void addEnemy(Line2D path,Color c,double speed){		
+		enemys.add(new Enemy(path,c,20,speed));	
+	}
+	
 	public void addBullet(Color c,int index){		;
 		bullets.add(new Bullet(10, c, 10, index,area.paths.get(index)));		
 	}
@@ -204,4 +214,5 @@ public class PlayState extends GameState{
 	public void removeBullet(Bullet bullet){
 		bullets.remove(bullet);
 	}
+
 }