GameSprint1Done, little bug. When aiming right down not possible to hit with button 1 and 3 :S
This commit is contained in:
+11
-5
@@ -8,12 +8,17 @@ import javax.swing.JFrame;
|
||||
import model.GameModel;
|
||||
import view.GameView;
|
||||
import control.GameControl;
|
||||
import control.GameStateManager;
|
||||
import control.LedHandler;
|
||||
import control.button.ButtonHandler;
|
||||
import control.joystick.JoystickHandler;
|
||||
|
||||
public class Window extends JFrame {
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
private static final long serialVersionUID = -9222956702898533696L;
|
||||
public static boolean ON_RASP;
|
||||
|
||||
public Window(boolean ON_RASP)
|
||||
@@ -23,7 +28,7 @@ public class Window extends JFrame {
|
||||
setSize(1280, 1024);
|
||||
|
||||
Window.ON_RASP = ON_RASP;
|
||||
System.out.println(ON_RASP);
|
||||
// System.out.println(ON_RASP);
|
||||
|
||||
//Set window close listener
|
||||
setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
|
||||
@@ -35,7 +40,7 @@ public class Window extends JFrame {
|
||||
|
||||
//Set window to fullscreen
|
||||
// setExtendedState(getExtendedState() | JFrame.MAXIMIZED_BOTH);
|
||||
setUndecorated(true);
|
||||
// setUndecorated(true);
|
||||
|
||||
//Create Events
|
||||
LedHandler led = null;
|
||||
@@ -49,9 +54,10 @@ public class Window extends JFrame {
|
||||
JoystickHandler jsh = new JoystickHandler();
|
||||
|
||||
//Create Instances
|
||||
GameView view = new GameView(led);
|
||||
GameModel model = new GameModel(view);
|
||||
GameControl control = new GameControl(model, view);
|
||||
GameStateManager gsm = new GameStateManager();
|
||||
GameView view = new GameView(led,gsm);
|
||||
GameModel model = new GameModel(view,gsm);
|
||||
GameControl control = new GameControl(model, view,gsm);
|
||||
setContentPane(view);
|
||||
|
||||
//Create EventListeners
|
||||
|
||||
Reference in New Issue
Block a user