|
@@ -18,6 +18,7 @@ import view.GameView;
|
|
|
import control.GameControl;
|
|
import control.GameControl;
|
|
|
import control.GameStateManager;
|
|
import control.GameStateManager;
|
|
|
import control.LedHandler;
|
|
import control.LedHandler;
|
|
|
|
|
+import control.NetworkHandler;
|
|
|
import control.button.ButtonHandler;
|
|
import control.button.ButtonHandler;
|
|
|
import control.joystick.JoystickHandler;
|
|
import control.joystick.JoystickHandler;
|
|
|
|
|
|
|
@@ -35,9 +36,8 @@ public class Window extends JFrame {
|
|
|
setSize(WIDTH, HEIGHT);
|
|
setSize(WIDTH, HEIGHT);
|
|
|
|
|
|
|
|
//Create Events
|
|
//Create Events
|
|
|
- LedHandler led = null;
|
|
|
|
|
Window.ON_RASP = ON_RASP;
|
|
Window.ON_RASP = ON_RASP;
|
|
|
-
|
|
|
|
|
|
|
+ LedHandler led = null;
|
|
|
if(ON_RASP){ //Only on the raspberry pi
|
|
if(ON_RASP){ //Only on the raspberry pi
|
|
|
led = new LedHandler();
|
|
led = new LedHandler();
|
|
|
GraphicsEnvironment graphicsEnvironment = GraphicsEnvironment.getLocalGraphicsEnvironment();
|
|
GraphicsEnvironment graphicsEnvironment = GraphicsEnvironment.getLocalGraphicsEnvironment();
|
|
@@ -57,6 +57,8 @@ public class Window extends JFrame {
|
|
|
ButtonHandler bth = new ButtonHandler(led);
|
|
ButtonHandler bth = new ButtonHandler(led);
|
|
|
JoystickHandler jsh = new JoystickHandler();
|
|
JoystickHandler jsh = new JoystickHandler();
|
|
|
|
|
|
|
|
|
|
+ NetworkHandler ntw = new NetworkHandler("192.168.1.6", 1113, bth, jsh);
|
|
|
|
|
+
|
|
|
//Create Instances
|
|
//Create Instances
|
|
|
final SongHandler sh = new SongHandler();
|
|
final SongHandler sh = new SongHandler();
|
|
|
GameStateManager gsm = new GameStateManager(sh);
|
|
GameStateManager gsm = new GameStateManager(sh);
|